diff options
| author | Juanma Barranquero | 2002-08-28 15:21:33 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2002-08-28 15:21:33 +0000 |
| commit | 2fb79329b5c58041da276ace62b9475fe3c78317 (patch) | |
| tree | 3b9422d9631c7719c9f066325bce6539aa8203c1 | |
| parent | bf770132a94fb1faa69f3b4e84a2570a6289b1d8 (diff) | |
| download | emacs-2fb79329b5c58041da276ace62b9475fe3c78317.tar.gz emacs-2fb79329b5c58041da276ace62b9475fe3c78317.zip | |
(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'.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/replace.el | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index eb057871d77..19ea7df3412 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,10 @@ | |||
| 1 | 2002-08-28 Juanma Barranquero <lektu@terra.es> | 1 | 2002-08-28 Juanma Barranquero <lektu@terra.es> |
| 2 | 2 | ||
| 3 | * replace.el (occur-hook): Renamed from `occur-mode-hook'. | ||
| 4 | (occur-mode): Remove call to `occur-mode-hook'. | ||
| 5 | (occur-rename-buffer): Fix reference to `occur-mode-hook' in docstring. | ||
| 6 | (occur-1): Add call to `occur-hook'. | ||
| 7 | |||
| 3 | * subr.el (make-variable-frame-localizable): Alias for | 8 | * subr.el (make-variable-frame-localizable): Alias for |
| 4 | `make-variable-frame-local'. | 9 | `make-variable-frame-local'. |
| 5 | 10 | ||
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." | |||
| 464 | "Arguments to pass to `occur-1' to revert an Occur mode buffer. | 464 | "Arguments to pass to `occur-1' to revert an Occur mode buffer. |
| 465 | See `occur-revert-function'.") | 465 | See `occur-revert-function'.") |
| 466 | 466 | ||
| 467 | (defcustom occur-mode-hook '(turn-on-font-lock) | 467 | (defcustom occur-hook '(turn-on-font-lock) |
| 468 | "Hooks run when `occur' is called." | 468 | "Hooks run when `occur' is called." |
| 469 | :type 'hook | 469 | :type 'hook |
| 470 | :group 'matching) | 470 | :group 'matching) |
| @@ -482,8 +482,7 @@ Alternatively, click \\[occur-mode-mouse-goto] on an item to go to it. | |||
| 482 | (setq major-mode 'occur-mode) | 482 | (setq major-mode 'occur-mode) |
| 483 | (setq mode-name "Occur") | 483 | (setq mode-name "Occur") |
| 484 | (set (make-local-variable 'revert-buffer-function) 'occur-revert-function) | 484 | (set (make-local-variable 'revert-buffer-function) 'occur-revert-function) |
| 485 | (make-local-variable 'occur-revert-arguments) | 485 | (make-local-variable 'occur-revert-arguments)) |
| 486 | (run-hooks 'occur-mode-hook)) | ||
| 487 | 486 | ||
| 488 | (defun occur-revert-function (ignore1 ignore2) | 487 | (defun occur-revert-function (ignore1 ignore2) |
| 489 | "Handle `revert-buffer' for Occur mode buffers." | 488 | "Handle `revert-buffer' for Occur mode buffers." |
| @@ -631,7 +630,7 @@ If the value is nil, don't highlight the buffer names specially." | |||
| 631 | Here `original-buffer-name' is the buffer name were occur was originally run. | 630 | Here `original-buffer-name' is the buffer name were occur was originally run. |
| 632 | When given the prefix argument, the renaming will not clobber the existing | 631 | When given the prefix argument, the renaming will not clobber the existing |
| 633 | buffer(s) of that name, but use `generate-new-buffer-name' instead. | 632 | buffer(s) of that name, but use `generate-new-buffer-name' instead. |
| 634 | You can add this to `occur-mode-hook' if you always want a separate *Occur* | 633 | You can add this to `occur-hook' if you always want a separate *Occur* |
| 635 | buffer for each buffer where you invoke `occur'." | 634 | buffer for each buffer where you invoke `occur'." |
| 636 | (interactive "P") | 635 | (interactive "P") |
| 637 | (with-current-buffer | 636 | (with-current-buffer |
| @@ -749,7 +748,8 @@ See also `multi-occur'." | |||
| 749 | buffer-read-only t) | 748 | buffer-read-only t) |
| 750 | (if (> count 0) | 749 | (if (> count 0) |
| 751 | (display-buffer occur-buf) | 750 | (display-buffer occur-buf) |
| 752 | (kill-buffer occur-buf)))))) | 751 | (kill-buffer occur-buf))) |
| 752 | (run-hooks 'occur-hook)))) | ||
| 753 | 753 | ||
| 754 | (defun occur-engine-add-prefix (lines) | 754 | (defun occur-engine-add-prefix (lines) |
| 755 | (mapcar | 755 | (mapcar |