aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/option.c
diff options
context:
space:
mode:
authorRom Grk <romgrk.cc@gmail.com>2020-10-26 18:48:39 -0400
committerRom Grk <romgrk.cc@gmail.com>2020-10-31 19:54:06 -0400
commit10bf69a43e8f58b0d49bc6253e4e2758060670a8 (patch)
tree421994bbf735a3477bec04cde91af2157a0ac10b /src/nvim/option.c
parentb6897ebc0c623d0a74c221c3030c7eaf17b7e151 (diff)
downloadrneovim-10bf69a43e8f58b0d49bc6253e4e2758060670a8.tar.gz
rneovim-10bf69a43e8f58b0d49bc6253e4e2758060670a8.tar.bz2
rneovim-10bf69a43e8f58b0d49bc6253e4e2758060670a8.zip
vim-patch:8.2.1909: number of status line items is limited to 80
Problem: Number of status line items is limited to 80. Solution: Dynamically allocate the arrays. (Rom Grk, closes vim/vim#7181) https://github.com/vim/vim/commit/8133cc6bf454eb90bb0868f7cf806fce5c0c9fe6 The members of stl_item_T have not been prefixed with stl_ contrary to the vim patch because the amount of stl_ prefixes on single lines of code in that region was hurtful to readability.
Diffstat (limited to 'src/nvim/option.c')
-rw-r--r--src/nvim/option.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c
index ca902d5669..d5ea358184 100644
--- a/src/nvim/option.c
+++ b/src/nvim/option.c
@@ -3751,11 +3751,10 @@ static char_u *set_chars_option(win_T *wp, char_u **varp, bool set)
/// Return error message or NULL.
char_u *check_stl_option(char_u *s)
{
- int itemcnt = 0;
int groupdepth = 0;
static char_u errbuf[80];
- while (*s && itemcnt < STL_MAX_ITEM) {
+ while (*s) {
// Check for valid keys after % sequences
while (*s && *s != '%') {
s++;
@@ -3764,9 +3763,6 @@ char_u *check_stl_option(char_u *s)
break;
}
s++;
- if (*s != '%' && *s != ')') {
- itemcnt++;
- }
if (*s == '%' || *s == STL_TRUNCMARK || *s == STL_SEPARATE) {
s++;
continue;
@@ -3808,9 +3804,6 @@ char_u *check_stl_option(char_u *s)
}
}
}
- if (itemcnt >= STL_MAX_ITEM) {
- return (char_u *)N_("E541: too many items");
- }
if (groupdepth != 0) {
return (char_u *)N_("E542: unbalanced groups");
}