summaryrefslogtreecommitdiff
path: root/lisp/tooltip.el
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2013-10-08 18:11:29 +0300
committerEli Zaretskii <eliz@gnu.org>2013-10-08 18:11:29 +0300
commitf3370a94fd887e9e01db81a86e42036d12dcda9b (patch)
tree4c85ed0de2f9044ba89cb584ac0264823ec0b9ca /lisp/tooltip.el
parentafd8eb2cb062e63135812775e7377bc968ac28ee (diff)
downloademacs-f3370a94fd887e9e01db81a86e42036d12dcda9b.tar.gz
Preload tooltip.el unconditionally.
Diffstat (limited to 'lisp/tooltip.el')
-rw-r--r--lisp/tooltip.el4
1 files changed, 1 insertions, 3 deletions
diff --git a/lisp/tooltip.el b/lisp/tooltip.el
index 657951d7b75..6ffa55bc14d 100644
--- a/lisp/tooltip.el
+++ b/lisp/tooltip.el
@@ -58,9 +58,7 @@ echo area, instead of making a pop-up window."
:init-value t
:initialize 'custom-initialize-delay
:group 'tooltip
- (unless (or (null tooltip-mode) (fboundp 'x-show-tip))
- (error "Sorry, tooltips are not yet available on this system"))
- (if tooltip-mode
+ (if (and tooltip-mode (fboundp 'x-show-tip))
(progn
(add-hook 'pre-command-hook 'tooltip-hide)
(add-hook 'tooltip-functions 'tooltip-help-tips))