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

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      07/01/27 19:27:53

Index: files.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/files.el,v
retrieving revision 1.879
retrieving revision 1.880
diff -u -b -r1.879 -r1.880
--- files.el    21 Jan 2007 03:53:11 -0000      1.879
+++ files.el    27 Jan 2007 19:27:53 -0000      1.880
@@ -2505,6 +2505,7 @@
                          ", or C-v to scroll")))
          (goto-char (point-min))
          (let ((cursor-in-echo-area t)
+               (executing-kbd-macro executing-kbd-macro)
                (exit-chars
                 (if offer-save '(?! ?y ?n ?\s ?\C-g) '(?y ?n ?\s ?\C-g)))
                done)
@@ -2512,11 +2513,17 @@
              (message prompt)
              (setq char (read-event))
              (if (numberp char)
-                 (if (eq char ?\C-v)
+                 (cond ((eq char ?\C-v)
                      (condition-case nil
                          (scroll-up)
-                       (error (goto-char (point-min))))
-                   (setq done (memq (downcase char) exit-chars))))))
+                          (error (goto-char (point-min)))))
+                       ;; read-event returns -1 if we are in a kbd
+                       ;; macro and there are no more events in the
+                       ;; macro.  In that case, attempt to get an
+                       ;; event interactively.
+                       ((and executing-kbd-macro (= char -1))
+                        (setq executing-kbd-macro nil))
+                       (t (setq done (memq (downcase char) exit-chars)))))))
          (setq char (downcase char))
          (when (and offer-save (= char ?!) unsafe-vars)
            (dolist (elt unsafe-vars)