Mercurial > emacs
changeset 49187:c9f452e277ea
(server-process-filter): Comment out -eval.
Don't switch buffers if inside isearch or minibuffer.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Mon, 13 Jan 2003 08:04:17 +0000 |
| parents | ce4ad428dcab |
| children | 4e3e9d5a3332 |
| files | lisp/server.el |
| diffstat | 1 files changed, 8 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- 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)))