(tooltip-mode): Revert to previous implementation of its defcustom.

diff --git a/lisp/tooltip.el b/lisp/tooltip.el
index 169ffafbbef97628278c19326b61f91f8b42a4d4..fabb154d7edc84dfe00aae3ed88a3ecb28e853a8 100644 (file)
--- a/lisp/tooltip.el
+++ b/lisp/tooltip.el
@@ -159,11 +159,13 @@ This might return nil if the event did not occur over a buffer."
   "Toggle Tooltip display.
 With ARG, turn tooltip mode on if and only if ARG is positive."
   :global t
+  ;; 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))))
-  :initialize 'custom-initialize-safe-default
   :group 'tooltip
   (unless (or (null tooltip-mode) (fboundp 'x-show-tip))
     (error "Sorry, tooltips are not yet available on this system"))