aboutsummaryrefslogtreecommitdiff
path: root/generic
diff options
context:
space:
mode:
authorDavid Aspinall2009-09-06 13:53:35 +0000
committerDavid Aspinall2009-09-06 13:53:35 +0000
commit38751c59d7cee8757e07829e0de5263932bc9f23 (patch)
tree792bae33ed1a1bb6738936a2329299ce20edd34a /generic
parent37b64777bb4aef28b3cadcd6aba9653eda14919c (diff)
Remove proof-shell-wakeup-char.
Clarify purpose and meaning of `proof-shell-end-goals-regexp'.
Diffstat (limited to 'generic')
-rw-r--r--generic/proof-config.el21
1 files changed, 10 insertions, 11 deletions
diff --git a/generic/proof-config.el b/generic/proof-config.el
index aeaecac0..675615f3 100644
--- a/generic/proof-config.el
+++ b/generic/proof-config.el
@@ -1076,14 +1076,6 @@ Normally error messages cause a beep. Set this to nil to prevent that."
;; 5b. Regexp variables for matching output from proof process.
;;
-;; FIXME da: replace this with wakeup-regexp or prompt-regexp?
-;; May not need next variable.
-(defcustom proof-shell-wakeup-char nil
- "A special character which terminates an annotated prompt.
-Set to nil if proof assistant does not support annotated prompts."
- :type '(choice character (const nil))
- :group 'proof-shell)
-
(defcustom proof-shell-annotated-prompt-regexp nil
"Regexp matching a (possibly annotated) prompt pattern.
@@ -1095,8 +1087,7 @@ recognize when the prover has finished processing a command.
To help speed up matching you may be able to annotate the
proof assistant prompt with a special character not appearing
-in ordinary output. The special character should appear in
-this regexp, and should be the value of `proof-shell-wakeup-char'."
+in ordinary output, which should appear in this regexp."
:type 'regexp
:group 'proof-shell)
@@ -1236,7 +1227,15 @@ and possibly analysed further for proof-by-pointing markup."
(defcustom proof-shell-end-goals-regexp nil
"Regexp matching the end of the proof state output, or nil.
-If nil, just use the rest of the output following `proof-shell-start-goals-regexp'."
+This allows a shorter form of the proof state output to be displayed,
+in case several messages are combined in a command output.
+
+The portion treated as the goals output will be that between the
+*end* of the match on `proof-shell-start-goals-regexp' and the
+*start* of the match on `proof-shell-end-goals-regexp'.
+
+If nil, use the whole of the output after
+`proof-shell-start-goals-regexp' up to the next prompt."
:type '(choice nil regexp)
:group 'proof-shell)