andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
emacsclient time to shut down after receiving an error string.

* etc/NEWS: Document tweak to emacsclient exit status.
This commit is contained in:
Chong Yidong 2010-10-02 20:03:44 -04:00
parent 3ecb8d931a
commit 2a847524ab
3 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
etc/NEWS
View file

@ -66,10 +66,15 @@ obsolete in Emacs 23.)
* Changes in Emacs 24.1 * 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 client frame in parent X window ID, via XEmbed. This works like the
--parent-id argument to Emacs. --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. ** Completion can cycle, depending on completion-cycle-threshold.
** auto-mode-case-fold is now enabled by default. ** auto-mode-case-fold is now enabled by default.

5
lisp/ChangeLog
View file

@ -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> 2010-10-02 Michael Albinus <michael.albinus@gmx.de>
* files.el (remote-file-name-inhibit-cache): New defcustom. * files.el (remote-file-name-inhibit-cache): New defcustom.

6
lisp/server.el
View file

@ -876,6 +876,9 @@ The following commands are accepted by the client:
(server-log "Authentication failed" proc) (server-log "Authentication failed" proc)
(server-send-string (server-send-string
proc (concat "-error " (server-quote-arg "Authentication failed"))) 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) (delete-process proc)
;; We return immediately ;; We return immediately
(return-from server-process-filter))) (return-from server-process-filter)))
@ -1129,6 +1132,9 @@ The following commands are accepted by the client:
proc (concat "-error " (server-quote-arg proc (concat "-error " (server-quote-arg
(error-message-string err)))) (error-message-string err))))
(server-log (error-message-string err) proc) (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))) (delete-process proc)))
(defun server-goto-line-column (line-col) (defun server-goto-line-column (line-col)