[Emacs-diffs] emacs/lisp ChangeLog vc-cvs.el

[Sam Steingold]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Sam Steingold <sds>     09/07/07 15:06:03

Modified files:
        lisp           : ChangeLog vc-cvs.el 

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

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15770&r2=1.15771
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/vc-cvs.el?cvsroot=emacs&r1=1.164&r2=1.165

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15770
retrieving revision 1.15771
diff -u -b -r1.15770 -r1.15771
--- ChangeLog   7 Jul 2009 06:28:54 -0000       1.15770
+++ ChangeLog   7 Jul 2009 15:06:00 -0000       1.15771
@@ -1,3 +1,8 @@
+2009-07-07  Sam Steingold  <address@hidden>
+
+       * vc-cvs.el (vc-cvs-merge-news): Fix message parsing for
+       non-top-level files.
+
 2009-07-07  Kenichi Handa  <address@hidden>
 
        * international/mule-cmds.el (reset-language-environment): Put

Index: vc-cvs.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/vc-cvs.el,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -b -r1.164 -r1.165
--- vc-cvs.el   23 Jun 2009 06:35:43 -0000      1.164
+++ vc-cvs.el   7 Jul 2009 15:06:03 -0000       1.165
@@ -457,7 +457,8 @@
             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