Merge pull request #412 from npostavs/less-narrow

[gnu-emacs-elpa] / yasnippet.el

diff --git a/yasnippet.el b/yasnippet.el
index 5ca59780568315c7d53ebd420053f9d9b9c189b7..91aabd98d450aacb1ba7ec9a5b6e92a3a560de1a 100644 (file)
--- 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)))))