diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2023-05-08 15:56:21 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2023-05-08 15:56:21 +0100 |
| commit | d619d6a9c6fa0e4295c817a88f84f0bab9457bbe (patch) | |
| tree | b4d9778b20798ecd97ec5d8156c4720e1f0a95ed | |
| parent | 3ce8c389155fc1257082cdb0cef7801b49f6aaf9 (diff) | |
| download | vim-git-d619d6a9c6fa0e4295c817a88f84f0bab9457bbe.tar.gz | |
patch 9.0.1526: condition is always truev9.0.1526
Problem: Condition is always true.
Solution: Remove unnecessary condition. (closes #12359)
| -rw-r--r-- | src/screen.c | 9 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/screen.c b/src/screen.c index cbf2ab3d8..08e147d10 100644 --- a/src/screen.c +++ b/src/screen.c @@ -4658,13 +4658,13 @@ get_encoded_char_adv(char_u **p) /* * Handle setting 'listchars' or 'fillchars'. * "value" points to either the global or the window-local value. - * "opt_lcs" is TRUE for "listchars" and FALSE for "fillchars". + * "is_listchars" is TRUE for "listchars" and FALSE for "fillchars". * When "apply" is FALSE do not store the flags, only check for errors. * Assume monocell characters. * Returns error message, NULL if it's OK. */ static char * -set_chars_option(win_T *wp, char_u *value, int opt_lcs, int apply) +set_chars_option(win_T *wp, char_u *value, int is_listchars, int apply) { int round, i, len, len2, entries; char_u *p, *s; @@ -4673,7 +4673,6 @@ set_chars_option(win_T *wp, char_u *value, int opt_lcs, int apply) char_u *last_lmultispace = NULL; // Last occurrence of "leadmultispace:" int multispace_len = 0; // Length of lcs-multispace string int lead_multispace_len = 0; // Length of lcs-leadmultispace string - int is_listchars = opt_lcs; struct charstab { @@ -4720,14 +4719,14 @@ set_chars_option(win_T *wp, char_u *value, int opt_lcs, int apply) tab = lcstab; CLEAR_FIELD(lcs_chars); entries = ARRAY_LENGTH(lcstab); - if (opt_lcs && wp->w_p_lcs[0] == NUL) + if (wp->w_p_lcs[0] == NUL) value = p_lcs; // local value is empty, use the global value } else { tab = filltab; entries = ARRAY_LENGTH(filltab); - if (!opt_lcs && wp->w_p_fcs[0] == NUL) + if (wp->w_p_fcs[0] == NUL) value = p_fcs; // local value is empty, us the global value } diff --git a/src/version.c b/src/version.c index e2d91d89b..ce64da4a5 100644 --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1526, +/**/ 1525, /**/ 1524, |