From 707731ee86e8f6caed52cb94384f99abb6566d8d Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Mon, 6 Apr 2009 23:52:41 +0000 Subject: [PATCH] * tooltip.el (tooltip-show-help-non-mode): Don't save the last message if it was also a help message (Bug#2895). --- lisp/ChangeLog | 5 +++++ lisp/tooltip.el | 15 +++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7639ed724bd..37e9a9284cf 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2009-04-06 Chong Yidong + + * tooltip.el (tooltip-show-help-non-mode): Don't save the last + message if it was also a help message (Bug#2895). + 2009-04-06 Roland Winkler * textmodes/bibtex.el (bibtex-format-entry) diff --git a/lisp/tooltip.el b/lisp/tooltip.el index b7883a02049..918c955dfaf 100644 --- a/lisp/tooltip.el +++ b/lisp/tooltip.el @@ -319,7 +319,9 @@ 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.") @@ -327,16 +329,17 @@ the buffer of PROCESS." (defun tooltip-show-help-non-mode (help) "Function installed as `show-help-function' when tooltip is off." (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) (setq help (replace-regexp-in-string "\n" ", " help)) (unless (or tooltip-previous-message - (string-equal help (current-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" help)))