options: Remove 'esckeys' (#6138)

This was never supported and it does not make sense for Nvim.
This commit is contained in:
Justin M. Keyes
2017-02-18 14:01:20 +01:00
committed by GitHub
parent b49a74a1af
commit 158ea52854
9 changed files with 9 additions and 40 deletions

View File

@@ -370,9 +370,6 @@ CTRL-G U don't break undo with next left/right cursor *i_CTRL-G_U*
within same the line) within same the line)
----------------------------------------------------------------------- -----------------------------------------------------------------------
Note: If the cursor keys take you out of Insert mode, check the 'noesckeys'
option.
The CTRL-O command sometimes has a side effect: If the cursor was beyond the The CTRL-O command sometimes has a side effect: If the cursor was beyond the
end of the line, it will be put on the last character in the line. In end of the line, it will be put on the last character in the line. In
mappings it's often better to use <Esc> (first put an "x" in the text, <Esc> mappings it's often better to use <Esc> (first put an "x" in the text, <Esc>

View File

@@ -2209,18 +2209,6 @@ A jump table for the options with a short description can be found at |Q_op|.
Scanf-like description of the format for the lines in the error file Scanf-like description of the format for the lines in the error file
(see |errorformat|). (see |errorformat|).
*'esckeys'* *'ek'* *'noesckeys'* *'noek'*
'esckeys' 'ek' boolean (Vim default: on, Vi default: off)
global
Function keys that start with an <Esc> are recognized in Insert
mode. When this option is off, the cursor and function keys cannot be
used in Insert mode if they start with an <Esc>. The advantage of
this is that the single <Esc> is recognized immediately, instead of
after one second. Instead of resetting this option, you might want to
try changing the values for 'timeoutlen' and 'ttimeoutlen'. Note that
when 'esckeys' is off, you can still map anything, but the cursor keys
won't work by default.
*'eventignore'* *'ei'* *'eventignore'* *'ei'*
'eventignore' 'ei' string (default "") 'eventignore' 'ei' string (default "")
global global

View File

@@ -678,7 +678,6 @@ Short explanation of each option: *option-list*
'errorbells' 'eb' ring the bell for error messages 'errorbells' 'eb' ring the bell for error messages
'errorfile' 'ef' name of the errorfile for the QuickFix mode 'errorfile' 'ef' name of the errorfile for the QuickFix mode
'errorformat' 'efm' description of the lines in the error file 'errorformat' 'efm' description of the lines in the error file
'esckeys' 'ek' recognize function keys in Insert mode
'eventignore' 'ei' autocommand events that are ignored 'eventignore' 'ei' autocommand events that are ignored
'expandtab' 'et' use spaces when <Tab> is inserted 'expandtab' 'et' use spaces when <Tab> is inserted
'exrc' 'ex' read .nvimrc and .exrc in the current directory 'exrc' 'ex' read .nvimrc and .exrc in the current directory

View File

@@ -70,9 +70,7 @@ for a next character to arrive. If it does not arrive within one second a
single <Esc> is assumed. On very slow systems this may fail, causing cursor single <Esc> is assumed. On very slow systems this may fail, causing cursor
keys not to work sometimes. If you discover this problem reset the 'timeout' keys not to work sometimes. If you discover this problem reset the 'timeout'
option. Vim will wait for the next character to arrive after an <Esc>. If option. Vim will wait for the next character to arrive after an <Esc>. If
you want to enter a single <Esc> you must type it twice. Resetting the you want to enter a single <Esc> you must type it twice.
'esckeys' option avoids this problem in Insert mode, but you lose the
possibility to use cursor and function keys in Insert mode.
Some terminals have confusing codes for the cursor keys. The televideo 925 is Some terminals have confusing codes for the cursor keys. The televideo 925 is
such a terminal. It sends a CTRL-H for cursor-left. This would make it such a terminal. It sends a CTRL-H for cursor-left. This would make it

View File

@@ -298,6 +298,7 @@ Other options:
'antialias' 'antialias'
'cpoptions' ("g", "w", "H", "*", "-", "j", and all POSIX flags were removed) 'cpoptions' ("g", "w", "H", "*", "-", "j", and all POSIX flags were removed)
'encoding' ("utf-8" is always used) 'encoding' ("utf-8" is always used)
'esckeys'
'guioptions' "t" flag was removed 'guioptions' "t" flag was removed
*'guipty'* (Nvim uses pipes and PTYs consistently on all platforms.) *'guipty'* (Nvim uses pipes and PTYs consistently on all platforms.)
*'imactivatefunc'* *'imaf'* *'imactivatefunc'* *'imaf'*

View File

@@ -524,8 +524,6 @@ endif
call <SID>Header("terminal") call <SID>Header("terminal")
call append("$", "esckeys\trecognize keys that start with <Esc> in Insert mode")
call <SID>BinOptionG("ek", &ek)
call append("$", "scrolljump\tminimal number of lines to scroll at a time") call append("$", "scrolljump\tminimal number of lines to scroll at a time")
call append("$", " \tset sj=" . &sj) call append("$", " \tset sj=" . &sj)
if has("gui") || has("msdos") || has("win32") if has("gui") || has("msdos") || has("win32")

View File

@@ -1911,17 +1911,13 @@ static int vgetorpeek(int advance)
if ((mp == NULL || max_mlen >= mp_match_len) if ((mp == NULL || max_mlen >= mp_match_len)
&& keylen != KEYLEN_PART_MAP) { && keylen != KEYLEN_PART_MAP) {
/* // When no matching mapping found or found a non-matching mapping
* When no matching mapping found or found a // that matches at least what the matching mapping matched:
* non-matching mapping that matches at least what the // Check if we have a terminal code, when:
* matching mapping matched: // mapping is allowed,
* Check if we have a terminal code, when: // keys have not been mapped,
* mapping is allowed, // and not an ESC sequence, not in insert mode,
* keys have not been mapped, // and when not timed out.
* and not an ESC sequence, not in insert mode or
* p_ek is on,
* and when not timed out,
*/
if ((no_mapping == 0 || allow_keys != 0) if ((no_mapping == 0 || allow_keys != 0)
&& (typebuf.tb_maplen == 0 && (typebuf.tb_maplen == 0
|| (p_remap && typebuf.tb_noremap[ || (p_remap && typebuf.tb_noremap[

View File

@@ -411,7 +411,6 @@ EXTERN char_u *p_efm; // 'errorformat'
EXTERN char_u *p_gefm; // 'grepformat' EXTERN char_u *p_gefm; // 'grepformat'
EXTERN char_u *p_gp; // 'grepprg' EXTERN char_u *p_gp; // 'grepprg'
EXTERN char_u *p_ei; // 'eventignore' EXTERN char_u *p_ei; // 'eventignore'
EXTERN int p_ek; // 'esckeys'
EXTERN int p_exrc; // 'exrc' EXTERN int p_exrc; // 'exrc'
EXTERN char_u *p_fencs; // 'fileencodings' EXTERN char_u *p_fencs; // 'fileencodings'
EXTERN char_u *p_ffs; // 'fileformats' EXTERN char_u *p_ffs; // 'fileformats'

View File

@@ -710,13 +710,6 @@ return {
varname='p_efm', varname='p_efm',
defaults={if_true={vi=macros('DFLT_EFM')}} defaults={if_true={vi=macros('DFLT_EFM')}}
}, },
{
full_name='esckeys', abbreviation='ek',
type='bool', scope={'global'},
vim=true,
varname='p_ek',
defaults={if_true={vi=false, vim=true}}
},
{ {
full_name='eventignore', abbreviation='ei', full_name='eventignore', abbreviation='ei',
type='string', list='onecomma', scope={'global'}, type='string', list='onecomma', scope={'global'},