diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2011-01-22 15:15:24 -0500 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2011-01-22 15:15:24 -0500 |
| commit | e7c1dca85c0ec5652ef5d85619d7426fbb1f322b (patch) | |
| tree | b0725c1d154fc97d0573749f34b05b5717dfc8e7 | |
| parent | 4d0143e6d7252cf83d44be1f4b604d73b8d61670 (diff) | |
| download | emacs-e7c1dca85c0ec5652ef5d85619d7426fbb1f322b.tar.gz | |
* vc/diff.el (diff-sentinel): Doc fix (Bug#7682).
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/vc/diff.el | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ab6c5c8ee63..7ebed843371 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2011-01-22 Chong Yidong <cyd@stupidchicken.com> + + * vc/diff.el (diff-sentinel): Doc fix (Bug#7682). + 2011-01-22 Jari Aalto <jari.aalto@cante.net> * play/landmark.el: Change `lm-' prefix to `landmark-' (Bug#7672). diff --git a/lisp/vc/diff.el b/lisp/vc/diff.el index 0a853c5d902..b29f9c10b18 100644 --- a/lisp/vc/diff.el +++ b/lisp/vc/diff.el @@ -60,7 +60,9 @@ (defun diff-sentinel (code &optional old-temp-file new-temp-file) "Code run when the diff process exits. CODE is the exit code of the process. It should be 0 only if no diffs -were found." +were found. +If optional args OLD-TEMP-FILE and/or NEW-TEMP-FILE are non-nil, +delete the temporary files so named." (if old-temp-file (delete-file old-temp-file)) (if new-temp-file (delete-file new-temp-file)) (save-excursion |