patch 7.4.2306

Problem:    Default value for 'langremap' is wrong.
Solution:   Set the right value. (Jürgen Krämer)  Add a test.

diff --git a/src/option.c b/src/option.c
index 7e362408a762435a53d17997631504c76c31601b..93e3c391fd48122a6bbe7f11aa5bcd696724c9be 100644 (file)
--- a/src/option.c
+++ b/src/option.c
@@ -1711,7 +1711,7 @@ static struct vimoption options[] =
 #else
                            (char_u *)NULL, PV_NONE,
 #endif
-                           {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+                           {(char_u *)TRUE, (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/testdir/test_mapping.vim b/src/testdir/test_mapping.vim
index 66b81cecf87dc7ccca9739def8bf2c1216fb229d..306eb2faea78f4885697e7622806cc6536ce3568 100644 (file)
--- a/src/testdir/test_mapping.vim
+++ b/src/testdir/test_mapping.vim
@@ -72,6 +72,14 @@ func Test_map_langmap()
   set nolangremap
   call assert_equal(1, &langnoremap)
 
+  " check default values
+  set langnoremap&
+  call assert_equal(0, &langnoremap)
+  call assert_equal(1, &langremap)
+  set langremap&
+  call assert_equal(0, &langnoremap)
+  call assert_equal(1, &langremap)
+
   " langmap should not apply in insert mode, 'langremap' doesn't matter
   set langmap=+{ nolangremap
   call feedkeys("Go+\<Esc>", "xt")

diff --git a/src/version.c b/src/version.c
index fa045f604c5c0453c326bd3114db765ab8bf208f..d68b76cacd3607116724326ad8e967678ff5473a 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -763,6 +763,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2306,
 /**/
     2305,
 /**/