1 files changed, 9 insertions, 5 deletions

diff --git a/lisp/files.el b/lisp/files.el
index 584aef9f456..6839fcf27dc 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2058,13 +2058,17 @@ saying what text to write."
          (file (file-name-nondirectory filename))
          (dir  (file-name-directory    filename))
          (comp (file-name-all-completions file dir))
-         newest)
+         (newest nil)
+         tem)
     (while comp
-      (setq file (concat dir (car comp))
+      (setq tem (car comp)
             comp (cdr comp))
-      (if (and (backup-file-name-p file)
-               (or (null newest) (file-newer-than-file-p file newest)))
-          (setq newest file)))
+      (cond ((and (backup-file-name-p tem)
+                  (string= (file-name-sans-versions tem) file))
+             (setq tem (concat dir tem))
+             (if (or (null newest)
+                     (file-newer-than-file-p tem newest))
+                 (setq newest tem)))))
     newest))
 
 (defun rename-uniquely ()