# HG changeset patch # User Nick Roberts # Date 1130533415 0 # Node ID 759df5a9dc3e0626c4ce59c0cb7dc267c80ccc41 # Parent 2712f28b75e06d3165793542cfb4e7d577917d17 (tool-bar-add-item-from-menu) (tool-bar-local-item-from-menu): Fix doc strings. diff -r 2712f28b75e0 -r 759df5a9dc3e lisp/tool-bar.el --- a/lisp/tool-bar.el Fri Oct 28 21:02:56 2005 +0000 +++ b/lisp/tool-bar.el Fri Oct 28 21:03:35 2005 +0000 @@ -145,7 +145,7 @@ ;;;###autoload (defun tool-bar-add-item-from-menu (command icon &optional map &rest props) - "Define tool bar binding for COMMAND using the given ICON in keymap MAP. + "Define tool bar binding for COMMAND in keymap MAP using the given ICON. This makes a binding for COMMAND in `tool-bar-map', copying its binding from the menu bar in MAP (which defaults to `global-map'), but modifies the binding by adding an image specification for ICON. It @@ -155,20 +155,21 @@ MAP must contain appropriate binding for `[menu-bar]' which holds a keymap. Use this function only to make bindings in the global value of `tool-bar-map'. -To define items in any other map, use `tool-bar-local-item'." +To define items in any other map, use `tool-bar-local-item-from-menu'." (apply 'tool-bar-local-item-from-menu command icon (default-value 'tool-bar-map) map props)) ;;;###autoload (defun tool-bar-local-item-from-menu (command icon in-map &optional from-map &rest props) - "Define tool bar binding for COMMAND using the given ICON in keymap MAP. + "Define local tool bar binding for COMMAND using the given ICON. This makes a binding for COMMAND in IN-MAP, copying its binding from the menu bar in FROM-MAP (which defaults to `global-map'), but modifies the binding by adding an image specification for ICON. It finds ICON just like `tool-bar-add-item'. PROPS are additional properties to add to the binding. -MAP must contain appropriate binding for `[menu-bar]' which holds a keymap." +FROM-MAP must contain appropriate binding for `[menu-bar]' which +holds a keymap." (unless from-map (setq from-map global-map)) (let* ((menu-bar-map (lookup-key from-map [menu-bar]))