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 @@
 2008-06-15  Andreas Schwab  <schwab@suse.de>
 
+        * vc-cvs.el (vc-cvs-status-extra-headers): Don't match newline
+        when parsing CVS/Repository.
+
         * wdired.el (wdired-search-and-rename): Fix undocumented change.
 
 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."
              (with-temp-buffer
                (insert-file-contents "CVS/Repository")
                (goto-char (point-min))
-               (re-search-forward "[^/]*" nil t)
+               (re-search-forward "[^/\n]*" nil t)
                (concat (match-string 0) "\n"))
            (file-error nil))))
     (concat