(tooltip-mode): `emacs-quick-startup' and `display-graphic-p' may not

be bound yet.

diff --git a/lisp/tooltip.el b/lisp/tooltip.el
index c903dbac523d41eebb00b484b0226d9bb9354677..89a72d570a22c8d9cd8013704ac1e87acc7f1308 100644 (file)
--- a/lisp/tooltip.el
+++ b/lisp/tooltip.el
@@ -188,8 +188,9 @@ With ARG, turn tooltip mode on if and only if ARG is positive."
   ;; If you change the :init-value below, you also need to change the
   ;; corresponding code in startup.el.
   :init-value (not (or noninteractive
-                      emacs-quick-startup
-                      (not (display-graphic-p))
+                      (and (boundp 'emacs-quick-startup) emacs-quick-startup)
+                      (not (and (fboundp 'display-graphic-p)
+                                (display-graphic-p)))
                       (not (fboundp 'x-show-tip))))
   :group 'tooltip
   (unless (or (null tooltip-mode) (fboundp 'x-show-tip))