(file-newest-backup): Use file-name-sans-versions.

2 files changed, 9 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a35caa9d765..e97889906b6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2002-05-22  Markus Rost  <rost@math.ohio-state.edu>
+
+        * files.el (file-newest-backup): Use file-name-sans-versions.
+
+        * diff.el (diff-latest-backup-file): Replace the main code by
+        a call of file-newest-backup.
+
 2002-05-22  Mike Williams  <mdub@bigfoot.com>
 
         * textmodes/sgml-mode.el (sgml-guess-indent): Look further into
diff --git a/lisp/files.el b/lisp/files.el
index 9169ae9193b..b01472171a9 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -3011,7 +3011,8 @@ saying what text to write."
   ;; `make-backup-file-name' will get us the right directory for
   ;; ordinary or numeric backups.  It might create a directory for
   ;; backups as a side-effect, according to `backup-directory-alist'.
-  (let* ((filename (make-backup-file-name filename))
+  (let* ((filename (file-name-sans-versions
+                    (make-backup-file-name filename)))
          (file (file-name-nondirectory filename))
          (dir  (file-name-directory    filename))
          (comp (file-name-all-completions file dir))