changeset 107176:3e078e935115

from trunk
author Kenichi Handa <handa@m17n.org>
date Thu, 18 Feb 2010 11:29:34 +0900
parents e98bd64897e0 (current diff) 6e6072f0c0a2 (diff)
children 0d0660dbdea4 68454434bdc4
files
diffstat 3 files changed, 13 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Thu Feb 18 11:27:25 2010 +0900
+++ b/lisp/ChangeLog	Thu Feb 18 11:29:34 2010 +0900
@@ -1,3 +1,10 @@
+2010-02-17  Mark A. Hershberger  <mah@everybody.org>
+
+	* vc-bzr.el: fix typo in Known Bugs section.
+
+	* isearch.el (isearch-update-post-hook): New hook
+	(isearch-update): Use the new hook.
+
 2010-02-16  Michael Albinus  <michael.albinus@gmx.de>
 
 	* net/tramp.el (tramp-do-copy-or-rename-file-out-of-band): Fix
--- a/lisp/isearch.el	Thu Feb 18 11:27:25 2010 +0900
+++ b/lisp/isearch.el	Thu Feb 18 11:29:34 2010 +0900
@@ -156,6 +156,9 @@
 (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'
@@ -868,7 +871,8 @@
     (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))
+  (setq disable-point-adjustment t)
+  (run-hooks 'isearch-update-post-hook))
 
 (defun isearch-done (&optional nopush edit)
   "Exit Isearch mode.
--- a/lisp/vc-bzr.el	Thu Feb 18 11:27:25 2010 +0900
+++ b/lisp/vc-bzr.el	Thu Feb 18 11:29:34 2010 +0900
@@ -35,7 +35,7 @@
 ;; Known bugs
 ;; ==========
 
-;; When edititing a symlink and *both* the symlink and its target
+;; When editing a symlink and *both* the symlink and its target
 ;; are bzr-versioned, `vc-bzr` presently runs `bzr status` on the
 ;; symlink, thereby not detecting whether the actual contents
 ;; (that is, the target contents) are changed.