[Emacs-diffs] Changes to emacs/lisp/server.el,v

[Juanma Barranquero]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Juanma Barranquero <lektu>      07/03/21 12:02:32

Index: server.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/server.el,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -b -r1.126 -r1.127
--- server.el   27 Jan 2007 19:03:43 -0000      1.126
+++ server.el   21 Mar 2007 12:02:32 -0000      1.127
@@ -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)