[Emacs-diffs] /srv/bzr/emacs/trunk r99862: xfns.c (Fx_show_tip): Undo last change.

[YAMAMOTO Mitsuharu]

------------------------------------------------------------
revno: 99862
committer: YAMAMOTO Mitsuharu <address@hidden>
branch nick: trunk
timestamp: Sat 2010-04-10 19:39:16 +0900
message:
  xfns.c (Fx_show_tip): Undo last change.
modified:
  src/ChangeLog
  src/xfns.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-04-09 16:49:06 +0000
+++ b/src/ChangeLog     2010-04-10 10:39:16 +0000
@@ -1,3 +1,7 @@
+2010-04-10  YAMAMOTO Mitsuharu  <address@hidden>
+
+       * xfns.c (Fx_show_tip): Undo last change.
+
 2010-04-09  Jan Djärv  <address@hidden>
 
        * xfns.c (Fx_show_tip): Call try_window in a loop until

=== modified file 'src/xfns.c'
--- a/src/xfns.c        2010-04-09 16:49:06 +0000
+++ b/src/xfns.c        2010-04-10 10:39:16 +0000
@@ -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;