No re-position when deleting char(s) in the middle

This commit is contained in:
Abit 2019-05-05 00:24:35 +02:00 committed by GitHub
parent 0a7c74676c
commit d466ec6213
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -187,27 +187,33 @@ static void tty_puts(const char *p)
tty_put(*p++); tty_put(*p++);
} }
static void tty_show(unsigned char c) static int tty_show(unsigned char c)
{ {
if (c == DEL) { if (c == DEL) {
tty_put('^'); tty_put('^');
tty_put('?'); tty_put('?');
return 2;
} else if (ISCTL(c)) { } else if (ISCTL(c)) {
tty_put('^'); tty_put('^');
tty_put(UNCTL(c)); tty_put(UNCTL(c));
return 2;
} else if (rl_meta_chars && ISMETA(c)) { } else if (rl_meta_chars && ISMETA(c)) {
tty_put('M'); tty_put('M');
tty_put('-'); tty_put('-');
tty_put(UNMETA(c)); tty_put(UNMETA(c));
return 3;
} else { } else {
tty_put(c); tty_put(c);
return 1;
} }
} }
static void tty_string(char *p) static int tty_string(char *p)
{ {
int n = 0;
while (*p) while (*p)
tty_show(*p++); n += tty_show(*p++);
return n;
} }
static void tty_push(int c) static void tty_push(int c)
@ -784,9 +790,10 @@ static el_status_t delete_string(int count)
p[0] = p[count]; p[0] = p[count];
ceol(); ceol();
rl_end -= count; rl_end -= count;
tty_string(&rl_line_buffer[rl_point]); i = tty_string(&rl_line_buffer[rl_point]);
tty_backn(i);
return CSmove; return CSstay;
} }
static el_status_t bk_char(void) static el_status_t bk_char(void)