From 821a5f41ca6e9715337a3176d6a82e4da6643ae1 Mon Sep 17 00:00:00 2001
From: David Aspinall
Date: Mon, 20 Sep 2010 11:50:52 +0000
Subject: 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.

---
 generic/proof-toolbar.el | 7 ++++---
 1 file 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!!
-- 
cgit v1.2.3