Backport 2010-04-10T10:39:16Z!mituharu@math.s.chiba-u.ac.jp from trunk

diff --git a/src/ChangeLog b/src/ChangeLog
index b4c9cbc..4a8a46e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-10  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+       * xfns.c (Fx_show_tip): Undo last change.
+
 2010-04-09  Jan Djärv  <jan.h.d@swipnet.se>
 
        * xfns.c (Fx_show_tip): Call try_window in a loop until

diff --git a/src/xfns.c b/src/xfns.c
index 5979c81..635264e 100644 (file)
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -5221,14 +5221,10 @@ 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;
-
-  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);
+  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);
 
   /* Compute width and height of the tooltip.  */
   width = height = 0;