diff options
| author | YAMAMOTO Mitsuharu | 2010-11-04 15:39:47 -0400 |
|---|---|---|
| committer | Chong Yidong | 2010-11-04 15:39:47 -0400 |
| commit | db5cada28d2c7cc54afdeaead30d639ebba507fc (patch) | |
| tree | f60bf77b35421ef896df573dcbbe57ce5496d1fe /src/ChangeLog | |
| parent | 00d9e115db74c5f22b198b430bbdb11378a3b4b8 (diff) | |
| parent | 2511e8e04fb3adf5e90685f9973665e2710255ed (diff) | |
| download | emacs-db5cada28d2c7cc54afdeaead30d639ebba507fc.tar.gz 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 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index a16e35df108..1e084a4bc3a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,16 @@ | |||
| 1 | 2010-11-04 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | ||
| 2 | |||
| 3 | * dispextern.h (TRY_WINDOW_CHECK_MARGINS) | ||
| 4 | (TRY_WINDOW_IGNORE_FONTS_CHANGE): New defines. | ||
| 5 | |||
| 6 | * xdisp.c (try_window): Change arg from CHECK_MARGINS to FLAGS. | ||
| 7 | Don't abort with fonts change if TRY_WINDOW_IGNORE_FONTS_CHANGE is | ||
| 8 | set in FLAGS. Callers with non-zero CHECK_MARGINS changed to use | ||
| 9 | TRY_WINDOW_CHECK_MARGINS. | ||
| 10 | |||
| 11 | * xfns.c (Fx_show_tip): Undo last change. Call try_window with | ||
| 12 | TRY_WINDOW_IGNORE_FONTS_CHANGE (Bug#2423). | ||
| 13 | |||
| 1 | 2010-11-04 Jan Djärv <jan.h.d@swipnet.se> | 14 | 2010-11-04 Jan Djärv <jan.h.d@swipnet.se> |
| 2 | 15 | ||
| 3 | * xfns.c (x_real_positions): Only use _NET_FRAME_EXTENTS if our | 16 | * xfns.c (x_real_positions): Only use _NET_FRAME_EXTENTS if our |