# HG changeset patch # User Bram Moolenaar # Date 1664825404 -7200 # Node ID ae1113e53ce33882faaea1d5c644bfbfa786283d # Parent 21fb40734ad8efaf0881f751217783c4c21455b6 patch 9.0.0653: BS and DEL do not work properly in an interacive shell Commit: https://github.com/vim/vim/commit/01c34e7d10e3dbd73d18a3dd79a48748c4147eaf Author: Bram Moolenaar Date: Mon Oct 3 20:24:39 2022 +0100 patch 9.0.0653: BS and DEL do not work properly in an interacive shell Problem: BS and DEL do not work properly in an interacive shell. (Gary Johnson) Solution: Adjust the length for replaced codes. diff --git a/src/os_unix.c b/src/os_unix.c --- a/src/os_unix.c +++ b/src/os_unix.c @@ -5106,7 +5106,7 @@ mch_call_shell_fork( } } - term_replace_bs_del_keycode(ta_buf, ta_len, len); + len = term_replace_bs_del_keycode(ta_buf, ta_len, len); /* * For pipes: echo the typed characters. diff --git a/src/os_win32.c b/src/os_win32.c --- a/src/os_win32.c +++ b/src/os_win32.c @@ -4531,7 +4531,7 @@ mch_system_piped(char *cmd, int options) } } - term_replace_bs_del_keycode(ta_buf, ta_len, len); + len = term_replace_bs_del_keycode(ta_buf, ta_len, len); /* * For pipes: echo the typed characters. For a pty this diff --git a/src/proto/term.pro b/src/proto/term.pro --- a/src/proto/term.pro +++ b/src/proto/term.pro @@ -86,5 +86,5 @@ void update_tcap(int attr); void swap_tcap(void); void ansi_color2rgb(int nr, char_u *r, char_u *g, char_u *b, char_u *ansi_idx); void cterm_color2rgb(int nr, char_u *r, char_u *g, char_u *b, char_u *ansi_idx); -void term_replace_bs_del_keycode(char_u *ta_buf, int ta_len, int len); +int term_replace_bs_del_keycode(char_u *ta_buf, int ta_len, int len_arg); /* vim: set ft=c : */ diff --git a/src/term.c b/src/term.c --- a/src/term.c +++ b/src/term.c @@ -6733,11 +6733,13 @@ cterm_color2rgb(int nr, char_u *r, char_ #endif /* - * Replace K_BS by and K_DEL by + * Replace K_BS by and K_DEL by . + * Returns "len" adjusted for replaced codes. */ - void -term_replace_bs_del_keycode(char_u *ta_buf, int ta_len, int len) + int +term_replace_bs_del_keycode(char_u *ta_buf, int ta_len, int len_arg) { + int len = len_arg; int i; int c; @@ -6762,4 +6764,5 @@ term_replace_bs_del_keycode(char_u *ta_b if (has_mbyte) i += (*mb_ptr2len_len)(ta_buf + i, ta_len + len - i) - 1; } + return len; } diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -700,6 +700,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 653, +/**/ 652, /**/ 651,