diff options
author | Chong Yidong <cyd@stupidchicken.com> | 2010-11-04 15:34:11 -0400 |
---|---|---|
committer | Chong Yidong <cyd@stupidchicken.com> | 2010-11-04 15:34:11 -0400 |
commit | 4677bd729cdb20cce54ffc0c4471c5265b151922 (patch) | |
tree | 498fbde6a0adf5ecbf21c3513036520d7549ff7d /src | |
parent | f553016861a0810d9f786d5ee9b6ffe98523f5ed (diff) | |
download | emacs-4677bd729cdb20cce54ffc0c4471c5265b151922.tar.gz |
Backport from trunk.
Diffstat (limited to 'src')
-rw-r--r-- | src/ChangeLog | 5 | ||||
-rw-r--r-- | src/xfns.c | 12 |
2 files changed, 13 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index a662a7a6813..51b292a5978 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2010-04-09 Jan Djärv <jan.h.d@swipnet.se> + + * xfns.c (Fx_show_tip): Call try_window in a loop until + fonts_changed_p is zero (Bug#2423). + 2010-11-04 Jan Djärv <jan.h.d@swipnet.se> * xfns.c (x_real_positions): Only use _NET_FRAME_EXTENTS if our diff --git a/src/xfns.c b/src/xfns.c index 635264ea862..5979c81e7b7 100644 --- a/src/xfns.c +++ b/src/xfns.c @@ -5221,10 +5221,14 @@ 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; - 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); + + 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); /* Compute width and height of the tooltip. */ width = height = 0; |