diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/eval.c | 4 | ||||
| -rw-r--r-- | src/nvim/getchar.c | 18 | ||||
| -rw-r--r-- | src/nvim/option_defs.h | 1 | ||||
| -rw-r--r-- | src/nvim/options.lua | 7 |
4 files changed, 11 insertions, 19 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index d98df6a06e..18b5de7e62 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -11442,6 +11442,10 @@ static void f_has(typval_T *argvars, typval_T *rettv, FunPtr fptr) #endif } else if (STRICMP(name, "syntax_items") == 0) { n = syntax_present(curwin); +#ifdef UNIX + } else if (STRICMP(name, "unnamedplus") == 0) { + n = eval_has_provider("clipboard"); +#endif } } diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c index 0717978ead..a471830c56 100644 --- a/src/nvim/getchar.c +++ b/src/nvim/getchar.c @@ -1911,17 +1911,13 @@ static int vgetorpeek(int advance) if ((mp == NULL || max_mlen >= mp_match_len) && keylen != KEYLEN_PART_MAP) { - /* - * When no matching mapping found or found a - * non-matching mapping that matches at least what the - * matching mapping matched: - * Check if we have a terminal code, when: - * mapping is allowed, - * keys have not been mapped, - * and not an ESC sequence, not in insert mode or - * p_ek is on, - * and when not timed out, - */ + // When no matching mapping found or found a non-matching mapping + // that matches at least what the matching mapping matched: + // Check if we have a terminal code, when: + // mapping is allowed, + // keys have not been mapped, + // and not an ESC sequence, not in insert mode, + // and when not timed out. if ((no_mapping == 0 || allow_keys != 0) && (typebuf.tb_maplen == 0 || (p_remap && typebuf.tb_noremap[ diff --git a/src/nvim/option_defs.h b/src/nvim/option_defs.h index 32021da922..602497461d 100644 --- a/src/nvim/option_defs.h +++ b/src/nvim/option_defs.h @@ -411,7 +411,6 @@ EXTERN char_u *p_efm; // 'errorformat' EXTERN char_u *p_gefm; // 'grepformat' EXTERN char_u *p_gp; // 'grepprg' EXTERN char_u *p_ei; // 'eventignore' -EXTERN int p_ek; // 'esckeys' EXTERN int p_exrc; // 'exrc' EXTERN char_u *p_fencs; // 'fileencodings' EXTERN char_u *p_ffs; // 'fileformats' diff --git a/src/nvim/options.lua b/src/nvim/options.lua index fd68d1cde0..4130e69858 100644 --- a/src/nvim/options.lua +++ b/src/nvim/options.lua @@ -711,13 +711,6 @@ return { 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', type='string', list='onecomma', scope={'global'}, deny_duplicates=true, |