(outline-invent-heading): New fun.

[gnu-emacs] / lisp / tooltip.el

diff --git a/lisp/tooltip.el b/lisp/tooltip.el
index f5953f49c7e79e2e5819df97c7009fe974863dad..59f07df00897ca803727280caba2daee9b90ccf6 100644 (file)
--- a/lisp/tooltip.el
+++ b/lisp/tooltip.el
@@ -1,6 +1,7 @@
-;;; tooltip.el --- Show tooltip windows
+;;; tooltip.el --- show tooltip windows

 
 

-;; Copyright (C) 1997, 1999, 2000 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1999, 2000, 2001, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.

 
 ;; Author: Gerd Moellmann <gerd@acm.org>
 ;; Keywords: help c mouse tools
 
 ;; Author: Gerd Moellmann <gerd@acm.org>
 ;; Keywords: help c mouse tools


@@ -19,55 +20,36 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the

-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.

 
 ;;; Commentary:
 
 
 ;;; Commentary:
 

-;; Put into your `.emacs'
-
-;; (require 'tooltip)
-;; (tooltip-mode 1)
-
-
-\f

 ;;; Code:
 
 ;;; Code:
 

-(eval-when-compile
-  (require 'cl)
-  (require 'comint)
-  (require 'gud))
-
-(provide 'tooltip)
-
-\f

 ;;; Customizable settings
 
 (defgroup tooltip nil
   "Customization group for the `tooltip' package."
   :group 'help
 ;;; Customizable settings
 
 (defgroup tooltip nil
   "Customization group for the `tooltip' package."
   :group 'help

-  :group 'c
+  :group 'gud

   :group 'mouse
   :group 'tools
   :version "21.1"
   :tag "Tool Tips")
 
   :group 'mouse
   :group 'tools
   :version "21.1"
   :tag "Tool Tips")
 

