diff options
| author | Chong Yidong | 2010-02-19 16:36:29 -0500 |
|---|---|---|
| committer | Chong Yidong | 2010-02-19 16:36:29 -0500 |
| commit | 3513efb2b574346664d73bf3027aa12c4f11a830 (patch) | |
| tree | 866e38398cc7b55718d45176b50fc8f1a6b85f52 | |
| parent | b4340b3f0b4c378450e41cf2fba898e8342349a1 (diff) | |
| download | emacs-3513efb2b574346664d73bf3027aa12c4f11a830.tar.gz emacs-3513efb2b574346664d73bf3027aa12c4f11a830.zip | |
Revert isearch.el change due to feature freeze.
* isearch.el (isearch-update-post-hook, isearch-update): Revert 2010-02-17 change.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/isearch.el | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 16dd8b1b4e4..5d2c0d87b03 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2010-02-19 Chong Yidong <cyd@stupidchicken.com> | ||
| 2 | |||
| 3 | * isearch.el (isearch-update-post-hook, isearch-update): Revert | ||
| 4 | 2010-02-17 change. | ||
| 5 | |||
| 1 | 2010-02-19 Ulf Jasper <ulf.jasper@web.de> | 6 | 2010-02-19 Ulf Jasper <ulf.jasper@web.de> |
| 2 | 7 | ||
| 3 | * calendar/icalendar.el (icalendar--convert-ordinary-to-ical) | 8 | * calendar/icalendar.el (icalendar--convert-ordinary-to-ical) |
diff --git a/lisp/isearch.el b/lisp/isearch.el index 0061e7a64ed..d0ad330c5c0 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el | |||
| @@ -156,9 +156,6 @@ command history." | |||
| 156 | (defvar isearch-mode-hook nil | 156 | (defvar isearch-mode-hook nil |
| 157 | "Function(s) to call after starting up an incremental search.") | 157 | "Function(s) to call after starting up an incremental search.") |
| 158 | 158 | ||
| 159 | (defvar isearch-update-post-hook nil | ||
| 160 | "Function(s) to call after isearch has found matches in the buffer.") | ||
| 161 | |||
| 162 | (defvar isearch-mode-end-hook nil | 159 | (defvar isearch-mode-end-hook nil |
| 163 | "Function(s) to call after terminating an incremental search. | 160 | "Function(s) to call after terminating an incremental search. |
| 164 | When these functions are called, `isearch-mode-end-hook-quit' | 161 | When these functions are called, `isearch-mode-end-hook-quit' |
| @@ -871,8 +868,7 @@ It is called by the function `isearch-forward' and other related functions." | |||
| 871 | (isearch-lazy-highlight-new-loop)) | 868 | (isearch-lazy-highlight-new-loop)) |
| 872 | ;; We must prevent the point moving to the end of composition when a | 869 | ;; We must prevent the point moving to the end of composition when a |
| 873 | ;; part of the composition has just been searched. | 870 | ;; part of the composition has just been searched. |
| 874 | (setq disable-point-adjustment t) | 871 | (setq disable-point-adjustment t)) |
| 875 | (run-hooks 'isearch-update-post-hook)) | ||
| 876 | 872 | ||
| 877 | (defun isearch-done (&optional nopush edit) | 873 | (defun isearch-done (&optional nopush edit) |
| 878 | "Exit Isearch mode. | 874 | "Exit Isearch mode. |