diff options
| author | Miles Bader <miles@gnu.org> | 2007-10-27 09:12:07 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-10-27 09:12:07 +0000 |
| commit | 18cd1f1a08833b0baad21c1d7b13a6845d95cf57 (patch) | |
| tree | 03f33df7513d15bd5de0348aec35ef82bd061508 /lisp/diff.el | |
| parent | 74863e7a78b1c8da1094a8250660a009c3b23015 (diff) | |
| parent | fdc9061358d3654e14bfc1419632e1d6c6c5c13e (diff) | |
| download | emacs-18cd1f1a08833b0baad21c1d7b13a6845d95cf57.tar.gz | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 902-908)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 131-137)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 261-262)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-278
Diffstat (limited to 'lisp/diff.el')
| -rw-r--r-- | lisp/diff.el | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lisp/diff.el b/lisp/diff.el index b063c07b40f..add3390881f 100644 --- a/lisp/diff.el +++ b/lisp/diff.el @@ -73,6 +73,10 @@ were found." (if (equal 0 code) " (no differences)" "") (current-time-string)))))) +(defvar diff-old-file nil) +(defvar diff-new-file nil) +(defvar diff-extra-args nil) + ;;;###autoload (defun diff (old new &optional switches no-async) "Find and display the differences between OLD and NEW files. |