[Emacs-diffs] /srv/bzr/emacs/trunk r99530: (vc-cvs-merge-news): Yet another fix of message parsing.

[Sam Steingold]

------------------------------------------------------------
revno: 99530
committer: Sam Steingold <address@hidden>
branch nick: trunk
timestamp: Thu 2010-02-18 14:55:41 -0500
message:
  (vc-cvs-merge-news): Yet another fix of message parsing.
modified:
  lisp/ChangeLog
  lisp/vc-cvs.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-02-18 18:52:36 +0000
+++ b/lisp/ChangeLog    2010-02-18 19:55:41 +0000
@@ -1,3 +1,7 @@
+2010-02-18  Sam Steingold  <address@hidden>
+
+       * vc-cvs.el (vc-cvs-merge-news): Yet another fix of message parsing.
+
 2010-02-18  Stefan Monnier  <address@hidden>
 
        Use abbreviated file names in bookmarks (bug#5591).

=== modified file 'lisp/vc-cvs.el'
--- a/lisp/vc-cvs.el    2010-01-13 08:35:10 +0000
+++ b/lisp/vc-cvs.el    2010-02-18 19:55:41 +0000
@@ -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