# HG changeset patch
# User Kenichi Handa  <handa@m17n.org>
# Date 1266460174 -32400
# Node ID 3e078e9351151c0cd7092ef225c17be5ce98a7d6
# Parent  e98bd64897e005ddef3f394c88e97696c03bfdef# Parent  6e6072f0c0a29564851ec8a9b831963f150956db
from trunk

diff -r e98bd64897e0 -r 3e078e935115 lisp/ChangeLog
--- 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
diff -r e98bd64897e0 -r 3e078e935115 lisp/isearch.el
--- 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.
diff -r e98bd64897e0 -r 3e078e935115 lisp/vc-bzr.el
--- 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.