diff options
author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2010-11-04 15:39:47 -0400 |
---|---|---|
committer | Chong Yidong <cyd@stupidchicken.com> | 2010-11-04 15:39:47 -0400 |
commit | db5cada28d2c7cc54afdeaead30d639ebba507fc (patch) | |
tree | f60bf77b35421ef896df573dcbbe57ce5496d1fe /lisp/emacs-lisp | |
parent | 00d9e115db74c5f22b198b430bbdb11378a3b4b8 (diff) | |
parent | 2511e8e04fb3adf5e90685f9973665e2710255ed (diff) | |
download | emacs-db5cada28d2c7cc54afdeaead30d639ebba507fc.tar.gz emacs-db5cada28d2c7cc54afdeaead30d639ebba507fc.tar.bz2 emacs-db5cada28d2c7cc54afdeaead30d639ebba507fc.zip |
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).
Diffstat (limited to 'lisp/emacs-lisp')
0 files changed, 0 insertions, 0 deletions