# HG changeset patch # User Kim F. Storm # Date 1112263839 0 # Node ID 22abf0130979a49369562599e34c41b69bb58cc7 # Parent 2bc2e06d78aaf6d8a958212b3ebcbda2a9725a24 (tooltip-show-help-function): Don't fixup message here. diff -r 2bc2e06d78aa -r 22abf0130979 lisp/tooltip.el --- a/lisp/tooltip.el Thu Mar 31 10:10:25 2005 +0000 +++ b/lisp/tooltip.el Thu Mar 31 10:10:39 2005 +0000 @@ -469,27 +469,7 @@ (defun tooltip-show-help-function (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) - mp pos) - (if (and mouse-1-click-follows-link - (stringp msg) - (save-match-data - (string-match "^mouse-2" msg)) - (setq mp (mouse-pixel-position)) - (consp (setq pos (cdr mp))) - (car pos) (>= (car pos) 0) - (cdr pos) (>= (cdr pos) 0) - (setq pos (posn-at-x-y (car pos) (cdr pos) (car mp))) - (windowp (posn-window pos))) - (with-current-buffer (window-buffer (posn-window pos)) - (if (mouse-on-link-p pos) - (setq msg (concat - (cond - ((eq mouse-1-click-follows-link 'double) "double-") - ((and (integerp mouse-1-click-follows-link) - (< mouse-1-click-follows-link 0)) "Long ") - (t "")) - "mouse-1" (substring msg 7)))))) + (let ((previous-help tooltip-help-message)) (setq tooltip-help-message msg) (cond ((null msg) ;; Cancel display. This also cancels a delayed tip, if