# HG changeset patch
# User Andreas Schwab <schwab@suse.de>
# Date 1194395221 0
# Node ID 69f410562c03915a71f3f7dd9a3ac70c7c16f680
# Parent  85b6f7d4aca83ca0d95fd306fb1ec1ce35abb04a
(server-start): Only register cleanup after server was
started.

diff -r 85b6f7d4aca8 -r 69f410562c03 lisp/server.el
--- a/lisp/server.el	Tue Nov 06 21:17:36 2007 +0000
+++ b/lisp/server.el	Wed Nov 07 00:27:01 2007 +0000
@@ -483,6 +483,7 @@
 	  (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 @@
   ;; continue standard unloading
   nil)
 
-(add-hook 'kill-emacs-hook (lambda () (server-mode -1))) ;Cleanup upon exit.
 (defvar server-unload-function 'server-unload-function)
 
 (provide 'server)