diff options
| -rw-r--r-- | etc/NEWS | 7 | ||||
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/server.el | 6 |
3 files changed, 17 insertions, 1 deletions
@@ -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. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 044db17a44c..c25e49a8c8d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +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. diff --git a/lisp/server.el b/lisp/server.el index 0f1b0219a2c..e661f055e1a 100644 --- a/lisp/server.el +++ b/lisp/server.el @@ -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) |