# HG changeset patch
# User Luc Teirlinck <teirllm@auburn.edu>
# Date 1121199280 0
# Node ID 808b36b5395eef52e22cc3a3976d411a1008122c
# Parent  f83907a4c7954d25ca9c788698ff02cfe6bf162d
(tooltip-mode): Revert to previous implementation of its defcustom.

diff -r f83907a4c795 -r 808b36b5395e lisp/tooltip.el
--- a/lisp/tooltip.el	Tue Jul 12 20:13:23 2005 +0000
+++ b/lisp/tooltip.el	Tue Jul 12 20:14:40 2005 +0000
@@ -159,11 +159,13 @@
   "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"))