(diff-latest-backup-file): Cope with backups stored

in a different directory.

diff --git a/lisp/diff.el b/lisp/diff.el
index 891fb97044994030cfd817dec36081de22778776..ff7906a80c46e0ca52f53ea98c9d47537bfa8168 100644 (file)
--- a/lisp/diff.el
+++ b/lisp/diff.el
@@ -266,8 +266,12 @@ The backup file is the first file given to `diff'."
       (or
        (let ((bak (make-backup-file-name fn)))
         (if (file-exists-p bak) bak))
-       (let* ((dir (file-name-directory fn))
-             (base-versions (concat (file-name-nondirectory fn) ".~"))
+       ;; We use BACKUPNAME to cope with backups stored in a different dir.
+       (let* ((backupname (car (find-backup-file-name fn)))
+             (dir (file-name-directory backupname))
+             (base-versions (concat (file-name-sans-versions
+                                     (file-name-nondirectory backupname))
+                                    ".~"))
              (bv-length (length base-versions)))
         (concat dir
                 (car (sort