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

fix deleting forward with count

This commit is contained in:
tg 2006-11-05 16:53:34 +00:00
parent aa867d19bb
commit abe860d486
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
edit.c
View File

@ -5,7 +5,7 @@
#include "sh.h" #include "sh.h"
__RCSID("$MirOS: src/bin/mksh/edit.c,v 1.44 2006/11/05 16:48:17 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/edit.c,v 1.45 2006/11/05 16:53:34 tg Exp $");
/* tty driver characters we are interested in */ /* tty driver characters we are interested in */
typedef struct { typedef struct {
@ -1708,15 +1708,23 @@ x_del_back(int c __attribute__((unused)))
static int static int
x_del_char(int c __attribute__((unused))) x_del_char(int c __attribute__((unused)))
{ {
int nleft = xep - xcp; char *cp, *cp2;
int i = 0;
if (!nleft) { cp = xcp;
while (i < x_arg) {
utf_widthadj(cp, (const char **)&cp2);
if (cp2 > xep)
break;
cp = cp2;
i++;
}
if (!i) {
x_e_putc2(7); x_e_putc2(7);
return KSTD; return KSTD;
} }
if (x_arg > nleft) x_delete(i, false);
x_arg = nleft;
x_delete(x_arg, false);
return KSTD; return KSTD;
} }