mirror of
https://github.com/neovim/neovim.git
synced 2025-02-25 18:55:25 -06:00
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:
parent
11957f51cc
commit
97fc68850f
@ -6471,13 +6471,6 @@ A jump table for the options with a short description can be found at |Q_op|.
|
|||||||
C1 Control characters 0x80...0x9F
|
C1 Control characters 0x80...0x9F
|
||||||
|
|
||||||
|
|
||||||
*'terse'* *'noterse'*
|
|
||||||
'terse' boolean (default off)
|
|
||||||
global
|
|
||||||
When set: Add 's' flag to 'shortmess' option (this makes the message
|
|
||||||
for a search that hits the start or end of the file not being
|
|
||||||
displayed). When reset: Remove 's' flag from 'shortmess' option.
|
|
||||||
|
|
||||||
*'textwidth'* *'tw'*
|
*'textwidth'* *'tw'*
|
||||||
'textwidth' 'tw' number (default 0)
|
'textwidth' 'tw' number (default 0)
|
||||||
local to buffer
|
local to buffer
|
||||||
|
@ -895,7 +895,6 @@ Short explanation of each option: *option-list*
|
|||||||
'tagstack' 'tgst' push tags onto the tag stack
|
'tagstack' 'tgst' push tags onto the tag stack
|
||||||
'term' name of the terminal
|
'term' name of the terminal
|
||||||
'termbidi' 'tbidi' terminal takes care of bi-directionality
|
'termbidi' 'tbidi' terminal takes care of bi-directionality
|
||||||
'terse' shorten some messages
|
|
||||||
'textwidth' 'tw' maximum width of text that is being inserted
|
'textwidth' 'tw' maximum width of text that is being inserted
|
||||||
'thesaurus' 'tsr' list of thesaurus files for keyword completion
|
'thesaurus' 'tsr' list of thesaurus files for keyword completion
|
||||||
'thesaurusfunc' 'tsrfu' function to be used for thesaurus completion
|
'thesaurusfunc' 'tsrfu' function to be used for thesaurus completion
|
||||||
|
@ -554,6 +554,7 @@ Options:
|
|||||||
*'shortname'* *'sn'* *'noshortname'* *'nosn'*
|
*'shortname'* *'sn'* *'noshortname'* *'nosn'*
|
||||||
*'swapsync'* *'sws'*
|
*'swapsync'* *'sws'*
|
||||||
*'termencoding'* *'tenc'* (Vim 7.4.852 also removed this for Windows)
|
*'termencoding'* *'tenc'* (Vim 7.4.852 also removed this for Windows)
|
||||||
|
*'terse'* *'noterse'* (Add "s" to 'shortmess' instead)
|
||||||
'textauto'
|
'textauto'
|
||||||
'textmode'
|
'textmode'
|
||||||
*'toolbar'* *'tb'*
|
*'toolbar'* *'tb'*
|
||||||
|
@ -4049,18 +4049,6 @@ static char *set_bool_option(const int opt_idx, char_u *const varp, const int va
|
|||||||
// buf->b_p_swf
|
// buf->b_p_swf
|
||||||
mf_close_file(curbuf, true); // remove the swap file
|
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) {
|
} else if ((int *)varp == &p_paste) {
|
||||||
// when 'paste' is set or reset also change other options
|
// when 'paste' is set or reset also change other options
|
||||||
paste_option_changed();
|
paste_option_changed();
|
||||||
|
@ -678,7 +678,6 @@ EXTERN int p_tr; ///< 'tagrelative'
|
|||||||
EXTERN char_u *p_tags; ///< 'tags'
|
EXTERN char_u *p_tags; ///< 'tags'
|
||||||
EXTERN int p_tgst; ///< 'tagstack'
|
EXTERN int p_tgst; ///< 'tagstack'
|
||||||
EXTERN int p_tbidi; ///< 'termbidi'
|
EXTERN int p_tbidi; ///< 'termbidi'
|
||||||
EXTERN int p_terse; ///< 'terse'
|
|
||||||
EXTERN int p_to; ///< 'tildeop'
|
EXTERN int p_to; ///< 'tildeop'
|
||||||
EXTERN int p_timeout; ///< 'timeout'
|
EXTERN int p_timeout; ///< 'timeout'
|
||||||
EXTERN long p_tm; ///< 'timeoutlen'
|
EXTERN long p_tm; ///< 'timeoutlen'
|
||||||
|
@ -2529,9 +2529,9 @@ return {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
full_name='terse',
|
full_name='terse',
|
||||||
short_desc=N_("hides notification of search wrap"),
|
short_desc=N_("No description"),
|
||||||
type='bool', scope={'global'},
|
type='bool', scope={'global'},
|
||||||
varname='p_terse',
|
varname='p_force_off',
|
||||||
defaults={if_true=false}
|
defaults={if_true=false}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user