From: Gerd Moellmann <gerd@gnu.org>
Date: Thu, 18 Jan 2001 14:49:07 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-21.0.96~217
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8962e30335b8cb870dfac214ce179369a2858cc7;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f917e27fda5..629c0ee3c71 100644
--- 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 3dc8252bd3c..b5a785542d9 100644
--- 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.