updated for version 7.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)

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index ccf92991f7fe997af73badb8baf9c0539efc4e67..525a08cdbe9b65b643cdfe51065c9124594124b1 100644 (file)
--- 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 27a5cfc222f500959a4e36f4710163ab03b265e2..215fd24658ed7a43aae46153674693e8c48f9e0d 100644 (file)
--- 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

diff --git a/src/macros.h b/src/macros.h
index 2706a02524e49dfe008613c5cd982296e7138384..01207d91b3f5ad2e13476317c4e79d3e7caaef39 100644 (file)
--- a/src/macros.h
+++ b/src/macros.h
@@ -128,13 +128,18 @@
  * Adjust chars in a language according to 'langmap' option.
  * NOTE that there is no noticeable overhead if 'langmap' is not set.
  * When set the overhead for characters < 256 is small.
- * Don't apply 'langmap' if the character comes from the Stuff buffer.
+ * Don't apply 'langmap' if the character comes from the Stuff buffer or from
+ * a mapping and the langnoremap option was set.
  * The do-while is just to ignore a ';' after the macro.
  */
 # ifdef FEAT_MBYTE
 #  define LANGMAP_ADJUST(c, condition) \
     do { \
-       if (*p_langmap && (condition) && !KeyStuffed && (c) >= 0) \
+       if (*p_langmap \
+               && (condition) \
+               && (!p_lnr || (p_lnr && typebuf_maplen() == 0)) \
+               && !KeyStuffed \
+               && (c) >= 0) \
        { \
            if ((c) < 256) \
                c = langmap_mapchar[c]; \
@@ -145,7 +150,11 @@
 # else
 #  define LANGMAP_ADJUST(c, condition) \
     do { \
-       if (*p_langmap && (condition) && !KeyStuffed && (c) >= 0 && (c) < 256) \
+       if (*p_langmap \
+               && (condition) \
+               && (!p_lnr || (p_lnr && typebuf_maplen() == 0)) \
+               && !KeyStuffed \
+               && (c) >= 0 && (c) < 256) \
            c = langmap_mapchar[c]; \
     } while (0)
 # endif

diff --git a/src/option.c b/src/option.c
index 5e8e95a6d27823664419da75742ee9da9a4b8b41..6841d42d6cfa92afdde42778c6746b0a7d8e7cb2 100644 (file)
--- a/src/option.c
+++ b/src/option.c
@@ -1691,6 +1691,13 @@ static struct vimoption
                            (char_u *)NULL, PV_NONE,
 #endif
                            {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
+    {"langnoremap",  "lnr",   P_BOOL|P_VI_DEF,
+#ifdef FEAT_LANGMAP
+                           (char_u *)&p_lnr, PV_NONE,
+#else
+                           (char_u *)NULL, PV_NONE,
+#endif
+                           {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
     {"laststatus",  "ls",   P_NUM|P_VI_DEF|P_RALL,
 #ifdef FEAT_WINDOWS
                            (char_u *)&p_ls, PV_NONE,

diff --git a/src/option.h b/src/option.h
index 23cdecdf01752b822f25db68a33b9ee86f808250..b0314667688d26900f6e655a51e3d68d8bbadc4f 100644 (file)
--- a/src/option.h
+++ b/src/option.h
@@ -576,6 +576,7 @@ EXTERN char_u       *p_kp;          /* 'keywordprg' */
 EXTERN char_u  *p_km;          /* 'keymodel' */
 #ifdef FEAT_LANGMAP
 EXTERN char_u  *p_langmap;     /* 'langmap'*/
+EXTERN int     p_lnr;          /* 'langnoremap' */
 #endif
 #if defined(FEAT_MENU) && defined(FEAT_MULTI_LANG)
 EXTERN char_u  *p_lm;          /* 'langmenu' */

diff --git a/src/version.c b/src/version.c
index 3c48dc433441981a3148a952d89a9f88d4487faa..7bc7153f77660c60a2a0fa2185c1e2e753a3a447 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    502,
 /**/
     501,
 /**/