Add four macros to lisp-font-lock-keywords-2 (Bug#6025).

* font-lock.el (lisp-font-lock-keywords-2): Add
combine-after-change-calls, condition-case-no-debug,
with-demoted-errors, and with-silent-modifications (Bug#6025).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 084b3eb3951488d23be5b4d2695e50c9e7ec3021..e2f68ba7677224f2113f8a0844a6e781f3c5aafe 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-14  Štěpán Němec  <stepnem@gmail.com>  (tiny change)
+
+       * font-lock.el (lisp-font-lock-keywords-2): Add
+       combine-after-change-calls, condition-case-no-debug,
+       with-demoted-errors, and with-silent-modifications (Bug#6025).
+
 2010-08-14  Kevin Ryde  <user42@zip.com.au>
 
        * emacs-lisp/copyright.el (copyright-update-year)

diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index db665857fdb4e79ed703d6a14f0f137867faacf4..9d9a2da834c0343a2dd073e9535098cfa5f10055 100644 (file)
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -2283,14 +2283,17 @@ in which C preprocessor directives are used. e.g. `asm-mode' and
                 "inline" "lambda" "save-restriction" "save-excursion"
                 "save-selected-window" "save-window-excursion"
                 "save-match-data" "save-current-buffer"
-                "unwind-protect" "condition-case" "track-mouse"
-                "eval-after-load" "eval-and-compile" "eval-when-compile"
-                "eval-when" "eval-next-after-load"
+                "combine-after-change-calls" "unwind-protect"
+                "condition-case" "condition-case-no-debug"
+                "track-mouse" "eval-after-load" "eval-and-compile"
+                "eval-when-compile" "eval-when" "eval-next-after-load"
                 "with-case-table" "with-category-table"
-                "with-current-buffer" "with-electric-help"
+                "with-current-buffer" "with-demoted-errors"
+                "with-electric-help"
                 "with-local-quit" "with-no-warnings"
                 "with-output-to-string" "with-output-to-temp-buffer"
-                "with-selected-window" "with-selected-frame" "with-syntax-table"
+                "with-selected-window" "with-selected-frame"
+                "with-silent-modifications" "with-syntax-table"
                 "with-temp-buffer" "with-temp-file" "with-temp-message"
                 "with-timeout" "with-timeout-handler") t)
          "\\>")