[Emacs-diffs] /srv/bzr/emacs/trunk r112201: * lisp/hi-lock.el (hi-lock-mode): Cleanup after revert-buffer.

[Stefan Monnier]

------------------------------------------------------------
revno: 112201
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=13891
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Sun 2013-03-31 09:34:35 -0400
message:
  * lisp/hi-lock.el (hi-lock-mode): Cleanup after revert-buffer.
modified:
  lisp/ChangeLog
  lisp/hi-lock.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-03-30 19:31:27 +0000
+++ b/lisp/ChangeLog    2013-03-31 13:34:35 +0000
@@ -1,3 +1,7 @@
+2013-03-31  Stefan Monnier  <address@hidden>
+
+       * hi-lock.el (hi-lock-mode): Cleanup after revert-buffer (bug#13891).
+
 2013-03-30  Fabián Ezequiel Gallina  <address@hidden>
 
        Un-indent after "pass" and "return" statements (Bug#13888)

=== modified file 'lisp/hi-lock.el'
--- a/lisp/hi-lock.el   2013-03-08 04:18:16 +0000
+++ b/lisp/hi-lock.el   2013-03-31 13:34:35 +0000
@@ -389,7 +389,9 @@
        (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)