event-stream.c, support help-event-list as does GNU. src/ChangeLog addition: 2015-03-14 Aidan Kehoe <kehoea@parhasard.net> Add support for GNU's help-event-list here, useful for accepting F1 and C-h as the help character at the same time. * event-stream.c: * event-stream.c (echo_key_event): Be better about calculation, comments here, in passing. * event-stream.c (help_char_p): New. * event-stream.c (execute_help_form): There's no need to reset the command builder here; the code that did relied on zero-termination, which we can't anymore, and did not actually discard the help character. Remove this. * event-stream.c (Fnext_event): Use help_char_p (). * event-stream.c (command_builder_find_leaf_no_jit_binding): Use help_char_p (). * event-stream.c (vars_of_event_stream): Make help-event-list available. man/ChangeLog addition: 2015-03-14 Aidan Kehoe <kehoea@parhasard.net> * lispref/help.texi (Help Functions): Document help-event-list, just added. lisp/ChangeLog addition: 2015-03-14 Aidan Kehoe <kehoea@parhasard.net> * cus-start.el (all): Describe help-event-list for Custom. * keydefs.el (help-event-list): Initialise it.

--- a/lisp/cus-start.el	Sat Mar 14 00:42:46 2015 +0000
+++ b/lisp/cus-start.el	Sat Mar 14 01:16:45 2015 +0000
@@ -152,6 +152,7 @@
 	     (focus-follows-mouse x boolean)
 	     (help-char keyboard (choice character
 					 (sexp :tag "Single key specifier")))
+	     (help-event-list keyboard (repeat (sexp :format "%v")))
 	     (max-lisp-eval-depth limits integer)
 	     (max-specpdl-size limits integer)
 	     (meta-prefix-char keyboard character)