Mercurial > hg > xemacs-beta
diff lisp/files.el @ 988:5df795348f45
[xemacs-hg @ 2002-09-01 22:13:52 by andyp]
apply various 21.4 patches
| author | andyp |
|---|---|
| date | Sun, 01 Sep 2002 22:14:58 +0000 |
| parents | 42375619fa45 |
| children | ccaf90c5a53a |
line wrap: on
line diff
--- a/lisp/files.el Sun Sep 01 17:54:58 2002 +0000 +++ b/lisp/files.el Sun Sep 01 22:14:58 2002 +0000 @@ -2829,6 +2829,7 @@ (funcall revert-buffer-function ignore-auto noconfirm) (let* ((opoint (point)) (newbuf nil) + (found nil) (delay-prompt nil) (auto-save-p (and (not ignore-auto) (recent-auto-save-p) @@ -2843,10 +2844,9 @@ (error "Buffer does not seem to be associated with any file")) ((or noconfirm (and (not (buffer-modified-p)) - (let (found) - (dolist (rx revert-without-query found) - (when (string-match rx file-name) - (setq found t))))) + (dolist (rx revert-without-query found) + (when (string-match rx file-name) + (setq found t)))) ;; If we might perform an optimized revert then we ;; want to delay prompting in case we don't need to ;; do it at all @@ -2862,7 +2862,7 @@ (buffer-modified-p) (and (setq newbuf (revert-buffer-internal file-name)) - (or noconfirm + (or noconfirm found (and delay-prompt (yes-or-no-p (format "Revert buffer from file %s? "