diff options
| author | Miles Bader | 2007-08-13 13:48:35 +0000 |
|---|---|---|
| committer | Miles Bader | 2007-08-13 13:48:35 +0000 |
| commit | b2e6b10fe2d40020a75ab0025af98a4abf339cd2 (patch) | |
| tree | db265e5ea93cdc13f8e3b54ed5c7ad2869d50ec9 /lisp/diff.el | |
| parent | 905350bef3ebc514a418658dd155c1d062664b56 (diff) | |
| parent | 37cc095b6a175fb5a2fb18fa029eaf3aa3b3fa53 (diff) | |
| download | emacs-b2e6b10fe2d40020a75ab0025af98a4abf339cd2.tar.gz emacs-b2e6b10fe2d40020a75ab0025af98a4abf339cd2.zip | |
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--unicode--0--patch-246
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 @@ | |||
| 62 | 62 | ||
| 63 | (defun diff-sentinel (code) | 63 | (defun diff-sentinel (code) |
| 64 | "Code run when the diff process exits. | 64 | "Code run when the diff process exits. |
| 65 | CODE is the exit code of the process. It should be 0 iff no diffs were found." | 65 | CODE is the exit code of the process. It should be 0 only if no diffs |
| 66 | were found." | ||
| 66 | (if diff-old-temp-file (delete-file diff-old-temp-file)) | 67 | (if diff-old-temp-file (delete-file diff-old-temp-file)) |
| 67 | (if diff-new-temp-file (delete-file diff-new-temp-file)) | 68 | (if diff-new-temp-file (delete-file diff-new-temp-file)) |
| 68 | (save-excursion | 69 | (save-excursion |