Fix 2010-12-20 change to tool-bar.el. * tool-bar.el (tool-bar-setup): Remove :enable conditions, which are handled by the menu-bar entries. As before, don't use :visibile to avoid changing the tool-bar.