# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 963947040 0
# Node ID 84ff1994e9d1c0de9f0c8ad7eb4781c0d65e5eba
# Parent  626d55ea66ef0a197797d98c954c726597ce6a7c
*** empty log message ***

diff -r 626d55ea66ef -r 84ff1994e9d1 etc/NEWS
--- a/etc/NEWS	Tue Jul 18 19:03:13 2000 +0000
+++ b/etc/NEWS	Tue Jul 18 19:04:00 2000 +0000
@@ -2839,10 +2839,11 @@
 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 -r 626d55ea66ef -r 84ff1994e9d1 src/ChangeLog
--- a/src/ChangeLog	Tue Jul 18 19:03:13 2000 +0000
+++ b/src/ChangeLog	Tue Jul 18 19:04:00 2000 +0000
@@ -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.