# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1042445057 0
# Node ID c9f452e277ead287b1e0160dfcb22a30012982a6
# Parent  ce4ad428dcab9aa9ae22480fccc27d49a3e9efbb
(server-process-filter): Comment out -eval.
Don't switch buffers if inside isearch or minibuffer.

diff -r ce4ad428dcab -r c9f452e277ea lisp/server.el
--- a/lisp/server.el	Mon Jan 13 08:02:47 2003 +0000
+++ b/lisp/server.el	Mon Jan 13 08:04:17 2003 +0000
@@ -278,7 +278,8 @@
 	  (setq request (substring request (match-end 0)))
 	  (cond
 	   ((equal "-nowait" arg) (setq nowait t))
-	   ((equal "-eval" arg) (setq eval t))
+;;; This is not safe unless we make sure other users can't send commands.
+;;;	   ((equal "-eval" arg) (setq eval t))
 	   ((and (equal "-display" arg) (string-match "\\([^ ]*\\) " request))
 	    (let ((display (server-unquote-arg (match-string 1 request))))
 	      (setq request (substring request (match-end 0)))
@@ -325,11 +326,12 @@
 	    (server-log "Close empty client" proc))
 	;; We visited some buffer for this client.
 	(or nowait (push client server-clients))
-	(server-switch-buffer (nth 1 client))
-	(run-hooks 'server-switch-hook)
-	(unless nowait
-	  (message (substitute-command-keys
-		    "When done with a buffer, type \\[server-edit]"))))))
+	(unless (or isearch-mode (minibuffer-active))
+	  (server-switch-buffer (nth 1 client))
+	  (run-hooks 'server-switch-hook)
+	  (unless nowait
+	    (message (substitute-command-keys
+		      "When done with a buffer, type \\[server-edit]")))))))
   ;; Save for later any partial line that remains.
   (when (> (length string) 0)
     (let ((ps (assq proc server-previous-strings)))