# HG changeset patch # User Markus Rost # Date 1028154540 0 # Node ID bc3820ad92b2aaeb7e39a120f79618dfcbc2f5ac # Parent af4505d3e0f83be5175cc975b6de3aed22b803f1 (ediff-backup): New autoloaded command. diff -r af4505d3e0f8 -r bc3820ad92b2 lisp/ediff.el --- a/lisp/ediff.el Wed Jul 31 22:28:30 2002 +0000 +++ b/lisp/ediff.el Wed Jul 31 22:29:00 2002 +0000 @@ -367,6 +367,22 @@ ;;;###autoload (defalias 'ediff 'ediff-files) +;;;###autoload +(defun ediff-backup (file) + "Run Ediff on FILE and its backup file. +Uses the latest backup, if there are several numerical backups. +If this file is a backup, `ediff' it with its original." + (interactive (list (read-file-name "Ediff (file with backup): "))) + ;; The code is taken from `diff-backup'. + (require 'diff) + (let (bak ori) + (if (backup-file-name-p file) + (setq bak file + ori (file-name-sans-versions file)) + (setq bak (or (diff-latest-backup-file file) + (error "No backup found for %s" file)) + ori file)) + (ediff-files bak ori))) ;;;###autoload (defun ediff-buffers (buffer-A buffer-B &optional startup-hooks job-name)