diff --git a/src/screen.c b/src/screen.c
index cbf2ab3..08e147d 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -4658,13 +4658,13 @@
 /*
  * 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 @@
     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 @@
 	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
     }