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

[gnu-emacs] / lisp / files.el

diff --git a/lisp/files.el b/lisp/files.el
index 1ffd17eefd4039ff44f78291773b81bb1a323685..68a85f07df80a783c8eed69db9e74e95863fc147 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -4877,7 +4877,7 @@ With prefix arg, silently save all file-visiting buffers, then kill."
 (define-key ctl-x-map "i" 'insert-file)
 (define-key esc-map "~" 'not-modified)
 (define-key ctl-x-map "\C-d" 'list-directory)
-(define-key ctl-x-map "\C-c" 'save-buffers-kill-emacs)
+(define-key ctl-x-map "\C-c" 'server-save-buffers-kill-display)
 (define-key ctl-x-map "\C-q" 'toggle-read-only)
 
 (define-key ctl-x-4-map "f" 'find-file-other-window)