martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Append newline to server -error commands

Browse Source 
Problem reported by Zhengyi Fu (bug#80844).
* lisp/server.el (server--process-filter-1, server-return-error)
(server-edit-abort): Append newline to -error commands, too.
Otherwise emacsclient has no reliable way to find the end of the
error command’s argument, except to wait for EOF which is
undesirable since the Emacs server keeps the socket open
for a while, waiting for emacsclient to exit.
This commit is contained in:
Paul Eggert
2026-04-16 23:31:19 -07:00
parent 35a8e7e068
commit eda9a819ce
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lisp/server.el
View File

@@ -1220,7 +1220,7 @@ The following commands are accepted by the client:
;; visible for some reason.
(server--message-sit-for 2 "Authentication failed")
(server-send-string
proc (concat "-error " (server-quote-arg "Authentication failed")))
proc (concat "-error " (server-quote-arg "Authentication failed") "\n"))
(unless (eq system-type 'windows-nt)
(let ((terminal (process-get proc 'terminal)))
;; Only delete the terminal if it is non-nil.
@@ -1576,7 +1576,8 @@ invocations of \"emacs\".")
(server--message-sit-for 2 (error-message-string err))
(server-send-string
proc (concat "-error " (server-quote-arg
(error-message-string err))))
(error-message-string err))
"\n"))
(server-log (error-message-string err) proc)
(unless (eq system-type 'windows-nt)
(let ((terminal (process-get proc 'terminal)))
@@ -1813,7 +1814,7 @@ To abort an edit instead of saying \"Done\", use \\[server-edit-abort]."
(mapc (lambda (proc)
(server-send-string
proc (concat "-error "
(server-quote-arg "Aborted by the user"))))
(server-quote-arg "Aborted by the user") "\n")))
server-clients)
(message "This buffer has no clients")))