aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/buffer_defs.h
diff options
context:
space:
mode:
authorZyX <kp-pav@yandex.ru>2017-12-23 15:27:42 +0300
committerZyX <kp-pav@yandex.ru>2017-12-23 15:27:42 +0300
commitc9ab209f9e70b2ebd91ef4cf3857c30822a6af57 (patch)
treeeb39e7370cf72c89b589cac204194ad68b9dfc15 /src/nvim/buffer_defs.h
parentedccf18df56d982dea350770ea42ffa25759b43f (diff)
parentaa951b14893d8a30ec3bad6fb4b7064ccda16d5c (diff)
downloadrneovim-c9ab209f9e70b2ebd91ef4cf3857c30822a6af57.tar.gz
rneovim-c9ab209f9e70b2ebd91ef4cf3857c30822a6af57.tar.bz2
rneovim-c9ab209f9e70b2ebd91ef4cf3857c30822a6af57.zip
Merge branch 'master' into hide-container-impl
Diffstat (limited to 'src/nvim/buffer_defs.h')
-rw-r--r--src/nvim/buffer_defs.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/nvim/buffer_defs.h b/src/nvim/buffer_defs.h
index f1cbcb2627..5702ceaaef 100644
--- a/src/nvim/buffer_defs.h
+++ b/src/nvim/buffer_defs.h
@@ -637,6 +637,7 @@ struct file_buffer {
uint32_t b_p_fex_flags; ///< flags for 'formatexpr'
char_u *b_p_kp; ///< 'keywordprg'
int b_p_lisp; ///< 'lisp'
+ char_u *b_p_menc; ///< 'makeencoding'
char_u *b_p_mps; ///< 'matchpairs'
int b_p_ml; ///< 'modeline'
int b_p_ml_nobin; ///< b_p_ml saved for binary mode