From: Luc Teirlinck <teirllm@auburn.edu>
Date: Tue, 12 Jul 2005 20:14:40 +0000 (+0000)
Subject: (tooltip-mode): Revert to previous implementation of its defcustom.
X-Git-Tag: emacs-pretest-22.0.90~8208
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2231b5c5f84315fe05f5c9c39b12c540f2a42158;p=emacs.git

(tooltip-mode): Revert to previous implementation of its defcustom.
---

diff --git a/lisp/tooltip.el b/lisp/tooltip.el
index 169ffafbbef..fabb154d7ed 100644
--- a/lisp/tooltip.el
+++ b/lisp/tooltip.el
@@ -159,11 +159,13 @@ This might return nil if the event did not occur over a buffer."
   "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"))