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

[Richard Stallman]

    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).

Now I understand the point of your patch.
But it seems to me that ALL the standard tool-bar items
ought to be added to the standard tool-bar map.
Not just Help and Preferences.

Ah, now I see.  All the rest are added using
tool-bar-add-item-from-menu, which uses (default-value 'tool-bar-map).

So I believe your patch is correct.  But I think this is cleaner.
Does it work?


*** tool-bar.el 07 Feb 2006 18:16:16 -0500      1.5
--- tool-bar.el 30 Apr 2006 23:58:17 -0400      
***************
*** 267,280 ****
    ;;(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-add-item "help" (lambda ()
!                             (interactive)
!                             (popup-menu menu-bar-help-menu))
!                    'help
!                    :help "Pop up the Help menu")
    )
  
  (provide 'tool-bar)
--- 267,286 ----
    ;;(tool-bar-add-item-from-menu 'compose-mail "mail/compose")
  
    (tool-bar-add-item-from-menu 'print-buffer "print")
  
!   ;; tool-bar-add-item-from-menu itself operates on
!   ;; (default-value 'tool-bar-map), but when we don't use that function,
!   ;; we must explicitly operate on the default value.
! 
!   (let ((tool-bar-map (default-value 'tool-bar-map)))
!     (tool-bar-add-item "preferences" 'customize 'customize
!                      :help "Edit preferences (customize)")
! 
!     (tool-bar-add-item "help" (lambda ()
!                               (interactive)
!                               (popup-menu menu-bar-help-menu))
!                      'help
!                      :help "Pop up the Help menu"))
    )
  
  (provide 'tool-bar)