* vc-bzr.el (vc-bzr-show-log-entry):

[gnu-emacs] / lisp / tooltip.el

diff --git a/lisp/tooltip.el b/lisp/tooltip.el
index f5676a325dbffa3bb9481c633400bf82a098a0cb..c6509d997af4ffc7663244bd0aa9042a542539de 100644 (file)
--- a/lisp/tooltip.el
+++ b/lisp/tooltip.el
@@ -49,10 +49,9 @@ all pop-up help appears in the echo area.)
 When Tooltip mode is disabled, Emacs displays one line of
 the help text in the echo area, and does not make a pop-up window."
   :global t
-  :init-value (not (or noninteractive
-                      emacs-basic-display
-                      (not (display-graphic-p))
-                      (not (fboundp 'x-show-tip))))
+  ;; Even if we start on a text-only terminal, make this non-nil by
+  ;; default because we can open a graphical frame later (multi-tty).
+  :init-value t
   :initialize 'custom-initialize-safe-default
   :group 'tooltip
   (unless (or (null tooltip-mode) (fboundp 'x-show-tip))
@@ -210,6 +209,9 @@ change the existing association.  Value is the resulting alist."
       (push (cons key value) alist))
     alist))
 
+(declare-function x-show-tip "xfns.c"
+                 (string &optional frame parms timeout dx dy))
+
 (defun tooltip-show (text &optional use-echo-area)
   "Show a tooltip window displaying TEXT.
 
@@ -245,6 +247,8 @@ in echo area."
        (sit-for 1)
        (message "%s" text)))))
 
+(declare-function x-hide-tip "xfns.c" ())
+
 (defun tooltip-hide (&optional ignored-arg)
   "Hide a tooltip, if one is displayed.
 Value is non-nil if tooltip was open."