[elpa] master 3bb1515 018/177: Merge pull request #409 from npostavs/font-lock

[Jo�o T�vora]

branch: master
commit 3bb151504648f15a5b907612bc7cd473613686dd
Merge: 7849ffc f21ddd1
Author: João Távora <joaotav...@gmail.com>
Commit: João Távora <joaotav...@gmail.com>

    Merge pull request #409 from npostavs/font-lock
    
    Fix yas--font-lock-keywords
---
 yasnippet.el |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/yasnippet.el b/yasnippet.el
index 8149acc..afa0a42 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -814,8 +814,6 @@ Honour `yas-dont-activate', which see."
 
 (defvar yas--font-lock-keywords
   (append '(("^#.*$" . font-lock-comment-face))
-          lisp-font-lock-keywords
-          lisp-font-lock-keywords-1
           lisp-font-lock-keywords-2
           '(("$\\([0-9]+\\)"
              (0 font-lock-keyword-face)
@@ -823,8 +821,8 @@ Honour `yas-dont-activate', which see."
             ("${\\([0-9]+\\):?"
              (0 font-lock-keyword-face)
              (1 font-lock-warning-face t))
-            ("${" font-lock-keyword-face)
-            ("$[0-9]+?" font-lock-preprocessor-face)
+            ("${" . font-lock-keyword-face)
+            ("$[0-9]+?" . font-lock-preprocessor-face)
             ("\\(\\$(\\)" 1 font-lock-preprocessor-face)
             ("}"
              (0 font-lock-keyword-face)))))