mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-04 17:06:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18630 from dundargoc/refactor/remove-remap

Browse Source
This commit is contained in:
Gregory Anders
2022-05-18 17:37:15 -06:00
committed by GitHub
parent 18fbdaeeab 97fc68850f
commit 6a2883c171
9 changed files with 9 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/nvim/getchar.c
View File

@@ -1881,8 +1881,7 @@ static int handle_mapping(int *keylenp, bool *timedout, int *mapdepth)
if (no_mapping == 0 && maphash_valid
&& (no_zero_mapping == 0 || tb_c1 != '0')
&& (typebuf.tb_maplen == 0 || is_plug_map
|| (p_remap
&& !(typebuf.tb_noremap[typebuf.tb_off] & (RM_NONE|RM_ABBR))))
|| (!(typebuf.tb_noremap[typebuf.tb_off] & (RM_NONE|RM_ABBR))))
&& !(p_paste && (State & (MODE_INSERT | MODE_CMDLINE)))
&& !(State == MODE_HITRETURN && (tb_c1 == CAR || tb_c1 == ' '))
&& State != MODE_ASKMORE

12
src/nvim/option.c
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();

2
src/nvim/option_defs.h
View File

@@ -557,7 +557,6 @@ static char *(p_rdb_values[]) = {
#define RDB_NODELTA 0x008
EXTERN long p_rdt; // 'redrawtime'
EXTERN int p_remap; // 'remap'
EXTERN long p_re; // 'regexpengine'
EXTERN long p_report; // 'report'
EXTERN long p_pvh; // 'previewheight'
@@ -679,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'

8
src/nvim/options.lua
View File

@@ -1911,9 +1911,9 @@ return {
},
{
full_name='remap',
short_desc=N_("mappings to work recursively"),
short_desc=N_("No description"),
type='bool', scope={'global'},
varname='p_remap',
varname='p_force_on',
defaults={if_true=true}
},
{
@@ -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}
},
{