summaryrefslogtreecommitdiff
path: root/lisp/vc-hooks.el
diff options
context:
space:
mode:
authorPaul Eggert <eggert@twinsun.com>1996-02-26 00:53:13 +0000
committerPaul Eggert <eggert@twinsun.com>1996-02-26 00:53:13 +0000
commit08cfdfddfedc540126ac6bc74f18b875e7771280 (patch)
tree48f30cf37a775f2a375f5f161cb65324e791b785 /lisp/vc-hooks.el
parentbb1ae454a4edaadfa7ea521cd4846ae14513901b (diff)
downloademacs-08cfdfddfedc540126ac6bc74f18b875e7771280.tar.gz
(vc-find-cvs-master): Don't require a "/" after the modification time
in CVS/Entries, since the time may be followed by a conflict notice (in CVS 1.7) or by some other value (in CVS 1.3).
Diffstat (limited to 'lisp/vc-hooks.el')
-rw-r--r--lisp/vc-hooks.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el
index ea4fd6543f5..4ac1668c842 100644
--- a/lisp/vc-hooks.el
+++ b/lisp/vc-hooks.el
@@ -791,7 +791,7 @@ For CVS, the full name of CVS/Entries is returned."
(cond
((re-search-forward
(concat "^/" (regexp-quote basename)
- "/\\([^/]*\\)/[^ /]* \\([A-Z][a-z][a-z]\\) *\\([0-9]*\\) \\([0-9]*\\):\\([0-9]*\\):\\([0-9]*\\) \\([0-9]*\\)/")
+ "/\\([^/]*\\)/[^ /]* \\([A-Z][a-z][a-z]\\) *\\([0-9]*\\) \\([0-9]*\\):\\([0-9]*\\):\\([0-9]*\\) \\([0-9]*\\)")
nil t)
(setq case-fold-search fold) ;; restore the old value
;; We found it. Store away version number now that we