branch: elpa/proof-general
commit 38ae8fdf23f37af71b8a4f9717ba48c52653db63
Merge: e2b4227 b9da0bf
Author: Erik Martin-Dorel <e...@martin-dorel.org>
Commit: GitHub <nore...@github.com>
Merge pull request #601 from ProofGeneral/fix/issue-600
fix: parsing of `coqtop -v` for 8.14+rc1
---
coq/coq-system.el | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/coq/coq-system.el b/coq/coq-system.el
index 48ddf77..e7041db 100644
--- a/coq/coq-system.el
+++ b/coq/coq-system.el
@@ -123,7 +123,6 @@ This function supports calling coqtop via tramp."
(if (or (not expectedretv) (equal retv expectedretv))
(buffer-string)))
(error nil))))
-
(defun coq-autodetect-version (&optional interactive-p)
"Detect and record the version of Coq currently in use.
@@ -131,7 +130,7 @@ Interactively (with INTERACTIVE-P), show that number."
(interactive '(t))
(setq coq-autodetected-version nil)
(let* ((str (coq-callcoq "-v" 0))
- (mtch (and str (string-match "version \\([^ ]+\\)" str))))
+ (mtch (and str (string-match "version \\([^ \n]+\\)" str))))
(when mtch
(setq coq-autodetected-version (match-string 1 str))))
(when interactive-p (coq-show-version))
