[Emacs-diffs] /srv/bzr/emacs/trunk r110726: * lisp/files.el (find-alternate-file): Only ask one question.

[Stefan Monnier]

------------------------------------------------------------
revno: 110726
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=12487
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Mon 2012-10-29 09:28:41 -0400
message:
  * lisp/files.el (find-alternate-file): Only ask one question.
modified:
  lisp/ChangeLog
  lisp/files.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-10-29 11:12:17 +0000
+++ b/lisp/ChangeLog    2012-10-29 13:28:41 +0000
@@ -1,3 +1,7 @@
+2012-10-29  Stefan Monnier  <address@hidden>
+
+       * files.el (find-alternate-file): Only ask one question (bug#12487).
+
 2012-10-29  Chong Yidong  <address@hidden>
 
        * vc/vc-hooks.el (vc-file-clearprops): Kill vc-parent-buffer.

=== modified file 'lisp/files.el'
--- a/lisp/files.el     2012-10-06 14:18:35 +0000
+++ b/lisp/files.el     2012-10-29 13:28:41 +0000
@@ -1537,12 +1537,9 @@
           t)))
   (unless (run-hook-with-args-until-failure 'kill-buffer-query-functions)
     (error "Aborted"))
-  (when (and (buffer-modified-p) buffer-file-name)
-    (if (yes-or-no-p (format "Buffer %s is modified; save it first? "
-                            (buffer-name)))
-        (save-buffer)
-      (unless (yes-or-no-p "Kill and replace the buffer without saving it? ")
-        (error "Aborted"))))
+  (and (buffer-modified-p) buffer-file-name
+       (not (yes-or-no-p "Kill and replace the buffer without saving it? "))
+       (error "Aborted"))
   (let ((obuf (current-buffer))
        (ofile buffer-file-name)
        (onum buffer-file-number)