diff options
author | David Aspinall <da@inf.ed.ac.uk> | 2002-08-15 23:52:10 +0000 |
---|---|---|
committer | David Aspinall <da@inf.ed.ac.uk> | 2002-08-15 23:52:10 +0000 |
commit | 04b46d595cee0a616be4278cbac5a6683ab086d6 (patch) | |
tree | 7c27a09559cef8dc0f13cf22869f980d8ca040e7 /generic | |
parent | 58da4a61d5cbb998710e85b8bb5e2911ce6cdec2 (diff) |
Refactoring
Diffstat (limited to 'generic')
-rw-r--r-- | generic/proof-config.el | 16 | ||||
-rw-r--r-- | generic/proof-utils.el | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/generic/proof-config.el b/generic/proof-config.el index ee8eb1a3..400ec3e3 100644 --- a/generic/proof-config.el +++ b/generic/proof-config.el @@ -1688,7 +1688,7 @@ See `proof-shell-error-regexp' and `proof-shell-interrupt-regexp'." :type 'boolean :group 'proof-shell) -(defcustom proof-shell-next-error-regexp nil +(defcustom pg-next-error-regexp nil "Regular expression which matches an error message, perhaps with line/column. Used by `proof-next-error' to jump to line numbers causing errors during some batch processing of the proof assistant. @@ -1698,12 +1698,12 @@ jumps to the end of the locked region) Match number 2 should be the line number, if present. Match number 3 should be the column number, if present. -The filename may be matched by `proof-shell-next-error-filename-regexp', -which is assumed to precede proof-shell-next-error-regexp." +The filename may be matched by `pg-next-error-filename-regexp', +which is assumed to precede pg-next-error-regexp." :type 'string :group 'proof-shell) -(defcustom proof-shell-next-error-filename-regexp nil +(defcustom pg-next-error-filename-regexp nil "Used to locate a filename that an error message refers to. Used by `proof-next-error' to jump to locations causing errors during some batch processing of the proof assistant. @@ -1712,13 +1712,13 @@ jumps to the end of the locked region). Match number 2 should be the file name, if present. -Errors must first be matched by `proof-shell-next-error-regexp' +Errors must first be matched by `pg-next-error-regexp' (whether they contain a line number or not). The response buffer is then searched *backwards* for a regexp matching this variable, -`proof-shell-next-error-filename-regexp'. (So if the +`pg-next-error-filename-regexp'. (So if the filename appears after the line number, make the first regexp match the whole line). Finally -`proof-shell-next-error-extract-filename' +`pg-next-error-extract-filename' may be used to extract the filename from This regexp should be set to match messages also matched by `proof-shell-error-message-line-number-regexp'. @@ -1727,7 +1727,7 @@ Match number 1 should be the filename." :group 'proof-shell) ;; FIXME: generalize this to string-or-function scheme -(defcustom proof-shell-next-error-extract-filename nil +(defcustom pg-next-error-extract-filename nil "A string used to extract filename from error message. %s replaced. NB: this is only used if the match itself does not already correspond to a filename." diff --git a/generic/proof-utils.el b/generic/proof-utils.el index af357b4a..b9a516f6 100644 --- a/generic/proof-utils.el +++ b/generic/proof-utils.el @@ -495,7 +495,7 @@ frame is the one showing the script buffer.)" ;; NB: useful optional arg to erase buffer is XEmacs specific, 8-(. (erase-buffer) (if (eq buffer proof-response-buffer) - (setq proof-shell-next-error nil)) ; all error msgs lost! + (setq pg-response-next-error nil)) ; all error msgs lost! (if proof-delete-empty-windows (delete-windows-on buffer t)))) |