# HG changeset patch
# User Sam Steingold <sds@gnu.org>
# Date 1266522941 18000
# Node ID dd61cb49d199162a87e2c9f3ce4262b9743686b3
# Parent  3c9f81253d07d00d6ee7f3c83fb5f4c5ea869b95
(vc-cvs-merge-news): Yet another fix of message parsing.

diff -r 3c9f81253d07 -r dd61cb49d199 lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Feb 18 13:52:36 2010 -0500
+++ b/lisp/ChangeLog	Thu Feb 18 14:55:41 2010 -0500
@@ -1,3 +1,7 @@
+2010-02-18  Sam Steingold  <sds@gnu.org>
+
+	* vc-cvs.el (vc-cvs-merge-news): Yet another fix of message parsing.
+
 2010-02-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	Use abbreviated file names in bookmarks (bug#5591).
diff -r 3c9f81253d07 -r dd61cb49d199 lisp/vc-cvs.el
--- a/lisp/vc-cvs.el	Thu Feb 18 13:52:36 2010 -0500
+++ b/lisp/vc-cvs.el	Thu Feb 18 14:55:41 2010 -0500
@@ -459,8 +459,8 @@
           (if (re-search-forward
                (concat "^\\([CMUP] \\)?"
                        (regexp-quote
-                        (substring file (length (expand-file-name
-                                                 "." default-directory))))
+                        (substring file (1+ (length (expand-file-name
+                                                     "." default-directory)))))
                        "\\( already contains the differences between \\)?")
                nil t)
               (cond