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

ff6b00de · Sam Steingold · fe8c0b47 · ff6b00de · ff6b00de
Commit ff6b00de authored Feb 18, 2010 by Sam Steingold
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

lisp/ChangeLog lisp/ChangeLog +4 -0

lisp/vc-cvs.el lisp/vc-cvs.el +2 -2

No files found.
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
+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).

--- 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