]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 00d9e11 2511e8e)
Backport fix for Bug#2423 from trunk.
authorYAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Thu, 4 Nov 2010 19:39:47 +0000 (15:39 -0400)
committerChong Yidong <cyd@stupidchicken.com>
Thu, 4 Nov 2010 19:39:47 +0000 (15:39 -0400)
commitdb5cada28d2c7cc54afdeaead30d639ebba507fc
treef60bf77b35421ef896df573dcbbe57ce5496d1fetree | snapshot
parent00d9e115db74c5f22b198b430bbdb11378a3b4b8commit | diff
parent2511e8e04fb3adf5e90685f9973665e2710255edcommit | diff
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).
src/ChangeLog diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.