diff options
| author | ZyX <kp-pav@yandex.ru> | 2017-12-23 15:27:42 +0300 |
|---|---|---|
| committer | ZyX <kp-pav@yandex.ru> | 2017-12-23 15:27:42 +0300 |
| commit | c9ab209f9e70b2ebd91ef4cf3857c30822a6af57 (patch) | |
| tree | eb39e7370cf72c89b589cac204194ad68b9dfc15 /src/nvim/option_defs.h | |
| parent | edccf18df56d982dea350770ea42ffa25759b43f (diff) | |
| parent | aa951b14893d8a30ec3bad6fb4b7064ccda16d5c (diff) | |
| download | rneovim-c9ab209f9e70b2ebd91ef4cf3857c30822a6af57.tar.gz rneovim-c9ab209f9e70b2ebd91ef4cf3857c30822a6af57.tar.bz2 rneovim-c9ab209f9e70b2ebd91ef4cf3857c30822a6af57.zip | |
Merge branch 'master' into hide-container-impl
Diffstat (limited to 'src/nvim/option_defs.h')
| -rw-r--r-- | src/nvim/option_defs.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/nvim/option_defs.h b/src/nvim/option_defs.h index 1b978137ae..864723a10c 100644 --- a/src/nvim/option_defs.h +++ b/src/nvim/option_defs.h @@ -489,6 +489,7 @@ EXTERN char_u *p_lcs; // 'listchars' EXTERN int p_lz; // 'lazyredraw' EXTERN int p_lpl; // 'loadplugins' EXTERN int p_magic; // 'magic' +EXTERN char_u *p_menc; // 'makeencoding' EXTERN char_u *p_mef; // 'makeef' EXTERN char_u *p_mp; // 'makeprg' EXTERN char_u *p_cc; // 'colorcolumn' @@ -736,6 +737,7 @@ enum { , BV_KP , BV_LISP , BV_LW + , BV_MENC , BV_MA , BV_ML , BV_MOD |