(command-line): Use `custom-reevaluate-setting' again for tooltip-mode.

diff --git a/lisp/startup.el b/lisp/startup.el
index 615870198000f28cdb8e91d55ad58c61e53d7888..cb3dae8123a28ab719d3166b9d9e5abd0ede5455 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -752,17 +752,7 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
   ;; are not set.
   (custom-reevaluate-setting 'blink-cursor-mode)
   (custom-reevaluate-setting 'normal-erase-is-backspace)
-
-  ;; If you change the code below, you need to also change the
-  ;; corresponding code in the tooltip-mode defcustom.  The two need
-  ;; to be equivalent under all conditions, or Custom will get confused.
-  ;; We can not use `custom-reevaluate-setting' here, because it would
-  ;; load the tooltip library on systems for which that does not make sense.
-  (unless (or noninteractive
-             emacs-basic-display
-             (not (display-graphic-p))
-             (not (fboundp 'x-show-tip)))
-    (tooltip-mode 1))
+  (custom-reevaluate-setting 'tooltip-mode)
 
   ;; Register default TTY colors for the case the terminal hasn't a
   ;; terminal init file.