Mercurial > emacs
changeset 111364:1d6217a47474
Backport fix for Bug#2423 from trunk.
* dispextern.h (TRY_WINDOW_CHECK_MARGINS)
(TRY_WINDOW_IGNORE_FONTS_CHANGE): New defines.
* xdisp.c (try_window): Change arg from CHECK_MARGINS to FLAGS.
Don't abort with fonts change if TRY_WINDOW_IGNORE_FONTS_CHANGE is
set in FLAGS. Callers with non-zero CHECK_MARGINS changed to use
TRY_WINDOW_CHECK_MARGINS.
* xfns.c (Fx_show_tip): Undo last change. Call try_window with
TRY_WINDOW_IGNORE_FONTS_CHANGE (Bug#2423).
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Thu, 04 Nov 2010 15:39:47 -0400 |
| parents | 3c958232fff8 (diff) a9fb26c764e7 (current diff) |
| children | 0c4c440f303c 7be30ce79ffd |
| files | src/ChangeLog |
| diffstat | 1 files changed, 1 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Thu Nov 04 15:35:32 2010 -0400 +++ b/src/ChangeLog Thu Nov 04 15:39:47 2010 -0400 @@ -1,4 +1,4 @@ -2010-04-10 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> +2010-11-04 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> * dispextern.h (TRY_WINDOW_CHECK_MARGINS) (TRY_WINDOW_IGNORE_FONTS_CHANGE): New defines. @@ -11,11 +11,6 @@ * xfns.c (Fx_show_tip): Undo last change. Call try_window with TRY_WINDOW_IGNORE_FONTS_CHANGE (Bug#2423). -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