*** empty log message ***

diff --git a/etc/NEWS b/etc/NEWS
index 28b20a36519c113616fd991831bc19de4fba1ca6..e15293e55184eca54d868807760349340806a5ed 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -2839,10 +2839,11 @@ moves over a tool-bar item or a piece of text that has a text property
 that have a `help-echo' property.
 
 If the value of the `help-echo' property is a function, that function
-is called with two arguments OBJECT and POSITION.  OBJECT is the 
-buffer or string which had the `help-echo' property.  POSITION is
-the position within OBJECT under the mouse pointer.  The function
-should return a help string or nil for none.
+is called with three arguments WINDOW, OBJECT and POSITION.  WINDOW is
+the window in which the help was found, OBJECT is the buffer or string
+which had the `help-echo' property.  POSITION is the position within
+OBJECT under the mouse pointer.  The function should return a help
+string or nil for none.
 
 If the value of the `help-echo' property is neither a function nor a
 string, it is evaluated to obtain a help string.

diff --git a/src/ChangeLog b/src/ChangeLog
index 2ecdc87e7c85dbbedab86e881c9c7d14415350c4..bfcf0ce93c966fd79363b3d554ce8a6739566a3c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2000-07-18  Gerd Moellmann  <gerd@gnu.org>
 
+       * xfaces.c (face-alternative-font-family-alist): Remove
+       DEFVAR_LISP; staticpro instead.
+
        * xmenu.c (menu_help_callback): Call show_help_echo with 
        new arguments.