[Emacs-diffs] Changes to emacs/lisp/tool-bar.el

[Nick Roberts]

Index: emacs/lisp/tool-bar.el
diff -c emacs/lisp/tool-bar.el:1.2 emacs/lisp/tool-bar.el:1.3
*** emacs/lisp/tool-bar.el:1.2  Fri Oct 28 16:22:08 2005
--- emacs/lisp/tool-bar.el      Fri Oct 28 21:03:35 2005
***************
*** 145,151 ****
  
  ;;;###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.
  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
--- 145,151 ----
  
  ;;;###autoload
  (defun tool-bar-add-item-from-menu (command icon &optional map &rest props)
!   "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,174 ****
  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'."
    (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.
  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."
    (unless from-map
      (setq from-map global-map))
    (let* ((menu-bar-map (lookup-key from-map [menu-bar]))
--- 155,175 ----
  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-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 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.
  
! 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]))