(gdb-flush-pending-output): New variable.

[gnu-emacs] / lisp / server.el

diff --git a/lisp/server.el b/lisp/server.el
index fe2fc0f59f470d1d1731dea7b5763468608fa2f4..534ba9fa09e96f2c59a05916c80cb3edf161076d 100644 (file)
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -343,7 +343,11 @@ PROC is the server process.  Format of STRING is \"PATH PATH PATH... \\n\"."
                    (with-temp-buffer
                      (let ((standard-output (current-buffer)))
                        (pp v)
-                       (process-send-region proc (point-min) (point-max))))))
+                       ;; Suppress the error rose when the pipe to PROC is closed.
+                       (condition-case err
+                           (process-send-region proc (point-min) (point-max))
+                         (file-error nil))
+                       ))))
              ;; ARG is a file name.
              ;; Collapse multiple slashes to single slashes.
              (setq arg (command-line-normalize-file-name arg))
@@ -627,6 +631,8 @@ Arg NEXT-BUFFER is a suggestion; if it is a live buffer, use it."
   (remove-hook 'kill-buffer-query-functions 'server-kill-buffer-query-function)
   (remove-hook 'kill-emacs-query-functions 'server-kill-emacs-query-function)
   (remove-hook 'kill-buffer-hook 'server-kill-buffer))
+
+(add-hook 'server-unload-hook 'server-unload-hook)
 \f
 (provide 'server)