[Emacs-diffs] /srv/bzr/emacs/trunk r105842: Fixes for Occur Edit mode.

[Chong Yidong]

------------------------------------------------------------
revno: 105842
author: Leo Liu <address@hidden>
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Mon 2011-09-19 14:57:55 -0400
message:
  Fixes for Occur Edit mode.
  
  * replace.el (occur-revert-arguments): Make it permanent-local.
  (occur-mode): Don't call font-lock-defontify.
modified:
  lisp/ChangeLog
  lisp/replace.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-09-19 18:45:55 +0000
+++ b/lisp/ChangeLog    2011-09-19 18:57:55 +0000
@@ -1,3 +1,8 @@
+2011-09-19  Leo Liu  <address@hidden>
+
+       * replace.el (occur-revert-arguments): Make it permanent-local.
+       (occur-mode): Don't call font-lock-defontify.
+
 2011-09-19  Chong Yidong  <address@hidden>
 
        * net/ldap.el (ldap-search-internal): Don't push empty search

=== modified file 'lisp/replace.el'
--- a/lisp/replace.el   2011-09-17 21:28:17 +0000
+++ b/lisp/replace.el   2011-09-19 18:57:55 +0000
@@ -826,6 +826,8 @@
 (defvar occur-revert-arguments nil
   "Arguments to pass to `occur-1' to revert an Occur mode buffer.
 See `occur-revert-function'.")
+(make-variable-buffer-local 'occur-revert-arguments)
+(put 'occur-revert-arguments 'permanent-local t)
 
 (defcustom occur-mode-hook '(turn-on-font-lock)
   "Hook run when entering Occur mode."
@@ -853,8 +855,6 @@
 
 \\{occur-mode-map}"
   (set (make-local-variable 'revert-buffer-function) 'occur-revert-function)
-  (make-local-variable 'occur-revert-arguments)
-  (add-hook 'change-major-mode-hook 'font-lock-defontify nil t)
   (setq next-error-function 'occur-next-error))
 
 
@@ -876,7 +876,7 @@
 In this mode, changes to the *Occur* buffer are also applied to
 the originating buffer.
 
-To return to ordinary Occur mode, use \\[occur-mode]."
+To return to ordinary Occur mode, use \\[occur-cease-edit]."
   (setq buffer-read-only nil)
   (add-hook 'after-change-functions 'occur-after-change-function nil t)
   (message (substitute-command-keys