JehanneOS/mksh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

From: Alexander Hall <alexander@beard.se>

Browse Source 
when following bind key macros, do not so recursively
This commit is contained in:
tg
2009-04-05 12:28:55 +00:00
parent 81b84b63b0
commit 5e4ffcbedd
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
edit.c
View File

@ -5,7 +5,7 @@
#include "sh.h" #include "sh.h"
__RCSID("$MirOS: src/bin/mksh/edit.c,v 1.157 2009/04/05 11:18:34 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/edit.c,v 1.158 2009/04/05 12:28:55 tg Exp $");
/* tty driver characters we are interested in */ /* tty driver characters we are interested in */
typedef struct { typedef struct {
@ -1431,6 +1431,10 @@ x_emacs(char *buf, size_t len)
x_e_ungetc(i); x_e_ungetc(i);
} }
/* avoid bind key macro recursion */
if (macroptr && f == XFUNC_ins_string)
f = XFUNC_insert;
if (!(x_ftab[f].xf_flags & XF_PREFIX) && if (!(x_ftab[f].xf_flags & XF_PREFIX) &&
x_last_command != XFUNC_set_arg) { x_last_command != XFUNC_set_arg) {
x_arg = 1; x_arg = 1;
@ -2892,14 +2896,16 @@ x_e_getc(void)
if (unget_char >= 0) { if (unget_char >= 0) {
c = unget_char; c = unget_char;
unget_char = -1; unget_char = -1;
} else if (macroptr) {
c = (unsigned char)*macroptr++;
if (!*macroptr)
macroptr = NULL;
} else
c = x_getc();
return (c); return (c);
}
if (macroptr) {
if ((c = (unsigned char)*macroptr++))
return (c);
macroptr = NULL;
}
return (x_getc());
} }
static void static void