From: João Távora <joaotavora@gmail.com>
Date: Wed, 27 Jun 2018 13:19:00 +0000 (+0100)
Subject: Respect s-s-b-default-predicate when killing terminal
X-Git-Tag: emacs-27.0.90~4756
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ce54573dacaeb234ac006b71cbaafe1c543515f1;p=emacs.git

Respect s-s-b-default-predicate when killing terminal

Fixes: Bug#31951

* lisp/server.el (server-save-buffers-kill-terminal): Only pass
PRED=t to save-some-bufers if ARG in non-nil.
---

diff --git a/lisp/server.el b/lisp/server.el
index 9eedc293a7d..87942e84191 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -1673,13 +1673,15 @@ only these files will be asked to be saved."
 	     (save-buffers-kill-emacs arg)))
 	  ((processp proc)
 	   (let ((buffers (process-get proc 'buffers)))
-	     ;; If client is bufferless, emulate a normal Emacs exit
-	     ;; and offer to save all buffers.  Otherwise, offer to
-	     ;; save only the buffers belonging to the client.
 	     (save-some-buffers
 	      arg (if buffers
+                      ;; Only files from emacsclient file list.
 		      (lambda () (memq (current-buffer) buffers))
-		    t))
+                    ;; No emacsclient file list: don't override
+                    ;; `save-some-buffers-default-predicate' (unless
+                    ;; ARG is non-nil), since we're not killing
+                    ;; Emacs (unlike `save-buffers-kill-emacs').
+		    (and arg t)))
 	     (server-delete-client proc)))
 	  (t (error "Invalid client frame")))))