Commit 77e5a3c7 authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

(server-process-filter): Ignore lines that don't start

with `Error:' or `Client:'.
parent 91c6bdc0
......@@ -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))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment