diff options
| author | Sam Steingold <sds@gnu.org> | 2009-08-14 04:24:01 +0000 |
|---|---|---|
| committer | Sam Steingold <sds@gnu.org> | 2009-08-14 04:24:01 +0000 |
| commit | 53dab179d324b7f92daa1b1b4b2776ac073eaf21 (patch) | |
| tree | ea241ab44a58a85ee288f2aaad59a5be02760479 | |
| parent | 417f77e6f27dab85c8eba4883c49346e29a27fc6 (diff) | |
| download | emacs-53dab179d324b7f92daa1b1b4b2776ac073eaf21.tar.gz | |
(vc-cvs-merge-news): Yet annother fix of message parsing.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/vc-cvs.el | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ca7cc805b70..4eca8d90491 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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 diff --git a/lisp/vc-cvs.el b/lisp/vc-cvs.el index 6ef8db50537..9d153e5c9fc 100644 --- a/lisp/vc-cvs.el +++ b/lisp/vc-cvs.el @@ -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 |