summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2021-11-12 19:52:47 +0000
committerBram Moolenaar <Bram@vim.org>2021-11-12 19:52:47 +0000
commit606efc7df4c94104bbd24248106dd0e4ee6f7cfa (patch)
tree21f93e5bf51ef04a0baa3e5bd382a76ccf649453
parent0a15c7676bccb0c9483579106318e785c6e40a7f (diff)
downloadvim-git-606efc7df4c94104bbd24248106dd0e4ee6f7cfa.tar.gz
patch 8.2.3588: break statement is never reachedv8.2.3588
Problem: Break statement is never reached. Solution: Rely on return value of set_chars_option() not changing. (closes #9103)
-rw-r--r--src/optionstr.c9
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 5 deletions
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
@@ -758,6 +758,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3588,
+/**/
3587,
/**/
3586,