(menu-bar-tools-menu): Read and send mail entries are not constants. (Bug#4913)

[bpt/emacs.git] / lisp / tooltip.el

diff --git a/lisp/tooltip.el b/lisp/tooltip.el
index 41a50b4..49ecaff 100644 (file)
--- a/lisp/tooltip.el
+++ b/lisp/tooltip.el
@@ -52,7 +52,7 @@ the help text in the echo area, and does not make a pop-up window."
   ;; 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
+  :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"))
@@ -319,25 +319,31 @@ the buffer of PROCESS."
 ;;; Tooltip help.
 
 (defvar tooltip-help-message nil
-  "The last help message received via `tooltip-show-help'.")
+  "The last help message received via `show-help-function'.
+This is used by `tooltip-show-help' and
+`tooltip-show-help-non-mode'.")
 
 (defvar tooltip-previous-message nil
   "The previous content of the echo area.")
 
 (defun tooltip-show-help-non-mode (help)
-  "Function installed as `show-help-function' when tooltip is off."
+  "Function installed as `show-help-function' when Tooltip mode is off.
+It is also called if Tooltip mode is on, for text-only displays."
   (when (and (not (window-minibuffer-p)) ;Don't overwrite minibuffer contents.
-             ;; Don't know how to reproduce it in Elisp:
-             ;; Don't overwrite a keystroke echo.
-             ;; (NILP (echo_message_buffer) || ok_to_overwrite_keystroke_echo)
-             (not cursor-in-echo-area)) ;Don't overwrite a prompt.
+             (not cursor-in-echo-area))  ;Don't overwrite a prompt.
     (cond
      ((stringp help)
-      (unless tooltip-previous-message
+      (setq help (replace-regexp-in-string "\n" ", " help))
+      (unless (or tooltip-previous-message
+                 (string-equal help (current-message))
+                 (and (stringp tooltip-help-message)
+                      (string-equal tooltip-help-message
+                                    (current-message))))
         (setq tooltip-previous-message (current-message)))
+      (setq tooltip-help-message help)
       (let ((message-truncate-lines t)
             (message-log-max nil))
-        (message "%s" (replace-regexp-in-string "\n" ", " help))))
+        (message "%s" help)))
      ((stringp tooltip-previous-message)
       (let ((message-log-max nil))
         (message "%s" tooltip-previous-message)
@@ -348,21 +354,24 @@ the buffer of PROCESS."
 (defun tooltip-show-help (msg)
   "Function installed as `show-help-function'.
 MSG is either a help string to display, or nil to cancel the display."
-  (let ((previous-help tooltip-help-message))
-    (setq tooltip-help-message msg)
-    (cond ((null msg)
-          ;; Cancel display.  This also cancels a delayed tip, if
-          ;; there is one.
-          (tooltip-hide))
-         ((equal previous-help msg)
-          ;; Same help as before (but possibly the mouse has moved).
-          ;; Keep what we have.
-          )
-         (t
-          ;; A different help.  Remove a previous tooltip, and
-          ;; display a new one, with some delay.
-          (tooltip-hide)
-          (tooltip-start-delayed-tip)))))
+  (if (display-graphic-p)
+      (let ((previous-help tooltip-help-message))
+       (setq tooltip-help-message msg)
+       (cond ((null msg)
+              ;; Cancel display.  This also cancels a delayed tip, if
+              ;; there is one.
+              (tooltip-hide))
+             ((equal previous-help msg)
+              ;; Same help as before (but possibly the mouse has moved).
+              ;; Keep what we have.
+              )
+             (t
+              ;; A different help.  Remove a previous tooltip, and
+              ;; display a new one, with some delay.
+              (tooltip-hide)
+              (tooltip-start-delayed-tip))))
+    ;; On text-only displays, try `tooltip-show-help-non-mode'.
+    (tooltip-show-help-non-mode msg)))
 
 (defun tooltip-help-tips (event)
   "Hook function to display a help tooltip.