xfns.c (Fx_show_tip): Undo last change.

diff --git a/src/ChangeLog b/src/ChangeLog
index cbb14a5862295837a7723cc8b92e6d1d7afb5599..43fdaaf3276b9b31d8922be38ec7748d74f06826 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 b70f20fe6441395e1f01e573aeb8425656432993..647526cc22bab1571c88c9fdaf020fa6503b0012 100644 (file)
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -5225,14 +5225,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;