diff options
| author | Dundar Goc <gocdundar@gmail.com> | 2022-05-18 23:57:18 +0200 |
|---|---|---|
| committer | Dundar Goc <gocdundar@gmail.com> | 2022-05-19 00:15:40 +0200 |
| commit | 97fc68850ff349a32f226117e04c37647966b2ff (patch) | |
| tree | 7bc067ae3207bfaefd081e08fd8b195c8747777e /src | |
| parent | 11957f51cc541efe3e4d5379191fa85dcdc50c45 (diff) | |
| download | rneovim-97fc68850ff349a32f226117e04c37647966b2ff.tar.gz rneovim-97fc68850ff349a32f226117e04c37647966b2ff.tar.bz2 rneovim-97fc68850ff349a32f226117e04c37647966b2ff.zip | |
refactor!: remove 'terse' option
Having two methods of setting the same option is redundant and can be
potentially confusing. Recommend adding 's' to 'shortmess' instead.
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/option.c | 12 | ||||
| -rw-r--r-- | src/nvim/option_defs.h | 1 | ||||
| -rw-r--r-- | src/nvim/options.lua | 4 |
3 files changed, 2 insertions, 15 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c index 2ee6c175bb..61ac542fcf 100644 --- a/src/nvim/option.c +++ b/src/nvim/option.c @@ -4049,18 +4049,6 @@ static char *set_bool_option(const int opt_idx, char_u *const varp, const int va // buf->b_p_swf mf_close_file(curbuf, true); // remove the swap file } - } else if ((int *)varp == &p_terse) { - // when 'terse' is set change 'shortmess' - char *p = vim_strchr((char *)p_shm, SHM_SEARCH); - - // insert 's' in p_shm - if (p_terse && p == NULL) { - STRCPY(IObuff, p_shm); - STRCAT(IObuff, "s"); - set_string_option_direct("shm", -1, IObuff, OPT_FREE, 0); - } else if (!p_terse && p != NULL) { // remove 's' from p_shm - STRMOVE(p, p + 1); - } } else if ((int *)varp == &p_paste) { // when 'paste' is set or reset also change other options paste_option_changed(); diff --git a/src/nvim/option_defs.h b/src/nvim/option_defs.h index 777c86bd06..876acf2f87 100644 --- a/src/nvim/option_defs.h +++ b/src/nvim/option_defs.h @@ -678,7 +678,6 @@ EXTERN int p_tr; ///< 'tagrelative' EXTERN char_u *p_tags; ///< 'tags' EXTERN int p_tgst; ///< 'tagstack' EXTERN int p_tbidi; ///< 'termbidi' -EXTERN int p_terse; ///< 'terse' EXTERN int p_to; ///< 'tildeop' EXTERN int p_timeout; ///< 'timeout' EXTERN long p_tm; ///< 'timeoutlen' diff --git a/src/nvim/options.lua b/src/nvim/options.lua index 9b9843e3f9..809d4ab48b 100644 --- a/src/nvim/options.lua +++ b/src/nvim/options.lua @@ -2529,9 +2529,9 @@ return { }, { full_name='terse', - short_desc=N_("hides notification of search wrap"), + short_desc=N_("No description"), type='bool', scope={'global'}, - varname='p_terse', + varname='p_force_off', defaults={if_true=false} }, { |