diff options
| author | Andreas Schwab <schwab@suse.de> | 2007-11-07 00:27:13 +0000 |
|---|---|---|
| committer | Andreas Schwab <schwab@suse.de> | 2007-11-07 00:27:13 +0000 |
| commit | 1d515b422c71737385f6d037ace407962edb67a3 (patch) | |
| tree | 071ac45fbf83db39528c6c15eda19836efb8a442 /lisp | |
| parent | 726f0272538ed95977d8686924b85ec81fa6e98f (diff) | |
| download | emacs-1d515b422c71737385f6d037ace407962edb67a3.tar.gz | |
(server-start): Only register cleanup after server was
started.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/server.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8ad799fa437..0b875a486cd 100644 --- 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 a1d34eb8128..bbebe784636 100644 --- 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) (provide 'server) |