2 files changed, 10 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 71fc929308b..6ec351d98c5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2011-07-04  Juanma Barranquero  <lekktu@gmail.com>
+
+        * 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  <ken.manheimer@gmail.com>
 
         * allout.el (allout-encrypt-unencrypted-on-saves): Do not provide
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