diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2006-04-19 16:23:46 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2006-04-19 16:23:46 +0000 |
| commit | 447b0165acd09060977e05c843f81c0bee4aa4df (patch) | |
| tree | 70cf2d254760a2cf68a10b67f8a3570c05fff9a5 /lisp/tooltip.el | |
| parent | 4c57cca724993ab1334cc5c0b35c22b06daee0c3 (diff) | |
| parent | 0fea1d10293b4c6d35c1e55b68cd26e91445213c (diff) | |
| download | emacs-447b0165acd09060977e05c843f81c0bee4aa4df.tar.gz emacs-447b0165acd09060977e05c843f81c0bee4aa4df.tar.bz2 emacs-447b0165acd09060977e05c843f81c0bee4aa4df.zip | |
Merged from emacs@sv.gnu.org
Patches applied:
* emacs@sv.gnu.org/emacs--devo--0--patch-216
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-217
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-218
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-219
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-220
Improve tq.el.
* emacs@sv.gnu.org/emacs--devo--0--patch-221
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-222
Update from CVS: src/puresize.h (PURESIZE_RATIO): Reduce to 10/6.
* emacs@sv.gnu.org/emacs--devo--0--patch-223
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-224
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-225
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-226
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-227
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-228
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-229
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-230
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-231
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-232
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-233
Update from CVS: lisp/progmodes/python.el (python-mode): Fix typo.
* emacs@sv.gnu.org/gnus--rel--5.10--patch-84
Merge from emacs--devo--0
* emacs@sv.gnu.org/gnus--rel--5.10--patch-85
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-86
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-550
Diffstat (limited to 'lisp/tooltip.el')
| -rw-r--r-- | lisp/tooltip.el | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/lisp/tooltip.el b/lisp/tooltip.el index 8dc811c09e6..cacd6f59670 100644 --- a/lisp/tooltip.el +++ b/lisp/tooltip.el @@ -47,11 +47,15 @@ ;; would be accompanied by a full redisplay. (define-minor-mode tooltip-mode - "Toggle Tooltip display. -With ARG, turn tooltip mode on if and only if ARG is positive. + "Toggle Tooltip mode. +With ARG, turn Tooltip mode on if and only if ARG is positive. When this minor mode is enabled, Emacs displays help text -in a pop-up window on mouse-over. When it is disabled, -Emacs displays the help text in the echo area instead." +in a pop-up window for buttons and menu items that you put the mouse on. +\(However, if `tooltip-use-echo-area' is non-nil, this and +all pop-up help appears in the echo area.) + +When Tooltip mode is disabled, Emacs displays one line of +the help text in the echo area, and does not make a pop-up window." :global t :init-value (not (or noninteractive emacs-basic-display @@ -142,7 +146,9 @@ position to pop up the tooltip." :group 'basic-faces) (defcustom tooltip-use-echo-area nil - "Use the echo area instead of tooltip frames for help and GUD tooltips." + "Use the echo area instead of tooltip frames for help and GUD tooltips. +To display multi-line help text in the echo area, set this to t +and enable `tooltip-mode'." :type 'boolean :group 'tooltip) |