/[emacs]/emacs/lisp/ediff.el
ViewVC logotype

Diff of /emacs/lisp/ediff.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.57 by kifer, Wed Mar 20 06:36:18 2002 UTC revision 1.58 by rost, Wed Jul 31 22:29:00 2002 UTC
# Line 367  Line 367 
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)

Legend:
Removed from v.1.57  
changed lines
  Added in v.1.58

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26