[Emacs-diffs] /srv/bzr/emacs/trunk r99859: Fix showing the complete tip the first time, bug #2423.

[Jan D]

------------------------------------------------------------
revno: 99859
committer: Jan D <address@hidden>
branch nick: trunk
timestamp: Fri 2010-04-09 18:49:06 +0200
message:
  Fix showing the complete tip the first time, bug #2423.
  
  * xfns.c (Fx_show_tip): Call try_window in a loop until
  fonts_changed_p is zero (Bug#2423).
modified:
  src/ChangeLog
  src/xfns.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-04-08 21:14:33 +0000
+++ b/src/ChangeLog     2010-04-09 16:49:06 +0000
@@ -1,3 +1,8 @@
+2010-04-09  Jan Djärv  <address@hidden>
+
+       * xfns.c (Fx_show_tip): Call try_window in a loop until
+       fonts_changed_p is zero (Bug#2423).
+
 2010-04-08  Eli Zaretskii  <address@hidden>
 
        * xdisp.c (set_cursor_from_row): Don't dereference glyphs beyond

=== modified file 'src/xfns.c'
--- a/src/xfns.c        2010-04-08 16:20:32 +0000
+++ b/src/xfns.c        2010-04-09 16:49:06 +0000
@@ -5225,10 +5225,14 @@
   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;