aboutsummaryrefslogtreecommitdiffhomepage
path: root/generic
diff options
context:
space:
mode:
authorGravatar David Aspinall <da@inf.ed.ac.uk>2009-08-07 14:14:08 +0000
committerGravatar David Aspinall <da@inf.ed.ac.uk>2009-08-07 14:14:08 +0000
commita8b86f207ebb3beaf75b8a8851a359d54057c3ca (patch)
tree55fe5e498269b0db0a055d71a3a3778f272771bf /generic
parentac4fe82a0faed262fb2895b2993e4a2c3a2a2fa7 (diff)
rename: proof-full-decoration -> proof-full-annotation
Diffstat (limited to 'generic')
-rw-r--r--generic/proof-menu.el2
-rw-r--r--generic/proof-shell.el3
2 files changed, 3 insertions, 2 deletions
diff --git a/generic/proof-menu.el b/generic/proof-menu.el
index ed71aa31..161b7d40 100644
--- a/generic/proof-menu.el
+++ b/generic/proof-menu.el
@@ -452,7 +452,7 @@ without adjusting window layout."
'proof-electric-terminator-enable
'proof-script-fly-past-comments
'proof-disappearing-proofs
- 'proof-full-decoration
+ 'proof-full-annotation
;;'proof-output-fontify-enable
'proof-strict-read-only
(proof-ass-sym unicode-tokens-enable)
diff --git a/generic/proof-shell.el b/generic/proof-shell.el
index 51bb15d1..d3dc1577 100644
--- a/generic/proof-shell.el
+++ b/generic/proof-shell.el
@@ -703,6 +703,7 @@ Then we call `proof-shell-handle-error-or-interrupt-hook'."
proof-shell-quiet-errors)
(beep))
(proof-script-clear-queue-spans)
+ ;; TODO: add temporary span for error message
(setq proof-action-list nil)
(proof-release-lock err-or-int)
;;
@@ -936,7 +937,7 @@ track what happens in the proof queue."
;; FIXME: could be macro for efficiency improvement in avoiding calculating num
(defun proof-shell-should-be-silent (num)
"Return non-nil if we must switch to silent mode, adding NUM entries to queue."
- (if (and (not proof-full-decoration)
+ (if (and (not proof-full-annotation)
proof-shell-start-silent-cmd)
(or proof-shell-silent ; already
;; NB: there is some question here over counting the