diff options
| author | David Aspinall | 2009-09-04 16:42:57 +0000 |
|---|---|---|
| committer | David Aspinall | 2009-09-04 16:42:57 +0000 |
| commit | 17460bf8b246b7f26b390ca67145c11ee230de9d (patch) | |
| tree | 465f779266370857f41fa284f25c01e3a44b019c /generic | |
| parent | d7997eed169686a3bc966fd4d6d7c68804e22eef (diff) | |
Remove proof-shell-prompt-pattern, no longer used.
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/proof-config.el | 8 | ||||
| -rw-r--r-- | generic/proof-shell.el | 5 | ||||
| -rw-r--r-- | generic/proof-syntax.el | 6 |
3 files changed, 4 insertions, 15 deletions
diff --git a/generic/proof-config.el b/generic/proof-config.el index 7db11cba..b0612661 100644 --- a/generic/proof-config.el +++ b/generic/proof-config.el @@ -1078,14 +1078,6 @@ Normally error messages cause a beep. Set this to nil to prevent that." ;; 5b. Regexp variables for matching output from proof process. ;; -(defcustom proof-shell-prompt-pattern nil - "Proof shell's value for `comint-prompt-pattern', which see. -NB!! This pattern is just for interaction in comint (shell buffer). -You don't really need to set it. The important one to set is -`proof-shell-annotated-prompt-regexp', which see." - :type 'regexp - :group 'proof-shell) - ;; FIXME da: replace this with wakeup-regexp or prompt-regexp? ;; May not need next variable. (defcustom proof-shell-wakeup-char nil diff --git a/generic/proof-shell.el b/generic/proof-shell.el index 0b6f2ce9..cc41b123 100644 --- a/generic/proof-shell.el +++ b/generic/proof-shell.el @@ -1822,11 +1822,8 @@ Error messages are displayed as usual." (buffer-disable-undo) - ;; comint customisation. + ;; scomint customisation. - (if proof-shell-prompt-pattern - (setq scomint-prompt-regexp proof-shell-prompt-pattern)) - (setq scomint-output-filter-functions '(proof-shell-filter)) ;; Proof marker is initialised in filter to first prompt found diff --git a/generic/proof-syntax.el b/generic/proof-syntax.el index 0ca652c8..bd36a7d3 100644 --- a/generic/proof-syntax.el +++ b/generic/proof-syntax.el @@ -12,11 +12,11 @@ (require 'proof-config) ; proof-case-fold-search (require 'proof-compat) ; proof-buffer-syntactic-context -(defun proof-ids-to-regexp (l) +(defsubst proof-ids-to-regexp (l) "Maps a non-empty list of tokens `l' to a regexp matching any element" (concat "\\_<\\(?:" (mapconcat 'identity l "\\|") "\\)\\_>")) -(defun proof-anchor-regexp (e) +(defsubst proof-anchor-regexp (e) "Anchor (\\`) and group the regexp E." (concat "\\`\\(" e "\\)")) @@ -25,7 +25,7 @@ "A regular expression that never matches anything") -(defun proof-regexp-alt (&rest args) +(defsubst proof-regexp-alt (&rest args) "Return the regexp which matches any of the regexps ARGS." ;; see regexp-optn (NB: but that is for strings, not regexps) (let ((res "")) |