(tooltip-mode): Use `custom-initialize-safe-default' and simplify

:init-value again.  Delete autoload.

1 files changed, 3 insertions, 6 deletions

diff --git a/lisp/tooltip.el b/lisp/tooltip.el
index fabb154d7ed..309edde1749 100644
--- a/lisp/tooltip.el
+++ b/lisp/tooltip.el
@@ -154,18 +154,15 @@ This might return nil if the event did not occur over a buffer."
 ;; set-buffer prevents redisplay optimizations, so every mouse motion
 ;; would be accompanied by a full redisplay.
 
-;;;###autoload
 (define-minor-mode tooltip-mode
   "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
-                       (and (boundp 'emacs-quick-startup) emacs-quick-startup)
-                       (not (and (fboundp 'display-graphic-p)
-                                 (display-graphic-p)))
+                       emacs-quick-startup
+                       (not (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"))