*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f917e27fda5bde226338dabe40f06b8023938a77..629c0ee3c719a618223ae512beb2409dccba88af 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2001-01-18  Gerd Moellmann  <gerd@gnu.org>
+
+       * tooltip.el (tooltip-hide-delay): New user-option.
+       (tooltip-show): Use tooltip-hide-delay instead of the default.
+
 2001-01-18  Kenichi Handa  <handa@etl.go.jp>
 
        * mail/sendmail.el (mail-setup): Call set-buffer-multibyte because

diff --git a/src/ChangeLog b/src/ChangeLog
index 3dc8252bd3c1757f4e1df222026cb5ed20f78f1c..b5a785542d955df05da3f8a3e813ca006572df0c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,12 @@
 2001-01-18  Gerd Moellmann  <gerd@gnu.org>
 
+       * xfns.c (Qcancel_timer): New variable.
+       (syms_of_xfns): Initialize and staticpro it.
+       (Fx_hide_tip, Fx_show_tip): Use it.
+       (Fx_show_tip): Make sure to set tip_timer to nil when canceling
+       the timer.
+       (toplevel): Lisp code for generating parts of syms_of_xfns removed.
+
        * window.c (Fwindow_live_p): Use WINDOW_LIVE_P.
 
        * window.h (WINDOW_LIVE_P): New macro.