Commit 3755bd32 authored by Markus Rost's avatar Markus Rost
Browse files

(ediff-backup): New autoloaded command.

parent 32d9a725
2002-07-31 Markus Rost <>
* help-fns.el (describe-function-1): Test function for
obsolescence only if it is a symbol.
* ediff.el (ediff-backup): New autoloaded command.
2002-07-31 Richard M. Stallman <>
* emacs-lisp/bytecomp.el (byte-compile-find-cl-functions):
......@@ -367,6 +367,22 @@
(defalias 'ediff 'ediff-files)
(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)))
(defun ediff-buffers (buffer-A buffer-B &optional startup-hooks job-name)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment