diff options
| -rw-r--r-- | src/charset.c | 11 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/charset.c b/src/charset.c index a8173c124..2b657476d 100644 --- a/src/charset.c +++ b/src/charset.c @@ -912,16 +912,13 @@ init_chartabsize_arg( char_u *line, char_u *ptr) { + CLEAR_POINTER(cts); cts->cts_win = wp; cts->cts_lnum = lnum; cts->cts_vcol = col; cts->cts_line = line; cts->cts_ptr = ptr; #ifdef FEAT_PROP_POPUP - cts->cts_text_prop_count = 0; - cts->cts_has_prop_with_text = FALSE; - cts->cts_cur_text_width = 0; - cts->cts_with_trailing = 0; if (lnum > 0) { char_u *prop_start; @@ -951,7 +948,7 @@ init_chartabsize_arg( if (!cts->cts_has_prop_with_text) { // won't use the text properties, free them - vim_free(cts->cts_text_props); + VIM_CLEAR(cts->cts_text_props); cts->cts_text_prop_count = 0; } } @@ -969,8 +966,8 @@ clear_chartabsize_arg(chartabsize_T *cts UNUSED) #ifdef FEAT_PROP_POPUP if (cts->cts_text_prop_count > 0) { - vim_free(cts->cts_text_props); - cts->cts_text_prop_count = 0; // avoid double free + VIM_CLEAR(cts->cts_text_props); + cts->cts_text_prop_count = 0; } #endif } diff --git a/src/version.c b/src/version.c index ac56f8c06..f079d3c7e 100644 --- a/src/version.c +++ b/src/version.c @@ -736,6 +736,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 128, +/**/ 127, /**/ 126, |