diff options
author | David Aspinall <da@inf.ed.ac.uk> | 2010-08-16 11:41:00 +0000 |
---|---|---|
committer | David Aspinall <da@inf.ed.ac.uk> | 2010-08-16 11:41:00 +0000 |
commit | 6a2df321708ad079bb018859a6c916fcb9f95013 (patch) | |
tree | 75b514dba600f275efdc9420fbd43d929b092b8d /generic/proof-shell.el | |
parent | 0b1ce1bd821974f68f683ec858a7a2fdd0fd49ea (diff) |
Fix compile errors, update tags
Diffstat (limited to 'generic/proof-shell.el')
-rw-r--r-- | generic/proof-shell.el | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/generic/proof-shell.el b/generic/proof-shell.el index d99e2b67..238ba47b 100644 --- a/generic/proof-shell.el +++ b/generic/proof-shell.el @@ -54,6 +54,13 @@ If flags are non-empty, other interactive cues will be surpressed. See the functions `proof-start-queue' and `proof-shell-exec-loop'.") +(defsubst proof-shell-invoke-callback (listitem) + "From `proof-action-list' LISTITEM, invoke the callback on the span." + (condition-case nil + (funcall (nth 2 listitem) (car listitem)) + (error nil))) + + ;; We record the last output from the prover and a flag indicating its ;; type, as well as a previous ("delayed") version for when the end ;; of the queue is reached or an error or interrupt occurs. @@ -644,12 +651,12 @@ This is a subroutine of `proof-shell-handle-error-or-interrupt'" (proof-script-clear-queue-spans-on-error badspan)) (setq proof-action-list nil) - (proof-release-lock)) + (proof-release-lock) ;; Give a hint about C-c C-`. (NB: approximate test) (unless flags (if (pg-response-has-error-location) (pg-next-error-hint))) - (run-hooks 'proof-shell-handle-error-or-interrupt-hook))) + (run-hooks 'proof-shell-handle-error-or-interrupt-hook)))) (defun proof-goals-pos (span maparg) "Given a span, return the start of it if corresponds to a goal, nil otherwise." @@ -879,12 +886,6 @@ track what happens in the proof queue." (>= (length proof-action-list) proof-shell-silent-threshold))) -(defsubst proof-shell-invoke-callback (listitem) - "From `proof-action-list' LISTITEM, invoke the callback on the span." - (condition-case nil - (funcall (nth 2 listitem) (car listitem)) - (error nil))) - (defsubst proof-shell-insert-action-item (item) "Insert ITEM from `proof-action-list' into the proof shell." (proof-shell-insert (nth 1 item) (nth 2 item) (nth 0 item))) |