[Emacs-diffs] Changes to emacs/lisp/server.el,v [EMACS_22_BASE]

[Juanma Barranquero]

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Juanma Barranquero <lektu>      07/10/30 00:20:03

Index: server.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/server.el,v
retrieving revision 1.127.2.4
retrieving revision 1.127.2.5
diff -u -b -r1.127.2.4 -r1.127.2.5
--- server.el   29 Oct 2007 00:42:24 -0000      1.127.2.4
+++ server.el   30 Oct 2007 00:20:02 -0000      1.127.2.5
@@ -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)