(list-colors-display): Use with-help-window instead of with-output-to-temp-buffer.

[bpt/emacs.git] / lisp / diff.el

diff --git a/lisp/diff.el b/lisp/diff.el
index 7149ef0..add3390 100644 (file)
--- a/lisp/diff.el
+++ b/lisp/diff.el
@@ -10,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -62,7 +62,8 @@
 
 (defun diff-sentinel (code)
   "Code run when the diff process exits.
-CODE is the exit code of the process.  It should be 0 iff no diffs were found."
+CODE is the exit code of the process.  It should be 0 only if no diffs
+were found."
   (if diff-old-temp-file (delete-file diff-old-temp-file))
   (if diff-new-temp-file (delete-file diff-new-temp-file))
   (save-excursion
@@ -72,6 +73,10 @@ CODE is the exit code of the process.  It should be 0 iff no diffs 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.