aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/option.c
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2017-04-01 17:33:32 +0200
committerJustin M. Keyes <justinkz@gmail.com>2017-04-01 17:42:15 +0200
commit33ff29fc740fd437f1600d8ccc60b7b484d78d19 (patch)
tree78c56a57359c8ffde5e613ed8a641e6134bd3058 /src/nvim/option.c
parent8de53157b691dd4ce604a5be0e2d9c3b6014bfdb (diff)
parent45a13c4bbc4a7c4f62a299c832ecc192d8f3cd0a (diff)
downloadrneovim-33ff29fc740fd437f1600d8ccc60b7b484d78d19.tar.gz
rneovim-33ff29fc740fd437f1600d8ccc60b7b484d78d19.tar.bz2
rneovim-33ff29fc740fd437f1600d8ccc60b7b484d78d19.zip
Merge #6344 'vim-patch:7.4.2236,7.4.2306'
Diffstat (limited to 'src/nvim/option.c')
-rw-r--r--src/nvim/option.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/nvim/option.c b/src/nvim/option.c
index 0b4d9aae5d..b3b4dc1e0a 100644
--- a/src/nvim/option.c
+++ b/src/nvim/option.c
@@ -3630,6 +3630,12 @@ static char *set_bool_option(const int opt_idx, char_u *const varp,
} else if ((int *)varp == &p_force_off && p_force_off == true) {
p_force_off = false;
return (char *)e_unsupportedoption;
+ } else if ((int *)varp == &p_lrm) {
+ // 'langremap' -> !'langnoremap'
+ p_lnr = !p_lrm;
+ } else if ((int *)varp == &p_lnr) {
+ // 'langnoremap' -> !'langremap'
+ p_lrm = !p_lnr;
// 'undofile'
} else if ((int *)varp == &curbuf->b_p_udf || (int *)varp == &p_udf) {
// Only take action when the option was set. When reset we do not