mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

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

Browse source 
Patches applied:

 * lorentey@elte.hu--2004/emacs--cvs-trunk--0--base-0
   tag of miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-474

 * lorentey@elte.hu--2004/emacs--cvs-trunk--0--patch-1
   Add CVS metadata files.

 * lorentey@elte.hu--2004/emacs--cvs-trunk--0--patch-2
   Update from CVS.


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-393
This commit is contained in:
Karoly Lorentey 2005-09-04 03:48:17 +00:00
commit fbf3497344
1502 changed files with 23319 additions and 13290 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lisp/server.el
View file

@ -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."