From: Juanma Barranquero <lekktu@gmail.com>
Date: Wed, 28 Aug 2002 15:21:33 +0000 (+0000)
Subject: (occur-hook): Renamed from `occur-mode-hook'.
X-Git-Tag: ttn-vms-21-2-B4~13520
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2fb79329b5c58041da276ace62b9475fe3c78317;p=emacs.git

(occur-hook): Renamed from `occur-mode-hook'.
(occur-mode): Remove call to `occur-mode-hook'.
(occur-rename-buffer): Fix reference to `occur-mode-hook' in docstring.
(occur-1): Add call to `occur-hook'.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index eb057871d77..19ea7df3412 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,10 @@
 2002-08-28  Juanma Barranquero  <lektu@terra.es>
 
+	* replace.el (occur-hook): Renamed from `occur-mode-hook'.
+	(occur-mode): Remove call to `occur-mode-hook'.
+	(occur-rename-buffer): Fix reference to `occur-mode-hook' in docstring.
+	(occur-1): Add call to `occur-hook'.
+
 	* subr.el (make-variable-frame-localizable): Alias for
 	`make-variable-frame-local'.
 
diff --git a/lisp/replace.el b/lisp/replace.el
index 0865499d441..7cfe1947f50 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -464,7 +464,7 @@ end of the buffer."
   "Arguments to pass to `occur-1' to revert an Occur mode buffer.
 See `occur-revert-function'.")
 
-(defcustom occur-mode-hook '(turn-on-font-lock)
+(defcustom occur-hook '(turn-on-font-lock)
   "Hooks run when `occur' is called."
   :type 'hook
   :group 'matching)
@@ -482,8 +482,7 @@ Alternatively, click \\[occur-mode-mouse-goto] on an item to go to it.
   (setq major-mode 'occur-mode)
   (setq mode-name "Occur")
   (set (make-local-variable 'revert-buffer-function) 'occur-revert-function)
-  (make-local-variable 'occur-revert-arguments)
-  (run-hooks 'occur-mode-hook))
+  (make-local-variable 'occur-revert-arguments))
 
 (defun occur-revert-function (ignore1 ignore2)
   "Handle `revert-buffer' for Occur mode buffers."
@@ -631,7 +630,7 @@ If the value is nil, don't highlight the buffer names specially."
 Here `original-buffer-name' is the buffer name were occur was originally run.
 When given the prefix argument, the renaming will not clobber the existing
 buffer(s) of that name, but use `generate-new-buffer-name' instead.
-You can add this to `occur-mode-hook' if you always want a separate *Occur*
+You can add this to `occur-hook' if you always want a separate *Occur*
 buffer for each buffer where you invoke `occur'."
   (interactive "P")
   (with-current-buffer
@@ -749,7 +748,8 @@ See also `multi-occur'."
 	      buffer-read-only t)
 	(if (> count 0)
 	    (display-buffer occur-buf)
-	  (kill-buffer occur-buf))))))
+	  (kill-buffer occur-buf)))
+      (run-hooks 'occur-hook))))
 
 (defun occur-engine-add-prefix (lines)
   (mapcar