Commit 9ba562d3 authored by Sam Steingold's avatar Sam Steingold

(vc-cvs-merge-news): Fix message parsing for non-top-level files.

parent fcaf6f3a
2009-07-07 Sam Steingold <sds@gnu.org>
* vc-cvs.el (vc-cvs-merge-news): Fix message parsing for
non-top-level files.
2009-07-07 Kenichi Handa <handa@m17n.org>
* international/mule-cmds.el (reset-language-environment): Put
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment