Backport from trunk.

c6981286 · Chong Yidong · 00d9e115 · c6981286 · c6981286
Commit c6981286 authored Nov 04, 2010 by Chong Yidong
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 4 deletions

src/ChangeLog src/ChangeLog +5 -0

src/xfns.c src/xfns.c +8 -4

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
+2010-04-09  Jan Djärv  <jan.h.d@swipnet.se>
+
+	* xfns.c (Fx_show_tip): Call try_window in a loop until
+	fonts_changed_p is zero (Bug#2423).
+
 2010-11-04  Jan Djärv  <jan.h.d@swipnet.se>

 	* xfns.c (x_real_positions): Only use _NET_FRAME_EXTENTS if our

--- a/src/xfns.c
+++ b/src/xfns.c
@@ -5221,10 +5221,14 @@ Text larger than the specified size is clipped.  */)
  old_buffer = current_buffer;
  set_buffer_internal_1 (XBUFFER (XWINDOW (FRAME_ROOT_WINDOW (f))->buffer));
  current_buffer->truncate_lines = Qnil;
-  clear_glyph_matrix (w->desired_matrix);
-  clear_glyph_matrix (w->current_matrix);
-  SET_TEXT_POS (pos, BEGV, BEGV_BYTE);
-  try_window (FRAME_ROOT_WINDOW (f), pos, 0);
+
+  do {
+    fonts_changed_p = 0;
+    clear_glyph_matrix (w->desired_matrix);
+    clear_glyph_matrix (w->current_matrix);
+    SET_TEXT_POS (pos, BEGV, BEGV_BYTE);
+    try_window (FRAME_ROOT_WINDOW (f), pos, 0);
+  } while (fonts_changed_p);

  /* Compute width and height of the tooltip.  */
  width = height = 0;