From: Gerd Moellmann <gerd@gnu.org>
Date: Sun, 12 Dec 1999 12:26:53 +0000 (+0000)
Subject: (after-find-file): Fix previous change.
X-Git-Tag: emacs-pretest-21.0.90~5797
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a390d6c6c8af0b3930012be294ceb88579a27842;p=emacs.git

(after-find-file): Fix previous change.
---

diff --git a/lisp/files.el b/lisp/files.el
index 73268891513..77fb79eefdf 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1195,7 +1195,11 @@ unless NOMODES is non-nil."
 		   "File exists, but cannot be read")
 		  ((not buffer-read-only)
 		   (if (and warn
-			    (file-newer-than-file-p (or auto-save-visited-file-name
+			    ;; No need to warn if buffer is auto-saved
+			    ;; under the name of the visited file.
+			    (not (and buffer-file-name
+				      auto-save-visited-file-name))
+			    (file-newer-than-file-p (or buffer-auto-save-file-name
 							(make-auto-save-file-name))
 						    buffer-file-name))
 		       (format "%s has auto save data; consider M-x recover-file"