patch 9.0.1526: condition is always true

Problem:    Condition is always true.
Solution:   Remove unnecessary condition. (closes #12359)

diff --git a/src/screen.c b/src/screen.c
index cbf2ab3d8430b786890b3b286d703aa16f1318f6..08e147d108e9fc69b9d6cf5e1e302e4c61e16efc 100644 (file)
--- 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 e2d91d89b74d615bdd20c1796ea094fc4e976078..ce64da4a5b8f5d70c68f72d4f1a94b76532fade5 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1526,
 /**/
     1525,
 /**/