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

fa884f18 · Chong Yidong · c6981286 · fa884f18 · fa884f18
Commit fa884f18 authored Nov 04, 2010 by Chong Yidong
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 8 deletions

src/ChangeLog src/ChangeLog +4 -0

src/xfns.c src/xfns.c +4 -8

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
+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

--- 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;