To: vim_dev@googlegroups.com Subject: Patch 7.4.1920 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.1920 (after 7.4.1919) Problem: Missing test changes. Solution: Update viminfo test. Files: src/testdir/test_viminfo.vim *** ../vim-7.4.1919/src/testdir/test_viminfo.vim 2016-06-11 15:31:44.079937578 +0200 --- src/testdir/test_viminfo.vim 2016-06-11 21:01:12.341953103 +0200 *************** *** 17,25 **** let lines = readfile('Xviminfo') let done = 0 for line in lines ! if line[0] == '|' if done == 0 ! call assert_equal('|1,2', line) elseif done == 1 call assert_equal('|copied as-is', line) elseif done == 2 --- 17,25 ---- let lines = readfile('Xviminfo') let done = 0 for line in lines ! if line[0] == '|' && line !~ '^|3,' if done == 0 ! call assert_equal('|1,3', line) elseif done == 1 call assert_equal('|copied as-is', line) elseif done == 2 *************** *** 180,185 **** --- 180,222 ---- call delete('Xviminfo') endfunc + func Test_viminfo_registers() + call test_settime(8) + call setreg('a', "eight", 'c') + call test_settime(20) + call setreg('b', ["twenty", "again"], 'l') + call test_settime(40) + call setreg('c', ["four", "agai"], 'b4') + let l = [] + set viminfo='100,<600,s10,h,!,nviminfo + for i in range(500) + call add(l, 'something') + endfor + call setreg('d', l, 'l') + wviminfo Xviminfo + + call test_settime(10) + call setreg('a', '', 'b10') + call test_settime(15) + call setreg('b', 'drop') + call test_settime(50) + call setreg('c', 'keep', 'l') + call test_settime(30) + call setreg('d', 'drop', 'l') + rviminfo Xviminfo + + call assert_equal("", getreg('a')) + call assert_equal("\10", getregtype('a')) + call assert_equal("twenty\nagain\n", getreg('b')) + call assert_equal("V", getregtype('b')) + call assert_equal("keep\n", getreg('c')) + call assert_equal("V", getregtype('c')) + call assert_equal(l, getreg('d', 1, 1)) + call assert_equal("V", getregtype('d')) + + call delete('Xviminfo') + endfunc + func Test_viminfo_encoding() if !has('multi_byte') return *************** *** 215,221 **** call add(lines, '|1,,,,') "trailing comma call add(lines, '|1,>234') " trailing continuation line call writefile(lines, 'Xviminfo') ! call assert_fails('rviminfo Xviminfo', 'E685:') call delete('Xviminfo') endfunc --- 252,258 ---- call add(lines, '|1,,,,') "trailing comma call add(lines, '|1,>234') " trailing continuation line call writefile(lines, 'Xviminfo') ! rviminfo Xviminfo call delete('Xviminfo') endfunc *** ../vim-7.4.1919/src/version.c 2016-06-11 21:04:34.927761279 +0200 --- src/version.c 2016-06-11 21:13:07.942207631 +0200 *************** *** 755,756 **** --- 755,758 ---- { /* Add new patch number below this line */ + /**/ + 1920, /**/ -- From "know your smileys": :-O>-o Smiley American tourist (note big mouth and camera) /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///