2 files changed, 22 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2759b13df48..a04f0a84d6a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,13 @@
 2001-01-04  Gerd Moellmann  <gerd@gnu.org>
 
+        * tooltip.el (tooltip-cancel-delayed-tip) 
+        (tooltip-start-delayed-tip): Renamed from tooltip-disable-timeout
+        and tooltip-add-timeout.
+        (tooltip-show): Set border color from faces's foreground.
+        (tooltip-show-help-function): If called with the same help string
+        as last time, do nothing.
+        (tooltip-help-tips): Don't set tooltip-help-message to nil.
+
         * startup.el (fancy-splash-screens): Don't bind show-help-function
         to nil.
 
@@ -102,7 +110,7 @@
 
         * ps-print.el: Handle form feed better when ps-zebra-stripe-follow is
         non-nil.  Adding almost all customization variables on ps-setup.  Doc
-        Fix.
+        fix.
         (ps-print-version): New version number (6.3.3).
         (ps-end-with-control-d): Initialization fix.
         (ps-lines-printed): New var.
diff --git a/src/ChangeLog b/src/ChangeLog
index 24d95e33e8d..b933994b6b8 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,16 @@
+2001-01-04  Gerd Moellmann  <gerd@gnu.org>
+
+        * xterm.c (clear_mouse_face): Don't return if tip_frame is
+        non-nil.
+
+        * xfns.c (x_create_tip_frame): Preserve the value of
+        face_change_count around the creation of the tip frame.
+        
+        * xfns.c (last_show_tip_args): New variable.
+        (compute_tip_xy): New function.
+        (Fx_show_tip): Reuse an existing tip frame, if possible.
+        (syms_of_xfns): Initialize and staticpro last_show_tip_args.
+
 2001-01-04  Dave Love  <fx@gnu.org>
 
         * systime.h (set_file_times): Prototype.