diff options
| author | Eli Zaretskii | 2012-08-13 21:34:37 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2012-08-13 21:34:37 +0300 |
| commit | b7f501c736b4f45b4dee1d4d54a6f710c52f2530 (patch) | |
| tree | 931a312238eb9ffb6151b30132bb600dea3980e1 /src/ChangeLog | |
| parent | 4432d2e25bc56cd06c9ed0c987d6570b2d57f230 (diff) | |
| download | emacs-b7f501c736b4f45b4dee1d4d54a6f710c52f2530.tar.gz emacs-b7f501c736b4f45b4dee1d4d54a6f710c52f2530.zip | |
Backport: Don't disable Unicode menus on Windows NT and later.
src/w32menu.c: Include w32heap.h.
(add_menu_item): If the call to AppendMenuW (via
unicode_append_menu) fails, disable Unicode menus only if we are
running on Windows 9X/Me.
src/makefile.w32-in ($(BLD)/w32menu.$(O)): Depend on w32heap.h.
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 96c6d244bd1..fbe4f06da58 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,12 @@ | |||
| 1 | 2012-08-13 Eli Zaretskii <eliz@gnu.org> | 1 | 2012-08-13 Eli Zaretskii <eliz@gnu.org> |
| 2 | 2 | ||
| 3 | * w32menu.c: Include w32heap.h. | ||
| 4 | (add_menu_item): If the call to AppendMenuW (via | ||
| 5 | unicode_append_menu) fails, disable Unicode menus only if we are | ||
| 6 | running on Windows 9X/Me. | ||
| 7 | |||
| 8 | * makefile.w32-in ($(BLD)/w32menu.$(O)): Depend on w32heap.h. | ||
| 9 | |||
| 3 | * window.c (Fdelete_other_windows_internal) | 10 | * window.c (Fdelete_other_windows_internal) |
| 4 | (Fdelete_window_internal): Don't access frame's mouse highlight | 11 | (Fdelete_window_internal): Don't access frame's mouse highlight |
| 5 | info of the initial frame. (Bug#11677) | 12 | info of the initial frame. (Bug#11677) |