From 158ea528545463a80ddce2cc83e52eb3b291cfa5 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sat, 18 Feb 2017 14:01:20 +0100
Subject: options: Remove 'esckeys' (#6138)

This was never supported and it does not make sense for Nvim.
---
 src/nvim/getchar.c     | 18 +++++++-----------
 src/nvim/option_defs.h |  1 -
 src/nvim/options.lua   |  7 -------
 3 files changed, 7 insertions(+), 19 deletions(-)

(limited to 'src')

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
@@ -710,13 +710,6 @@ return {
       varname='p_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',
       type='string', list='onecomma', scope={'global'},
-- 
cgit