diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2010-11-04 15:34:50 -0400 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2010-11-04 15:34:50 -0400 |
| commit | fa884f18e117267c0b2d740112fcd46410334913 (patch) | |
| tree | 8d33cc9f031bfd69372f94fae5eb5f0a24858c82 | |
| parent | c698128618583af08186c80dfc949dedf73f3b07 (diff) | |
| download | emacs-fa884f18e117267c0b2d740112fcd46410334913.tar.gz | |
Backport 2010-04-10T10:39:16Z!mituharu@math.s.chiba-u.ac.jp from trunk
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/xfns.c | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index b4c9cbcc159..4a8a46e4cf3 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 5979c81e7b7..635264ea862 100644 --- 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; |