From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Date: Sat, 10 Apr 2010 10:39:16 +0000 (+0900)
Subject: xfns.c (Fx_show_tip): Undo last change.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~552
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5634ff8508021cf03ce07709d992aff98d33902e;p=emacs.git

xfns.c (Fx_show_tip): Undo last change.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index cbb14a58622..43fdaaf3276 100644
--- 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 b70f20fe644..647526cc22b 100644
--- 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;