Mercurial > emacs

changeset 76648:ab479de41b29

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(server-process-filter): Cancel any pending isearch.
author Juanma Barranquero <lekktu@gmail.com>
date Wed, 21 Mar 2007 12:02:32 +0000
parents a91fecca26d3
children 6faaecee918b
files lisp/server.el
diffstat 1 files changed, 10 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/server.el	Wed Mar 21 07:15:44 2007 +0000
+++ b/lisp/server.el	Wed Mar 21 12:02:32 2007 +0000
@@ -414,6 +414,16 @@
     (run-with-timer 0 nil (lexical-let ((proc proc))
                             (lambda () (server-process-filter proc ""))))
     (top-level))
+  (condition-case nil
+      ;; If we're running isearch, we must abort it to allow Emacs to
+      ;; display the buffer and switch to it.
+      (mapc #'(lambda (buffer)
+		(with-current-buffer buffer
+		  (when (bound-and-true-p isearch-mode)
+		    (isearch-cancel))))
+	    (buffer-list))
+    ;; Signaled by isearch-cancel
+    (quit (message nil)))
   ;; If the input is multiple lines,
   ;; process each line individually.
   (while (string-match "\n" string)