diff options
| author | Dundar Goc <gocdundar@gmail.com> | 2022-05-18 22:58:10 +0200 |
|---|---|---|
| committer | Dundar Goc <gocdundar@gmail.com> | 2022-05-19 00:15:36 +0200 |
| commit | 11957f51cc541efe3e4d5379191fa85dcdc50c45 (patch) | |
| tree | c527dc4e6fa787eb673e7f742d3551309aad7f94 /src | |
| parent | 03a8269e3a904e7660eb95b9c17ccfc0938f1e30 (diff) | |
| download | rneovim-11957f51cc541efe3e4d5379191fa85dcdc50c45.tar.gz rneovim-11957f51cc541efe3e4d5379191fa85dcdc50c45.tar.bz2 rneovim-11957f51cc541efe3e4d5379191fa85dcdc50c45.zip | |
refactor!: remove 'remap' option
An option that should always be kept on except for when working with old
Vi scripts is of little use to us.
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/getchar.c | 3 | ||||
| -rw-r--r-- | src/nvim/option_defs.h | 1 | ||||
| -rw-r--r-- | src/nvim/options.lua | 4 |
3 files changed, 3 insertions, 5 deletions
diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c index 2cc068b30d..8881263d1c 100644 --- a/src/nvim/getchar.c +++ b/src/nvim/getchar.c @@ -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 diff --git a/src/nvim/option_defs.h b/src/nvim/option_defs.h index f5c7ae07bb..777c86bd06 100644 --- a/src/nvim/option_defs.h +++ b/src/nvim/option_defs.h @@ -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' diff --git a/src/nvim/options.lua b/src/nvim/options.lua index eb92d47fc8..9b9843e3f9 100644 --- a/src/nvim/options.lua +++ b/src/nvim/options.lua @@ -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} }, { |