diff options
| author |  Hendrik Tews <hendrik@askra.de> | 2012-09-12 12:33:13 +0000 |
|---|---|---|
| committer | Hendrik Tews <hendrik@askra.de> | 2012-09-12 12:33:13 +0000 |
| commit | 4bce74dd1e4682086b9497ad3577c88b4a01df0c (patch) | |
| tree | ba1a22f157102cd4fc05e79c17fc5ef91a0949b6 | |
| parent | 1e5fcb1a36df556dc7c0b8bac2b0b36a8e8d2743 (diff) | |
treat #450 by requiring that proofs are started with Proof
| -rw-r--r-- | coq/coq.el | 8 | ||||
| -rw-r--r-- | doc/ProofGeneral.texi | 6 | ||||
| -rw-r--r-- | generic/proof-tree.el | 7 |
3 files changed, 18 insertions, 3 deletions
@@ -199,8 +199,14 @@ See also `coq-hide-additional-subgoals'." :group 'coq-config :package-version '(ProofGeneral . "4.2")) +;; Ignore all commands that start a proof. Otherwise "Proof" will appear +;; as superfluous node in the proof tree. Note that we cannot ignore Proof, +;; because, Fixpoint does not display the proof goal, see Coq bug #2776. (defcustom coq-proof-tree-ignored-commands-regexp - "^\\(Show\\)\\|\\(Locate\\)" + (concat "^\\(\\(Show\\)\\|\\(Locate\\)\\|" + "\\(Theorem\\)\\|\\(Lemma\\)\\|\\(Remark\\)\\|\\(Fact\\)\\|" + "\\(Corollary\\)\\|\\(Proposition\\)\\|\\(Definition\\)\\|" + "\\(Let\\)\\|\\(Fixpoint\\)\\|\\(CoFixpoint\\)\\)") "Regexp for `proof-tree-ignored-commands-regexp'." :type 'regexp :group 'coq-proof-tree) diff --git a/doc/ProofGeneral.texi b/doc/ProofGeneral.texi index 3c3d4a3b..05f3d1ed 100644 --- a/doc/ProofGeneral.texi +++ b/doc/ProofGeneral.texi @@ -4770,6 +4770,12 @@ Starting with Proof General version 4.2 and Coq version 8.4, Coq Proof General has full support for proof-tree visualization, @pxref{Graphical Proof-Tree Visualization}. +Proof-tree visualization does currently not support Coq's command +``Grab Existential Variables''. + +For the visualization to work properly, proofs must be started +with ``Proof.'', which is encouraged practice anyway (see Coq Bug +#2776). @c ================================================================= @c diff --git a/generic/proof-tree.el b/generic/proof-tree.el index 6a34d919..b73c2308 100644 --- a/generic/proof-tree.el +++ b/generic/proof-tree.el @@ -118,9 +118,12 @@ (defcustom proof-tree-ignored-commands-regexp nil "Commands that should be ignored for the prooftree display. The output of commands matching this regular expression is not -send to prooftree. It should match commands that display +sent to prooftree. It should match commands that display additional information but do not make any proof progress. Leave -at nil to act on all commands." +at nil to act on all commands. + +For Coq this regular expression should contain all commands such +as Lemma, that can start a proof." :type '(choice regexp (const nil)) :group 'proof-tree-internals) |