Mercurial > vim
changeset 32389:03f2f598094d v9.0.1526
patch 9.0.1526: condition is always true
Commit: https://github.com/vim/vim/commit/d619d6a9c6fa0e4295c817a88f84f0bab9457bbe
Author: zeertzjq <zeertzjq@outlook.com>
Date: Mon May 8 15:56:21 2023 +0100
patch 9.0.1526: condition is always true
Problem: Condition is always true.
Solution: Remove unnecessary condition. (closes https://github.com/vim/vim/issues/12359)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Mon, 08 May 2023 17:00:05 +0200 |
| parents | 8f59127b4db4 |
| children | a13ad7738129 |
| files | src/screen.c src/version.c |
| diffstat | 2 files changed, 6 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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 *valu 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 *valu 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 }