(line-move-1): If we did not move as far as desired, ensure that

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

diff --git a/lisp/diff.el b/lisp/diff.el
index 7149ef0..e806a61 100644 (file)
--- a/lisp/diff.el
+++ b/lisp/diff.el
@@ -1,17 +1,17 @@
 ;;; diff.el --- run `diff' in compilation-mode
 
 ;; Copyright (C) 1992, 1994, 1996, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007 Free Software Foundation, Inc.
+;;   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: unix, tools
 
 ;; This file is part of GNU Emacs.
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; 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)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -19,9 +19,7 @@
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -62,7 +60,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 +71,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.