Merged in changes from CVS trunk. Plus added lisp/term tweaks.

[gnu-emacs] / lisp / server.el

diff --git a/lisp/server.el b/lisp/server.el
index 0c6175d1ee68917adb6fe35134406ffc87a86f78..0104e2787fe70ac107a5fb4d197f1d479edebbe7 100644 (file)
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -1,7 +1,7 @@
 ;;; server.el --- Lisp code for GNU Emacs running as server process
 
-;; Copyright (C) 1986,87,92,94,95,96,97,98,99,2000,01,02,03,2004
-;;      Free Software Foundation, Inc.
+;; Copyright (C) 1986, 1987, 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+;;   2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
 
 ;; Author: William Sommerfeld <wesommer@athena.mit.edu>
 ;; Maintainer: FSF
@@ -1049,7 +1049,7 @@ only these files will be asked to be saved."
          (server-delete-client proc))
       (save-buffers-kill-emacs))))
 
-(global-set-key "\C-x#" 'server-edit)
+(define-key ctl-x-map "#" 'server-edit)
 
 (defun server-unload-hook ()
   "Unload the server library."