[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/lisp ChangeLog vc-cvs.el
From: |
Sam Steingold |
Subject: |
[Emacs-diffs] emacs/lisp ChangeLog vc-cvs.el |
Date: |
Fri, 14 Aug 2009 04:24:06 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Sam Steingold <sds> 09/08/14 04:24:06
Modified files:
lisp : ChangeLog vc-cvs.el
Log message:
(vc-cvs-merge-news): Yet annother fix of message parsing.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15930&r2=1.15931
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/vc-cvs.el?cvsroot=emacs&r1=1.165&r2=1.166
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15930
retrieving revision 1.15931
diff -u -b -r1.15930 -r1.15931
--- ChangeLog 13 Aug 2009 15:59:34 -0000 1.15930
+++ ChangeLog 14 Aug 2009 04:24:01 -0000 1.15931
@@ -1,3 +1,7 @@
+2009-08-14 Sam Steingold <address@hidden>
+
+ * vc-cvs.el (vc-cvs-merge-news): Yet annother fix of message parsing.
+
2009-08-13 Chong Yidong <address@hidden>
* faces.el (help-argument-name): Define it here instead of
Index: vc-cvs.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/vc-cvs.el,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -b -r1.165 -r1.166
--- vc-cvs.el 7 Jul 2009 15:06:03 -0000 1.165
+++ vc-cvs.el 14 Aug 2009 04:24:06 -0000 1.166
@@ -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
- [Emacs-diffs] emacs/lisp ChangeLog vc-cvs.el,
Sam Steingold <=