367 |
;;;###autoload |
;;;###autoload |
368 |
(defalias 'ediff 'ediff-files) |
(defalias 'ediff 'ediff-files) |
369 |
|
|
370 |
|
;;;###autoload |
371 |
|
(defun ediff-backup (file) |
372 |
|
"Run Ediff on FILE and its backup file. |
373 |
|
Uses the latest backup, if there are several numerical backups. |
374 |
|
If this file is a backup, `ediff' it with its original." |
375 |
|
(interactive (list (read-file-name "Ediff (file with backup): "))) |
376 |
|
;; The code is taken from `diff-backup'. |
377 |
|
(require 'diff) |
378 |
|
(let (bak ori) |
379 |
|
(if (backup-file-name-p file) |
380 |
|
(setq bak file |
381 |
|
ori (file-name-sans-versions file)) |
382 |
|
(setq bak (or (diff-latest-backup-file file) |
383 |
|
(error "No backup found for %s" file)) |
384 |
|
ori file)) |
385 |
|
(ediff-files bak ori))) |
386 |
|
|
387 |
;;;###autoload |
;;;###autoload |
388 |
(defun ediff-buffers (buffer-A buffer-B &optional startup-hooks job-name) |
(defun ediff-buffers (buffer-A buffer-B &optional startup-hooks job-name) |