From: Sam Steingold Date: Tue, 7 Jul 2009 15:06:00 +0000 (+0000) Subject: (vc-cvs-merge-news): Fix message parsing for non-top-level files. X-Git-Tag: emacs-pretest-23.1.90~2295 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9ba562d3da40918a8727ebc3ba4f4d2b2a2dfeba;p=emacs.git (vc-cvs-merge-news): Fix message parsing for non-top-level files. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7196d29c477..6e9bbb1ef46 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2009-07-07 Sam Steingold + + * vc-cvs.el (vc-cvs-merge-news): Fix message parsing for + non-top-level files. + 2009-07-07 Kenichi Handa * international/mule-cmds.el (reset-language-environment): Put diff --git a/lisp/vc-cvs.el b/lisp/vc-cvs.el index c3f94dc2a15..6ef8db50537 100644 --- a/lisp/vc-cvs.el +++ b/lisp/vc-cvs.el @@ -457,7 +457,8 @@ The changes are between FIRST-REVISION and SECOND-REVISION." 0 ;; there were no news; indicate success (if (re-search-forward (concat "^\\([CMUP] \\)?" - (regexp-quote (file-name-nondirectory file)) + (regexp-quote + (substring file (length default-directory))) "\\( already contains the differences between \\)?") nil t) (cond