aboutsummaryrefslogtreecommitdiffhomepage
path: root/coq
diff options
context:
space:
mode:
authorGravatar Pierre Courtieu <courtieu@lri.fr>2003-02-16 13:19:33 +0000
committerGravatar Pierre Courtieu <courtieu@lri.fr>2003-02-16 13:19:33 +0000
commit4c0b4c53baf0d44445ecf228ff40cc09a31374e6 (patch)
treeab500678be6a9d8b7419bd39c877a68f841f0129 /coq
parentf13b808d337156a9e460fb9115a4c600ef585ca7 (diff)
Added documentation string to the variables coq-version-is-V6 (new),
coq-version-is-V7 and coq-version-is-V74.
Diffstat (limited to 'coq')
-rw-r--r--coq/coq-syntax.el35
-rw-r--r--coq/coq.el1
2 files changed, 32 insertions, 4 deletions
diff --git a/coq/coq-syntax.el b/coq/coq-syntax.el
index 39897057..aeef1fac 100644
--- a/coq/coq-syntax.el
+++ b/coq/coq-syntax.el
@@ -21,9 +21,38 @@
;; -v" can be skipped if the variable coq-version-is-V7 is already set (useful for
;; people dealing with several version of coq) We also have coq-version-is-V74, to
;; deal with the new module system
+
+(defvar coq-version-is-V6 nil
+"This variable can be set to t to force ProofGeneral to coq version
+coq-6.x. To do that, put (setq coq-version-is-V6 t) in your .emacs and
+restart emacs. This variable overrides coq-version-is-V7 and
+coq-version-is-V74. If none of these 3 variables is set to t, then
+ProofGeneral guesses the version of coq by doing 'coqtop -v'.")
+
+(defvar coq-version-is-V7 nil
+ "This variable can be set to t to force ProofGeneral to coq version
+between coq-7.0 and coq-7.3.1. To do that, put (setq coq-version-is-V7 t)
+in your .emacs and restart emacs. This variable overrides
+coq-version-is-V74 and is overrriden by coq-version-is-V6. If none of
+these 3 variables is set to t, then ProofGeneral guesses the version of
+coq by doing 'coqtop -v'.")
+
+(defvar coq-version-is-V74 nil
+ "This variable can be set to t to force ProofGeneral to coq version
+above coq-7.4. To do that, put (setq coq-version-is-V74 t) in your
+.emacs and restart emacs. This variable is overrriden by
+coq-version-is-V6 and coq-version-is-V7. If none of these 3 variables
+is set to t, then ProofGeneral guesses the version of coq by doing
+'coqtop -v'." )
+
+
+
+;; only coq-version-is-V74 and coq-version-is-V7 are used later (V6
+;; corresponds to v7=nil and v74=nil)
(cond
- ((boundp 'coq-version-is-V74) (setq coq-version-is-V7 t))
- ((boundp 'coq-version-is-V7) (setq coq-version-is-V74 nil))
+ (coq-version-is-V74 (setq coq-version-is-V7 t))
+ (coq-version-is-V7 (setq coq-version-is-V74 nil))
+ (coq-version-is-V6 (setq coq-version-is-V74 nil) (setq coq-version-is-V7 nil))
(t
(let* ((str (shell-command-to-string (concat coq-prog-name " -v")))
(x (string-match "version \\([.0-9]*\\)" str))
@@ -39,8 +68,6 @@
(t (message "coq is => V7.3.1")
(setq coq-version-is-V7 t) (setq coq-version-is-V74 t))))))
-
-
;; ----- keywords for font-lock.
diff --git a/coq/coq.el b/coq/coq.el
index 2c0c3562..a8660ae7 100644
--- a/coq/coq.el
+++ b/coq/coq.el
@@ -26,6 +26,7 @@
;; da 15/02/03: moved setting of coq-version-is-vX to coq-syntax to
;; fix compilation
+
(require 'coq-syntax)
;; Command to reset the Coq Proof Assistant