To: vim_dev@googlegroups.com Subject: Patch 8.2.1128 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.1128 Problem: The write message mentions characters, but it's actually bytes. Solution: Change "C" to "B" and "characters" to "bytes". Files: runtime/doc/options.txt, src/fileio.c, src/testdir/test_cscope.vim, src/testdir/test_netbeans.vim, src/testdir/dumps/Test_diff_syntax_1.dump, src/testdir/dumps/Test_long_file_name_1.dump, src/testdir/dumps/Test_display_unprintable_01.dump, src/testdir/dumps/Test_tselect_1.dump *** ../vim-8.2.1127/runtime/doc/options.txt 2020-07-01 15:12:39.715774200 +0200 --- runtime/doc/options.txt 2020-07-05 14:08:36.693681183 +0200 *************** *** 6729,6735 **** flag meaning when present ~ f use "(3 of 5)" instead of "(file 3 of 5)" i use "[noeol]" instead of "[Incomplete last line]" ! l use "999L, 888C" instead of "999 lines, 888 characters" m use "[+]" instead of "[Modified]" n use "[New]" instead of "[New File]" r use "[RO]" instead of "[readonly]" --- 6730,6736 ---- flag meaning when present ~ f use "(3 of 5)" instead of "(file 3 of 5)" i use "[noeol]" instead of "[Incomplete last line]" ! l use "999L, 888B" instead of "999 lines, 888 bytes" m use "[+]" instead of "[Modified]" n use "[New]" instead of "[New File]" r use "[RO]" instead of "[readonly]" *** ../vim-8.2.1127/src/fileio.c 2020-06-29 21:32:03.278898255 +0200 --- src/fileio.c 2020-07-05 13:47:42.744828956 +0200 *************** *** 3039,3051 **** *p++ = ' '; if (shortmess(SHM_LINES)) vim_snprintf((char *)p, IOSIZE - (p - IObuff), ! "%ldL, %lldC", lnum, (varnumber_T)nchars); else { sprintf((char *)p, NGETTEXT("%ld line, ", "%ld lines, ", lnum), lnum); p += STRLEN(p); vim_snprintf((char *)p, IOSIZE - (p - IObuff), ! NGETTEXT("%lld character", "%lld characters", nchars), (varnumber_T)nchars); } } --- 3039,3051 ---- *p++ = ' '; if (shortmess(SHM_LINES)) vim_snprintf((char *)p, IOSIZE - (p - IObuff), ! "%ldL, %lldB", lnum, (varnumber_T)nchars); else { sprintf((char *)p, NGETTEXT("%ld line, ", "%ld lines, ", lnum), lnum); p += STRLEN(p); vim_snprintf((char *)p, IOSIZE - (p - IObuff), ! NGETTEXT("%lld byte", "%lld bytes", nchars), (varnumber_T)nchars); } } *** ../vim-8.2.1127/src/testdir/test_cscope.vim 2020-04-05 15:36:13.023853428 +0200 --- src/testdir/test_cscope.vim 2020-07-05 13:55:44.751619242 +0200 *************** *** 103,109 **** for cmd in ['cs find f Xmemfile_test.c', 'cs find 7 Xmemfile_test.c'] enew let a = execute(cmd) ! call assert_true(a =~ '"Xmemfile_test.c" \d\+L, \d\+C') call assert_equal('Xmemfile_test.c', @%) endfor --- 103,109 ---- for cmd in ['cs find f Xmemfile_test.c', 'cs find 7 Xmemfile_test.c'] enew let a = execute(cmd) ! call assert_true(a =~ '"Xmemfile_test.c" \d\+L, \d\+B') call assert_equal('Xmemfile_test.c', @%) endfor *************** *** 113,119 **** let a = execute(cmd) let alines = split(a, '\n', 1) call assert_equal('', alines[0]) ! call assert_true(alines[1] =~ '"Xmemfile_test.c" \d\+L, \d\+C') call assert_equal('(1 of 1): <> #include ', alines[2]) call assert_equal('#include ', getline('.')) endfor --- 113,119 ---- let a = execute(cmd) let alines = split(a, '\n', 1) call assert_equal('', alines[0]) ! call assert_true(alines[1] =~ '"Xmemfile_test.c" \d\+L, \d\+B') call assert_equal('(1 of 1): <> #include ', alines[2]) call assert_equal('#include ', getline('.')) endfor *** ../vim-8.2.1127/src/testdir/test_netbeans.vim 2020-05-31 21:27:58.331221914 +0200 --- src/testdir/test_netbeans.vim 2020-07-05 14:01:01.662823682 +0200 *************** *** 501,507 **** let l = readfile('Xnetbeans') call assert_equal('send: 3:insertDone!78 T F', l[-1]) sleep 1m ! call assert_match('.*/Xfile4" 3L, 0C', v:statusmsg) let g:last += 3 " saveDone test --- 501,507 ---- let l = readfile('Xnetbeans') call assert_equal('send: 3:insertDone!78 T F', l[-1]) sleep 1m ! call assert_match('.*/Xfile4" 3L, 0B', v:statusmsg) let g:last += 3 " saveDone test *************** *** 511,517 **** let l = readfile('Xnetbeans') call assert_equal('send: 3:saveDone!79', l[-1]) sleep 1m ! call assert_match('.*/Xfile4" 3L, 0C', v:statusmsg) let g:last += 3 " unimplemented command test --- 511,517 ---- let l = readfile('Xnetbeans') call assert_equal('send: 3:saveDone!79', l[-1]) sleep 1m ! call assert_match('.*/Xfile4" 3L, 0B', v:statusmsg) let g:last += 3 " unimplemented command test *** ../vim-8.2.1127/src/testdir/dumps/Test_diff_syntax_1.dump 2019-09-15 19:28:21.000000000 +0200 --- src/testdir/dumps/Test_diff_syntax_1.dump 2020-07-05 13:52:02.716176626 +0200 *************** *** 17,20 **** |~| @73 |~| @73 |X+1#0000000&|p|r|o|g|r|a|m|1|.|c| @45|1|,|1| @11|A|l@1 ! |"+0&&|X|p|r|o|g|r|a|m|2|.|c|"| |5|L|,| |7|6|C| @53 --- 17,20 ---- |~| @73 |~| @73 |X+1#0000000&|p|r|o|g|r|a|m|1|.|c| @45|1|,|1| @11|A|l@1 ! |"+0&&|X|p|r|o|g|r|a|m|2|.|c|"| |5|L|,| |7|6|B| @53 *** ../vim-8.2.1127/src/testdir/dumps/Test_long_file_name_1.dump 2019-12-11 18:54:10.000000000 +0100 --- src/testdir/dumps/Test_long_file_name_1.dump 2020-07-05 13:52:07.464164704 +0200 *************** *** 5,8 **** |~| @73 |~| @73 |~| @73 ! |<+0#0000000&|x@64|"| |0|L|,| |0|C| --- 5,8 ---- |~| @73 |~| @73 |~| @73 ! |<+0#0000000&|x@64|"| |0|L|,| |0|B| *** ../vim-8.2.1127/src/testdir/dumps/Test_display_unprintable_01.dump 2020-06-10 14:16:30.102988393 +0200 --- src/testdir/dumps/Test_display_unprintable_01.dump 2020-07-05 13:52:11.916153527 +0200 *************** *** 6,9 **** |t|w|o| @46 |~+0#4040ff13&| @48 |X+1#0000000&|u|n|i|x|.|t|x|t| @22|1|,|1| @11|A|l@1 ! |"+0&&|X|m|a|c|.|t|x|t|"| |[|n|o|e|o|l|]|[|m|a|c|]| |2|L|,| |9|C| @19 --- 6,9 ---- |t|w|o| @46 |~+0#4040ff13&| @48 |X+1#0000000&|u|n|i|x|.|t|x|t| @22|1|,|1| @11|A|l@1 ! |"+0&&|X|m|a|c|.|t|x|t|"| |[|n|o|e|o|l|]|[|m|a|c|]| |2|L|,| |9|B| @19 *** ../vim-8.2.1127/src/testdir/dumps/Test_tselect_1.dump 2019-10-12 17:00:05.000000000 +0200 --- src/testdir/dumps/Test_tselect_1.dump 2020-07-05 13:53:44.251921749 +0200 *************** *** 7,10 **** |~| @48 |~| @48 |~| @48 ! |"+0#0000000&|X|t|e|s|t|.|c|"| |2|L|,| |2|3|C| @14|1|,|1| @10|A|l@1| --- 7,10 ---- |~| @48 |~| @48 |~| @48 ! |"+0#0000000&|X|t|e|s|t|.|c|"| |2|L|,| |2|3|B| @14|1|,|1| @10|A|l@1| *** ../vim-8.2.1127/src/version.c 2020-07-04 19:19:40.004062203 +0200 --- src/version.c 2020-07-05 14:08:58.933625332 +0200 *************** *** 756,757 **** --- 756,759 ---- { /* Add new patch number below this line */ + /**/ + 1128, /**/ -- A village. Sound of chanting of Latin canon, punctuated by short, sharp cracks. It comes nearer. We see it is a line of MONKS ala SEVENTH SEAL flagellation scene, chanting and banging themselves on the foreheads with wooden boards. "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 ///