[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/tooltip.el
From: |
Nick Roberts |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/tooltip.el |
Date: |
Tue, 14 Jun 2005 17:13:28 -0400 |
Index: emacs/lisp/tooltip.el
diff -c emacs/lisp/tooltip.el:1.55 emacs/lisp/tooltip.el:1.56
*** emacs/lisp/tooltip.el:1.55 Fri May 6 22:11:35 2005
--- emacs/lisp/tooltip.el Tue Jun 14 21:13:28 2005
***************
*** 113,118 ****
--- 113,129 ----
"Face for tooltips."
:group 'tooltip)
+ (defcustom tooltip-use-echo-area nil
+ "Use the echo area instead of tooltip frames for help and GUD tooltips."
+ :type 'boolean
+ :tag "Use echo area"
+ :group 'tooltip)
+
+ (make-obsolete-variable 'tooltip-use-echo-area
+ "To display help tooltips in the echo area turn tooltip-mode off.
+ To display GUD tooltips in the echo area turn gud-tooltip-mode on and set
+ gud-tooltip-echo-area to t." "22.1")
+
;;; Variables that are not customizable.
***************
*** 169,175 ****
(remove-hook 'pre-command-hook 'tooltip-hide))
(remove-hook 'tooltip-hook 'tooltip-help-tips))
(setq show-help-function
! (if tooltip-mode 'tooltip-show-help-function nil)))
;;; Timeout for tooltip display
--- 180,186 ----
(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)))
;;; Timeout for tooltip display
***************
*** 314,322 ****
;;; Tooltip help.
(defvar tooltip-help-message nil
! "The last help message received via `tooltip-show-help-function'.")
! (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))
--- 325,333 ----
;;; Tooltip help.
(defvar tooltip-help-message nil
! "The last help message received via `tooltip-show-help'.")
! (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))
***************
*** 341,347 ****
the timer with ID `tooltip-timeout-id' fires.
Value is non-nil if this function handled the tip."
(when (stringp tooltip-help-message)
! (tooltip-show tooltip-help-message)
t))
(provide 'tooltip)
--- 352,358 ----
the timer with ID `tooltip-timeout-id' fires.
Value is non-nil if this function handled the tip."
(when (stringp tooltip-help-message)
! (tooltip-show tooltip-help-message tooltip-use-echo-area)
t))
(provide 'tooltip)
- [Emacs-diffs] Changes to emacs/lisp/tooltip.el,
Nick Roberts <=