diff options
| author | Chong Yidong | 2010-11-04 15:35:32 -0400 |
|---|---|---|
| committer | Chong Yidong | 2010-11-04 15:35:32 -0400 |
| commit | 2511e8e04fb3adf5e90685f9973665e2710255ed (patch) | |
| tree | f17ae746cc31452e4e4aed29226553d66f94cb6c /src/ChangeLog | |
| parent | fa884f18e117267c0b2d740112fcd46410334913 (diff) | |
| download | emacs-2511e8e04fb3adf5e90685f9973665e2710255ed.tar.gz emacs-2511e8e04fb3adf5e90685f9973665e2710255ed.zip | |
Backport 2010-04-10T10:52:30Z!mituharu@math.s.chiba-u.ac.jp from trunk
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 4a8a46e4cf3..2df31f6e57f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,6 +1,15 @@ | |||
| 1 | 2010-04-10 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 1 | 2010-04-10 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> |
| 2 | 2 | ||
| 3 | * xfns.c (Fx_show_tip): Undo last change. | 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). | ||
| 4 | 13 | ||
| 5 | 2010-04-09 Jan Djärv <jan.h.d@swipnet.se> | 14 | 2010-04-09 Jan Djärv <jan.h.d@swipnet.se> |
| 6 | 15 | ||