diff lisp/vc-cvs.el @ 104262:396d04b7c922

(vc-cvs-merge-news): Yet annother fix of message parsing.
author Sam Steingold <sds@gnu.org>
date Fri, 14 Aug 2009 04:24:01 +0000
parents 4f648d5b56cd
children 5bce9145b1cc
line wrap: on
line diff
--- a/lisp/vc-cvs.el	Thu Aug 13 18:08:25 2009 +0000
+++ b/lisp/vc-cvs.el	Fri Aug 14 04:24:01 2009 +0000
@@ -458,7 +458,8 @@
           (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