From: Juanma Barranquero <lekktu@gmail.com>
Date: Tue, 30 Oct 2007 00:20:02 +0000 (+0000)
Subject: (server-unload-function): Unbind `server-edit' from `C-x #'.
X-Git-Tag: emacs-pretest-22.1.90~482
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a8e0c05381278c14334b8f1c2a26edc031c19955;p=emacs.git

(server-unload-function): Unbind `server-edit' from `C-x #'.
(server-unload-function): Remove variable.
---

diff --git a/lisp/server.el b/lisp/server.el
index 6af9b9952d6..9eef2906f7d 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -767,6 +767,7 @@ Arg NEXT-BUFFER is a suggestion; if it is a live buffer, use it."
 (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 @@ Arg NEXT-BUFFER is a suggestion; if it is a live buffer, use it."
   nil)
 
 (add-hook 'kill-emacs-hook (lambda () (server-mode -1))) ;Cleanup upon exit.
-(defvar server-unload-function 'server-unload-function)
 
 (provide 'server)