aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelipe Morales <hel.sheep@gmail.com>2015-06-18 16:56:39 -0300
committerJustin M. Keyes <justinkz@gmail.com>2015-06-20 14:19:15 -0400
commite3568364dfcb952bee2376baccc6925cc0fa7fe6 (patch)
tree974cf3b58ae69eb238733eb029c56a39b28e13f7
parentba84f7fc002ecf92a5bc56fa8902b1625b0f8fc9 (diff)
downloadrneovim-e3568364dfcb952bee2376baccc6925cc0fa7fe6.tar.gz
rneovim-e3568364dfcb952bee2376baccc6925cc0fa7fe6.tar.bz2
rneovim-e3568364dfcb952bee2376baccc6925cc0fa7fe6.zip
default: enable 'langnoremap'. #2853
Re: https://github.com/neovim/neovim/issues/2676
-rw-r--r--runtime/doc/options.txt2
-rw-r--r--runtime/doc/vim_diff.txt1
-rw-r--r--src/nvim/option.c4
3 files changed, 4 insertions, 3 deletions
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index d473fc1603..13bf538d89 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -4123,7 +4123,7 @@ A jump table for the options with a short description can be found at |Q_op|.
< Warning: This deletes all menus that you defined yourself!
*'langnoremap'* *'lnr'*
-'langnoremap' 'lnr' boolean (default off)
+'langnoremap' 'lnr' boolean (default on)
global
When on, setting 'langmap' does not apply to characters resulting from
a mapping. This basically means, if you noticed that setting
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 9193a1e0d2..54bc4fc4d8 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -33,6 +33,7 @@ these differences.
- 'backspace' defaults to "indent,eol,start"
- 'encoding' defaults to "utf-8"
- 'formatoptions' defaults to "tcqj"
+- 'langnoremap' is set by default
- 'mouse' defaults to "a"
- 'nocompatible' is always set
- 'nrformats' defaults to "hex"
diff --git a/src/nvim/option.c b/src/nvim/option.c
index 876a32b913..08ae9c1dda 100644
--- a/src/nvim/option.c
+++ b/src/nvim/option.c
@@ -1013,9 +1013,9 @@ static vimoption_T
{"langmenu", "lm", P_STRING|P_VI_DEF|P_NFNAME,
(char_u *)&p_lm, PV_NONE,
{(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
- {"langnoremap", "lnr", P_BOOL|P_VI_DEF,
+ {"langnoremap", "lnr", P_BOOL,
(char_u *)&p_lnr, PV_NONE,
- {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+ {(char_u *)FALSE, (char_u *)TRUE} SCRIPTID_INIT},
{"laststatus", "ls", P_NUM|P_VI_DEF|P_RALL,
(char_u *)&p_ls, PV_NONE,
{(char_u *)1L, (char_u *)0L} SCRIPTID_INIT},