branch: elpa/proof-general
commit 67006d14e3fef5147554beea96a2ba7b8f2c32be
Merge: 543aa777d7 df19c7ba0e
Author: Dominique Unruh <[email protected]>
Commit: Dominique Unruh <[email protected]>
Merge branch 'master' into qrhl-tool
---
README.md | 12 ++++++------
coq/coq-system.el | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/README.md b/README.md
index fce5f86a8a..71ba70d5e2 100644
--- a/README.md
+++ b/README.md
@@ -15,15 +15,13 @@ This is version 4.5-git of Proof General.
Two editions of Proof General are currently available:
-* the (legacy) REPL-based, stable version of Proof General,
+* the (standard) REPL-based, stable version of Proof General,
gathered in the
- [master](https://github.com/ProofGeneral/PG/tree/master) branch, and
- licensed under GPLv2;
-* the (newest) Coq-specific, experimental version of Proof General,
+ [master](https://github.com/ProofGeneral/PG/tree/master) branch;
+* the (unmaintained) Coq-specific, experimental version of Proof General,
supporting asynchronous proof processing,
gathered in the
- [async](https://github.com/ProofGeneral/PG/tree/async) branch, and
- licensed under GPLv3+.
+ [async](https://github.com/ProofGeneral/PG/tree/async) branch.
## Installing Proof General
@@ -126,6 +124,8 @@ See:
Links:
* [https://proofgeneral.github.io/doc](https://proofgeneral.github.io/doc) for
online documentation of Proof General
+* [https://coq.zulipchat.com](https://coq.zulipchat.com/) for chatting with PG
maintainers and developers on the Zulip chat of Coq (in streams [Proof General
devs](https://coq.zulipchat.com/#narrow/stream/304020-Proof-General.20devs) and
[Proof General
users](https://coq.zulipchat.com/#narrow/stream/304019-Proof-General.20users))
+* [https://coq.gitlab.io/zulip-archive](https://coq.gitlab.io/zulip-archive)
for the corresponding public Zulip archive (read-only, no authentication
required)
Supported proof assistants:
diff --git a/coq/coq-system.el b/coq/coq-system.el
index d32629f289..3afc26715c 100644
--- a/coq/coq-system.el
+++ b/coq/coq-system.el
@@ -130,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 \\([^ \n]+\\)" str))))
+ (mtch (and str (string-match "version \\([^ \r\n]+\\)" str))))
(when mtch
(setq coq-autodetected-version (match-string 1 str))))
(when interactive-p (coq-show-version))
