aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Aspinall1999-10-06 10:50:11 +0000
committerDavid Aspinall1999-10-06 10:50:11 +0000
commit5dcc66c9b3f29edd9f3b09590b9344a179e66e86 (patch)
treea8d793d82cac6a59bda7b543e6bf30308f3b0362
parent20a2c8a8ad535bda82c94af4f47bba629e322b6b (diff)
face arg for proof-response-buffer-display is now optional
added proof-message, proof-warning, proof-debug here.
-rw-r--r--generic/proof.el30
1 files changed, 25 insertions, 5 deletions
diff --git a/generic/proof.el b/generic/proof.el
index ff5f540a..f56c1f1a 100644
--- a/generic/proof.el
+++ b/generic/proof.el
@@ -87,7 +87,8 @@ an error.")
(defvar proof-included-files-list nil
"List of files currently included in proof process.
-This list contains files in canonical truename format.
+This list contains files in canonical truename format
+(see `file-truename').
Whenever a new file is being processed, it gets added to this list
via the proof-shell-process-file configuration settings.
@@ -100,8 +101,10 @@ Proof General itself will automatically add the filenames of script
buffers which are completely read, when scripting is deactivated or
switched to another buffer.
-Currently there is no generic provision for removing files which
-are only partly read-in due to an error.")
+NB: Currently there is no generic provision for removing files which
+are only partly read-in due to an error, so ideally the proof assistant
+should only output a processed message when a file has been successfully
+read.")
(defvar proof-script-buffer nil
@@ -146,7 +149,7 @@ The argument KBL is a list of tuples (k . f) where `k' is a keybinding
;; FIXME: this function should be combined with
;; proof-shell-maybe-erase-response-buffer. Should allow
;; face of nil for unfontified output.
-(defun proof-response-buffer-display (str face)
+(defun proof-response-buffer-display (str &optional face)
"Display STR with FACE in response buffer and return fontified STR."
(let (start end)
(with-current-buffer proof-response-buffer
@@ -161,7 +164,7 @@ The argument KBL is a list of tuples (k . f) where `k' is a keybinding
(save-excursion
(font-lock-set-defaults) ;required for FSF Emacs 20.2
(font-lock-fontify-region start end)
- (font-lock-append-text-property start end 'face face))
+ (if face (font-lock-append-text-property start end 'face face)))
(buffer-substring start end))))
;; FIXME da: this window dedicated stuff is a real pain and I've
@@ -229,6 +232,23 @@ Restrict to BUFLIST if it's set."
(setq bufs-got (cons buf bufs-got))))))
+(defun proof-message (str)
+ "Issue the message STR in the response buffer and display it."
+ (proof-response-buffer-display str)
+ (proof-display-and-keep-buffer proof-response-buffer))
+
+(defun proof-warning (str)
+ "Issue the warning STR in the response buffer and display it.
+The warning is coloured with proof-warning-face."
+ (proof-response-buffer-display str 'proof-warning-face)
+ (proof-display-and-keep-buffer proof-response-buffer))
+
+(defmacro proof-debug (str)
+ "Issue the debugging message STR in the response buffer, display it.
+If proof-show-debug-messages is nil, do nothing."
+ (if proof-show-debug-messages
+ `(proof-warning ,str)))
+
;; Function for submitting bug reports.
(defun proof-submit-bug-report ()
"Submit an bug report or other report for Proof General."