# HG changeset patch
# User YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
# Date 1270895956 -32400
# Node ID 8973aee6b80ad2c57f0c8100a693e039cd68540a
# Parent  1cba68e0c6f64bc67e7e236e5d38d5e739983f36
xfns.c (Fx_show_tip): Undo last change.

diff -r 1cba68e0c6f6 -r 8973aee6b80a src/ChangeLog
--- a/src/ChangeLog	Fri Apr 09 19:18:09 2010 -0700
+++ b/src/ChangeLog	Sat Apr 10 19:39:16 2010 +0900
@@ -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 -r 1cba68e0c6f6 -r 8973aee6b80a src/xfns.c
--- a/src/xfns.c	Fri Apr 09 19:18:09 2010 -0700
+++ b/src/xfns.c	Sat Apr 10 19:39:16 2010 +0900
@@ -5225,14 +5225,10 @@
   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;