2 files changed, 6 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 47c2bceba8d..f0516519ade 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-24  Richard M. Stallman  <rms@gnu.org>
+
+        * tooltip.el (tooltip-mode): Test emacs-basic-display,
+        not emacs-quick-startup.
+
 2005-07-24  Juanma Barranquero  <lekktu@gmail.com>
 
         * emacs-lisp/re-builder.el (reb-with-current-window): Delete.
diff --git a/lisp/tooltip.el b/lisp/tooltip.el
index 309edde1749..c8991c07e54 100644
--- a/lisp/tooltip.el
+++ b/lisp/tooltip.el
@@ -159,7 +159,7 @@ This might return nil if the event did not occur over a buffer."
 With ARG, turn tooltip mode on if and only if ARG is positive."
   :global t
   :init-value (not (or noninteractive
-                       emacs-quick-startup
+                       emacs-basic-display
                        (not (display-graphic-p))
                        (not (fboundp 'x-show-tip))))
   :initialize 'custom-initialize-safe-default