# HG changeset patch
# User Luc Teirlinck <teirllm@auburn.edu>
# Date 1121302665 0
# Node ID 12d6287fd482297d02a020ff4c03f1ee9fc34abe
# Parent  d905b8d515a174693db0a64d13113c0ad86a72db
(command-line): Use `custom-reevaluate-setting' again for tooltip-mode.

diff -r d905b8d515a1 -r 12d6287fd482 lisp/startup.el
--- a/lisp/startup.el	Thu Jul 14 00:56:53 2005 +0000
+++ b/lisp/startup.el	Thu Jul 14 00:57:45 2005 +0000
@@ -752,17 +752,7 @@
   ;; 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.