diff options
| author |  David Aspinall <da@inf.ed.ac.uk> | 2010-09-20 11:50:52 +0000 |
|---|---|---|
| committer | David Aspinall <da@inf.ed.ac.uk> | 2010-09-20 11:50:52 +0000 |
| commit | 821a5f41ca6e9715337a3176d6a82e4da6643ae1 (patch) | |
| tree | 29efa7d557e1abb27ec2881c43bf5608eb5d6c64 /generic/proof-toolbar.el | |
| parent | c36396fb154c8b9a6af7a5445ae82d625f95e249 (diff) | |
Attempt to fix #352 by ensuring symbol in toolbar keymap is given a prefix
to not clash with standard toolbar buttons. Doesn't yet solve issue completely.
Diffstat (limited to 'generic/proof-toolbar.el')
| -rw-r--r-- | generic/proof-toolbar.el | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/generic/proof-toolbar.el b/generic/proof-toolbar.el index a50905b0..830cdc62 100644 --- a/generic/proof-toolbar.el +++ b/generic/proof-toolbar.el @@ -61,6 +61,7 @@ ;; Entry format: (TOKEN MENUNAME TOOLTIP TOOLBAR-P [VISIBLE-P]) (dolist (tle tles) (let* ((token (nth 0 tle)) + (longtoken (intern (concat "pg-" (symbol-name token)))) (includep (nth 3 tle)) (visiblep (nth 4 tle)) (icon (proof-toolbar-icon token)) @@ -73,9 +74,9 @@ (list :enable (list enabler))) (if visiblep (list :visible visiblep))))) - (if includep + (if (eval includep) (apply 'tool-bar-local-item - (eval icon) buttonfn token map props))))) + (eval icon) buttonfn longtoken map props))))) ;; ;; Code for displaying and refreshing toolbar @@ -274,7 +275,7 @@ back the default toolbar." (tooltip (nth 2 tle)) (visiblep (nth 4 tle)) (enabler (proof-toolbar-enabler token)) - (fnname (proof-toolbar-function token)) + (fnname (proof-toolbar-function token)) ;; fnval: remove defalias to get keybinding onto menu; ;; NB: function and alias must both be defined for this ;; to work!! |