mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-10 09:43:26 -08:00
Code Issues Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Sam Steingold 2009-07-07 15:06:00 +00:00
parent fcaf6f3a78
commit 9ba562d3da
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
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

3
lisp/vc-cvs.el
View file

@ -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