diff options
| -rw-r--r-- | src/drawline.c | 9 | ||||
| -rw-r--r-- | src/getchar.c | 27 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 10 insertions, 28 deletions
diff --git a/src/drawline.c b/src/drawline.c index 59c62c79d3..51a5fbfab0 100644 --- a/src/drawline.c +++ b/src/drawline.c @@ -2116,14 +2116,15 @@ win_line( mb_utf8 = FALSE; } - if ((trailcol != MAXCOL && ptr > line + trailcol && c == ' ') - || (leadcol != 0 && ptr < line + leadcol && c == ' ')) + if (c == ' ' && ((trailcol != MAXCOL && ptr > line + trailcol) + || (leadcol != 0 && ptr < line + leadcol))) { if (leadcol != 0 && in_multispace && ptr < line + leadcol && wp->w_lcs_chars.leadmultispace != NULL) { c = wp->w_lcs_chars.leadmultispace[multispace_pos++]; - if (wp->w_lcs_chars.leadmultispace[multispace_pos] == NUL) + if (wp->w_lcs_chars.leadmultispace[multispace_pos] + == NUL) multispace_pos = 0; } @@ -2133,7 +2134,7 @@ win_line( else if (ptr < line + leadcol && wp->w_lcs_chars.lead) c = wp->w_lcs_chars.lead; - else if (leadcol != 0 && c == ' ' && wp->w_lcs_chars.space) + else if (leadcol != 0 && wp->w_lcs_chars.space) c = wp->w_lcs_chars.space; diff --git a/src/getchar.c b/src/getchar.c index 2747423b1d..210a67acad 100644 --- a/src/getchar.c +++ b/src/getchar.c @@ -1115,33 +1115,12 @@ ins_typebuf( * Returns the length of what was inserted. */ int -ins_char_typebuf(int c, int modifier) +ins_char_typebuf(int c, int modifiers) { char_u buf[MB_MAXBYTES * 3 + 4]; - int len = 0; + int len = special_to_buf(c, modifiers, TRUE, buf); - if (modifier != 0) - { - buf[0] = K_SPECIAL; - buf[1] = KS_MODIFIER; - buf[2] = modifier; - buf[3] = NUL; - len = 3; - } - if (IS_SPECIAL(c)) - { - buf[len] = K_SPECIAL; - buf[len + 1] = K_SECOND(c); - buf[len + 2] = K_THIRD(c); - buf[len + 3] = NUL; - len += 3; - } - else - { - char_u *end = add_char2buf(c, buf + len); - *end = NUL; - len = end - buf; - } + buf[len] = NUL; (void)ins_typebuf(buf, KeyNoremap, 0, !KeyTyped, cmd_silent); return len; } diff --git a/src/version.c b/src/version.c index d86a23d564..091cdbac08 100644 --- a/src/version.c +++ b/src/version.c @@ -735,6 +735,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 5076, +/**/ 5075, /**/ 5074, |