More informative error when autosave file is not available

* lisp/files.el (recover-file): Distinguish in error messages
between autosave file not existing and not being current.
(Bug#29179)

diff --git a/lisp/files.el b/lisp/files.el
index ae90d19f2f297db31060de53ab5d3c4681f48c8e..63dd509eab807f42be64fc47f4176a34af00b31a 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -5881,7 +5881,11 @@ an auto-save file."
       (error "%s is an auto-save file" (abbreviate-file-name file)))
   (let ((file-name (let ((buffer-file-name file))
                     (make-auto-save-file-name))))
-    (cond ((if (file-exists-p file)
+    (cond ((and (file-exists-p file)
+                (not (file-exists-p file-name)))
+           (error "Auto save file %s does not exist"
+                  (abbreviate-file-name file-name)))
+          ((if (file-exists-p file)
               (not (file-newer-than-file-p file-name file))
             (not (file-exists-p file-name)))
           (error "Auto-save file %s not current"