-(defvar tooltip-mode)
-
-(defcustom tooltip-delay 1.0
+(defcustom tooltip-delay 0.7

   "Seconds to wait before displaying a tooltip the first time."
   :tag "Delay"
   :type 'number
   :group 'tooltip)
 
   "Seconds to wait before displaying a tooltip the first time."
   :tag "Delay"
   :type 'number
   :group 'tooltip)
 

-

 (defcustom tooltip-short-delay 0.1
   "Seconds to wait between subsequent tooltips on different items."
   :tag "Short delay"
   :type 'number
   :group 'tooltip)
 
 (defcustom tooltip-short-delay 0.1
   "Seconds to wait between subsequent tooltips on different items."
   :tag "Short delay"
   :type 'number
   :group 'tooltip)
 

-

 (defcustom tooltip-recent-seconds 1
   "Display tooltips if changing tip items within this many seconds.
 Do so after `tooltip-short-delay'."
 (defcustom tooltip-recent-seconds 1
   "Display tooltips if changing tip items within this many seconds.
 Do so after `tooltip-short-delay'."


@@ -75,75 +57,66 @@ Do so after `tooltip-short-delay'."
   :type 'number
   :group 'tooltip)
 
   :type 'number
   :group 'tooltip)
 

+(defcustom tooltip-hide-delay 10
+  "Hide tooltips automatically after this many seconds."
+  :tag "Hide delay"
+  :type 'number
+  :group 'tooltip)

 
 (defcustom tooltip-x-offset nil
 
 (defcustom tooltip-x-offset nil

-  "Specify an X offset for the display of tooltips.
+  "X offset, in pixels, for the display of tooltips.

 The offset is relative to the position of the mouse.  It must
 be chosen so that the tooltip window doesn't contain the mouse
 The offset is relative to the position of the mouse.  It must
 be chosen so that the tooltip window doesn't contain the mouse

-when it pops up."
+when it pops up.  If the value is nil, the default offset is 5
+pixels.
+
+If `tooltip-frame-parameters' includes the `left' parameter,
+the value of `tooltip-x-offset' is ignored."

   :tag "X offset"
   :type '(choice (const :tag "Default" nil)
                 (integer :tag "Offset" :value 1))
   :group 'tooltip)
 
   :tag "X offset"
   :type '(choice (const :tag "Default" nil)
                 (integer :tag "Offset" :value 1))
   :group 'tooltip)
 

-

 (defcustom tooltip-y-offset nil
 (defcustom tooltip-y-offset nil

-  "Specify an Y offset for the display of tooltips.
+  "Y offset, in pixels, for the display of tooltips.

 The offset is relative to the position of the mouse.  It must
 be chosen so that the tooltip window doesn't contain the mouse
 The offset is relative to the position of the mouse.  It must
 be chosen so that the tooltip window doesn't contain the mouse

-when it pops up."
+when it pops up.  If the value is nil, the default offset is -10
+pixels.
+
+If `tooltip-frame-parameters' includes the `top' parameter,
+the value of `tooltip-y-offset' is ignored."

   :tag "Y offset"
   :type '(choice (const :tag "Default" nil)
                 (integer :tag "Offset" :value 1))
   :group 'tooltip)
 
   :tag "Y offset"
   :type '(choice (const :tag "Default" nil)
                 (integer :tag "Offset" :value 1))
   :group 'tooltip)
 

-

 (defcustom tooltip-frame-parameters
   '((name . "tooltip")
 (defcustom tooltip-frame-parameters
   '((name . "tooltip")

-    (foreground-color . "black")
-    (background-color . "lightyellow")

     (internal-border-width . 5)
     (internal-border-width . 5)

-    (border-color . "lightyellow")

     (border-width . 1))
     (border-width . 1))

-  "Frame parameters used for tooltips."
+  "Frame parameters used for tooltips.
+
+If `left' or `top' parameters are included, they specify the absolute
+position to pop up the tooltip."

   :type 'sexp
   :tag "Frame Parameters"
   :group 'tooltip)
 
   :type 'sexp
   :tag "Frame Parameters"
   :group 'tooltip)
 

-
-(defcustom tooltip-gud-tips-p nil
-  "*Non-nil means show tooltips in GUD sessions."
-  :type 'boolean
-  :tag "GUD"
-  :set #'(lambda (symbol on)
-          (setq tooltip-gud-tips-p on)
-          (if on (tooltip-gud-tips-setup)))
+(defface tooltip
+  '((((class color))
+     :background "lightyellow"
+     :foreground "black"
+     :inherit variable-pitch)
+    (t
+     :inherit variable-pitch))
+  "Face for tooltips."

   :group 'tooltip)
 
   :group 'tooltip)
 

-
-(defcustom tooltip-gud-modes '(gud-mode c-mode c++-mode)
-  "List of modes for which to enable GUD tips."
-  :type 'sexp
-  :tag "GUD modes"
-  :group 'tooltip)
-
-
-(defcustom tooltip-gud-display
-  '((eq (tooltip-event-buffer tooltip-gud-event)
-       (marker-buffer overlay-arrow-position)))
-  "List of forms determining where GUD tooltips are displayed.
-
-Forms in the list are combined with AND.  The default is to display
-only tooltips in the buffer containing the overlay arrow."
-  :type 'sexp
-  :tag "GUD buffers predicate"
-  :group 'tooltip)
-
-

 (defcustom tooltip-use-echo-area nil
 (defcustom tooltip-use-echo-area nil

-  "Use the echo area instead of the actual tooltip windows."
+  "Use the echo area instead of tooltip frames for help and GUD tooltips."

   :type 'boolean
   :type 'boolean

-  :tag "use echo area"
+  :tag "Use echo area"

   :group 'tooltip)
 
 \f
   :group 'tooltip)
 
 \f


@@ -154,24 +127,17 @@ only tooltips in the buffer containing the overlay arrow."
 Each function is called with one argument EVENT which is a copy of
 the last mouse movement event that occurred.")
 
 Each function is called with one argument EVENT which is a copy of
 the last mouse movement event that occurred.")
 

-

 (defvar tooltip-timeout-id nil
   "The id of the timeout started when Emacs becomes idle.")
 
 (defvar tooltip-timeout-id nil
   "The id of the timeout started when Emacs becomes idle.")
 

-

 (defvar tooltip-last-mouse-motion-event nil
   "A copy of the last mouse motion event seen.")
 
 (defvar tooltip-last-mouse-motion-event nil
   "A copy of the last mouse motion event seen.")
 

-

 (defvar tooltip-hide-time nil
   "Time when the last tooltip was hidden.")
 
 (defvar tooltip-hide-time nil
   "Time when the last tooltip was hidden.")
 

+(defvar gud-tooltip-mode) ;; Prevent warning.

 
 

-(defvar tooltip-gud-debugger nil
-  "The debugger for which we show tooltips.")
-
-
-\f

 ;;; Event accessors
 
 (defun tooltip-event-buffer (event)
 ;;; Event accessors
 
 (defun tooltip-event-buffer (event)


@@ -180,8 +146,6 @@ This might return nil if the event did not occur over a buffer."
   (let ((window (posn-window (event-end event))))
     (and window (window-buffer window))))
 
   (let ((window (posn-window (event-end event))))
     (and window (window-buffer window))))
 

-
-\f

 ;;; Switching tooltips on/off
 
 ;; We don't set track-mouse globally because this is a big redisplay
 ;;; Switching tooltips on/off
 
 ;; We don't set track-mouse globally because this is a big redisplay


@@ -190,41 +154,28 @@ This might return nil if the event did not occur over a buffer."
 ;; set-buffer prevents redisplay optimizations, so every mouse motion
 ;; would be accompanied by a full redisplay.
 
 ;; set-buffer prevents redisplay optimizations, so every mouse motion
 ;; would be accompanied by a full redisplay.
 

-;;;###autoload
-(defun tooltip-mode (&optional arg)
-  "Mode for tooltip display.
+(define-minor-mode tooltip-mode
+  "Toggle Tooltip display.

 With ARG, turn tooltip mode on if and only if ARG is positive."
 With ARG, turn tooltip mode on if and only if ARG is positive."

-  (interactive "P")
-  (let* ((on (if arg
-                (> (prefix-numeric-value arg) 0)
-              (not tooltip-mode)))
-        (hook-fn (if on 'add-hook 'remove-hook)))
-    (setq tooltip-mode on)
-    (funcall hook-fn 'change-major-mode-hook 'tooltip-change-major-mode)
-    (tooltip-activate-mouse-motions-if-enabled)
-    (funcall hook-fn 'pre-command-hook 'tooltip-hide)
-    (funcall hook-fn 'tooltip-hook 'tooltip-gud-tips)
-    (funcall hook-fn 'tooltip-hook 'tooltip-help-tips)
-    (setq show-help-function (if on 'tooltip-show-help-function nil))
-    ;; `ignore' is the default binding for mouse movements.
-    (define-key global-map [mouse-movement]
-      (if on 'tooltip-mouse-motion 'ignore))
-    (tooltip-gud-tips-setup)))
-
-(defun tooltip-gud-tips-setup ()
-  "Setup debugger mode-hooks for tooltips."
-  (when (and tooltip-mode tooltip-gud-tips-p)
-    (global-set-key [S-mouse-3] 'tooltip-gud-toggle-dereference)
-    (add-hook 'gdb-mode-hook
-             #'(lambda () (setq tooltip-gud-debugger 'gdb)))
-    (add-hook 'sdb-mode-hook
-             #'(lambda () (setq tooltip-gud-debugger 'sdb)))
-    (add-hook 'dbx-mode-hook
-             #'(lambda () (setq tooltip-gud-debugger 'dbx)))
-    (add-hook 'xdb-mode-hook
-             #'(lambda () (setq tooltip-gud-debugger 'xdb)))
-    (add-hook 'perldb-mode-hook
-             #'(lambda () (setq tooltip-gud-debugger 'perldb)))))
+  :global t
+  :init-value (not (or noninteractive
+                      emacs-basic-display
+                      (not (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"))
+  (if tooltip-mode
+      (progn
+       (add-hook 'pre-command-hook 'tooltip-hide)
+       (add-hook 'tooltip-hook 'tooltip-help-tips))
+    (unless (and (boundp 'gud-tooltip-mode) gud-tooltip-mode)
+      (remove-hook 'pre-command-hook 'tooltip-hide))
+    (remove-hook 'tooltip-hook 'tooltip-help-tips))
+  (setq show-help-function
+       (if tooltip-mode 'tooltip-show-help nil)))
+

 \f
 ;;; Timeout for tooltip display
 
 \f
 ;;; Timeout for tooltip display
 


@@ -237,90 +188,77 @@ With ARG, turn tooltip mode on if and only if ARG is positive."
       (setq delay tooltip-short-delay))
     delay))
 
       (setq delay tooltip-short-delay))
     delay))
 

-
-(defun tooltip-disable-timeout ()
+(defun tooltip-cancel-delayed-tip ()

   "Disable the tooltip timeout."
   (when tooltip-timeout-id
     (disable-timeout tooltip-timeout-id)
     (setq tooltip-timeout-id nil)))
 
   "Disable the tooltip timeout."
   (when tooltip-timeout-id
     (disable-timeout tooltip-timeout-id)
     (setq tooltip-timeout-id nil)))
 

-
-(defun tooltip-add-timeout ()
-  "Add a one-shot timeout to call function tooltip-timeout."
+(defun tooltip-start-delayed-tip ()
+  "Add a one-shot timeout to call function `tooltip-timeout'."

   (setq tooltip-timeout-id
        (add-timeout (tooltip-delay) 'tooltip-timeout nil)))
 
   (setq tooltip-timeout-id
        (add-timeout (tooltip-delay) 'tooltip-timeout nil)))
 

-

 (defun tooltip-timeout (object)
 (defun tooltip-timeout (object)

-  "Function called when timer with id tooltip-timeout-id fires."
+  "Function called when timer with id `tooltip-timeout-id' fires."

   (run-hook-with-args-until-success 'tooltip-hook
                                    tooltip-last-mouse-motion-event))
 
   (run-hook-with-args-until-success 'tooltip-hook
                                    tooltip-last-mouse-motion-event))
 

-
-\f
-;;; Reacting on mouse movements
-
-(defun tooltip-change-major-mode ()
-  "Function added to `change-major-mode-hook' when tooltip mode is on."
-  (add-hook 'post-command-hook 'tooltip-activate-mouse-motions-if-enabled))
-
-
-(defun tooltip-activate-mouse-motions-if-enabled ()
-  "Reconsider for all buffers whether mouse motion events are desired."
-  (remove-hook 'post-command-hook 'tooltip-activate-mouse-motions-if-enabled)
-  (let ((buffers (buffer-list)))
-    (save-excursion
-      (while buffers
-       (set-buffer (car buffers))
-       (if (and tooltip-mode
-                tooltip-gud-tips-p
-                (memq major-mode tooltip-gud-modes))
-           (tooltip-activate-mouse-motions t)
-         (tooltip-activate-mouse-motions nil))
-       (setq buffers (cdr buffers))))))
-
-
-(defun tooltip-activate-mouse-motions (activatep)
-  "Activate/deactivate mouse motion events for the current buffer.
-ACTIVATEP non-nil means activate mouse motion events."
-  (if activatep
-      (progn
-       (make-local-variable 'track-mouse)
-       (setq track-mouse t))
-    (kill-local-variable 'track-mouse)))
-
-
-(defun tooltip-mouse-motion (event)
-  "Command handler for mouse movement events in `global-map'."
-  (interactive "e")
-  (tooltip-hide)
-  (when (car (mouse-pixel-position))
-    (setq tooltip-last-mouse-motion-event (copy-sequence event))
-    (tooltip-add-timeout)))
-
-

 \f
 ;;; Displaying tips
 
 \f
 ;;; Displaying tips
 

-(defun tooltip-show (text)
-  "Show a tooltip window at the current mouse position displaying TEXT."
-  (if tooltip-use-echo-area
+(defun tooltip-set-param (alist key value)
+  "Change the value of KEY in alist ALIST to VALUE.
+If there's no association for KEY in ALIST, add one, otherwise
+change the existing association.  Value is the resulting alist."
+  (let ((param (assq key alist)))
+    (if (consp param)
+       (setcdr param value)
+      (push (cons key value) alist))
+    alist))
+
+(defun tooltip-show (text &optional use-echo-area)
+  "Show a tooltip window displaying TEXT.
+
+Text larger than `x-max-tooltip-size' is clipped.
+
+If the alist in `tooltip-frame-parameters' includes `left' and `top'
+parameters, they determine the x and y position where the tooltip
+is displayed.  Otherwise, the tooltip pops at offsets specified by
+`tooltip-x-offset' and `tooltip-y-offset' from the current mouse
+position.
+
+Optional second arg USE-ECHO-AREA non-nil means to show tooltip
+in echo area."
+  (if use-echo-area

       (message "%s" text)
       (message "%s" text)

-    (x-show-tip text
-               (selected-frame)
-               tooltip-frame-parameters
-               nil
-               tooltip-x-offset
-               tooltip-y-offset)))
+    (condition-case error
+       (let ((params (copy-sequence tooltip-frame-parameters))
+             (fg (face-attribute 'tooltip :foreground))
+             (bg (face-attribute 'tooltip :background)))
+         (when (stringp fg)
+           (setq params (tooltip-set-param params 'foreground-color fg))
+           (setq params (tooltip-set-param params 'border-color fg)))
+         (when (stringp bg)
+           (setq params (tooltip-set-param params 'background-color bg)))
+         (x-show-tip (propertize text 'face 'tooltip)
+                     (selected-frame)
+                     params
+                     tooltip-hide-delay
+                     tooltip-x-offset
+                     tooltip-y-offset))
+      (error
+       (message "Error while displaying tooltip: %s" error)
+       (sit-for 1)
+       (message "%s" text)))))

 
 (defun tooltip-hide (&optional ignored-arg)
   "Hide a tooltip, if one is displayed.
 Value is non-nil if tooltip was open."
 
 (defun tooltip-hide (&optional ignored-arg)
   "Hide a tooltip, if one is displayed.
 Value is non-nil if tooltip was open."

-  (tooltip-disable-timeout)
+  (tooltip-cancel-delayed-tip)

   (when (x-hide-tip)
     (setq tooltip-hide-time (float-time))))
 
   (when (x-hide-tip)
     (setq tooltip-hide-time (float-time))))
 

-

 \f
 ;;; Debugger-related functions
 
 \f
 ;;; Debugger-related functions
 


@@ -336,14 +274,12 @@ is based on the current syntax table."
        (when (> (point) start)
          (buffer-substring start (point)))))))
 
        (when (> (point) start)
          (buffer-substring start (point)))))))
 

-

 (defmacro tooltip-region-active-p ()
   "Value is non-nil if the region is currently active."
   (if (string-match "^GNU" (emacs-version))
       `(and transient-mark-mode mark-active)
     `(region-active-p)))
 
 (defmacro tooltip-region-active-p ()
   "Value is non-nil if the region is currently active."
   (if (string-match "^GNU" (emacs-version))
       `(and transient-mark-mode mark-active)
     `(region-active-p)))
 

-

 (defun tooltip-expr-to-print (event)
   "Return an expression that should be printed for EVENT.
 If a region is active and the mouse is inside the region, print
 (defun tooltip-expr-to-print (event)
   "Return an expression that should be printed for EVENT.
 If a region is active and the mouse is inside the region, print


@@ -357,11 +293,10 @@ where the mouse is."
            (buffer-substring (region-beginning) (region-end)))
        (tooltip-identifier-from-point point)))))
 
            (buffer-substring (region-beginning) (region-end)))
        (tooltip-identifier-from-point point)))))
 

-

 (defun tooltip-process-prompt-regexp (process)
   "Return regexp matching the prompt of PROCESS at the end of a string.
 (defun tooltip-process-prompt-regexp (process)
   "Return regexp matching the prompt of PROCESS at the end of a string.

-The prompt is taken from the value of COMINT-PROMPT-REGEXP in the buffer
-of PROCESS."
+The prompt is taken from the value of `comint-prompt-regexp' in
+the buffer of PROCESS."

   (let ((prompt-regexp (save-excursion
                         (set-buffer (process-buffer process))
                         comint-prompt-regexp)))
   (let ((prompt-regexp (save-excursion
                         (set-buffer (process-buffer process))
                         comint-prompt-regexp)))


@@ -372,7 +307,6 @@ of PROCESS."
       (setq prompt-regexp "\\*"))
     (concat "\n*" prompt-regexp "$")))
 
       (setq prompt-regexp "\\*"))
     (concat "\n*" prompt-regexp "$")))
 

-

 (defun tooltip-strip-prompt (process output)
   "Return OUTPUT with any prompt of PROCESS stripped from its end."
   (let ((prompt-regexp (tooltip-process-prompt-regexp process)))
 (defun tooltip-strip-prompt (process output)
   "Return OUTPUT with any prompt of PROCESS stripped from its end."
   (let ((prompt-regexp (tooltip-process-prompt-regexp process)))


@@ -381,128 +315,41 @@ of PROCESS."
        (setq output (substring output 0 (match-beginning 0)))))
     output))
 
        (setq output (substring output 0 (match-beginning 0)))))
     output))
 

-
-\f
-;;; Tips for `gud'
-
-(defvar tooltip-gud-original-filter nil
-  "Process filter to restore after GUD output has been received.")
-
-
-(defvar tooltip-gud-dereference nil
-  "Non-nil means print expressions with a `*' in front of them.
-For C this would dereference a pointer expression.")
-
-
-(defvar tooltip-gud-event nil
-  "The mouse movement event that led to a tooltip display.
-This event can be examined by forms in TOOLTIP-GUD-DISPLAY.")
-
-
-(defvar tooltip-gud-debugger nil
-  "A symbol describing the debugger running under GUD.")
-
-
-(defun tooltip-gud-toggle-dereference ()
-  "Toggle whether tooltips should show `* expr' or `expr'."
-  (interactive)
-  (setq tooltip-gud-dereference (not tooltip-gud-dereference))
-  (when (interactive-p)
-    (message "Dereferencing is now %s."
-            (if tooltip-gud-dereference "on" "off"))))
-
-
-(defun tooltip-gud-process-output (process output)
-  "Process debugger output and show it in a tooltip window."
-  (set-process-filter process tooltip-gud-original-filter)
-  (tooltip-show (tooltip-strip-prompt process output)))
-
-
-(defun tooltip-gud-print-command (expr)
-  "Return a suitable command to print the expression EXPR.
-If TOOLTIP-GUD-DEREFERENCE is t, also prepend a `*' to EXPR."
-  (when tooltip-gud-dereference
-    (setq expr (concat "*" expr)))
-  (case tooltip-gud-debugger
-    ((gdb dbx) (concat "print " expr))
-    (xdb (concat "p " expr))
-    (sdb (concat expr "/"))
-    (perldb expr)))
-
-
-(defun tooltip-gud-tips (event)
-  "Show tip for identifier or selection under the mouse.
-The mouse must either point at an identifier or inside a selected
-region for the tip window to be shown.  If tooltip-gud-dereference is t,
-add a `*' in front of the printed expression.
-
-This function must return nil if it doesn't handle EVENT."
-  (let (gud-buffer process)
-    (when (and (eventp event)
-              tooltip-gud-tips-p
-              (boundp 'gud-comint-buffer)
-              (setq gud-buffer gud-comint-buffer)
-              (setq process (get-buffer-process gud-buffer))
-              (posn-point (event-end event))
-              (progn (setq tooltip-gud-event event)
-                     (eval (cons 'and tooltip-gud-display))))
-      (let ((expr (tooltip-expr-to-print event)))
-       (when expr
-         (let ((cmd (tooltip-gud-print-command expr)))
-           (unless (null cmd)         ; CMD can be nil if unknown debugger
-             (setq tooltip-gud-original-filter (process-filter process))
-             (set-process-filter process 'tooltip-gud-process-output)
-             (gud-basic-call cmd)
-             expr)))))))
-

 \f
 ;;; Tooltip help.
 
 (defvar tooltip-help-message nil
 \f
 ;;; Tooltip help.
 
 (defvar tooltip-help-message nil

-  "The last help message received via `tooltip-show-help-function'.")
+  "The last help message received via `tooltip-show-help'.")

 
 

-
-(defun tooltip-show-help-function (msg)
+(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)
   "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))
           (tooltip-hide))

-         ((or (not (stringp previous-help))
-              (not (string= msg previous-help)))
-          (tooltip-hide)
-          (tooltip-add-timeout))
+         ((equal previous-help msg)
+          ;; Same help as before (but possibly the mouse has moved).
+          ;; Keep what we have.
+          )

          (t
          (t

-          (tooltip-disable-timeout)
-          (tooltip-add-timeout)))))
-
+          ;; A different help.  Remove a previous tooltip, and
+          ;; display a new one, with some delay.
+          (tooltip-hide)
+          (tooltip-start-delayed-tip)))))

 
 (defun tooltip-help-tips (event)
   "Hook function to display a help tooltip.
 
 (defun tooltip-help-tips (event)
   "Hook function to display a help tooltip.

+This is installed on the hook `tooltip-hook', which is run when
+the timer with id `tooltip-timeout-id' fires.

 Value is non-nil if this function handled the tip."
   (when (stringp tooltip-help-message)
 Value is non-nil if this function handled the tip."
   (when (stringp tooltip-help-message)

-    (tooltip-show tooltip-help-message)
-    (setq tooltip-help-message nil)
+    (tooltip-show tooltip-help-message tooltip-use-echo-area)

     t))
 
     t))
 

+(provide 'tooltip)

 
 

-\f
-;;; Do this after all functions have been defined that are called from
-;;; `tooltip-mode'.  The actual default value of `tooltip-mode' is set
-;;; in startup.el.
-
-;;;###autoload
-(defcustom tooltip-mode nil
-  "Toggle tooltip-mode.
-Setting this variable directly does not take effect;
-use either \\[customize] or the function `tooltip-mode'."
-  :set (lambda (symbol value)
-        (tooltip-mode (or value 0)))
-  :initialize 'custom-initialize-default
-  :type 'boolean
-  :require 'tooltip
-  :group 'tooltip)
-
-
+;; arch-tag: 3d61135e-4618-4a78-af28-183f6df5636f

 ;;; tooltip.el ends here
 ;;; tooltip.el ends here