diff options
| author | Andreas Schwab | 2008-06-15 10:29:13 +0000 |
|---|---|---|
| committer | Andreas Schwab | 2008-06-15 10:29:13 +0000 |
| commit | 06abe7bc18852e71baa16563334a3f6ea5b8ca07 (patch) | |
| tree | d30bc016c55cea67b3861f5d4bd1a9e30b310761 /lisp | |
| parent | 3306c6dcd73a6329e05aa46cce8cac86651b109b (diff) | |
| download | emacs-06abe7bc18852e71baa16563334a3f6ea5b8ca07.tar.gz emacs-06abe7bc18852e71baa16563334a3f6ea5b8ca07.zip | |
(vc-cvs-status-extra-headers): Don't match newline
when parsing CVS/Repository.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/vc-cvs.el | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 158523bc7ac..dde77ec7155 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2008-06-15 Andreas Schwab <schwab@suse.de> | 1 | 2008-06-15 Andreas Schwab <schwab@suse.de> |
| 2 | 2 | ||
| 3 | * vc-cvs.el (vc-cvs-status-extra-headers): Don't match newline | ||
| 4 | when parsing CVS/Repository. | ||
| 5 | |||
| 3 | * wdired.el (wdired-search-and-rename): Fix undocumented change. | 6 | * wdired.el (wdired-search-and-rename): Fix undocumented change. |
| 4 | 7 | ||
| 5 | 2008-06-15 Ulf Jasper <ulf@web.de> | 8 | 2008-06-15 Ulf Jasper <ulf@web.de> |
diff --git a/lisp/vc-cvs.el b/lisp/vc-cvs.el index 6c3d4fe5c18..edaf7f08d7c 100644 --- a/lisp/vc-cvs.el +++ b/lisp/vc-cvs.el | |||
| @@ -942,7 +942,7 @@ state." | |||
| 942 | (with-temp-buffer | 942 | (with-temp-buffer |
| 943 | (insert-file-contents "CVS/Repository") | 943 | (insert-file-contents "CVS/Repository") |
| 944 | (goto-char (point-min)) | 944 | (goto-char (point-min)) |
| 945 | (re-search-forward "[^/]*" nil t) | 945 | (re-search-forward "[^/\n]*" nil t) |
| 946 | (concat (match-string 0) "\n")) | 946 | (concat (match-string 0) "\n")) |
| 947 | (file-error nil)))) | 947 | (file-error nil)))) |
| 948 | (concat | 948 | (concat |