[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r101735: * lisp/server.el (server-pro
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r101735: * lisp/server.el (server-process-filter, server-return-error): Give |
Date: |
Sat, 02 Oct 2010 20:03:44 -0400 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 101735
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sat 2010-10-02 20:03:44 -0400
message:
* 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.
modified:
etc/NEWS
lisp/ChangeLog
lisp/server.el
=== modified file 'etc/NEWS'
--- a/etc/NEWS 2010-10-02 08:24:14 +0000
+++ b/etc/NEWS 2010-10-03 00:03:44 +0000
@@ -66,10 +66,15 @@
* 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.
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2010-10-02 13:21:43 +0000
+++ b/lisp/ChangeLog 2010-10-03 00:03:44 +0000
@@ -1,3 +1,8 @@
+2010-10-03 Chong Yidong <address@hidden>
+
+ * server.el (server-process-filter, server-return-error): Give
+ emacsclient time to shut down after receiving an error string.
+
2010-10-02 Michael Albinus <address@hidden>
* files.el (remote-file-name-inhibit-cache): New defcustom.
=== modified file 'lisp/server.el'
--- a/lisp/server.el 2010-10-01 01:28:45 +0000
+++ b/lisp/server.el 2010-10-03 00:03:44 +0000
@@ -876,6 +876,9 @@
(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 @@
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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r101735: * lisp/server.el (server-process-filter, server-return-error): Give,
Chong Yidong <=