diff options
| author | Stefan Monnier | 2010-12-12 23:11:49 -0500 |
|---|---|---|
| committer | Stefan Monnier | 2010-12-12 23:11:49 -0500 |
| commit | 7a600d54c026061eee6db4e499802f524e7ebe00 (patch) | |
| tree | 684aa988f06de977a52027ee5e1262c37f7678eb /src/ChangeLog.trunk | |
| parent | f07a954eeb0930029104402e706165bf89853576 (diff) | |
| parent | fdbb4d85ffa2ac30cb7ac0ceea6f12d0c8054d6c (diff) | |
| download | emacs-7a600d54c026061eee6db4e499802f524e7ebe00.tar.gz emacs-7a600d54c026061eee6db4e499802f524e7ebe00.zip | |
Merge from trunk
Diffstat (limited to 'src/ChangeLog.trunk')
| -rw-r--r-- | src/ChangeLog.trunk | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/ChangeLog.trunk b/src/ChangeLog.trunk index eeba4192e25..18c482c2e92 100644 --- a/src/ChangeLog.trunk +++ b/src/ChangeLog.trunk | |||
| @@ -1,3 +1,11 @@ | |||
| 1 | 2010-12-11 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * w32fns.c (Fx_show_tip): Call try_window with last argument | ||
| 4 | TRY_WINDOW_IGNORE_FONTS_CHANGE. Delete the TODO ifdef: problem | ||
| 5 | solved. Round up the tip height to an integral multiple of the | ||
| 6 | frame's line height. Add FRAME_COLUMN_WIDTH to the tip width. | ||
| 7 | (Bug#7398) | ||
| 8 | |||
| 1 | 2010-12-08 Glenn Morris <rgm@gnu.org> | 9 | 2010-12-08 Glenn Morris <rgm@gnu.org> |
| 2 | 10 | ||
| 3 | * fileio.c (Fverify_visited_file_modtime): Default to current buffer. | 11 | * fileio.c (Fverify_visited_file_modtime): Default to current buffer. |
| @@ -5690,7 +5698,7 @@ | |||
| 5690 | * s/netbsd.h (LIB_GCC): | 5698 | * s/netbsd.h (LIB_GCC): |
| 5691 | Move to configure. | 5699 | Move to configure. |
| 5692 | 5700 | ||
| 5693 | 2010-05-11 Karel Klic <kklic@redhat.com> | 5701 | 2010-05-11 Karel Klíč <kklic@redhat.com> |
| 5694 | 5702 | ||
| 5695 | * ftfont.c: Fix incorrect parentheses of #if condition for | 5703 | * ftfont.c: Fix incorrect parentheses of #if condition for |
| 5696 | definining M17N_FLT_USE_NEW_FEATURE. | 5704 | definining M17N_FLT_USE_NEW_FEATURE. |