aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/vc/diff.el4
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 @@
12011-01-22 Chong Yidong <cyd@stupidchicken.com>
2
3 * vc/diff.el (diff-sentinel): Doc fix (Bug#7682).
4
12011-01-22 Jari Aalto <jari.aalto@cante.net> 52011-01-22 Jari Aalto <jari.aalto@cante.net>
2 6
3 * play/landmark.el: Change `lm-' prefix to `landmark-' (Bug#7672). 7 * 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 @@
60(defun diff-sentinel (code &optional old-temp-file new-temp-file) 60(defun diff-sentinel (code &optional old-temp-file new-temp-file)
61 "Code run when the diff process exits. 61 "Code run when the diff process exits.
62CODE is the exit code of the process. It should be 0 only if no diffs 62CODE is the exit code of the process. It should be 0 only if no diffs
63were found." 63were found.
64If optional args OLD-TEMP-FILE and/or NEW-TEMP-FILE are non-nil,
65delete the temporary files so named."
64 (if old-temp-file (delete-file old-temp-file)) 66 (if old-temp-file (delete-file old-temp-file))
65 (if new-temp-file (delete-file new-temp-file)) 67 (if new-temp-file (delete-file new-temp-file))
66 (save-excursion 68 (save-excursion