aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/diff.el
diff options
context:
space:
mode:
authorMarkus Rost2002-05-22 23:26:51 +0000
committerMarkus Rost2002-05-22 23:26:51 +0000
commita8090e38c009722ccebaa8e982ab983f45cda8f6 (patch)
tree513fe50462f18d03fae53e8c457844a7c499d4b8 /lisp/diff.el
parent6065f9e2764766f90f95b9fc9d5fd2cf2eea0be9 (diff)
downloademacs-a8090e38c009722ccebaa8e982ab983f45cda8f6.tar.gz
emacs-a8090e38c009722ccebaa8e982ab983f45cda8f6.zip
(diff-latest-backup-file): Replace the main code by a call of
file-newest-backup.
Diffstat (limited to 'lisp/diff.el')
-rw-r--r--lisp/diff.el25
1 files changed, 1 insertions, 24 deletions
diff --git a/lisp/diff.el b/lisp/diff.el
index 19ec2e599ad..ee49482cfe8 100644
--- a/lisp/diff.el
+++ b/lisp/diff.el
@@ -295,30 +295,7 @@ The backup file is the first file given to `diff'."
295 (let ((handler (find-file-name-handler fn 'diff-latest-backup-file))) 295 (let ((handler (find-file-name-handler fn 'diff-latest-backup-file)))
296 (if handler 296 (if handler
297 (funcall handler 'diff-latest-backup-file fn) 297 (funcall handler 'diff-latest-backup-file fn)
298 ;; First try simple backup, then the highest numbered of the 298 (file-newest-backup fn))))
299 ;; numbered backups.
300 ;; Ignore the value of version-control because we look for existing
301 ;; backups, which maybe were made earlier or by another user with
302 ;; a different value of version-control.
303 (setq fn (file-chase-links (expand-file-name fn)))
304 (or
305 (let ((bak (make-backup-file-name fn)))
306 (if (file-exists-p bak) bak))
307 ;; We use BACKUPNAME to cope with backups stored in a different dir.
308 (let* ((backupname (car (find-backup-file-name fn)))
309 (dir (file-name-directory backupname))
310 (base-versions (concat (file-name-sans-versions
311 (file-name-nondirectory backupname))
312 ".~"))
313 ;; This is a fluid var for backup-extract-version.
314 (backup-extract-version-start (length base-versions)))
315 (concat dir
316 (car (sort
317 (file-name-all-completions base-versions dir)
318 (function
319 (lambda (fn1 fn2)
320 (> (backup-extract-version fn1)
321 (backup-extract-version fn2))))))))))))
322 299
323(provide 'diff) 300(provide 'diff)
324 301