Mercurial > emacs

diff lisp/vc-cvs.el @ 108420:c82e39ab7a78

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from mainline.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Fri, 19 Feb 2010 15:29:56 +0000
parents dd61cb49d199
children 1918e70c8b37 376148b31b5e
line wrap: on
line diff
--- a/lisp/vc-cvs.el	Wed Feb 17 13:43:12 2010 +0000
+++ b/lisp/vc-cvs.el	Fri Feb 19 15:29:56 2010 +0000
@@ -459,8 +459,8 @@
           (if (re-search-forward
                (concat "^\\([CMUP] \\)?"
                        (regexp-quote
-                        (substring file (length (expand-file-name
-                                                 "." default-directory))))
+                        (substring file (1+ (length (expand-file-name
+                                                     "." default-directory)))))
                        "\\( already contains the differences between \\)?")
                nil t)
               (cond