mirror of
https://github.com/neovim/neovim.git
synced 2024-12-24 13:15:09 -07:00
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.
This commit is contained in:
parent
03a8269e3a
commit
11957f51cc
@ -796,9 +796,8 @@ command. For example: >
|
||||
:noremap j k
|
||||
This will exchange the cursor up and down commands.
|
||||
|
||||
With the normal :map command, when the 'remap' option is on, mapping takes
|
||||
place until the text is found not to be a part of a {lhs}. For example, if
|
||||
you use: >
|
||||
With the normal :map command mapping takes place until the text is found not
|
||||
to be a part of a {lhs}. For example, if you use: >
|
||||
:map x y
|
||||
:map y x
|
||||
Vim will replace x with y, and then y with x, etc. When this has happened
|
||||
|
@ -4800,15 +4800,6 @@ A jump table for the options with a short description can be found at |Q_op|.
|
||||
'number', see |number_relativenumber| for all combinations of the two
|
||||
options.
|
||||
|
||||
*'remap'* *'noremap'*
|
||||
'remap' boolean (default on)
|
||||
global
|
||||
Allows for mappings to work recursively. If you do not want this for
|
||||
a single entry, use the :noremap[!] command.
|
||||
NOTE: To avoid portability problems with Vim scripts, always keep
|
||||
this option at the default "on". Only switch it off when working with
|
||||
old Vi scripts.
|
||||
|
||||
*'report'*
|
||||
'report' number (default 2)
|
||||
global
|
||||
|
@ -824,7 +824,6 @@ Short explanation of each option: *option-list*
|
||||
'redrawtime' 'rdt' timeout for 'hlsearch' and |:match| highlighting
|
||||
'regexpengine' 're' default regexp engine to use
|
||||
'relativenumber' 'rnu' show relative line number in front of each line
|
||||
'remap' allow mappings to work recursively
|
||||
'report' threshold for reporting nr. of lines changed
|
||||
'revins' 'ri' inserting characters will work backwards
|
||||
'rightleft' 'rl' window is right-to-left oriented
|
||||
|
@ -548,6 +548,7 @@ Options:
|
||||
'maxmemtot' Nvim delegates memory-management to the OS.
|
||||
'maxcombine' (6 is always used)
|
||||
*'prompt'* *'noprompt'*
|
||||
*'remap'* *'noremap'*
|
||||
*'restorescreen'* *'rs'* *'norestorescreen'* *'nors'*
|
||||
'shelltype'
|
||||
*'shortname'* *'sn'* *'noshortname'* *'nosn'*
|
||||
|
@ -956,7 +956,6 @@ call <SID>Header("mapping")
|
||||
call append("$", "maxmapdepth\tmaximum depth of mapping")
|
||||
call append("$", " \tset mmd=" . &mmd)
|
||||
call append("$", "remap\trecognize mappings in mapped keys")
|
||||
call <SID>BinOptionG("remap", &remap)
|
||||
call append("$", "timeout\tallow timing out halfway into a mapping")
|
||||
call <SID>BinOptionG("to", &to)
|
||||
call append("$", "ttimeout\tallow timing out halfway into a key code")
|
||||
|
@ -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
|
||||
|
@ -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'
|
||||
|
@ -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}
|
||||
},
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user