Mercurial > emacs

changeset 107193:dd61cb49d199

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(vc-cvs-merge-news): Yet another fix of message parsing.
author Sam Steingold <sds@gnu.org>
date Thu, 18 Feb 2010 14:55:41 -0500
parents 3c9f81253d07
children f14b4c307fe1 396dc65ad74c
files lisp/ChangeLog lisp/vc-cvs.el
diffstat 2 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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).
--- 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