mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-26 07:33:47 +00:00
Code Issues Releases Activity

Fix TTY menus on MS-Windows broken by last commit.

Browse Source 
src/w32console.c (initialize_w32_display): Set the console
 menu_show_hook, otherwise TTY menus on w32 crash and burn.
This commit is contained in:
Eli Zaretskii 2014-06-04 10:54:16 +03:00
parent cfd794af42
commit 5dff48b0f8
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@ -1,3 +1,8 @@
2014-06-04 Eli Zaretskii <eliz@gnu.org>
* w32console.c (initialize_w32_display): Set the console
menu_show_hook, otherwise TTY menus are broken on w32.
2014-06-04 Dmitry Antipov <dmantipov@yandex.ru>
Use terminal-specific hooks to display menus.

4
src/w32console.c
View File

@ -36,8 +36,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include "termhooks.h"
#include "termchar.h"
#include "dispextern.h"
#include "menu.h" /* for tty_menu_show */
#include "w32term.h"
#include "w32common.h" /* for os_subtype */
#include "w32common.h" /* for os_subtype */
#include "w32inevt.h"
/* from window.c */
@ -650,6 +651,7 @@ initialize_w32_display (struct terminal *term, int *width, int *height)
term->read_socket_hook = w32_console_read_socket;
term->mouse_position_hook = w32_console_mouse_position;
term->menu_show_hook = tty_menu_show;
/* The following are not used on the console. */
term->frame_rehighlight_hook = 0;