diff options
author | Juanma Barranquero <lekktu@gmail.com> | 2011-07-05 00:40:03 +0200 |
---|---|---|
committer | Juanma Barranquero <lekktu@gmail.com> | 2011-07-05 00:40:03 +0200 |
commit | b768cdcd31e941af9a1ddce45da7e1482b494e77 (patch) | |
tree | fe21db239bf1976cf04ca0618db166364822d7a3 /lisp/server.el | |
parent | 13aa217bacf43ef70b68e5287e714366e77ae61d (diff) | |
download | emacs-b768cdcd31e941af9a1ddce45da7e1482b494e77.tar.gz emacs-b768cdcd31e941af9a1ddce45da7e1482b494e77.tar.bz2 emacs-b768cdcd31e941af9a1ddce45da7e1482b494e77.zip |
lisp/server.el: Catch quit and close the connection (bug#8942).
Diffstat (limited to 'lisp/server.el')
-rw-r--r-- | lisp/server.el | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/server.el b/lisp/server.el index 36b137b7bc9..c91f10b6584 100644 --- a/lisp/server.el +++ b/lisp/server.el @@ -1153,7 +1153,10 @@ The following commands are accepted by the client: "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 |