HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* progmodes/sh-script.el (sh-mode): Use define-derived-mode.
[bpt/emacs.git]
/
lisp
/
diff.el
diff --git
a/lisp/diff.el
b/lisp/diff.el
index
7149ef0
..
d7fc993
100644
(file)
--- a/
lisp/diff.el
+++ b/
lisp/diff.el
@@
-1,17
+1,19
@@
;;; diff.el --- run `diff' in compilation-mode
;;; diff.el --- run `diff' in compilation-mode
-;; Copyright (C) 1992, 1994, 1996, 2001, 2002, 2003, 2004,
-;; 200
5, 2006, 2007
Free Software Foundation, Inc.
+;; Copyright (C) 1992, 1994, 1996, 2001, 2002, 2003, 2004,
2005, 2006,
+;; 200
7, 2008, 2009, 2010
Free Software Foundation, Inc.
+;; Author: Frank Bresz
+;; (according to authors.el)
;; Maintainer: FSF
;; Keywords: unix, tools
;; This file is part of GNU Emacs.
;; 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
;; 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
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-19,9
+21,7
@@
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
;; 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:
;;; Commentary:
@@
-36,14
+36,14
@@
:group 'tools)
;;;###autoload
:group 'tools)
;;;###autoload
-(defcustom diff-switches
"-c"
- "
*
A string or list of strings specifying switches to be passed to diff."
+(defcustom diff-switches
(purecopy "-c")
+ "A string or list of strings specifying switches to be passed to diff."
:type '(choice string (repeat string))
:group 'diff)
;;;###autoload
:type '(choice string (repeat string))
:group 'diff)
;;;###autoload
-(defcustom diff-command
"diff"
- "
*
The command to use to run diff."
+(defcustom diff-command
(purecopy "diff")
+ "The command to use to run diff."
:type 'string
:group 'diff)
:type 'string
:group 'diff)
@@
-62,23
+62,34
@@
(defun diff-sentinel (code)
"Code run when the diff process exits.
(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."
- (if diff-old-temp-file (delete-file diff-old-temp-file))
- (if diff-new-temp-file (delete-file diff-new-temp-file))
+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 t))
+ (if diff-new-temp-file (delete-file diff-new-temp-file t))
(save-excursion
(goto-char (point-max))
(let ((inhibit-read-only t))
(insert (format "\nDiff finished%s. %s\n"
(save-excursion
(goto-char (point-max))
(let ((inhibit-read-only t))
(insert (format "\nDiff finished%s. %s\n"
- (if (equal 0 code) " (no differences)" "")
+ (cond ((equal 0 code) " (no differences)")
+ ((equal 2 code) " (diff error)")
+ (t ""))
(current-time-string))))))
(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.
;;;###autoload
(defun diff (old new &optional switches no-async)
"Find and display the differences between OLD and NEW files.
-Interactively the current buffer's file name is the default for NEW
-and a backup file for NEW is the default for OLD.
+When called interactively, read OLD and NEW using the minibuffer;
+the default for NEW is the current buffer's file name, and the
+default for OLD is a backup file for NEW, if one exists.
If NO-ASYNC is non-nil, call diff synchronously.
If NO-ASYNC is non-nil, call diff synchronously.
-With prefix arg, prompt for diff switches."
+
+When called interactively with a prefix argument, prompt
+interactively for diff switches. Otherwise, the switches
+specified in `diff-switches' are passed to the diff command."
(interactive
(let (oldf newf)
(setq newf (buffer-file-name)
(interactive
(let (oldf newf)
(setq newf (buffer-file-name)