For help commands, ensure all keys of a mouse sequence are reported.

This solves the problem where read_key_sequence initializes and uses a global
buffer raw_keybuf, yet is called recusrsively.  The initialization is now done
elsewhere, avoiding the reinitialization of that global buffer.

* src/keyboard.c (command_loop_1, read_key_sequence_vs): Initialize
raw_event_count before calling read_key_sequence.
(read_char_x_menu_prompt): Call x_popup_menu_1 in place of Fx_popup_menu.
(init_raw_keybuf_count): New function.
(read_key_sequence): Remove initialization of raw_event_count.  Add a missing
GROW_RAW_KEYBUF invocation.

* src/keyboard.h: (init_raw_keybuf_count): New declaration.

* src/menu.c: (x_popup_menu_1): New function with the functionality of the
former Fx_popup_menu.
(Fx_popup_menu): Replace with function which initializes raw_event_count then
calls x_popup_menu_1.

* src/menu.h: (x_popup_menu_1): New declaration.

1 files changed, 1 insertions, 0 deletions

diff --git a/src/menu.h b/src/menu.h
index 1469cc87d99..3335616338d 100644
--- a/src/menu.h
+++ b/src/menu.h
@@ -60,4 +60,5 @@ extern Lisp_Object ns_menu_show (struct frame *, int, int, int,
 extern Lisp_Object tty_menu_show (struct frame *, int, int, int,
                                   Lisp_Object, const char **);
 extern ptrdiff_t menu_item_width (const unsigned char *);
+extern Lisp_Object x_popup_menu_1 (Lisp_Object position, Lisp_Object menu);
 #endif /* MENU_H */