emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/trunk r104955: lisp/server.el: Catch quit a


From: Juanma Barranquero
Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r104955: lisp/server.el: Catch quit and close the connection (bug#8942).
Date: Tue, 05 Jul 2011 00:40:03 +0200
User-agent: Bazaar (2.3.1)

------------------------------------------------------------
revno: 104955
fixes bug(s): http://debbugs.gnu.org/8942
committer: Juanma Barranquero <address@hidden>
branch nick: trunk
timestamp: Tue 2011-07-05 00:40:03 +0200
message:
  lisp/server.el: Catch quit and close the connection (bug#8942).
modified:
  lisp/ChangeLog
  lisp/server.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-07-04 22:16:10 +0000
+++ b/lisp/ChangeLog    2011-07-04 22:40:03 +0000
@@ -1,3 +1,9 @@
+2011-07-04  Juanma Barranquero  <address@hidden>
+
+       * server.el (server-execute): Catch quit and call
+       `server-return-error' to pass the error back to emacsclient and
+       close the connection (bug#8942).
+
 2011-07-04  Ken Manheimer  <address@hidden>
 
        * allout.el (allout-encrypt-unencrypted-on-saves): Do not provide

=== modified file 'lisp/server.el'
--- a/lisp/server.el    2011-07-04 01:04:29 +0000
+++ b/lisp/server.el    2011-07-04 22:40:03 +0000
@@ -1153,7 +1153,10 @@
                              "When done with a buffer, type 
\\[server-edit]")))))
           (when (and frame (null tty-name))
             (server-unselect-display frame)))
-      (error (server-return-error proc err)))))
+      ((quit error)
+       (when (eq (car err) 'quit)
+         (message "Quit emacsclient request"))
+       (server-return-error proc err)))))
 
 (defun server-return-error (proc err)
   (ignore-errors


reply via email to

[Prev in Thread] Current Thread [Next in Thread]