From fe24036eb467f81aa882da72703a22a9a785244c Mon Sep 17 00:00:00 2001 From: David Aspinall Date: Fri, 4 Sep 2009 14:34:19 +0000 Subject: Remove configuration of obsolete package function-menu (aka "fume") --- generic/proof-script.el | 56 ------------------------------------------------- 1 file changed, 56 deletions(-) diff --git a/generic/proof-script.el b/generic/proof-script.el index 07dc07bc..19eb4330 100644 --- a/generic/proof-script.el +++ b/generic/proof-script.el @@ -2600,7 +2600,6 @@ finish setup which depends on specific proof assistant configuration." ;; Setup imenu and/or func-menu. (proof-setup-imenu) - (proof-setup-func-menu) ;; Add the Index menu, if enabled (proof-imenu-enable) @@ -2680,61 +2679,6 @@ Choice of function depends on configuration setting." (list "Saves" proof-save-with-hole-regexp proof-save-with-hole-result)))))))) -(defun proof-setup-func-menu () - "Configure func-menu for a proof script buffer." - ;; NB: Ideal place for this and similar stuff would be in something - ;; evaluated at top level after defining the derived mode: normally - ;; we wouldn't repeat this each time the mode function is run, so we - ;; wouldn't need "pushnew"). - (if (proof-try-require 'func-menu) - (progn - (unless proof-script-next-entity-regexps ; unless already set - ;; Try to calculate a useful default value. - ;; FIXME: this is rather complicated! The use of the regexp - ;; variables needs sorting out. - (customize-set-variable - 'proof-script-next-entity-regexps - (let ((goal-discrim - ;; Goal discriminator searches forward for matching - ;; save if the regexp is set. - (if proof-goal-with-hole-regexp - (if proof-save-command-regexp - (list - proof-goal-with-hole-regexp 2 - 'forward proof-save-command-regexp) - (list proof-goal-with-hole-regexp 2)))) - ;; Save discriminator searches backward for matching - ;; goal if the regexp is set. - (save-discrim - (if proof-save-with-hole-regexp - (if proof-goal-command-regexp - (list - proof-save-with-hole-regexp 2 - 'backward proof-goal-command-regexp) - (list proof-save-with-hole-regexp 2))))) - (cond - ((and proof-goal-with-hole-regexp proof-save-with-hole-regexp) - (list - (proof-regexp-alt - proof-goal-with-hole-regexp - proof-save-with-hole-regexp) goal-discrim save-discrim)) - - (proof-goal-with-hole-regexp - (list proof-goal-with-hole-regexp goal-discrim)) - - (proof-save-with-hole-regexp - (list proof-save-with-hole-regexp save-discrim)))))) - - (if proof-script-next-entity-regexps - ;; Enable func-menu for this mode if regexps set now - (progn - (pushnew - (cons major-mode 'proof-script-next-entity-regexps) - fume-function-name-regexp-alist) - (pushnew - (cons major-mode proof-script-find-next-entity-fn) - fume-find-function-name-method-alist)))))) - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; ;; Caching parse results for unedited portions of the buffer -- cgit v1.2.3