summaryrefslogtreecommitdiff
path: root/lisp/server.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/server.el')
-rw-r--r--lisp/server.el4
1 files changed, 4 insertions, 0 deletions
diff --git a/lisp/server.el b/lisp/server.el
index bbebe784636..c263a21a6cf 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -1287,6 +1287,7 @@ only these files will be asked to be saved."
(defun server-unload-function ()
"Unload the server library."
(server-mode -1)
+ (substitute-key-definition 'server-edit nil ctl-x-map)
(save-current-buffer
(dolist (buffer (buffer-list))
(set-buffer buffer)
@@ -1294,7 +1295,10 @@ 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)