* lisp/isearch.el (isearch-mode, isearch-done): Don't set arg LOCAL

in add-hook and remove-hook for multi-buffer search. 

* doc/lispref/searching.texi (Search and Replace): Fix `unread-command-events'
and add ref.

Fixes: debbugs:16035

4 files changed, 15 insertions, 6 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 92335dc616d..f4f036f33ad 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-04  Juri Linkov  <juri@jurta.org>
+
+        * searching.texi (Search and Replace): Fix `unread-command-events'
+        and add ref.
+
 2013-12-03  Juri Linkov  <juri@jurta.org>
 
         * windows.texi (Choosing Window): Rename `no-display-ok' to
diff --git a/doc/lispref/searching.texi b/doc/lispref/searching.texi
index 15aa23f77ea..a5bd5ab719b 100644
--- a/doc/lispref/searching.texi
+++ b/doc/lispref/searching.texi
@@ -1770,10 +1770,9 @@ Do not take action for this question---in other words, ``no''.
 Answer this question ``no'', and give up on the entire series of
 questions, assuming that the answers will be ``no''.
 
-@c FIXME: Document ‘unread-comment-events’?  --xfq
 @item exit-prefix
 Like @code{exit}, but add the key that was pressed to
-@code{unread-comment-events}.
+@code{unread-command-events} (@pxref{Event Input Misc}).
 
 @item act-and-exit
 Answer this question ``yes'', and give up on the entire series of
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0c5db95587d..530a7012f6f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-04  Juri Linkov  <juri@jurta.org>
+
+        * isearch.el (isearch-mode, isearch-done): Don't set arg LOCAL in
+        add-hook and remove-hook for multi-buffer search.  (Bug#16035)
+
 2013-12-03  Tom Regner <tom@goochesa.de>  (tiny change)
 
         * notifications.el (notifications-close-notification): Call the
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 3abb03a084a..aee2f4f9f27 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -912,8 +912,8 @@ convert the search string to a regexp used by regexp search functions."
 
   (isearch-update)
 
-  (add-hook 'pre-command-hook 'isearch-pre-command-hook nil t)
-  (add-hook 'post-command-hook 'isearch-post-command-hook nil t)
+  (add-hook 'pre-command-hook 'isearch-pre-command-hook)
+  (add-hook 'post-command-hook 'isearch-post-command-hook)
   (add-hook 'mouse-leave-buffer-hook 'isearch-done)
   (add-hook 'kbd-macro-termination-hook 'isearch-done)
 
@@ -992,8 +992,8 @@ NOPUSH is t and EDIT is t."
         (unless (equal (car command-history) command)
           (setq command-history (cons command command-history)))))
 
-  (remove-hook 'pre-command-hook 'isearch-pre-command-hook t)
-  (remove-hook 'post-command-hook 'isearch-post-command-hook t)
+  (remove-hook 'pre-command-hook 'isearch-pre-command-hook)
+  (remove-hook 'post-command-hook 'isearch-post-command-hook)
   (remove-hook 'mouse-leave-buffer-hook 'isearch-done)
   (remove-hook 'kbd-macro-termination-hook 'isearch-done)
   (setq isearch-lazy-highlight-start nil)