diff options
| author | Richard M. Stallman <rms@gnu.org> | 2005-08-20 21:50:48 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 2005-08-20 21:50:48 +0000 |
| commit | 6e86be0b47a519b70e74b80b9478b571ea30cce1 (patch) | |
| tree | 662ab507b4ab0714a81607554b73a5adb19eb8fa | |
| parent | 23bb94bb4a9edf0fede53274990c1e39f6dd6545 (diff) | |
| download | emacs-6e86be0b47a519b70e74b80b9478b571ea30cce1.tar.gz | |
(normal-mode): If font lock is on, turn it off and on.
| -rw-r--r-- | lisp/ChangeLog | 13 | ||||
| -rw-r--r-- | lisp/files.el | 6 |
2 files changed, 19 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4c2a0e44fb8..d2f4f011ff7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,16 @@ +2005-08-20 Richard M. Stallman <rms@gnu.org> + + * files.el (normal-mode): If font lock is on, turn it off and on. + + * subr.el (replace-regexp-in-string): Doc fix. + + * startup.el (command-line-1): Don't suppress startup screen + due to existing processes. + + * progmodes/grep.el (grep): Bind compilation-disable-input to t. + + * progmodes/compile.el (compilation-disable-input): Default to nil. + 2005-08-20 Kevin Rodgers <ihs_4664@yahoo.com> (tiny change) * progmodes/compile.el (compilation-disable-input): New defcustom. diff --git a/lisp/files.el b/lisp/files.el index c2cce8b57c9..1613f3add95 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -1733,6 +1733,12 @@ in that case, this function acts as if `enable-local-variables' were t." (set-auto-mode)) (report-errors "File local-variables error: %s" (hack-local-variables))) + ;; Turn font lock off and on, to make sure it takes account of + ;; whatever file local variables are relevant to it. + (when (and font-lock-mode (eq (car font-lock-keywords) t)) + (setq font-lock-keywords (cadr font-lock-keywords)) + (font-lock-mode 1)) + (if (fboundp 'ucs-set-table-for-input) ; don't lose when building (ucs-set-table-for-input))) |