*** empty log message ***

[gnu-emacs] / lisp / server.el

diff --git a/lisp/server.el b/lisp/server.el
index 3a8bede9f951d1ad550904fe307405375624de02..a0f41e59ff815df3168822facf1a92f6a53e0115 100644 (file)
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -123,7 +123,7 @@ If it is a frame, use the frame's selected window.
 It is not meaningful to set this to a specific frame or window with Custom.
 Only programs can do so."
   :group 'server
-  :version "21.4"
+  :version "22.1"
   :type '(choice (const :tag "Use selected window"
                        :match (lambda (widget value)
                                 (not (functionp value)))
@@ -282,7 +282,7 @@ Server mode runs a process that accepts commands from the
 `emacsclient' program.  See `server-start' and Info node `Emacs server'."
   :global t
   :group 'server
-  :version "21.4"
+  :version "22.1"
   ;; Fixme: Should this check for an existing server socket and do
   ;; nothing if there is one (for multiple Emacs sessions)?
   (server-start (not server-mode)))
@@ -305,6 +305,7 @@ PROC is the server process.  Format of STRING is \"PATH PATH PATH... \\n\"."
          client nowait eval
          (files nil)
          (lineno 1)
+         (tmp-frame nil) ; Sometimes used to embody the selected display.
          (columnno 0))
       ;; Remove this line from STRING.
       (setq string (substring string (match-end 0)))
@@ -319,7 +320,7 @@ PROC is the server process.  Format of STRING is \"PATH PATH PATH... \\n\"."
            (let ((display (server-unquote-arg (match-string 1 request))))
              (setq request (substring request (match-end 0)))
              (condition-case err
-                 (server-select-display display)
+                 (setq tmp-frame (server-select-display display))
                (error (process-send-string proc (nth 1 err))
                       (setq request "")))))
           ;; ARG is a line number option.
@@ -342,7 +343,12 @@ 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)
+                         (error nil))
+                       ))))
              ;; ARG is a file name.
              ;; Collapse multiple slashes to single slashes.
              (setq arg (command-line-normalize-file-name arg))
@@ -366,7 +372,9 @@ PROC is the server process.  Format of STRING is \"PATH PATH PATH... \\n\"."
          (run-hooks 'server-switch-hook)
          (unless nowait
            (message (substitute-command-keys
-                     "When done with a buffer, type \\[server-edit]")))))))
+                     "When done with a buffer, type \\[server-edit]")))))
+      ;; Avoid preserving the connection after the last real frame is deleted.
+      (if tmp-frame (delete-frame tmp-frame))))
   ;; Save for later any partial line that remains.
   (when (> (length string) 0)
     (process-put proc 'previous-string string)))
@@ -624,6 +632,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)