diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-06-09 13:55:28 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-06-09 13:55:28 +0100 |
| commit | b5f0801b1f043b5cf99380f58eca51b75b3236c7 (patch) | |
| tree | d5659b07d36b5170b2380edaa714267405cc9de7 | |
| parent | ebb01bdb273216607f60faddf791a1b378cccfa8 (diff) | |
| download | vim-git-b5f0801b1f043b5cf99380f58eca51b75b3236c7.tar.gz | |
patch 8.2.5070: unnecessary codev8.2.5070
Problem: Unnecessary code.
Solution: Remove code that isn't needed. (closes #10534)
| -rw-r--r-- | src/message.c | 14 | ||||
| -rw-r--r-- | src/screen.c | 12 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 12 insertions, 16 deletions
diff --git a/src/message.c b/src/message.c index c6bf6da00..ed9b53251 100644 --- a/src/message.c +++ b/src/message.c @@ -1997,11 +1997,13 @@ msg_prt_line(char_u *s, int list) && curwin->w_lcs_chars.leadmultispace != NULL) { c = curwin->w_lcs_chars.leadmultispace[multispace_pos++]; - if (curwin->w_lcs_chars.leadmultispace[multispace_pos] == NUL) + if (curwin->w_lcs_chars.leadmultispace[multispace_pos] + == NUL) multispace_pos = 0; attr = HL_ATTR(HLF_8); } - else if (lead != NULL && s <= lead && curwin->w_lcs_chars.lead) + else if (lead != NULL && s <= lead + && curwin->w_lcs_chars.lead != NUL) { c = curwin->w_lcs_chars.lead; attr = HL_ATTR(HLF_8); @@ -2011,14 +2013,6 @@ msg_prt_line(char_u *s, int list) c = curwin->w_lcs_chars.trail; attr = HL_ATTR(HLF_8); } - else if (list && lead != NULL && s <= lead && in_multispace - && curwin->w_lcs_chars.leadmultispace != NULL) - { - c = curwin->w_lcs_chars.leadmultispace[multispace_pos++]; - if (curwin->w_lcs_chars.leadmultispace[multispace_pos] == NUL) - multispace_pos = 0; - attr = HL_ATTR(HLF_8); - } else if (list && in_multispace && curwin->w_lcs_chars.multispace != NULL) { diff --git a/src/screen.c b/src/screen.c index 503587953..cba7e0b2b 100644 --- a/src/screen.c +++ b/src/screen.c @@ -4904,6 +4904,7 @@ set_chars_option(win_T *wp, char_u **varp) { lcs_chars.tab1 = NUL; lcs_chars.tab3 = NUL; + if (multispace_len > 0) { lcs_chars.multispace = ALLOC_MULT(int, multispace_len + 1); @@ -5028,7 +5029,8 @@ set_chars_option(win_T *wp, char_u **varp) s = p + len2 + 1; if (round == 0) { - // Get length of lcsmultispace string in first round + // get length of lcs-leadmultispace string in first + // round last_lmultispace = p; lead_multispace_len = 0; while (*s != NUL && *s != ',') @@ -5039,7 +5041,7 @@ set_chars_option(win_T *wp, char_u **varp) ++lead_multispace_len; } if (lead_multispace_len == 0) - // lcsmultispace cannot be an empty string + // lcs-leadmultispace cannot be an empty string return e_invalid_argument; p = s; } @@ -5066,10 +5068,8 @@ set_chars_option(win_T *wp, char_u **varp) } if (tab == lcstab) { - if (wp->w_lcs_chars.multispace != NULL) - vim_free(wp->w_lcs_chars.multispace); - if (wp->w_lcs_chars.leadmultispace != NULL) - vim_free(wp->w_lcs_chars.leadmultispace); + vim_free(wp->w_lcs_chars.multispace); + vim_free(wp->w_lcs_chars.leadmultispace); wp->w_lcs_chars = lcs_chars; } diff --git a/src/version.c b/src/version.c index de4f27cdb..5163254ae 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 */ /**/ + 5070, +/**/ 5069, /**/ 5068, |