# HG changeset patch
# User Eric S. Raymond <esr@snark.thyrsus.com>
# Date 1192272885 0
# Node ID 3f37000e811a9576bc7a02a8e8934c6f4d51061f
# Parent  7f1336541cb11d4cc71b6a1943e092ce6c551620
Clarification requested by RMS.

diff -r 7f1336541cb1 -r 3f37000e811a lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Oct 13 09:14:27 2007 +0000
+++ b/lisp/ChangeLog	Sat Oct 13 10:54:45 2007 +0000
@@ -105,11 +105,12 @@
 
 2007-10-11  Eric S. Raymond  <esr@snark.thyrsus.com>
 
-	* vc.el (vc-diff, vc-diff-internal): Bug fixes by Juanma Barranquero.
-	Temporarily disable the check for his edge case, it's calling some
-	brittle code.
-	(with-vc-properties): Fievaluation time of a macro argument.
-
+	* vc.el (vc-diff):
+	(vc-diff-internal): Merge a patch by Juanma Barranquero.  Also,
+	emporarily disable the check for his edge case of
+	vc-diff (stopping it from grinding when callerd from $HOME), as
+	it's calling some brittle code in vc-hooks.el.
+	(with-vc-properties): Fix evaluation time of a macro argument.
 	* ediff-vers.el (ediff-vc-internal):
 	* vc-hooks.el:
 	* loaddefs.el: Follow up on VC terminology change.