diff options
| author | Richard M. Stallman <rms@gnu.org> | 1995-09-24 23:28:18 +0000 |
|---|---|---|
| committer | Richard M. Stallman <rms@gnu.org> | 1995-09-24 23:28:18 +0000 |
| commit | 360eba66f408979bb21c043461e43f7201a9c711 (patch) | |
| tree | 7f85aea6fb4099f2a9e00591dd2ab2bde0e69516 /lisp/server.el | |
| parent | a61394d139511cacde0c284ac646eb142268c66b (diff) | |
| download | emacs-360eba66f408979bb21c043461e43f7201a9c711.tar.gz | |
(server-process-filter): Ignore lines that don't start
with `Error:' or `Client:'.
Diffstat (limited to 'lisp/server.el')
| -rw-r--r-- | lisp/server.el | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/lisp/server.el b/lisp/server.el index bc6cb2522b0..0d1e0827ba1 100644 --- a/lisp/server.el +++ b/lisp/server.el @@ -183,26 +183,27 @@ Prefix arg means just kill any existing server communications subprocess." (if (string-match "^Error: " request) (message (concat "Server error: " (substring request (match-end 0)))) (if (string-match "^Client: " request) - (setq request (substring request (match-end 0)))) - (setq client (list (substring request 0 (string-match " " request)))) - (setq request (substring request (match-end 0))) - (while (string-match "[^ ]+ " request) - (let ((arg - (substring request (match-beginning 0) (1- (match-end 0))))) - (setq request (substring request (match-end 0))) - (if (string-match "\\`\\+[0-9]+\\'" arg) - (setq lineno (read (substring arg 1))) - (setq files - (cons (list arg lineno) - files)) - (setq lineno 1)))) - (server-visit-files files client) - ;; CLIENT is now a list (CLIENTNUM BUFFERS...) - (setq server-clients (cons client server-clients)) - (server-switch-buffer (nth 1 client)) - (run-hooks 'server-switch-hook) - (message (substitute-command-keys - "When done with a buffer, type \\[server-edit]"))))) + (progn + (setq request (substring request (match-end 0))) + (setq client (list (substring request 0 (string-match " " request)))) + (setq request (substring request (match-end 0))) + (while (string-match "[^ ]+ " request) + (let ((arg + (substring request (match-beginning 0) (1- (match-end 0))))) + (setq request (substring request (match-end 0))) + (if (string-match "\\`\\+[0-9]+\\'" arg) + (setq lineno (read (substring arg 1))) + (setq files + (cons (list arg lineno) + files)) + (setq lineno 1)))) + (server-visit-files files client) + ;; CLIENT is now a list (CLIENTNUM BUFFERS...) + (setq server-clients (cons client server-clients)) + (server-switch-buffer (nth 1 client)) + (run-hooks 'server-switch-hook) + (message (substitute-command-keys + "When done with a buffer, type \\[server-edit]"))))))) ;; Save for later any partial line that remains. (setq server-previous-string string)) |