[Emacs-diffs] Changes to emacs/lisp/server.el,v

[Andreas Schwab]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Andreas Schwab <schwab> 07/11/07 00:27:01

Index: server.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/server.el,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -b -r1.149 -r1.150
--- server.el   29 Oct 2007 00:50:41 -0000      1.149
+++ server.el   7 Nov 2007 00:27:01 -0000       1.150
@@ -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)