[Emacs-diffs] trunk r117256: Fix TTY menus on MS-Windows broken by last commit.

[Eli Zaretskii]

------------------------------------------------------------
revno: 117256
revision-id: address@hidden
parent: address@hidden
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Wed 2014-06-04 10:54:16 +0300
message:
  Fix TTY menus on MS-Windows broken by last commit.
  
   src/w32console.c (initialize_w32_display): Set the console
   menu_show_hook, otherwise TTY menus on w32 crash and burn.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/w32console.c               
w32console.c-20091113204419-o5vbwnq5f7feedwu-812

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-06-04 04:58:31 +0000
+++ b/src/ChangeLog     2014-06-04 07:54:16 +0000
@@ -1,3 +1,8 @@
+2014-06-04  Eli Zaretskii  <address@hidden>
+
+       * w32console.c (initialize_w32_display): Set the console
+       menu_show_hook, otherwise TTY menus are broken on w32.
+
 2014-06-04  Dmitry Antipov  <address@hidden>
 
        Use terminal-specific hooks to display menus.

=== modified file 'src/w32console.c'
--- a/src/w32console.c  2014-01-01 07:43:34 +0000
+++ b/src/w32console.c  2014-06-04 07:54:16 +0000
@@ -36,8 +36,9 @@
 #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 @@
 
   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;