aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog7
-rw-r--r--lisp/isearch.el6
-rw-r--r--lisp/vc-bzr.el2
3 files changed, 13 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 17655fe4f6b..047f2b03b62 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
12010-02-17 Mark A. Hershberger <mah@everybody.org>
2
3 * vc-bzr.el: fix typo in Known Bugs section.
4
5 * isearch.el (isearch-update-post-hook): New hook
6 (isearch-update): Use the new hook.
7
12010-02-16 Michael Albinus <michael.albinus@gmx.de> 82010-02-16 Michael Albinus <michael.albinus@gmx.de>
2 9
3 * net/tramp.el (tramp-do-copy-or-rename-file-out-of-band): Fix 10 * net/tramp.el (tramp-do-copy-or-rename-file-out-of-band): Fix
diff --git a/lisp/isearch.el b/lisp/isearch.el
index d0ad330c5c0..0061e7a64ed 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -156,6 +156,9 @@ 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
159(defvar isearch-mode-end-hook nil 162(defvar isearch-mode-end-hook nil
160 "Function(s) to call after terminating an incremental search. 163 "Function(s) to call after terminating an incremental search.
161When these functions are called, `isearch-mode-end-hook-quit' 164When these functions are called, `isearch-mode-end-hook-quit'
@@ -868,7 +871,8 @@ It is called by the function `isearch-forward' and other related functions."
868 (isearch-lazy-highlight-new-loop)) 871 (isearch-lazy-highlight-new-loop))
869 ;; We must prevent the point moving to the end of composition when a 872 ;; We must prevent the point moving to the end of composition when a
870 ;; part of the composition has just been searched. 873 ;; part of the composition has just been searched.
871 (setq disable-point-adjustment t)) 874 (setq disable-point-adjustment t)
875 (run-hooks 'isearch-update-post-hook))
872 876
873(defun isearch-done (&optional nopush edit) 877(defun isearch-done (&optional nopush edit)
874 "Exit Isearch mode. 878 "Exit Isearch mode.
diff --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el
index efeb19de4c7..b0dbb8ec192 100644
--- a/lisp/vc-bzr.el
+++ b/lisp/vc-bzr.el
@@ -35,7 +35,7 @@
35;; Known bugs 35;; Known bugs
36;; ========== 36;; ==========
37 37
38;; When edititing a symlink and *both* the symlink and its target 38;; When editing a symlink and *both* the symlink and its target
39;; are bzr-versioned, `vc-bzr` presently runs `bzr status` on the 39;; are bzr-versioned, `vc-bzr` presently runs `bzr status` on the
40;; symlink, thereby not detecting whether the actual contents 40;; symlink, thereby not detecting whether the actual contents
41;; (that is, the target contents) are changed. 41;; (that is, the target contents) are changed.