Commit 14c0a34d authored by Jan Djärv's avatar Jan Djärv
Browse files

(tooltip-mode): Set tooltip-show-help-non-mode as

show-help-function when turning tooltip off.
(tooltip-show): Call tooltip-show-help-non-mode if use-echo-area.
(tooltip-trunc-str, tooltip-show-help-non-mode): New.
parent 96bdb5cf
2008-04-09 Jan Djärv <jan.h.d@swipnet.se>
* tooltip.el (tooltip-mode): Set tooltip-show-help-non-mode as
show-help-function when turning tooltip off.
(tooltip-show): Call tooltip-show-help-non-mode if use-echo-area.
(tooltip-trunc-str, tooltip-show-help-non-mode): New.
2008-04-09 Alan Mackenzie <acm@muc.de> 2008-04-09 Alan Mackenzie <acm@muc.de>
   
* font-lock.el (font-lock-extend-after-change-region-function): * font-lock.el (font-lock-extend-after-change-region-function):
......
...@@ -67,7 +67,7 @@ the help text in the echo area, and does not make a pop-up window." ...@@ -67,7 +67,7 @@ the help text in the echo area, and does not make a pop-up window."
(remove-hook 'pre-command-hook 'tooltip-hide)) (remove-hook 'pre-command-hook 'tooltip-hide))
(remove-hook 'tooltip-hook 'tooltip-help-tips)) (remove-hook 'tooltip-hook 'tooltip-help-tips))
(setq show-help-function (setq show-help-function
(if tooltip-mode 'tooltip-show-help nil))) (if tooltip-mode 'tooltip-show-help 'tooltip-show-help-non-mode)))
;;; Customizable settings ;;; Customizable settings
...@@ -228,7 +228,7 @@ position. ...@@ -228,7 +228,7 @@ position.
Optional second arg USE-ECHO-AREA non-nil means to show tooltip Optional second arg USE-ECHO-AREA non-nil means to show tooltip
in echo area." in echo area."
(if use-echo-area (if use-echo-area
(message "%s" text) (tooltip-show-help-non-mode text)
(condition-case error (condition-case error
(let ((params (copy-sequence tooltip-frame-parameters)) (let ((params (copy-sequence tooltip-frame-parameters))
(fg (face-attribute 'tooltip :foreground)) (fg (face-attribute 'tooltip :foreground))
...@@ -316,6 +316,22 @@ the buffer of PROCESS." ...@@ -316,6 +316,22 @@ the buffer of PROCESS."
(defvar tooltip-help-message nil (defvar tooltip-help-message nil
"The last help message received via `tooltip-show-help'.") "The last help message received via `tooltip-show-help'.")
(defun tooltip-trunc-str (str maxlen pieces)
(let ((s (car pieces)))
(if (and pieces (< (+ (length str) (length s) 2) maxlen))
(tooltip-trunc-str (concat str
(if (> (length str) 0) ", " "")
s)
maxlen (cdr pieces))
(if (> (length str) 0) str s))))
(defun tooltip-show-help-non-mode (msg)
"Function installed as `show-help-function' when tooltip is off."
(message "%s" (if msg
(tooltip-trunc-str "" (frame-parameter nil 'width)
(split-string msg "\n" t))
"")))
(defun tooltip-show-help (msg) (defun tooltip-show-help (msg)
"Function installed as `show-help-function'. "Function installed as `show-help-function'.
MSG is either a help string to display, or nil to cancel the display." MSG is either a help string to display, or nil to cancel the display."
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment