*** empty log message ***

2 files changed, 29 insertions, 5 deletions

diff --git a/etc/NEWS b/etc/NEWS
index cc0c27501cc..51edc097265 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1250,6 +1250,9 @@ functionality with aliases for the mldrag functions.
 * Lisp changes made after edition 2.6 of the Emacs Lisp Manual,
 (Display-related features are described in a page of their own below.)
 
+** The value of the `help-echo' text property is evaluated, if it
+is not a string already, to obtain a help string.
+
 ** Function `make-obsolete' now has an optional arg to say when the
 function was declared obsolete.
 
@@ -2814,11 +2817,13 @@ moves over a tool-bar item or a piece of text that has a text property
 `help-echo'.  This feature also applies to strings in the mode line
 that have a `help-echo' property.
 
-The value of the `help-echo' property must be a string.  For tool-bar
-items, their key definition is used to determine the help to display.
-If their definition contains a property `:help FORM', FORM is
-evaluated to determine the help string.  Otherwise, the caption of the
-tool-bar item is used.
+If the value of the `help-echo' property is not a string. it is
+evaluated to obtain a help string.
+
+For tool-bar items, their key definition is used to determine the help
+to display.  If their definition contains a property `:help FORM',
+FORM is evaluated to determine the help string.  Otherwise, the
+caption of the tool-bar item is used.
 
 The hook `show-help-function' can be set to a function that displays
 help differently.  For example, enabling a tooltip window causes the
diff --git a/src/ChangeLog b/src/ChangeLog
index df27fad0945..0eb6ccd580d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,22 @@
+2000-07-14  Gerd Moellmann  <gerd@gnu.org>
+
+        * xterm.c (construct_mouse_click, x_scroll_bar_to_input_event)
+        (x_scroll_bar_handle_click, SET_SAVED_MENU_EVENT, XTread_socket):
+        Always set `arg' member of input_events.
+        (construct_menu_click): Unused function removed.
+
+        * msdos.c (dos_rawgetc): Always set `arg' member of input_events.
+
+        * w32term.c (construct_mouse_click, construct_mouse_wheel)
+        (construct_drag_n_drop, x_scroll_bar_handle_click)
+        (w32_read_socket): Always set `arg' member of input_events.
+
+        * keyboard.c (show_help_echo): Use eval_form.  Add comment.
+
+        * lisp.h (eval_form): Add prototype.
+
+        * xdisp.c (eval_form): Make it externally visible.
+
 2000-07-13  Gerd Moellmann  <gerd@gnu.org>
 
         * xterm.c (x_handle_tool_bar_click): Store the frame in the