summaryrefslogtreecommitdiff
path: root/readline/macro.c
diff options
context:
space:
mode:
authorDaniel Jacobowitz <dan@debian.org>2006-05-05 18:26:14 +0000
committerDaniel Jacobowitz <dan@debian.org>2006-05-05 18:26:14 +0000
commitc6fad60c72bac0b0ba1b7912f866caa3a6cb744c (patch)
treecb1fdaddf8e7f48afb82b1d028764ce7521e34c2 /readline/macro.c
parentc3f93e41631d798ff739e1936c51b29515cd4248 (diff)
downloadgdb-c6fad60c72bac0b0ba1b7912f866caa3a6cb744c.tar.gz
Readline 5.1 import for HEAD.
Diffstat (limited to 'readline/macro.c')
-rw-r--r--readline/macro.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/readline/macro.c b/readline/macro.c
index b73c3af9aa4..2975bf1f74f 100644
--- a/readline/macro.c
+++ b/readline/macro.c
@@ -100,6 +100,8 @@ _rl_with_macro_input (string)
int
_rl_next_macro_key ()
{
+ int c;
+
if (rl_executing_macro == 0)
return (0);
@@ -109,7 +111,14 @@ _rl_next_macro_key ()
return (_rl_next_macro_key ());
}
+#if defined (READLINE_CALLBACKS)
+ c = rl_executing_macro[executing_macro_index++];
+ if (RL_ISSTATE (RL_STATE_CALLBACK) && RL_ISSTATE (RL_STATE_READCMD) && rl_executing_macro[executing_macro_index] == 0)
+ _rl_pop_executing_macro ();
+ return c;
+#else
return (rl_executing_macro[executing_macro_index++]);
+#endif
}
/* Save the currently executing macro on a stack of saved macros. */