[7676] ESC as abort key under --vi-keys

[gavinsmith0123]

Revision: 7676
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7676
Author:   gavin
Date:     2017-02-19 08:35:05 -0500 (Sun, 19 Feb 2017)
Log Message:
-----------
ESC as abort key under --vi-keys

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/info/infomap.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2017-02-19 13:16:17 UTC (rev 7675)
+++ trunk/ChangeLog     2017-02-19 13:35:05 UTC (rev 7676)
@@ -1,5 +1,11 @@
 2017-02-19  Gavin Smith  <address@hidden>
 
+       * info/infomap.c (default_vi_like_ea_keys): Add ESC as an
+       abort key, and remove bindings ESC 1 ... ESC 9 that conflict
+       with this.
+
+2017-02-19  Gavin Smith  <address@hidden>
+
        * info/infomap.c (default_vi_like_ea_keys): Interchange the 
        meanings of M-h and M-l to match line editing commands of GNU 
        Less.  (The former bindings appear to have been in place since 

Modified: trunk/info/infomap.c
===================================================================
--- trunk/info/infomap.c        2017-02-19 13:16:17 UTC (rev 7675)
+++ trunk/info/infomap.c        2017-02-19 13:35:05 UTC (rev 7676)
@@ -490,16 +490,6 @@
 
 static int default_vi_like_ea_keys[] =
 {
-  ESC, '1', NUL,                  A_info_add_digit_to_numeric_arg,
-  ESC, '2', NUL,                  A_info_add_digit_to_numeric_arg,
-  ESC, '3', NUL,                  A_info_add_digit_to_numeric_arg,
-  ESC, '4', NUL,                  A_info_add_digit_to_numeric_arg,
-  ESC, '5', NUL,                  A_info_add_digit_to_numeric_arg,
-  ESC, '6', NUL,                  A_info_add_digit_to_numeric_arg,
-  ESC, '7', NUL,                  A_info_add_digit_to_numeric_arg,
-  ESC, '8', NUL,                  A_info_add_digit_to_numeric_arg,
-  ESC, '9', NUL,                  A_info_add_digit_to_numeric_arg,
-  ESC, '-', NUL,                  A_info_add_digit_to_numeric_arg,
   KEYMAP_META('1'), NUL,                 A_info_add_digit_to_numeric_arg,
   KEYMAP_META('2'), NUL,                 A_info_add_digit_to_numeric_arg,
   KEYMAP_META('3'), NUL,                 A_info_add_digit_to_numeric_arg,
@@ -533,6 +523,7 @@
   CONTROL('e'), NUL,              A_ea_end_of_line,
   CONTROL('f'), NUL,              A_ea_forward,
   CONTROL('g'), NUL,              A_ea_abort,
+  ESC, NUL,                       A_ea_abort,
   CONTROL('h'), NUL,              A_ea_rubout,
   CONTROL('k'), NUL,              A_ea_kill_line,
   CONTROL('l'), NUL,              A_info_redraw_display,