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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 228aac9e29cbd5c232c2c1ec9e2c959513374482..80b7fd64478149f658df840d099e485203dbb7cb 100644 (file)
--- 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 44baf22f8bd31caafd5aeb72d254f16751df21a5..73268891513a7813828ec68d6dd27331168225c3 100644 (file)
--- 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))