[Emacs-diffs] Changes to emacs/lisp/files.el,v

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        08/06/11 01:47:48

Index: files.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/files.el,v
retrieving revision 1.984
retrieving revision 1.985
diff -u -b -r1.984 -r1.985
--- files.el    28 May 2008 20:23:06 -0000      1.984
+++ files.el    11 Jun 2008 01:47:47 -0000      1.985
@@ -4163,21 +4163,27 @@
   nil)
 
 (defvar save-some-buffers-action-alist
-  '((?\C-r
-     (lambda (buf)
-       (view-buffer buf
-                   (lambda (ignore)
-                     (exit-recursive-edit)))
-       (recursive-edit)
+  `((?\C-r
+     ,(lambda (buf)
+        (if (not enable-recursive-minibuffers)
+            (progn (display-buffer buf)
+                   (setq other-window-scroll-buffer buf))
+          (view-buffer buf (lambda (_) (exit-recursive-edit)))
+          (recursive-edit))
        ;; Return nil to ask about BUF again.
        nil)
      "view this buffer")
-    (?d (lambda (buf)
-         (save-window-excursion
-           (diff-buffer-with-file buf))
+    (?d ,(lambda (buf)
+           (if (null buffer-file-name)
+               (message "Not applicable: no file")
+             (save-window-excursion (diff-buffer-with-file buf))
+             (if (not enable-recursive-minibuffers)
+                 (progn (display-buffer (get-buffer-create "*Diff*"))
+                        (setq other-window-scroll-buffer "*Diff*"))
          (view-buffer (get-buffer-create "*Diff*")
-                      (lambda (ignore) (exit-recursive-edit)))
-         (recursive-edit)
+                            (lambda (_) (exit-recursive-edit)))
+               (recursive-edit)))
+           ;; Return nil to ask about BUF again.
          nil)
        "view changes in this buffer"))
   "ACTION-ALIST argument used in call to `map-y-or-n-p'.")
@@ -4216,7 +4222,6 @@
       ;; and record the number thus saved.
       (setq files-done
            (map-y-or-n-p
-            (function
              (lambda (buffer)
                (and (buffer-modified-p buffer)
                     (not (buffer-base-buffer buffer))
@@ -4235,10 +4240,9 @@
                           (format "Save file %s? "
                                   (buffer-file-name buffer))
                         (format "Save buffer %s? "
-                                (buffer-name buffer)))))))
-            (function
+                                (buffer-name buffer))))))
              (lambda (buffer)
-               (set-buffer buffer)
+               (with-current-buffer buffer
                (save-buffer)))
             (buffer-list)
             '("buffer" "buffers" "save")