*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index aeef4eb1e927e3cdaf43eb9402c509469da51118..8d1c808404f3a944b121b758c70e78b58b6e25d9 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -3,7 +3,7 @@
        * vc.el (vc-do-command): Condition out a misleading message when
        running asynchronously.
        (vc-deduce-fileset): New argument enables using an unregistered
-       visited file as a singleton fileset idf nothing else is available.
+       visited file as a singleton fileset if nothing else is available.
        (vc-next-action): Restore file-registering behavior.
 
 2007-10-20  Jay Belanger  <jay.p.belanger@gmail.com>
@@ -683,12 +683,10 @@
        * follow.el (follow-stop-intercept-process-output):
        Use `follow-call-process-filter' rather than `process-filter'.
        Simplify.
+       * vc.el (vc0iff): Prevent errors in an edge case.
 
 2007-10-11  Eric S. Raymond  <esr@snark.thyrsus.com>
 
-       * vc.el: Address an edge case in vc-diff pointed out by
-       Juanma Barranquero.  This is an experimental fix and may change.
-
        * vc-hooks.el (vc-registered): Robustify this function a bit
        against filenames with no directory component.