From: YAMAMOTO Mitsuharu Date: Thu, 4 Nov 2010 19:39:47 +0000 (-0400) Subject: Backport fix for Bug#2423 from trunk. X-Git-Tag: emacs-pretest-23.2.90~20 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=db5cada28d2c7cc54afdeaead30d639ebba507fc;p=emacs.git 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). --- db5cada28d2c7cc54afdeaead30d639ebba507fc diff --cc src/ChangeLog index a16e35df108,2df31f6e57f..1e084a4bc3a --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,3 -1,21 +1,16 @@@ -2010-04-10 YAMAMOTO Mitsuharu ++2010-11-04 YAMAMOTO Mitsuharu + + * 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). + -2010-04-09 Jan Djärv - - * 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 * xfns.c (x_real_positions): Only use _NET_FRAME_EXTENTS if our