(vc-cvs-merge-news): Yet another fix of message parsing.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1549c42ebcca0856264f0036a3ccef86f9fc9884..7bbc41aff63653a903a5bf860996eef7b5349318 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/vc-cvs.el b/lisp/vc-cvs.el
index e521f608209c5d1c3370abd366076aa66f077ddf..1abef9f48b8dca7ff8a2e48c2665ee15629ec42c 100644 (file)
--- a/lisp/vc-cvs.el
+++ b/lisp/vc-cvs.el
@@ -459,8 +459,8 @@ The changes are between FIRST-REVISION and SECOND-REVISION."
           (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