From: Richard M. Stallman <rms@gnu.org>
Date: Mon, 1 Apr 2002 16:37:41 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: ttn-vms-21-2-B4~15854
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4f4fada2f5bf3e9319952d94c0bfd5fa4b979fc7;p=emacs.git

*** empty log message ***
---

diff --git a/etc/NEWS b/etc/NEWS
index 0bd04163dbd..a6ca59e5686 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -740,8 +740,10 @@ When the non-blocking connect completes, the sentinel is called with
 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 @@ or the header line.
 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 --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6b1a203df2a..1fee51b822c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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.