From: Richard M. Stallman <rms@gnu.org>
Date: Mon, 11 Jul 1994 04:31:40 +0000 (+0000)
Subject: (diff-latest-backup-file): Cope with backups stored
X-Git-Tag: emacs-19.34~7658
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cf2d98df973411a8d18190e0cb7fc9c180d3e22e;p=emacs.git

(diff-latest-backup-file): Cope with backups stored
in a different directory.
---

diff --git a/lisp/diff.el b/lisp/diff.el
index 891fb970449..ff7906a80c4 100644
--- 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