summaryrefslogtreecommitdiff
path: root/src/option.h
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-08-21 14:37:09 +0200
committerBram Moolenaar <Bram@vim.org>2019-08-21 14:37:09 +0200
commite2c453d38f6512ac4cff7cd26aa7780b4e2534d7 (patch)
tree8458a35d59ac43121bfd2d24d5e9f7f54969d0dc /src/option.h
parentd933c82ff4e2c910bd533ed9a50377699c3f5ec9 (diff)
downloadvim-git-e2c453d38f6512ac4cff7cd26aa7780b4e2534d7.tar.gz
patch 8.1.1901: the +insert_expand feature is not always availablev8.1.1901
Problem: The +insert_expand feature is not always available. Solution: Graduate the +insert_expand feature.
Diffstat (limited to 'src/option.h')
-rw-r--r--src/option.h12
1 files changed, 2 insertions, 10 deletions
diff --git a/src/option.h b/src/option.h
index 0ccf8f129..c1a25b342 100644
--- a/src/option.h
+++ b/src/option.h
@@ -410,14 +410,12 @@ EXTERN long p_ch; // 'cmdheight'
EXTERN int p_confirm; // 'confirm'
#endif
EXTERN int p_cp; // 'compatible'
-#ifdef FEAT_INS_EXPAND
EXTERN char_u *p_cot; // 'completeopt'
-# ifdef BACKSLASH_IN_FILENAME
+#ifdef BACKSLASH_IN_FILENAME
EXTERN char_u *p_csl; // 'completeslash'
-# endif
+#endif
EXTERN long p_ph; // 'pumheight'
EXTERN long p_pw; // 'pumwidth'
-#endif
EXTERN char_u *p_cpo; // 'cpoptions'
#ifdef FEAT_CSCOPE
EXTERN char_u *p_csprg; // 'cscopeprg'
@@ -443,9 +441,7 @@ EXTERN char_u *p_dip; // 'diffopt'
EXTERN char_u *p_dex; // 'diffexpr'
# endif
#endif
-#ifdef FEAT_INS_EXPAND
EXTERN char_u *p_dict; // 'dictionary'
-#endif
#ifdef FEAT_DIGRAPHS
EXTERN int p_dg; // 'digraph'
#endif
@@ -849,9 +845,7 @@ EXTERN long p_titlelen; // 'titlelen'
EXTERN char_u *p_titleold; // 'titleold'
EXTERN char_u *p_titlestring; // 'titlestring'
#endif
-#ifdef FEAT_INS_EXPAND
EXTERN char_u *p_tsr; // 'thesaurus'
-#endif
EXTERN int p_ttimeout; // 'ttimeout'
EXTERN long p_ttm; // 'ttimeoutlen'
EXTERN int p_tbi; // 'ttybuiltin'
@@ -996,11 +990,9 @@ enum
#ifdef FEAT_COMMENTS
, BV_COM
#endif
-#ifdef FEAT_INS_EXPAND
, BV_CPT
, BV_DICT
, BV_TSR
-#endif
#ifdef BACKSLASH_IN_FILENAME
, BV_CSL
#endif