# HG changeset patch
# User Luc Teirlinck <teirllm@auburn.edu>
# Date 1121013611 0
# Node ID 32225b9cc7d54ce11f69da721c80af2d1344d4f4
# Parent  43f2b7f50a25c7f2e1048f623420024a894daa13
(tooltip-mode): Use custom-initialize-safe-default and simplify
:init-value.  Delete obsolete comment.

diff -r 43f2b7f50a25 -r 32225b9cc7d5 lisp/tooltip.el
--- a/lisp/tooltip.el	Sun Jul 10 16:36:04 2005 +0000
+++ b/lisp/tooltip.el	Sun Jul 10 16:40:11 2005 +0000
@@ -159,13 +159,11 @@
   "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"))