(server-start): Only register cleanup after server was

started.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8ad799fa4370f33d3543de2d84ab581aff28b796..0b875a486cd56d800a638e7f16e100a3708b8b34 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-07  Andreas Schwab  <schwab@suse.de>
+
+       * server.el (server-start): Only register cleanup after server was
+       started.
+
 2007-11-06  Michael Albinus  <michael.albinus@gmx.de>
 
        * net/tramp.el (top): Don't autoload `tramp-cache-print'.

diff --git a/lisp/server.el b/lisp/server.el
index a1d34eb81284c7a6b54f1440d24fc76e86715b02..bbebe784636a216973ed459372062fae062d5001 100644 (file)
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -483,6 +483,7 @@ kill any existing server communications subprocess."
          (add-hook 'delete-frame-functions 'server-handle-delete-frame)
          (add-hook 'kill-buffer-query-functions 'server-kill-buffer-query-function)
          (add-hook 'kill-emacs-query-functions 'server-kill-emacs-query-function)
+         (add-hook 'kill-emacs-hook (lambda () (server-mode -1))) ;Cleanup upon exit.
          (setq server-process
                (apply #'make-network-process
                       :name server-name
@@ -1293,7 +1294,6 @@ only these files will be asked to be saved."
   ;; continue standard unloading
   nil)
 
-(add-hook 'kill-emacs-hook (lambda () (server-mode -1))) ;Cleanup upon exit.
 (defvar server-unload-function 'server-unload-function)
 \f
 (provide 'server)