diff options
| author | Dan Nicolaescu <dann@ics.uci.edu> | 2007-10-26 22:24:14 +0000 |
|---|---|---|
| committer | Dan Nicolaescu <dann@ics.uci.edu> | 2007-10-26 22:24:14 +0000 |
| commit | 3fe5c37a0c6236ec34781d956ad9b7c764906999 (patch) | |
| tree | 61c2eb7949ce13be1e3d2dbb2afb3a8e8416062d /lisp/diff.el | |
| parent | 67b73e3aa76d9854b3be5f7a2c1075fb24a21074 (diff) | |
| download | emacs-3fe5c37a0c6236ec34781d956ad9b7c764906999.tar.gz | |
* emulation/pc-select.el (next-line-mark, next-line-nomark)
(previous-line-mark, previous-line-nomark): Wrap with-no-warnings
around uses of previous-line and next-line.
* diff.el (diff-old-file, diff-new-file, diff-extra-args): New
defvars.
* textmodes/css-mode.el (comment-continue):
* net/browse-url.el (url-handler-regexp):
* progmodes/idlw-help.el (idlwave-system-routines): Pacify
byte-compiler.
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. |