diff options
| author | Sam Steingold <sds@gnu.org> | 2010-02-18 14:55:41 -0500 |
|---|---|---|
| committer | Sam Steingold <sds@gnu.org> | 2010-02-18 14:55:41 -0500 |
| commit | ff6b00de888a44fcb01fb68c870db08509640d52 (patch) | |
| tree | 3402ea3398c9fb77d7363515ee1b6f9d743217a7 | |
| parent | fe8c0b47d26808347509a3ad86089276b121a692 (diff) | |
| download | emacs-ff6b00de888a44fcb01fb68c870db08509640d52.tar.gz | |
(vc-cvs-merge-news): Yet another fix of message parsing.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/vc-cvs.el | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1549c42ebcc..7bbc41aff63 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2010-02-18 Sam Steingold <sds@gnu.org> + + * vc-cvs.el (vc-cvs-merge-news): Yet another fix of message parsing. + 2010-02-18 Stefan Monnier <monnier@iro.umontreal.ca> Use abbreviated file names in bookmarks (bug#5591). diff --git a/lisp/vc-cvs.el b/lisp/vc-cvs.el index e521f608209..1abef9f48b8 100644 --- a/lisp/vc-cvs.el +++ b/lisp/vc-cvs.el @@ -459,8 +459,8 @@ The changes are between FIRST-REVISION and SECOND-REVISION." (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 |