From: Chong Yidong <cyd@stupidchicken.com>
Date: Sat, 22 Jan 2011 20:15:24 +0000 (-0500)
Subject: * vc/diff.el (diff-sentinel): Doc fix (Bug#7682).
X-Git-Tag: emacs-pretest-24.0.90~104^2~618^2~1322^2~159
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e7c1dca85c0ec5652ef5d85619d7426fbb1f322b;p=emacs.git

* vc/diff.el (diff-sentinel): Doc fix (Bug#7682).
---

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