aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert1996-02-26 00:53:13 +0000
committerPaul Eggert1996-02-26 00:53:13 +0000
commitd5c8e97af581c93baa090a26c12ca76ee9bb9863 (patch)
treedb51bdcb7c28ac133e5132c9729e823798efaaca
parentd9a84b157d9d640ebd9f46a98c8905a32f6ac678 (diff)
downloademacs-d5c8e97af581c93baa090a26c12ca76ee9bb9863.tar.gz
emacs-d5c8e97af581c93baa090a26c12ca76ee9bb9863.zip
(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).
-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."
791 (cond 791 (cond
792 ((re-search-forward 792 ((re-search-forward
793 (concat "^/" (regexp-quote basename) 793 (concat "^/" (regexp-quote basename)
794 "/\\([^/]*\\)/[^ /]* \\([A-Z][a-z][a-z]\\) *\\([0-9]*\\) \\([0-9]*\\):\\([0-9]*\\):\\([0-9]*\\) \\([0-9]*\\)/") 794 "/\\([^/]*\\)/[^ /]* \\([A-Z][a-z][a-z]\\) *\\([0-9]*\\) \\([0-9]*\\):\\([0-9]*\\):\\([0-9]*\\) \\([0-9]*\\)")
795 nil t) 795 nil t)
796 (setq case-fold-search fold) ;; restore the old value 796 (setq case-fold-search fold) ;; restore the old value
797 ;; We found it. Store away version number now that we 797 ;; We found it. Store away version number now that we