diff --git a/src/optionstr.c b/src/optionstr.c
index 3afb3dbcf..2c4b2b826 100644
--- a/src/optionstr.c
+++ b/src/optionstr.c
@@ -1331,11 +1331,10 @@ ambw_end:
 	    if (!(opt_flags & OPT_GLOBAL))
 		clear_string_option(&curwin->w_p_lcs);
 	    FOR_ALL_TAB_WINDOWS(tp, wp)
-	    {
-		errmsg = set_chars_option(wp, &wp->w_p_lcs);
-		if (errmsg)
-		    break;
-	    }
+		// If no error was returned above, we don't expect an error
+		// here, so ignore the return value.
+		(void)set_chars_option(wp, &wp->w_p_lcs);
+
 	    redraw_all_later(NOT_VALID);
 	}
     }
diff --git a/src/version.c b/src/version.c
index 65d9d10f6..4be3fd2f5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -757,6 +757,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3588,
 /**/
     3587,
 /**/