Remove finished items.

[gnu-emacs] / lisp / server.el

diff --git a/lisp/server.el b/lisp/server.el
index ef8a3d1835577b2607f0d70ba8065c19b37ddd68..266d9d7824fa52985984fd1aa311c671ac7e1837 100644 (file)
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -1,7 +1,7 @@
 ;;; server.el --- Lisp code for GNU Emacs running as server process
 
 ;; Copyright (C) 1986, 1987, 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-;;   2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+;;   2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: William Sommerfeld <wesommer@athena.mit.edu>
 ;; Maintainer: FSF
@@ -252,8 +252,6 @@ Emacs distribution as your standard \"editor\".
 
 Prefix arg means just kill any existing server communications subprocess."
   (interactive "P")
-  ;; Make sure there is a safe directory in which to place the socket.
-  (server-ensure-safe-dir server-socket-dir)
   ;; kill it dead!
   (if server-process
       (condition-case () (delete-process server-process) (error nil)))
@@ -265,7 +263,10 @@ Prefix arg means just kill any existing server communications subprocess."
   (while server-clients
     (let ((buffer (nth 1 (car server-clients))))
       (server-buffer-done buffer)))
+  ;; Now any previous server is properly stopped.
   (unless leave-dead
+    ;; Make sure there is a safe directory in which to place the socket.
+    (server-ensure-safe-dir server-socket-dir)
     (if server-process
        (server-log (message "Restarting server")))
     (letf (((default-file-modes) ?\700))
@@ -343,10 +344,14 @@ PROC is the server process.  Format of STRING is \"PATH PATH PATH... \\n\"."
            (if coding-system
                (setq arg (decode-coding-string arg coding-system)))
            (if eval
-               (let ((v (eval (car (read-from-string arg)))))
+               (let* (errorp
+                      (v (condition-case errobj
+                            (eval (car (read-from-string arg)))
+                          (error (setq errorp t) errobj))))
                  (when v
                    (with-temp-buffer
                      (let ((standard-output (current-buffer)))
+                       (if errorp (princ "error: "))
                        (pp v)
                        ;; Suppress the error rose when the pipe to PROC is closed.
                        (condition-case err
@@ -407,7 +412,7 @@ so don't mark these buffers specially, just visit them normally."
        ;; deleted file, offer to write it.
        (let* ((filen (car file))
               (obuf (get-file-buffer filen)))
-         (push filen file-name-history)
+         (add-to-history 'file-name-history filen)
          (if (and obuf (set-buffer obuf))
              (progn
                (cond ((file-exists-p filen)
@@ -571,11 +576,13 @@ which filenames are considered temporary.
 If invoked with a prefix argument, or if there is no server process running,
 starts server process and that is all.  Invoked by \\[server-edit]."
   (interactive "P")
-  (if (or arg
-         (not server-process)
-         (memq (process-status server-process) '(signal exit)))
-      (server-start nil)
-    (apply 'server-switch-buffer (server-done))))
+  (cond
+   ((or arg
+       (not server-process)
+       (memq (process-status server-process) '(signal exit)))
+    (server-mode 1))
+   (server-clients (apply 'server-switch-buffer (server-done)))
+   (t (message "No server editing buffers exist"))))
 
 (defun server-switch-buffer (&optional next-buffer killed-one)
   "Switch to another buffer, preferably one that has a client.
@@ -633,14 +640,15 @@ Arg NEXT-BUFFER is a suggestion; if it is a live buffer, use it."
 (define-key ctl-x-map "#" 'server-edit)
 
 (defun server-unload-hook ()
-  (server-start t)
+  (server-mode -1)
   (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 'kill-emacs-hook (lambda () (server-mode -1))) ;Cleanup upon exit.
 (add-hook 'server-unload-hook 'server-unload-hook)
 \f
 (provide 'server)
 
-;;; arch-tag: 1f7ecb42-f00a-49f8-906d-61995d84c8d6
+;; arch-tag: 1f7ecb42-f00a-49f8-906d-61995d84c8d6
 ;;; server.el ends here