# HG changeset patch
# User Juanma Barranquero <lekktu@gmail.com>
# Date 1193703602 0
# Node ID 02a9c3ab0adfcc1ecf01fac80f68df5d98330356
# Parent  3e37b479924d8a08e3a07a391e703cf29358cc7c
(server-unload-function): Unbind `server-edit' from `C-x #'.
(server-unload-function): Remove variable.

diff -r 3e37b479924d -r 02a9c3ab0adf lisp/server.el
--- a/lisp/server.el	Tue Oct 30 00:15:06 2007 +0000
+++ b/lisp/server.el	Tue Oct 30 00:20:02 2007 +0000
@@ -767,6 +767,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)
@@ -775,7 +776,6 @@
   nil)
 
 (add-hook 'kill-emacs-hook (lambda () (server-mode -1))) ;Cleanup upon exit.
-(defvar server-unload-function 'server-unload-function)
 
 (provide 'server)