[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108103: Backport: Don't disable U
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108103: Backport: Don't disable Unicode menus on Windows NT and later. |
Date: |
Mon, 13 Aug 2012 21:34:37 +0300 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 108103
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-24
timestamp: Mon 2012-08-13 21:34:37 +0300
message:
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.
modified:
src/ChangeLog
src/makefile.w32-in
src/w32menu.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2012-08-13 05:11:19 +0000
+++ b/src/ChangeLog 2012-08-13 18:34:37 +0000
@@ -1,5 +1,12 @@
2012-08-13 Eli Zaretskii <address@hidden>
+ * 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.
+
+ * makefile.w32-in ($(BLD)/w32menu.$(O)): Depend on w32heap.h.
+
* window.c (Fdelete_other_windows_internal)
(Fdelete_window_internal): Don't access frame's mouse highlight
info of the initial frame. (Bug#11677)
=== modified file 'src/makefile.w32-in'
--- a/src/makefile.w32-in 2012-01-19 07:21:25 +0000
+++ b/src/makefile.w32-in 2012-08-13 18:34:37 +0000
@@ -1506,6 +1506,7 @@
$(SRC)/w32menu.c \
$(SRC)/buffer.h \
$(SRC)/keymap.h \
+ $(SRC)/w32heap.h \
$(BLOCKINPUT_H) \
$(CHARSET_H) \
$(CODING_H) \
=== modified file 'src/w32menu.c'
--- a/src/w32menu.c 2012-04-01 16:55:30 +0000
+++ b/src/w32menu.c 2012-08-13 18:34:37 +0000
@@ -40,6 +40,8 @@
if this is not done before the other system files. */
#include "w32term.h"
+#include "w32heap.h"
+
/* Load sys/types.h if not already loaded.
In some systems loading it twice is suicidal. */
#ifndef makedev
@@ -1498,8 +1500,11 @@
AppendMenu (menu, fuFlags,
item != NULL ? (UINT) item: (UINT) wv->call_data,
out_string);
- /* Don't use Unicode menus in future. */
- unicode_append_menu = NULL;
+ /* Don't use Unicode menus in future, unless this is Windows
+ NT or later, where a failure of AppendMenuW does NOT mean
+ Unicode menus are unsupported. */
+ if (osinfo_cache.dwPlatformId != VER_PLATFORM_WIN32_NT)
+ unicode_append_menu = NULL;
}
if (unicode_append_menu && (fuFlags & MF_OWNERDRAW))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/emacs-24 r108103: Backport: Don't disable Unicode menus on Windows NT and later.,
Eli Zaretskii <=