[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/server.el,v
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/server.el,v |
Date: |
Fri, 09 Nov 2007 09:45:34 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Miles Bader <miles> 07/11/09 09:45:31
Index: lisp/server.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/server.el,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -b -r1.150 -r1.151
--- lisp/server.el 7 Nov 2007 00:27:01 -0000 1.150
+++ lisp/server.el 9 Nov 2007 09:45:20 -0000 1.151
@@ -1287,6 +1287,7 @@
(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,8 +1295,11 @@
;; 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)
;; arch-tag: 1f7ecb42-f00a-49f8-906d-61995d84c8d6