Re: tool-bar-setup overwrites local tool-bar-map

[Bill Wohler <wohler@newt.com>]

Richard Stallman <rms@gnu.org> wrote:

>     > To see what should have happened:
>     > 
>     >   emacs22 -Q
>     >   M-x tool-bar-mode
>     > 
>     > Note how Preferences and Help icons are present.
>     > 
>     >   M-x info
>     > 
>     > Note how Preferences and Help icons are absent.
> 
> In what sense is that "what should have happened"?  I do not follow.

You get the tool bar as the info package had intended.

> Shouldn't the Preferences and Help icons always be present?

Arguably yes, but their function is context-dependent. For example, the
MH-E package defines the actions as mh-tool-bar-customize and
mh-tool-bar-folder-help or mh-tool-bar-letter-help where the default
actions are customize and help.

With the current tool-bar code, the behavior is inconsistent.

If one runs tool-bar-mode first, and then MH-E, one sees the one pair of
Preferences/Help buttons (the ones defined by MH-E). If vice-versa, one
sees *two* pairs of Preferences/Help buttons (the ones defined by MH-E
plus the ones defined by tool-bar).

Similarly, if one runs tool-bar-mode first, and then info, one does not
see the pair of Preferences/Help buttons since the info package does not
define them. If vice-versa, one sees the pair of Preferences/Help
buttons defined by tool-bar.

Does that help clear things up?

> What are you asking us to do?

My patch makes the tool-bar's behavior consistent. It prevents the
default tool bar from interfering with the mode's tool bar if
tool-bar-mode is run after the mode has been initialized. I just wanted
a review and a "Please check it in" before checking it in. Perhaps Nick
Roberts? Here it is again.

Index: tool-bar.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/tool-bar.el,v
retrieving revision 1.5
diff -u -u -r1.5 tool-bar.el
--- tool-bar.el	6 Feb 2006 14:33:35 -0000	1.5
+++ tool-bar.el	30 Apr 2006 18:21:10 -0000
@@ -267,14 +267,16 @@
   ;;(tool-bar-add-item-from-menu 'compose-mail "mail/compose")
 
   (tool-bar-add-item-from-menu 'print-buffer "print")
-  (tool-bar-add-item "preferences" 'customize 'customize
-		     :help "Edit preferences (customize)")
+  (tool-bar-local-item "preferences" 'customize 'customize
+                       (default-value 'tool-bar-map)
+                       :help "Edit preferences (customize)")
 
-  (tool-bar-add-item "help" (lambda ()
-			      (interactive)
-			      (popup-menu menu-bar-help-menu))
-		     'help
-		     :help "Pop up the Help menu")
+  (tool-bar-local-item "help" (lambda ()
+                                (interactive)
+                                (popup-menu menu-bar-help-menu))
+                       'help
+                       (default-value 'tool-bar-map)
+                       :help "Pop up the Help menu")
   )
 
 (provide 'tool-bar)

-- 
Bill Wohler <wohler@newt.com>  http://www.newt.com/wohler/  GnuPG ID:610BD9AD
Maintainer of comp.mail.mh FAQ and MH-E. Vote Libertarian!
If you're passed on the right, you're in the wrong lane.