Merge pull request #409 from npostavs/font-lock

Fix yas--font-lock-keywords

diff --combined yasnippet.el
index 8149acc166c90fe643da9a19659a735c3aef0071,e7531fe9032a27493384992641e18937704dbe0f..afa0a4209a62e4b27e5cbd75f85e9c213a762efb
--- 1/yasnippet.el
--- 2/yasnippet.el
+++ b/yasnippet.el
@@@ -814,8 -814,6 +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 +821,8 @@@
              ("${\\([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)))))
@@@ -2203,7 -2201,7 +2201,7 @@@ If expansion fails, execute the previou
    (interactive)
    (setq yas--condition-cache-timestamp (current-time))
    (let* ((vec (subseq (this-command-keys-vector) (if current-prefix-arg
 -                                                     universal-argument-num-events
 +                                                     (length (this-command-keys))
                                                     0)))
           (templates (mapcan #'(lambda (table)
                                  (yas--fetch table vec))
@@@ -3523,11 -3521,9 +3521,11 @@@ considered when expanding the snippet.
                   (setq snippet
                         (if expand-env
                             (eval `(let* ,expand-env
 -                                    (insert content)
 +                                    (let ((inhibit-modification-hooks t))
 +                                      (insert content))
                                      (yas--snippet-create (point-min))))
 -                         (insert content)
 +                         (let ((inhibit-modification-hooks t))
 +                           (insert content))
                           (yas--snippet-create (point-min)))))))
  
             ;; stacked-expansion: This checks for stacked expansion, save the