Merge #6268 from lonerover/vim-7.4.2208

vim-patch: 7.4.2208,7.4.2305

src/nvim/testdir/Makefile

@@ -24,7 +24,6 @@ SCRIPTS ?= \
            test64.out             \
            test73.out             \
            test79.out             \
-           test_marks.out         \
 
 # Tests using runtest.vim.
 # Keep test_alot*.res as the last one, sort the others.
@@ -44,8 +43,10 @@ NEW_TESTS ?= \
 	    test_increment_dbcs.res \
 	    test_lambda.res \
 	    test_langmap.res \
+	    test_marks.res \
 	    test_match.res \
 	    test_matchadd_conceal.res \
+	    test_nested_function.res \
 	    test_quickfix.res \
 	    test_signs.res \
 	    test_syntax.res \
@@ -55,6 +56,7 @@ NEW_TESTS ?= \
 	    test_viml.res \
 	    test_visual.res \
 	    test_window_id.res \
+	    test_writefile.res \
 	    test_alot.res
 
 SCRIPTS_GUI := test16.out

src/nvim/testdir/test_alot.vim

@@ -16,6 +16,7 @@ source test_lambda.vim
 source test_match.vim
 source test_matchadd_conceal_utf8.vim
 source test_menu.vim
+source test_mapping.vim
 source test_messages.vim
 source test_options.vim
 source test_partial.vim

src/nvim/testdir/test_mapping.vim

