summaryrefslogtreecommitdiffstats
path: root/runtime
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-11-05 17:44:52 +0100
committerBram Moolenaar <Bram@vim.org>2014-11-05 17:44:52 +0100
commit4391cf98ec3b94f33dfd053cab25ed56c787bea9 (patch)
tree66e0561154ddd7794d1b220d2b0d2e1faf3ea180 /runtime
parentc3940c76e8248ea7f618b3f1716d754c8e981f35 (diff)
updated for version 7.4.502v7.4.502
Problem: Language mapping also applies to mapped characters. Solution: Add the 'langnoremap' option, when on 'langmap' does not apply to mapped characters. (Christian Brabandt)
Diffstat (limited to 'runtime')
-rw-r--r--runtime/doc/options.txt12
-rw-r--r--runtime/vimrc_example.vim9
2 files changed, 20 insertions, 1 deletions
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index ccf92991f7..525a08cdbe 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -4589,6 +4589,18 @@ A jump table for the options with a short description can be found at |Q_op|.
:source $VIMRUNTIME/menu.vim
< Warning: This deletes all menus that you defined yourself!
+ *'langnoremap'* *'lnr'*
+'langnoremap' 'lnr' boolean (default off)
+ global
+ {not in Vi}
+ {only available when compiled with the |+langmap|
+ feature}
+ When on, setting 'langmap' does not apply to characters resulting from
+ a mapping. This basically means, if you noticed that setting
+ 'langmap' disables some of your mappings, try setting this option.
+ This option defaults to off for backwards compatibility. Set it on if
+ that works for you to avoid mappings to break.
+
*'laststatus'* *'ls'*
'laststatus' 'ls' number (default 1)
global
diff --git a/runtime/vimrc_example.vim b/runtime/vimrc_example.vim
index 27a5cfc222..215fd24658 100644
--- a/runtime/vimrc_example.vim
+++ b/runtime/vimrc_example.vim
@@ -1,7 +1,7 @@
" An example for a vimrc file.
"
" Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last change: 2014 Feb 05
+" Last change: 2014 Nov 05
"
" To use it, copy it to
" for Unix and OS/2: ~/.vimrc
@@ -95,3 +95,10 @@ if !exists(":DiffOrig")
command DiffOrig vert new | set bt=nofile | r ++edit # | 0d_ | diffthis
\ | wincmd p | diffthis
endif
+
+if has('langmap') && exists('+langnoremap')
+ " Prevent that the langmap option applies to characters that result from a
+ " mapping. If unset (default), this may break plugins (but it's backward
+ " compatible).
+ set langnoremap
+endif