mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-15 10:30:25 -08:00
(ediff-backup): New autoloaded command.
This commit is contained in:
parent
32d9a725a5
commit
3755bd32c9
2 changed files with 23 additions and 0 deletions
|
|
@ -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)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue