summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2010-02-19 16:36:29 -0500
committerChong Yidong <cyd@stupidchicken.com>2010-02-19 16:36:29 -0500
commit3513efb2b574346664d73bf3027aa12c4f11a830 (patch)
tree866e38398cc7b55718d45176b50fc8f1a6b85f52
parentb4340b3f0b4c378450e41cf2fba898e8342349a1 (diff)
downloademacs-3513efb2b574346664d73bf3027aa12c4f11a830.tar.gz
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/ChangeLog5
-rw-r--r--lisp/isearch.el6
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 @@
+2010-02-19 Chong Yidong <cyd@stupidchicken.com>
+
+ * isearch.el (isearch-update-post-hook, isearch-update): Revert
+ 2010-02-17 change.
+
2010-02-19 Ulf Jasper <ulf.jasper@web.de>
* 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."
(defvar isearch-mode-hook nil
"Function(s) to call after starting up an incremental search.")
-(defvar isearch-update-post-hook nil
- "Function(s) to call after isearch has found matches in the buffer.")
-
(defvar isearch-mode-end-hook nil
"Function(s) to call after terminating an incremental search.
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."
(isearch-lazy-highlight-new-loop))
;; We must prevent the point moving to the end of composition when a
;; part of the composition has just been searched.
- (setq disable-point-adjustment t)
- (run-hooks 'isearch-update-post-hook))
+ (setq disable-point-adjustment t))
(defun isearch-done (&optional nopush edit)
"Exit Isearch mode.