From 2c7e8c38e0f483cf803eb225720cd11ae370ae75 Mon Sep 17 00:00:00 2001
From: David Bürgin <676c7473@gmail.com>
Date: Sat, 28 Mar 2015 15:51:48 +0100
Subject: vim-patch:7.4.502 #2282

Problem:    Language mapping also applies to mapped characters.
Solution:   Add the 'langnoremap' option, when on 'langmap' does not apply to
            mapped characters. (Christian Brabandt)

https://github.com/vim/vim/releases/tag/v7-4-502
---
 runtime/doc/options.txt   | 10 ++++++++++
 runtime/vimrc_example.vim |  7 ++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

(limited to 'runtime')

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index a9e1d0f381..0322fae991 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -4351,6 +4351,16 @@ 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}
+	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 cd944155f2..1be1bcd3b6 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:  ~/.vimrc
@@ -80,3 +80,8 @@ if !exists(":DiffOrig")
   command DiffOrig vert new | set bt=nofile | r ++edit # | 0d_ | diffthis
                  \ | wincmd p | diffthis
 endif
+
+" 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
-- 
cgit