@@ -0,0 +1,100 @@
+" Tests for mappings and abbreviations
+
+if !has('multi_byte')
+  finish
+endif
+
+func Test_abbreviation()
+  " abbreviation with 0x80 should work
+  inoreab чкпр   vim
+  call feedkeys("Goчкпр \<Esc>", "xt")
+  call assert_equal('vim ', getline('$'))
+  iunab чкпр
+  set nomodified
+endfunc
+
+func Test_map_ctrl_c_insert()
+  " mapping of ctrl-c in Insert mode
+  set cpo-=< cpo-=k
+  inoremap <c-c> <ctrl-c>
+  cnoremap <c-c> dummy
+  cunmap <c-c>
+  call feedkeys("GoTEST2: CTRL-C |\<C-C>A|\<Esc>", "xt")
+  call assert_equal('TEST2: CTRL-C |<ctrl-c>A|', getline('$'))
+  unmap! <c-c>
+  set nomodified
+endfunc
+
+func Test_map_ctrl_c_visual()
+  " mapping of ctrl-c in Visual mode
+  vnoremap <c-c> :<C-u>$put ='vmap works'
+  call feedkeys("GV\<C-C>\<CR>", "xt")
+  call assert_equal('vmap works', getline('$'))
+  vunmap <c-c>
+  set nomodified
+endfunc
+
+func Test_map_langmap()
+  " langmap should not get remapped in insert mode
+  inoremap { FAIL_ilangmap
+  set langmap=+{ langnoremap
+  call feedkeys("Go+\<Esc>", "xt")
+  call assert_equal('+', getline('$'))
+
+  " Insert-mode expr mapping with langmap
+  inoremap <expr> { "FAIL_iexplangmap"
+  call feedkeys("Go+\<Esc>", "xt")
+  call assert_equal('+', getline('$'))
+  iunmap <expr> {
+
+  " langmap should not get remapped in Command-line mode
+  cnoremap { FAIL_clangmap
+  call feedkeys(":call append(line('$'), '+')\<CR>", "xt")
+  call assert_equal('+', getline('$'))
+  cunmap {
+
+  " Command-line mode expr mapping with langmap
+  cnoremap <expr> { "FAIL_cexplangmap"
+  call feedkeys(":call append(line('$'), '+')\<CR>", "xt")
+  call assert_equal('+', getline('$'))
+  cunmap {
+  set nomodified
+endfunc
+
+func Test_map_feedkeys()
+  " issue #212 (feedkeys insert mapping at current position)
+  nnoremap . :call feedkeys(".", "in")<cr>
+  call setline('$', ['a b c d', 'a b c d'])
+  $-1
+  call feedkeys("0qqdw.ifoo\<Esc>qj0@q\<Esc>", "xt")
+  call assert_equal(['fooc d', 'fooc d'], getline(line('$') - 1, line('$')))
+  unmap .
+  set nomodified
+endfunc
+
+func Test_map_cursor()
+  " <c-g>U<cursor> works only within a single line
+  imapclear
+  imap ( ()<c-g>U<left>
+  call feedkeys("G2o\<Esc>ki\<CR>Test1: text with a (here some more text\<Esc>k.", "xt")
+  call assert_equal('Test1: text with a (here some more text)', getline(line('$') - 2))
+  call assert_equal('Test1: text with a (here some more text)', getline(line('$') - 1))
+
+  " test undo
+  call feedkeys("G2o\<Esc>ki\<CR>Test2: text wit a (here some more text [und undo]\<C-G>u\<Esc>k.u", "xt")
+  call assert_equal('', getline(line('$') - 2))
+  call assert_equal('Test2: text wit a (here some more text [und undo])', getline(line('$') - 1))
+  set nomodified
+  imapclear
+endfunc
+
+" This isn't actually testing a mapping, but similar use of CTRL-G U as above.
+func Test_break_undo()
+  :set whichwrap=<,>,[,]
+  call feedkeys("G4o2k", "xt")
+  exe ":norm! iTest3: text with a (parenthesis here\<C-G>U\<Right>new line here\<esc>\<up>\<up>."
+  call assert_equal('new line here', getline(line('$') - 3))
+  call assert_equal('Test3: text with a (parenthesis here', getline(line('$') - 2))
+  call assert_equal('new line here', getline(line('$') - 1))
+  set nomodified
+endfunc

src/nvim/testdir/test_marks.vim

@@ -0,0 +1,26 @@
+
+" Test that a deleted mark is restored after delete-undo-redo-undo.
+function! Test_Restore_DelMark()
+  enew!
+  call append(0, ["	textline A", "	textline B", "	textline C"])
+  normal! 2gg
+  set nocp viminfo+=nviminfo
+  exe "normal! i\<C-G>u\<Esc>"
+  exe "normal! maddu\<C-R>u"
+  let pos = getpos("'a")
+  call assert_equal(2, pos[1])
+  call assert_equal(1, pos[2])
+  enew!
+endfunction
+
+" Test that CTRL-A and CTRL-X updates last changed mark '[, '].
+function! Test_Incr_Marks()
+  enew!
+  call append(0, ["123 123 123", "123 123 123", "123 123 123"])
+  normal! gg
+  execute "normal! \<C-A>`[v`]rAjwvjw\<C-X>`[v`]rX"
+  call assert_equal("AAA 123 123", getline(1))
+  call assert_equal("123 XXXXXXX", getline(2))
+  call assert_equal("XXX 123 123", getline(3))
+  enew!
+endfunction

src/nvim/testdir/test_nested_function.vim

@@ -0,0 +1,32 @@
+"Tests for nested functions
+"
+function! NestedFunc()
+  fu! Func1()
+    let g:text .= 'Func1 '
+  endfunction
+  call Func1()
+  fu! s:func2()
+    let g:text .= 's:func2 '
+  endfunction
+  call s:func2()
+  fu! s:_func3()
+    let g:text .= 's:_func3 '
+  endfunction
+  call s:_func3()
+  let fn = 'Func4'
+  fu! {fn}()
+    let g:text .= 'Func4 '
+  endfunction
+  call {fn}()
+  let fn = 'func5'
+  fu! s:{fn}()
+    let g:text .= 's:func5'
+  endfunction
+  call s:{fn}()
+endfunction
+
+function! Test_nested_functions()
+  let g:text = ''
+  call NestedFunc()
+  call assert_equal('Func1 s:func2 s:_func3 Func4 s:func5', g:text)
+endfunction

src/nvim/testdir/test_writefile.vim

@@ -0,0 +1,16 @@
+
+function! Test_WriteFile()
+  let f = tempname()
+  call writefile(["over","written"], f, "b")
+  call writefile(["hello","world"], f, "b")
+  call writefile(["!", "good"], f, "a")
+  call writefile(["morning"], f, "ab")
+  call writefile(["", "vimmers"], f, "ab")
+  let l = readfile(f)
+  call assert_equal("hello", l[0])
+  call assert_equal("world!", l[1])
+  call assert_equal("good", l[2])
+  call assert_equal("morning", l[3])
+  call assert_equal("vimmers", l[4])
+  call delete(f)
+endfunction

src/nvim/version.c

@@ -135,7 +135,7 @@ static int included_patches[] = {
   // 2308 NA
   // 2307,
   // 2306,
-  // 2305,
+  2305,
   // 2304 NA
   // 2303,
   // 2302 NA
@@ -232,7 +232,7 @@ static int included_patches[] = {
   // 2211 NA
   // 2210 NA
   // 2209,
-  // 2208,
+  2208,
   // 2207 NA
   // 2206 NA
   2205,