diff options
| author | Michael Albinus | 2015-03-07 21:02:39 +0100 |
|---|---|---|
| committer | Michael Albinus | 2015-03-07 21:02:39 +0100 |
| commit | bcf89ff33523e69f45b7afb528105089c62ec810 (patch) | |
| tree | 5173ea14b5b482ea8a31741d3ca9ca558aacdd6c /src/ChangeLog | |
| parent | 81822823191a8b7dc5f016780c6b667e7b68228c (diff) | |
| parent | e851da3540d29122fd3b53ae26d766237c85b989 (diff) | |
| download | emacs-bcf89ff33523e69f45b7afb528105089c62ec810.tar.gz emacs-bcf89ff33523e69f45b7afb528105089c62ec810.zip | |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 6b658f51671..fc776188f05 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,12 @@ | |||
| 1 | 2015-03-07 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * w32fns.c <ImmReleaseContext_Proc, ImmSetCompositionWindow_Proc>: | ||
| 4 | Fix typedefs to be consistent with the corresponding w32 API | ||
| 5 | signatures. | ||
| 6 | (w32_wnd_proc) <WM_IME_STARTCOMPOSITION>: Don't invoke | ||
| 7 | DefWindowProc if we successfully handled the message, as doing so | ||
| 8 | causes problems in displaying selection dialogs. (Bug#11732) | ||
| 9 | |||
| 1 | 2015-03-05 Paul Eggert <eggert@cs.ucla.edu> | 10 | 2015-03-05 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 11 | ||
| 3 | Work around x86 glibc backtrace bug | 12 | Work around x86 glibc backtrace bug |