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.
This commit is contained in:
Dundar Goc
2022-05-18 23:57:18 +02:00
parent 11957f51cc
commit 97fc68850f
6 changed files with 3 additions and 23 deletions

View File

@@ -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();

View File

@@ -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'

View File

@@ -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}
},
{