To: vim_dev@googlegroups.com Subject: Patch 8.2.1547 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.1547 Problem: Various comment problems. Solution: Update comments. Files: src/arglist.c, src/map.c, src/mbyte.c, src/tag.c, src/undo.c, src/testdir/README.txt, src/testdir/test_put.vim, src/libvterm/README *** ../vim-8.2.1546/src/arglist.c 2020-08-17 19:34:06.957427107 +0200 --- src/arglist.c 2020-08-17 21:02:49.694707684 +0200 *************** *** 778,784 **** if (eap->addr_count > 0 || *eap->arg == NUL) { ! // ":argdel" works like ":argdel" if (eap->addr_count == 0) { if (curwin->w_arg_idx >= ARGCOUNT) --- 778,784 ---- if (eap->addr_count > 0 || *eap->arg == NUL) { ! // ":argdel" works like ":.argdel" if (eap->addr_count == 0) { if (curwin->w_arg_idx >= ARGCOUNT) *** ../vim-8.2.1546/src/map.c 2020-06-24 20:33:59.565106319 +0200 --- src/map.c 2020-08-01 12:53:48.417198241 +0200 *************** *** 1952,1958 **** // when they are read back. if (c == K_SPECIAL && what != 2) { ! modifiers = 0x0; if (str[1] == KS_MODIFIER) { modifiers = str[2]; --- 1952,1958 ---- // when they are read back. if (c == K_SPECIAL && what != 2) { ! modifiers = 0; if (str[1] == KS_MODIFIER) { modifiers = str[2]; *** ../vim-8.2.1546/src/mbyte.c 2020-08-28 23:27:16.932923997 +0200 --- src/mbyte.c 2020-08-29 15:04:59.072530445 +0200 *************** *** 1607,1613 **** { int c; ! // Need to convert to a wide character. if (*p >= 0x80) { c = utf_ptr2char(p); --- 1607,1613 ---- { int c; ! // Need to convert to a character number. if (*p >= 0x80) { c = utf_ptr2char(p); *************** *** 1762,1768 **** } /* ! * Convert a UTF-8 byte sequence to a wide character. * If the sequence is illegal or truncated by a NUL the first byte is * returned. * For an overlong sequence this may return zero. --- 1762,1768 ---- } /* ! * Convert a UTF-8 byte sequence to a character number. * If the sequence is illegal or truncated by a NUL the first byte is * returned. * For an overlong sequence this may return zero. *** ../vim-8.2.1546/src/tag.c 2020-05-13 13:40:12.690995638 +0200 --- src/tag.c 2020-06-12 22:53:50.695287444 +0200 *************** *** 687,693 **** { VIM_CLEAR(tagstack[tagstackidx].user_data); tagstack[tagstackidx].user_data = vim_strnsave( ! tagp.user_data, tagp.user_data_end - tagp.user_data); } ++tagstackidx; --- 687,693 ---- { VIM_CLEAR(tagstack[tagstackidx].user_data); tagstack[tagstackidx].user_data = vim_strnsave( ! tagp.user_data, tagp.user_data_end - tagp.user_data); } ++tagstackidx; *** ../vim-8.2.1546/src/undo.c 2020-06-12 22:59:07.274097177 +0200 --- src/undo.c 2020-08-23 20:32:09.068727158 +0200 *************** *** 3520,3526 **** do_outofmem_msg((long_u)0); return; } ! ml_replace_len(curbuf->b_u_line_lnum, curbuf->b_u_line_ptr.ul_line, curbuf->b_u_line_ptr.ul_len, TRUE, FALSE); changed_bytes(curbuf->b_u_line_lnum, 0); curbuf->b_u_line_ptr = oldp; --- 3520,3527 ---- do_outofmem_msg((long_u)0); return; } ! ml_replace_len(curbuf->b_u_line_lnum, curbuf->b_u_line_ptr.ul_line, ! curbuf->b_u_line_ptr.ul_len, TRUE, FALSE); changed_bytes(curbuf->b_u_line_lnum, 0); curbuf->b_u_line_ptr = oldp; *** ../vim-8.2.1546/src/testdir/README.txt 2020-08-11 20:42:15.466616325 +0200 --- src/testdir/README.txt 2020-08-14 19:27:40.087406880 +0200 *************** *** 49,51 **** --- 49,60 ---- Mostly the same as writing a new style test. Additionally, see help on "terminal-dumptest". Put the reference dump in "dumps/Test_func_name.dump". + + OLD STYLE TESTS: + + There are a few tests that are used when Vim was built without the +eval + feature. These cannot use the "assert" functions, therefore they consist of a + .in file that contains Normal mode commands between STARTTEST and ENDTEST. + They modify the file and the result gets writtein in the test.out file. This + is then compared with the .ok file. If they are equal the test passed. If + they differ the test failed. *** ../vim-8.2.1546/src/testdir/test_put.vim 2020-03-10 07:48:06.575619533 +0100 --- src/testdir/test_put.vim 2020-08-22 20:58:47.455025935 +0200 *************** *** 22,36 **** func Test_put_char_block2() new - let a = [ 'a'->getreg(), 'a'->getregtype() ] call setreg('a', ' one ', 'v') call setline(1, ['Line 1', '', 'Line 3', '']) " visually select the first 3 lines and put register a over it exe "norm! ggl\2j2l\"ap" ! call assert_equal(['L one 1', '', 'L one 3', ''], getline(1,4)) " clean up bw! - call setreg('a', a[0], a[1]) endfunc func Test_put_lines() --- 22,34 ---- func Test_put_char_block2() new call setreg('a', ' one ', 'v') call setline(1, ['Line 1', '', 'Line 3', '']) " visually select the first 3 lines and put register a over it exe "norm! ggl\2j2l\"ap" ! call assert_equal(['L one 1', '', 'L one 3', ''], getline(1, 4)) " clean up bw! endfunc func Test_put_lines() *************** *** 38,44 **** let a = [ getreg('a'), getregtype('a') ] call setline(1, ['Line 1', 'Line2', 'Line 3', '']) exe 'norm! gg"add"AddG""p' ! call assert_equal(['Line 3', '', 'Line 1', 'Line2'], getline(1,'$')) " clean up bw! eval a[0]->setreg('a', a[1]) --- 36,42 ---- let a = [ getreg('a'), getregtype('a') ] call setline(1, ['Line 1', 'Line2', 'Line 3', '']) exe 'norm! gg"add"AddG""p' ! call assert_equal(['Line 3', '', 'Line 1', 'Line2'], getline(1, '$')) " clean up bw! eval a[0]->setreg('a', a[1]) *************** *** 53,59 **** exec "4norm! \"=\P" norm! j0. norm! j0. ! call assert_equal(['A1','A2','A3','4A','5A','6A'], getline(1,'$')) bw! endfunc --- 51,57 ---- exec "4norm! \"=\P" norm! j0. norm! j0. ! call assert_equal(['A1','A2','A3','4A','5A','6A'], getline(1, '$')) bw! endfunc *** ../vim-8.2.1546/src/libvterm/README 2020-05-17 14:59:24.063410405 +0200 --- src/libvterm/README 2020-06-27 13:39:23.972481196 +0200 *************** *** 11,18 **** - Convert from C99 to C90. - Other changes to support embedding in Vim. ! To find the diff of a libvterm patch edit this URL, changing "999" to the patch ! number: https://bazaar.launchpad.net/~libvterm/libvterm/trunk/diff/999?context=3 To merge in changes from Github, do this: --- 11,21 ---- - Convert from C99 to C90. - Other changes to support embedding in Vim. ! To get the latest version of libvterm you need the "bzr" command and do: ! bzr co http://bazaar.leonerd.org.uk/c/libvterm/ ! ! To find the diff of a libvterm revision edit this URL, changing "999" to the ! patch number: https://bazaar.launchpad.net/~libvterm/libvterm/trunk/diff/999?context=3 To merge in changes from Github, do this: *** ../vim-8.2.1546/src/version.c 2020-08-30 18:11:49.597111423 +0200 --- src/version.c 2020-08-30 19:22:40.757221902 +0200 *************** *** 756,757 **** --- 756,759 ---- { /* Add new patch number below this line */ + /**/ + 1547, /**/ -- TALL KNIGHT: We shall say Ni! again to you if you do not appease us. ARTHUR: All right! What do you want? TALL KNIGHT: We want ... a shrubbery! "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// 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 ///