diff options
| author | Bram Moolenaar <Bram@vim.org> | 2014-05-13 12:17:15 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2014-05-13 12:17:15 +0200 |
| commit | ed7547da438e44e7907bd9fd488f6b961f23e1e0 (patch) | |
| tree | 3c6359ecc460470b9c65c5ed12919d964084c4f5 | |
| parent | d442ec7fe2f929d098ee2739e3c98c70e3bf45a4 (diff) | |
| download | vim-git-ed7547da438e44e7907bd9fd488f6b961f23e1e0.tar.gz | |
updated for version 7.4.284v7.4.284
Problem: Setting 'langmap' in the modeline can cause trouble. E.g. mapping
":" breaks many commands. (Jens-Wolfhard Schicke-Uffmann)
Solution: Disallow setting 'langmap' from the modeline.
| -rw-r--r-- | src/option.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/option.c b/src/option.c index 86e47571c..a36f8c0a0 100644 --- a/src/option.c +++ b/src/option.c @@ -1652,7 +1652,7 @@ static struct vimoption #endif #endif (char_u *)0L} SCRIPTID_INIT}, - {"langmap", "lmap", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, + {"langmap", "lmap", P_STRING|P_VI_DEF|P_COMMA|P_NODUP|P_SECURE, #ifdef FEAT_LANGMAP (char_u *)&p_langmap, PV_NONE, {(char_u *)"", /* unmatched } */ diff --git a/src/version.c b/src/version.c index ae03814df..739057d01 100644 --- a/src/version.c +++ b/src/version.c @@ -735,6 +735,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 284, +/**/ 283, /**/ 282, |