(note_mode_line_or_margin_highlight): Remove unused variables `row', `i'

and `area'.
(XTread_socket) <KeyPress>: Pass KeyPress events when in menu to toolkit
library.

1 files changed, 6 insertions, 2 deletions

diff --git a/src/xterm.c b/src/xterm.c
index 70b4b37c8b..25cb21bd95 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -6810,8 +6810,7 @@ note_mode_line_or_margin_highlight (w, x, y, portion)
   struct frame *f = XFRAME (w->frame);
   struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f);
   Cursor cursor = dpyinfo->vertical_scroll_bar_cursor;
-  struct glyph_row *row;
-  int i, area, charpos;
+  int charpos;
   Lisp_Object string, help, map, pos;
 
   if (portion == 1 || portion == 3)
@@ -10406,6 +10405,11 @@ XTread_socket (sd, bufp, numchars, expected)
 	      goto OTHER;
 
 	    case KeyPress:
+
+	      /* Dispatch KeyPress events when in menu.  */
+	      if (popup_activated_flag)
+               goto OTHER;
+
 	      f = x_any_window_to_frame (dpyinfo, event.xkey.window);
 
 	      if (!dpyinfo->mouse_face_hidden && INTEGERP (Vmouse_highlight))