summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Rudalics <rudalics@gmx.at>2015-11-07 08:51:28 +0100
committerMartin Rudalics <rudalics@gmx.at>2015-11-07 08:51:28 +0100
commite5a98644f8afd29bc105270bacb09fe9044957c4 (patch)
treedbbf7afaf4c69c4c57b87ffdd5127c2bf2a96401
parent60959975b1b44ad9c4a4019a0a203c8a3bf08fd3 (diff)
downloademacs-e5a98644f8afd29bc105270bacb09fe9044957c4.tar.gz
In x_consider_frame_title don't set title of tooltip frames
* src/xdisp.c (x_consider_frame_title): Return immediately for tooltip frames to avoid displaying empty tooltips.
-rw-r--r--src/xdisp.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/xdisp.c b/src/xdisp.c
index f6d63ea702f..dbc2d840d44 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -11551,9 +11551,10 @@ x_consider_frame_title (Lisp_Object frame)
{
struct frame *f = XFRAME (frame);
- if (FRAME_WINDOW_P (f)
- || FRAME_MINIBUF_ONLY_P (f)
- || f->explicit_name)
+ if ((FRAME_WINDOW_P (f)
+ || FRAME_MINIBUF_ONLY_P (f)
+ || f->explicit_name)
+ && NILP (Fframe_parameter (frame, Qtooltip)))
{
/* Do we have more than one visible frame on this X display? */
Lisp_Object tail, other_frame, fmt;