diff options
| author | Nick Roberts <nickrob@snap.net.nz> | 2005-10-28 21:03:35 +0000 |
|---|---|---|
| committer | Nick Roberts <nickrob@snap.net.nz> | 2005-10-28 21:03:35 +0000 |
| commit | 7c06485983433cca0cce207b96a9e40fd6a46b5d (patch) | |
| tree | 4480fcfb881397b0813fb21e552b262351f9ef49 /lisp/tool-bar.el | |
| parent | 147ebacae18cb7bb16d4c3ad7e2ed5d2d58fb130 (diff) | |
| download | emacs-7c06485983433cca0cce207b96a9e40fd6a46b5d.tar.gz | |
(tool-bar-add-item-from-menu)
(tool-bar-local-item-from-menu): Fix doc strings.
Diffstat (limited to 'lisp/tool-bar.el')
| -rw-r--r-- | lisp/tool-bar.el | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lisp/tool-bar.el b/lisp/tool-bar.el index ea2bad9dcb2..c4325505ac4 100644 --- a/lisp/tool-bar.el +++ b/lisp/tool-bar.el @@ -145,7 +145,7 @@ ICON.xbm, using `find-image'." ;;;###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 @@ properties to add to the binding. 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])) |