diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-03-31 09:34:35 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-03-31 09:34:35 -0400 |
| commit | 2bd8a4a8675b92b9dfed0a145493abb48e048d2d (patch) | |
| tree | a9dd613e73a37c3b33f713f3501a014b1ff38ec3 | |
| parent | df8abd0be836a5441c5ccd4ebf1a90937ea354d9 (diff) | |
| download | emacs-2bd8a4a8675b92b9dfed0a145493abb48e048d2d.tar.gz emacs-2bd8a4a8675b92b9dfed0a145493abb48e048d2d.tar.bz2 emacs-2bd8a4a8675b92b9dfed0a145493abb48e048d2d.zip | |
* lisp/hi-lock.el (hi-lock-mode): Cleanup after revert-buffer.
Fixes: debbugs:13891
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/hi-lock.el | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ced7672ef99..9a471252797 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2013-03-31 Stefan Monnier <monnier@iro.umontreal.ca> + + * hi-lock.el (hi-lock-mode): Cleanup after revert-buffer (bug#13891). + 2013-03-30 Fabián Ezequiel Gallina <fabian@anue.biz> Un-indent after "pass" and "return" statements (Bug#13888) diff --git a/lisp/hi-lock.el b/lisp/hi-lock.el index 38e5e8acb15..e2dc4eac67b 100644 --- a/lisp/hi-lock.el +++ b/lisp/hi-lock.el @@ -389,7 +389,9 @@ versions before 22 use the following in your init file: (define-key-after menu-bar-edit-menu [hi-lock] (cons "Regexp Highlighting" hi-lock-menu)) (hi-lock-find-patterns) - (add-hook 'font-lock-mode-hook 'hi-lock-font-lock-hook nil t)) + (add-hook 'font-lock-mode-hook 'hi-lock-font-lock-hook nil t) + ;; Remove regexps from font-lock-keywords (bug#13891). + (add-hook 'change-major-mode-hook (lambda () (hi-lock-mode -1)) nil t)) ;; Turned off. (when (or hi-lock-interactive-patterns hi-lock-file-patterns) |