Commit 2a847524 authored by Chong Yidong's avatar Chong Yidong
Browse files

* lisp/server.el (server-process-filter, server-return-error): Give

emacsclient time to shut down after receiving an error string.

* etc/NEWS: Document tweak to emacsclient exit status.
parent 3ecb8d93
......@@ -66,10 +66,15 @@ obsolete in Emacs 23.)
* Changes in Emacs 24.1
** New emacsclient argument --parent-id ID can be used to open a
** emacsclient changes
*** New emacsclient argument --parent-id ID can be used to open a
client frame in parent X window ID, via XEmbed. This works like the
--parent-id argument to Emacs.
*** If emacsclient shuts down as a result of Emacs signalling an
error, its exit status is 1.
** Completion can cycle, depending on completion-cycle-threshold.
** auto-mode-case-fold is now enabled by default.
......
2010-10-03 Chong Yidong <cyd@stupidchicken.com>
* server.el (server-process-filter, server-return-error): Give
emacsclient time to shut down after receiving an error string.
2010-10-02 Michael Albinus <michael.albinus@gmx.de>
 
* files.el (remote-file-name-inhibit-cache): New defcustom.
......
......@@ -876,6 +876,9 @@ The following commands are accepted by the client:
(server-log "Authentication failed" proc)
(server-send-string
proc (concat "-error " (server-quote-arg "Authentication failed")))
;; Before calling `delete-process', give emacsclient time to
;; receive the error string and shut down on its own.
(sit-for 1)
(delete-process proc)
;; We return immediately
(return-from server-process-filter)))
......@@ -1129,6 +1132,9 @@ The following commands are accepted by the client:
proc (concat "-error " (server-quote-arg
(error-message-string err))))
(server-log (error-message-string err) proc)
;; Before calling `delete-process', give emacsclient time to
;; receive the error string and shut down on its own.
(sit-for 5)
(delete-process proc)))
(defun server-goto-line-column (line-col)
......
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