From: Gerd Moellmann <gerd@gnu.org>
Date: Thu, 9 Dec 1999 15:23:31 +0000 (+0000)
Subject: (after-find-file): Use auto-save-visited-file-name if set.
X-Git-Tag: emacs-pretest-21.0.90~5822
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=365e9bce08109beb18ef476d19ed4c39d81b787b;p=emacs.git

(after-find-file): Use auto-save-visited-file-name if set.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 228aac9e29c..80b7fd64478 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+1999-12-09  Gerd Moellmann  <gerd@gnu.org>
+
+	* files.el (after-find-file): Use auto-save-visited-file-name if
+	set.
+
+	* mail/feedmail.el (feedmail-find-eoh): Take
+	feedmail-queue-alternative-mail-header-separator into account.
+
 1999-12-09  Stefan Monnier  <monnier@cs.yale.edu>
 
 	* smerge-mode.el: New file.
diff --git a/lisp/files.el b/lisp/files.el
index 44baf22f8bd..73268891513 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1195,7 +1195,8 @@ unless NOMODES is non-nil."
 		   "File exists, but cannot be read")
 		  ((not buffer-read-only)
 		   (if (and warn
-			    (file-newer-than-file-p (make-auto-save-file-name)
+			    (file-newer-than-file-p (or auto-save-visited-file-name
+							(make-auto-save-file-name))
 						    buffer-file-name))
 		       (format "%s has auto save data; consider M-x recover-file"
 			       (file-name-nondirectory buffer-file-name))