Merged from emacs@sv.gnu.org

[gnu-emacs] / lisp / files.el

diff --git a/lisp/files.el b/lisp/files.el
index 969c2d9365961bb7971a89076ca104d3d6bc62cc..ec974ceebe74b0fe7d13fec59475a237c2c126bd 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2442,6 +2442,7 @@ is specified, returning t if it is specified."
 (put 'mode-line-format 'risky-local-variable t)
 (put 'mode-line-modified 'risky-local-variable t)
 (put 'mode-line-mule-info 'risky-local-variable t)
+(put 'mode-line-client 'risky-local-variable t)
 (put 'mode-line-buffer-identification 'risky-local-variable t)
 (put 'mode-line-modes 'risky-local-variable t)
 (put 'mode-line-position 'risky-local-variable t)
@@ -4892,6 +4893,22 @@ With prefix arg, silently save all file-visiting buffers, then kill."
        (or (null confirm-kill-emacs)
           (funcall confirm-kill-emacs "Really exit Emacs? "))
        (kill-emacs)))
+
+(defun save-buffers-kill-terminal (&optional arg)
+  "Offer to save each buffer, then kill the current connection.
+If the current frame has no client, kill Emacs itself.
+
+With prefix arg, silently save all file-visiting buffers, then kill.
+
+If emacsclient was started with a list of filenames to edit, then
+only these files will be asked to be saved."
+  (interactive "P")
+  (let ((proc (frame-parameter (selected-frame) 'client))
+       (frame (selected-frame)))
+    (if (null proc)
+       (save-buffers-kill-emacs)
+      (server-save-buffers-kill-terminal proc arg))))
+
 \f
 ;; We use /: as a prefix to "quote" a file name
 ;; so that magic file name handlers will not apply to it.
@@ -4989,7 +5006,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" 'save-buffers-kill-terminal)
 (define-key ctl-x-map "\C-q" 'toggle-read-only)
 
 (define-key ctl-x-4-map "f" 'find-file-other-window)