diff options
| author | Miles Bader <miles@gnu.org> | 2007-10-11 16:14:00 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-10-11 16:14:00 +0000 |
| commit | ecb21060d5c1752d41d7a742be565c59b5fcb855 (patch) | |
| tree | fadebcd18a69457a1d564f738c3f9bdcf512ab4b /lisp/font-lock.el | |
| parent | 42af7493ae7e7a14ee508800c7fa75b65a94c143 (diff) | |
| parent | 58ade22bf16a9ec2ff0aee6c59d8db4d1703e94f (diff) | |
| download | emacs-ecb21060d5c1752d41d7a742be565c59b5fcb855.tar.gz | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 866-879)
- Merge multi-tty branch
- Update from CVS
- Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-257
Diffstat (limited to 'lisp/font-lock.el')
| -rw-r--r-- | lisp/font-lock.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/font-lock.el b/lisp/font-lock.el index e254b040ce7..d7882d3e988 100644 --- a/lisp/font-lock.el +++ b/lisp/font-lock.el @@ -2228,7 +2228,7 @@ other modes in which C preprocessor directives are used. e.g. `asm-mode' and `(;; Control structures. Emacs Lisp forms. (,(concat "(" (regexp-opt - '("cond" "if" "while" "while-no-input" "let" "let*" + '("cond" "if" "while" "while-no-input" "let" "let*" "let-environment" "prog" "progn" "progv" "prog1" "prog2" "prog*" "inline" "lambda" "save-restriction" "save-excursion" "save-window-excursion" "save-selected-window" @@ -2240,7 +2240,7 @@ other modes in which C preprocessor directives are used. e.g. `asm-mode' and "with-current-buffer" "with-electric-help" "with-local-quit" "with-no-warnings" "with-output-to-string" "with-output-to-temp-buffer" - "with-selected-window" "with-syntax-table" + "with-selected-window" "with-selected-frame" "with-syntax-table" "with-temp-buffer" "with-temp-file" "with-temp-message" "with-timeout" "with-timeout-handler") t) "\\>") |