; * lisp/simple.el (kill-buffer--possibly-save): Simplify.

diff --git a/lisp/simple.el b/lisp/simple.el
index f8ac9a549c094b02f246e9e092ec5b3f6dba48f9..60e881bbf888535f7805e00ad8d4d6e8a8f0c4a7 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -11185,7 +11185,7 @@ If the buffer doesn't exist, create it first."
 If the user confirms, optionally save BUFFER that is about to be
 killed."
   (let ((response
-         (cadr
+         (car
           (read-multiple-choice
            (format "Buffer %s modified; kill anyway?"
                    (buffer-name))
@@ -11194,9 +11194,8 @@ killed."
              (?s "save and then kill" "save the buffer and then kill it"))
            nil nil (and (not use-short-answers)
                         (not (use-dialog-box-p)))))))
-    (if (equal response "no")
-        nil
-      (unless (equal response "yes")
+    (unless (= response ?n)
+      (when (= response ?s)
         (with-current-buffer buffer
           (save-buffer)))
       t)))