# HG changeset patch
# User Luc Teirlinck <teirllm@auburn.edu>
# Date 1121199095 0
# Node ID 76dcc947e7fc258a57c76167ae686eda15f62edd
# Parent  f2bb50c9b2dd8f09410746c119a53bd15a49002a
*** empty log message ***

diff -r f2bb50c9b2dd -r 76dcc947e7fc lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Jul 12 18:05:09 2005 +0000
+++ b/lisp/ChangeLog	Tue Jul 12 20:11:35 2005 +0000
@@ -1,3 +1,14 @@
+2005-07-12  Luc Teirlinck  <teirllm@auburn.edu>
+
+	* startup.el (command-line): Revert to previous handling of
+	tooltip-mode.  Explain in comment why the complexity is needed.
+
+	* tooltip.el (tooltip-mode): Revert to previous implementation of
+	its defcustom.
+
+	* frame.el (blink-cursor-mode): Revert to previous implementation
+	of its defcustom.  Update.comment.
+
 2005-07-12  Lars Hansen  <larsh@soem.dk>
 
 	* desktop.el: Update e-mail address.