Mercurial > emacs
changeset 111362:6a193fac7810
Backport r99862 from trunk
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Thu, 04 Nov 2010 15:34:50 -0400 |
| parents | 1b94785df959 |
| children | a9fb26c764e7 |
| files | src/ChangeLog src/xfns.c |
| diffstat | 2 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Thu Nov 04 15:34:11 2010 -0400 +++ b/src/ChangeLog Thu Nov 04 15:34:50 2010 -0400 @@ -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
--- a/src/xfns.c Thu Nov 04 15:34:11 2010 -0400 +++ b/src/xfns.c Thu Nov 04 15:34:50 2010 -0400 @@ -5221,14 +5221,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;