aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlonerover <pathfinder1644@yahoo.com>2017-03-22 12:52:15 +0800
committerlonerover <pathfinder1644@yahoo.com>2017-04-01 22:46:27 +0800
commit45a13c4bbc4a7c4f62a299c832ecc192d8f3cd0a (patch)
treecffbb2694e1d1af6f9ea58a4a34a2283fbbdd496
parent53da57d27a8ee47fe42604ad07bb7c956d9012f5 (diff)
downloadrneovim-45a13c4bbc4a7c4f62a299c832ecc192d8f3cd0a.tar.gz
rneovim-45a13c4bbc4a7c4f62a299c832ecc192d8f3cd0a.tar.bz2
rneovim-45a13c4bbc4a7c4f62a299c832ecc192d8f3cd0a.zip
vim-patch:7.4.2306
Problem: Default value for 'langremap' is wrong. Solution: Set the right value. (Jürgen Krämer) Add a test. https://github.com/vim/vim/commit/da9ce2cde11ddd0e16cdfbab6d4ac4e8110218e1
-rw-r--r--src/nvim/testdir/test_mapping.vim8
-rw-r--r--src/nvim/version.c2
2 files changed, 9 insertions, 1 deletions
diff --git a/src/nvim/testdir/test_mapping.vim b/src/nvim/testdir/test_mapping.vim
index 3b6dcdccf5..6b313ff54f 100644
--- a/src/nvim/testdir/test_mapping.vim
+++ b/src/nvim/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(1, &langnoremap)
+ call assert_equal(0, &langremap)
+ set langremap&
+ call assert_equal(1, &langnoremap)
+ call assert_equal(0, &langremap)
+
" langmap should not apply in insert mode, 'langremap' doesn't matter
set langmap=+{ nolangremap
call feedkeys("Go+\<Esc>", "xt")
diff --git a/src/nvim/version.c b/src/nvim/version.c
index ba1ebc8f2c..0ee0419849 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -135,7 +135,7 @@ static const int included_patches[] = {
2309,
// 2308 NA
2307,
- // 2306,
+ 2306,
2305,
// 2304 NA
2303,