diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/ediff.el | 16 |
2 files changed, 23 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 553da0faa22..45f8b368256 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2002-07-31 Markus Rost <rost@math.ohio-state.edu> + + * 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 <rms@gnu.org> * emacs-lisp/bytecomp.el (byte-compile-find-cl-functions): diff --git a/lisp/ediff.el b/lisp/ediff.el index 2db82f85547..5b0f85d05cd 100644 --- a/lisp/ediff.el +++ b/lisp/ediff.el @@ -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) |