From: Chong Yidong <cyd@stupidchicken.com>
Date: Sun, 11 Jan 2009 16:45:52 +0000 (+0000)
Subject: (save-buffers-kill-terminal): Args for
X-Git-Tag: emacs-pretest-23.0.90~507
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0eef14bdd0c18c87df5b54bf2c58c2736ba3a090;p=emacs.git

(save-buffers-kill-terminal): Args for
server-save-buffers-kill-terminal changed.
---

diff --git a/lisp/files.el b/lisp/files.el
index 6e95dfc34c6..e846d5d2ba4 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -5731,12 +5731,9 @@ 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))))
-
+  (if (frame-parameter (selected-frame) 'client)
+      (server-save-buffers-kill-terminal arg)
+    (save-buffers-kill-emacs arg)))
 
 ;; We use /: as a prefix to "quote" a file name
 ;; so that magic file name handlers will not apply to it.