diff options
| author |  Stefan Monnier <monnier@iro.umontreal.ca> | 2012-06-29 16:23:50 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2012-06-29 16:23:50 +0000 |
| commit | c0bd5544c6c7dcdef9ddd005c952ea5acf68603b (patch) | |
| tree | beec5fbedb963cd7b0eef0d1335a26c76b37ad1f /generic | |
| parent | ec00c7fe67dc27c13b6b7bab42d60feb66355240 (diff) | |
* generic/pg-user.el (which-func-modes): Fix compiler declaration.
* generic/proof-site.el (assistants): Fix regexp.
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/pg-user.el | 6 | ||||
| -rw-r--r-- | generic/proof-script.el | 6 | ||||
| -rw-r--r-- | generic/proof-site.el | 2 |
3 files changed, 9 insertions, 5 deletions
diff --git a/generic/pg-user.el b/generic/pg-user.el index 15db8478..3ff06579 100644 --- a/generic/pg-user.el +++ b/generic/pg-user.el @@ -23,9 +23,9 @@ (require 'proof-script) ; we build on proof-script (require 'cl) -(eval-when (compile) - (require 'completion) ; loaded dynamically at runtime - (defvar which-func-modes nil)) ; defined by which-func +(eval-when-compile + (require 'completion)) ; Loaded dynamically at runtime. +(defvar which-func-modes) ; Defined by which-func. (declare-function proof-segment-up-to "proof-script") (declare-function proof-interrupt-process "proof-shell") diff --git a/generic/proof-script.el b/generic/proof-script.el index 74e92918..4ddb0045 100644 --- a/generic/proof-script.el +++ b/generic/proof-script.el @@ -2390,7 +2390,11 @@ assistant." (regexp-quote "\n") ;; end-of-line terminated comments (regexp-quote proof-script-comment-end)))) - ;; BOGUS + ;; FIXME: This is clearly bogus: it sets the *start* matcher based on the + ;; *end* marker. But I'm not sure what's the right fix: OT1H the code is + ;; careful to build a correct end-matcher, but OTOH it's not as careful as + ;; the default code in newcomment.el anyway. So I'm tempted to just remove + ;; this code altogether. (make-local-variable 'comment-start-skip) (unless comment-start-skip (setq comment-start-skip diff --git a/generic/proof-site.el b/generic/proof-site.el index bccb7da6..15aed957 100644 --- a/generic/proof-site.el +++ b/generic/proof-site.el @@ -318,7 +318,7 @@ the lisp variable `proof-assistants', or the contents of `proof-assistant-table' (regexp (or (nth 3 tableentry) (concat (regexp-quote ".") (regexp-quote (nth 2 tableentry)) - "$"))) + "\\'"))) (sname (symbol-name assistant)) ;; NB: File name for each prover is the same as its symbol name! (elisp-file sname) |