diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:05:19 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-09-19 04:05:19 +0000 |
| commit | a4e9136f68a40b1cb0eb6df5a5f06603224a87f4 (patch) | |
| tree | ba32e0d0069ad6adfd6b32d05161a03eea5e4c7c /src/optionstr.c | |
| parent | Releasing progress-linux version 2:9.1.0496-1~progress7.99u1. (diff) | |
| download | vim-a4e9136f68a40b1cb0eb6df5a5f06603224a87f4.tar.xz vim-a4e9136f68a40b1cb0eb6df5a5f06603224a87f4.zip | |
Merging upstream version 2:9.1.0698.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'src/optionstr.c')
| -rw-r--r-- | src/optionstr.c | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/src/optionstr.c b/src/optionstr.c index d722981..b6249a2 100644 --- a/src/optionstr.c +++ b/src/optionstr.c @@ -33,7 +33,7 @@ static char *(p_briopt_values[]) = {"shift:", "min:", "sbr", "list:", "column:", static char *(p_dip_values[]) = {"filler", "context:", "iblank", "icase", "iwhite", "iwhiteall", "iwhiteeol", "horizontal", "vertical", "closeoff", "hiddenoff", "foldcolumn:", "followwrap", "internal", "indent-heuristic", "algorithm:", NULL}; static char *(p_dip_algorithm_values[]) = {"myers", "minimal", "patience", "histogram", NULL}; #endif -static char *(p_nf_values[]) = {"bin", "octal", "hex", "alpha", "unsigned", NULL}; +static char *(p_nf_values[]) = {"bin", "octal", "hex", "alpha", "unsigned", "blank", NULL}; static char *(p_ff_values[]) = {FF_UNIX, FF_DOS, FF_MAC, NULL}; #ifdef FEAT_CLIPBOARD // Note: Keep this in sync with did_set_clipboard() @@ -81,6 +81,8 @@ static char *(p_ssop_values[]) = {"buffers", "winpos", "resize", "winsize", static char *(p_swb_values[]) = {"useopen", "usetab", "split", "newtab", "vsplit", "uselast", NULL}; static char *(p_spk_values[]) = {"cursor", "screen", "topline", NULL}; static char *(p_tc_values[]) = {"followic", "ignore", "match", "followscs", "smart", NULL}; +// Keep in sync with TCL_ flags in option.h +static char *(p_tcl_values[]) = {"left", "uselast", NULL}; #if defined(FEAT_TOOLBAR) && !defined(FEAT_GUI_MSWIN) static char *(p_toolbar_values[]) = {"text", "icons", "tooltips", "horiz", NULL}; #endif @@ -166,6 +168,7 @@ didset_string_options(void) (void)opt_strings_flags(p_tbis, p_tbis_values, &tbis_flags, FALSE); #endif (void)opt_strings_flags(p_swb, p_swb_values, &swb_flags, TRUE); + (void)opt_strings_flags(p_tcl, p_tcl_values, &tcl_flags, TRUE); } #if defined(FEAT_EVAL) || defined(PROTO) @@ -3669,6 +3672,26 @@ expand_set_switchbuf(optexpand_T *args, int *numMatches, char_u ***matches) matches); } +/* + * The 'tabclose' option is changed. + */ + char * +did_set_tabclose(optset_T *args UNUSED) +{ + return did_set_opt_flags(p_tcl, p_tcl_values, &tcl_flags, TRUE); +} + + int +expand_set_tabclose(optexpand_T *args, int *numMatches, char_u ***matches) +{ + return expand_set_opt_string( + args, + p_tcl_values, + ARRAY_LENGTH(p_tcl_values) - 1, + numMatches, + matches); +} + #if defined(FEAT_STL_OPT) || defined(PROTO) /* * The 'tabline' option is changed. |