[Emacs-diffs] /srv/bzr/emacs/trunk r101087: Add four macros to lisp-font-lock-keywords-2 (Bug#6025).

[Chong Yidong]

------------------------------------------------------------
revno: 101087
author: Štěpán Němec <address@hidden>
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sat 2010-08-14 19:42:07 -0400
message:
  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).
modified:
  lisp/ChangeLog
  lisp/font-lock.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-08-14 23:32:25 +0000
+++ b/lisp/ChangeLog    2010-08-14 23:42:07 +0000
@@ -1,3 +1,9 @@
+2010-08-14  Štěpán Němec  <address@hidden>  (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  <address@hidden>
 
        * emacs-lisp/copyright.el (copyright-update-year)

=== modified file 'lisp/font-lock.el'
--- a/lisp/font-lock.el 2010-06-16 20:08:41 +0000
+++ b/lisp/font-lock.el 2010-08-14 23:42:07 +0000
@@ -2283,14 +2283,17 @@
                 "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)
          "\\>")