[Emacs-diffs] master e5a9864: In x_consider_frame_title don't set title of tooltip frames

[Martin Rudalics]

branch: master
commit e5a98644f8afd29bc105270bacb09fe9044957c4
Author: Martin Rudalics <address@hidden>
Commit: Martin Rudalics <address@hidden>

    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.
---
 src/xdisp.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/xdisp.c b/src/xdisp.c
index f6d63ea..dbc2d84 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;