# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1017679061 0
# Node ID ecd559f0d5c3c7d6a96ec9cac989d6b0347e83cb
# Parent  62bd2c6cd91f42ca58323a209ea5590d7fbef6db
*** empty log message ***

diff -r 62bd2c6cd91f -r ecd559f0d5c3 etc/NEWS
--- a/etc/NEWS	Mon Apr 01 16:28:16 2002 +0000
+++ b/etc/NEWS	Mon Apr 01 16:37:41 2002 +0000
@@ -740,8 +740,10 @@
 the status matching "open" or "failed".
 
 *** New function open-network-stream-server.
+MORE INFO NEEDED HERE.
 
 *** New functions process-datagram-address and set-process-datagram-address.
+MORE INFO NEEDED HERE.
 
 *** By default, the function process-contact still returns (HOST SERVICE)
 for a network process.  Using the new optional KEY arg, the complete list
@@ -784,6 +786,13 @@
 These functions are like `plist-get' and `plist-put' except that they
 compare the property name using `equal' rather than `eq'.
 
+** New function `tool-bar-local-item-from-menu'
+
+The `tool-bar-add-item-from-menu' most not be used (as previously
+recommended) for making entries in the tool bar for local keymaps.
+Instead, use the function `tool-bar-local-item-from-menu', which lets
+you specify the map to use as an argument.
+
 +++
 ** The function `atan' now accepts an optional second argument.
 
diff -r 62bd2c6cd91f -r ecd559f0d5c3 lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Apr 01 16:28:16 2002 +0000
+++ b/lisp/ChangeLog	Mon Apr 01 16:37:41 2002 +0000
@@ -8,6 +8,15 @@
 	
 2002-04-01  Richard M. Stallman  <rms@gnu.org>
 
+	* info.el (info-tool-bar-map): Use tool-bar-local-item-from-menu.
+
+	* toolbar/tool-bar.el (tool-bar-local-item): Renamed from
+	tool-bar-add-item, and new arg MAP.
+	(tool-bar-add-item): Now calls tool-bar-local-item.
+	(tool-bar-local-item-from-menu): Renamed from 
+	tool-bar-add-item-from-menu, and new arg IN-MAP.
+	(tool-bar-add-item-from-menu): Now calls tool-bar-local-item-from-menu.
+
 	* help-fns.el (help-with-tutorial): Allow various ways
 	to specify the text in the [...] line, in handling the <...> line.