diff options
author | Miles Bader <miles@gnu.org> | 2007-08-13 13:51:08 +0000 |
---|---|---|
committer | Miles Bader <miles@gnu.org> | 2007-08-13 13:51:08 +0000 |
commit | aaf34461ff5804e5cebe163b31e535da72e81d87 (patch) | |
tree | b096310b459b78e437f08ac0f1f00954840a5db5 /lisp/diff.el | |
parent | 61d032dfd91b811d59acd7605ac02758be97e912 (diff) | |
parent | 37cc095b6a175fb5a2fb18fa029eaf3aa3b3fa53 (diff) | |
download | emacs-aaf34461ff5804e5cebe163b31e535da72e81d87.tar.gz |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 846-851)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 88-92)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 242-244)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-31
Diffstat (limited to 'lisp/diff.el')
-rw-r--r-- | lisp/diff.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/diff.el b/lisp/diff.el index 3013f0d769e..b063c07b40f 100644 --- a/lisp/diff.el +++ b/lisp/diff.el @@ -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 |