mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-02-07 20:54:32 +00:00
Code Issues Releases Activity

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

Browse Source
This commit is contained in:
Sam Steingold 2009-08-14 04:24:01 +00:00
parent 417f77e6f2
commit 53dab179d3
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/ChangeLog
View File

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

3
lisp/vc-cvs.el
View File

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