Patchwork [3/8] Remove gdb workaround from readline/emacs_keymap.c

login
register
mail settings
Submitter Tom Tromey
Date Aug. 6, 2019, 8:43 p.m.
Message ID <20190806204334.13441-4-tom@tromey.com>
Download mbox | patch
Permalink /patch/33980/
State New
Headers show

Comments

Tom Tromey - Aug. 6, 2019, 8:43 p.m.
There is a gdb-local patch in readline/emacs_keymap.c that says:

  /* Temporary - this is a bug in readline 5.1 that should be fixed in
     readline 5.2.  */

So, I think this can be removed now.  I have no way to test this, as
the patch was specific to mingw.

2018-10-07  Tom Tromey  <tom@tromey.com>

	* emacs_keymap.c: Remove gdb workaround.
---
 readline/ChangeLog.gdb  | 4 ++++
 readline/emacs_keymap.c | 6 ------
 2 files changed, 4 insertions(+), 6 deletions(-)

Patch

diff --git a/readline/emacs_keymap.c b/readline/emacs_keymap.c
index 9f816581efa..cb6e140a217 100644
--- a/readline/emacs_keymap.c
+++ b/readline/emacs_keymap.c
@@ -277,13 +277,7 @@  KEYMAP_ENTRY_ARRAY emacs_standard_keymap = {
   { ISFUNC, rl_insert },	/* Latin capital letter Y with acute */
   { ISFUNC, rl_insert },	/* Latin capital letter thorn (Icelandic) */
   { ISFUNC, rl_insert },	/* Latin small letter sharp s (German) */
-#ifndef __MINGW32__
   { ISFUNC, rl_insert },	/* Latin small letter a with grave */
-#else
-  /* Temporary - this is a bug in readline 5.1 that should be fixed in
-     readline 5.2.  */
-  { ISFUNC, 0 },		/* Must leave this unbound for the arrow keys to work.  */
-#endif
   { ISFUNC, rl_insert },	/* Latin small letter a with acute */
   { ISFUNC, rl_insert },	/* Latin small letter a with circumflex */
   { ISFUNC, rl_insert },	/* Latin small letter a with tilde */