summaryrefslogtreecommitdiff
path: root/lisp/tooltip.el
diff options
context:
space:
mode:
authorLuc Teirlinck <teirllm@auburn.edu>2005-07-12 20:14:40 +0000
committerLuc Teirlinck <teirllm@auburn.edu>2005-07-12 20:14:40 +0000
commit2231b5c5f84315fe05f5c9c39b12c540f2a42158 (patch)
treebf4be2f773decf2bde522555d9f78cf37f3105e1 /lisp/tooltip.el
parent022034b72e74256a43011dcf8fae865e277c0d11 (diff)
downloademacs-2231b5c5f84315fe05f5c9c39b12c540f2a42158.tar.gz
emacs-2231b5c5f84315fe05f5c9c39b12c540f2a42158.tar.bz2
emacs-2231b5c5f84315fe05f5c9c39b12c540f2a42158.zip
(tooltip-mode): Revert to previous implementation of its defcustom.
Diffstat (limited to 'lisp/tooltip.el')
-rw-r--r--lisp/tooltip.el8
1 files changed, 5 insertions, 3 deletions
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"))