diff options
| -rw-r--r-- | generic/proof-script.el | 15 | ||||
| -rw-r--r-- | generic/proof-toolbar.el | 6 |
2 files changed, 15 insertions, 6 deletions
diff --git a/generic/proof-script.el b/generic/proof-script.el index 72fafb34..a2858768 100644 --- a/generic/proof-script.el +++ b/generic/proof-script.el @@ -1821,14 +1821,18 @@ finish setup which depends on specific proof assistant configuration." (if proof-script-indent (setq indent-line-function 'proof-indent-line)) - ;; Toolbar - ;; (NB: autloads proof-toolbar, which extends proof-menu variable) + ;; Toolbar and scripting menu + ;; NB: autloads proof-toolbar, which defines proof-toolbar-scripting-menu. (proof-toolbar-setup) + (easy-menu-define proof-mode-script-menu + proof-mode-map + "Scripting menu of Proof General" + proof-toolbar-scripting-menu) ;; Menu (easy-menu-define proof-mode-menu proof-mode-map - "Menu used in Proof General scripting mode." + "Proof General menu" (cons proof-general-name (append (cdr proof-menu) @@ -1843,7 +1847,12 @@ finish setup which depends on specific proof assistant configuration." nil) ;; end UGLY COMPATIBILTY HACK ))) + + ;; Put the ProofGeneral menu first on the menubar, then Scripting menu + ;; (makes Scripting menu more obvious) (easy-menu-add proof-mode-menu proof-mode-map) + (easy-menu-add proof-mode-script-menu proof-mode-map) + ;; For fontlock diff --git a/generic/proof-toolbar.el b/generic/proof-toolbar.el index f98f8153..445b7382 100644 --- a/generic/proof-toolbar.el +++ b/generic/proof-toolbar.el @@ -104,7 +104,7 @@ If MENUNAME is nil, item will not appear on the \"Scripting\" menu.") (if enablep (list ':active (list (proof-toolbar-enabler token)))))))))) -(defconst proof-toolbar-menu +(defconst proof-toolbar-scripting-menu ;; Toolbar contains commands to manipulate script and ;; other handy stuff. Called "Scripting" (append @@ -117,8 +117,8 @@ If MENUNAME is nil, item will not appear on the \"Scripting\" menu.") ;; ;; Add this menu to proof-menu ;; -(setq proof-menu - (append proof-menu (list proof-toolbar-menu))) +; (setq proof-menu +; (append proof-menu (list proof-toolbar-menu))) ;; ;; Now the toolbar icons and buttons |