diff options
| author | Bram Moolenaar <Bram@vim.org> | 2014-11-05 17:44:52 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2014-11-05 17:44:52 +0100 |
| commit | 4391cf98ec3b94f33dfd053cab25ed56c787bea9 (patch) | |
| tree | 66e0561154ddd7794d1b220d2b0d2e1faf3ea180 /src | |
| parent | c3940c76e8248ea7f618b3f1716d754c8e981f35 (diff) | |
| download | vim-git-4391cf98ec3b94f33dfd053cab25ed56c787bea9.tar.gz | |
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 'src')
| -rw-r--r-- | src/macros.h | 15 | ||||
| -rw-r--r-- | src/option.c | 7 | ||||
| -rw-r--r-- | src/option.h | 1 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 22 insertions, 3 deletions
diff --git a/src/macros.h b/src/macros.h index 2706a0252..01207d91b 100644 --- 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 5e8e95a6d..6841d42d6 100644 --- 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 23cdecdf0..b03146676 100644 --- 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 3c48dc433..7bc7153f7 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 502, +/**/ 501, /**/ 500, |