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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ca7cc805b70088c0781e4f1d1875743919731d60..4eca8d9049111969ecf6a176dd2707a5c45785af 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2009-08-14  Sam Steingold  <sds@gnu.org>
+
+       * vc-cvs.el (vc-cvs-merge-news): Yet annother fix of message parsing.
+
 2009-08-13  Chong Yidong  <cyd@stupidchicken.com>
 
        * faces.el (help-argument-name): Define it here instead of

diff --git a/lisp/vc-cvs.el b/lisp/vc-cvs.el
index 6ef8db50537e7cad2ab3620a3ca7ebefee84b3c5..9d153e5c9fcbc89f9fe7f4fad154b7e54ea3840c 100644 (file)
--- a/lisp/vc-cvs.el
+++ b/lisp/vc-cvs.el
@@ -458,7 +458,8 @@ The changes are between FIRST-REVISION and SECOND-REVISION."
           (if (re-search-forward
                (concat "^\\([CMUP] \\)?"
                        (regexp-quote
-                        (substring file (length default-directory)))
+                        (substring file (length (expand-file-name
+                                                 "." default-directory))))
                        "\\( already contains the differences between \\)?")
                nil t)
               (cond