Mercurial > emacs
changeset 109788:19cb825301e0
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).
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Sat, 14 Aug 2010 19:42:07 -0400 |
parents | f4d4062dc611 |
children | 6994dcd2f3fa |
files | lisp/ChangeLog lisp/font-lock.el |
diffstat | 2 files changed, 14 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sat Aug 14 19:32:25 2010 -0400 +++ b/lisp/ChangeLog Sat Aug 14 19:42:07 2010 -0400 @@ -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)
--- a/lisp/font-lock.el Sat Aug 14 19:32:25 2010 -0400 +++ b/lisp/font-lock.el Sat Aug 14 19:42:07 2010 -0400 @@ -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) "\\>")