patch 8.2.1128: the write message mentions characters, but it's bytes

Problem:    The write message mentions characters, but it's actually bytes.
Solution:   Change "C" to "B" and "characters" to "bytes".

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index bd6cc62d629461e7e3315dd6398a548f3ab8c4fe..109fc1614dac7d85501eb20c0a8c65d9dd2a94af 100644 (file)
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -6730,7 +6730,7 @@ A jump table for the options with a short description can be found at |Q_op|.
         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"
+         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]"

diff --git a/src/fileio.c b/src/fileio.c
index 81a502665252664cf7b70b13e5d21599cc539470..e46231029cacf4fef4170ebc0770ac571d45f101 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -3039,13 +3039,13 @@ msg_add_lines(
        *p++ = ' ';
     if (shortmess(SHM_LINES))
        vim_snprintf((char *)p, IOSIZE - (p - IObuff),
-               "%ldL, %lldC", lnum, (varnumber_T)nchars);
+               "%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 character", "%lld characters", nchars),
+               NGETTEXT("%lld byte", "%lld bytes", nchars),
                (varnumber_T)nchars);
     }
 }

diff --git a/src/testdir/dumps/Test_diff_syntax_1.dump b/src/testdir/dumps/Test_diff_syntax_1.dump
index 05598ff096c52ba9e6f808ccc81e7a2b6908c67c..9204b47ab963aee179904ff4762850d773441e9c 100644 (file)
--- a/src/testdir/dumps/Test_diff_syntax_1.dump
+++ b/src/testdir/dumps/Test_diff_syntax_1.dump
@@ -17,4 +17,4 @@
 |~| @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
+|"+0&&|X|p|r|o|g|r|a|m|2|.|c|"| |5|L|,| |7|6|B| @53

diff --git a/src/testdir/dumps/Test_display_unprintable_01.dump b/src/testdir/dumps/Test_display_unprintable_01.dump
index e4cc0d9c7fff55d531e1110c7473d0e623b99702..552b40213e87e3d5b8bf3a512c0aa981a7e981e1 100644 (file)
--- a/src/testdir/dumps/Test_display_unprintable_01.dump
+++ b/src/testdir/dumps/Test_display_unprintable_01.dump
@@ -6,4 +6,4 @@
 |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
+|"+0&&|X|m|a|c|.|t|x|t|"| |[|n|o|e|o|l|]|[|m|a|c|]| |2|L|,| |9|B| @19

diff --git a/src/testdir/dumps/Test_long_file_name_1.dump b/src/testdir/dumps/Test_long_file_name_1.dump
index 46fa9bdfbe39453799dd5511cef055416877a00d..1dcafc315cb887b3e8a0b3e73e69e44921fb0bbb 100644 (file)
--- a/src/testdir/dumps/Test_long_file_name_1.dump
+++ b/src/testdir/dumps/Test_long_file_name_1.dump
@@ -5,4 +5,4 @@
 |~| @73
 |~| @73
 |~| @73
-|<+0#0000000&|x@64|"| |0|L|,| |0|C| 
+|<+0#0000000&|x@64|"| |0|L|,| |0|B| 

diff --git a/src/testdir/dumps/Test_tselect_1.dump b/src/testdir/dumps/Test_tselect_1.dump
index cdaee4577684110f3d5d94f694c6a5c3aeaa7f14..909012245edeb232f3b9c950c666447bfc072bcd 100644 (file)
--- a/src/testdir/dumps/Test_tselect_1.dump
+++ b/src/testdir/dumps/Test_tselect_1.dump
@@ -7,4 +7,4 @@
 |~| @48
 |~| @48
 |~| @48
-|"+0#0000000&|X|t|e|s|t|.|c|"| |2|L|,| |2|3|C| @14|1|,|1| @10|A|l@1| 
+|"+0#0000000&|X|t|e|s|t|.|c|"| |2|L|,| |2|3|B| @14|1|,|1| @10|A|l@1| 

diff --git a/src/testdir/test_cscope.vim b/src/testdir/test_cscope.vim
index a1a839fcd26b41920d52242eed5194a47378598f..9d12e2f60292d94d33da0b30816bcac599c3d488 100644 (file)
--- a/src/testdir/test_cscope.vim
+++ b/src/testdir/test_cscope.vim
@@ -103,7 +103,7 @@ func Test_cscopeWithCscopeConnections()
     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_true(a =~ '"Xmemfile_test.c" \d\+L, \d\+B')
       call assert_equal('Xmemfile_test.c', @%)
     endfor
 
@@ -113,7 +113,7 @@ func Test_cscopeWithCscopeConnections()
       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_true(alines[1] =~ '"Xmemfile_test.c" \d\+L, \d\+B')
       call assert_equal('(1 of 1): <<global>> #include <assert.h>', alines[2])
       call assert_equal('#include <assert.h>', getline('.'))
     endfor

diff --git a/src/testdir/test_netbeans.vim b/src/testdir/test_netbeans.vim
index 52c37820ef6ec89165bd59e4a824acd5792e2795..8a35389d52b63fd27a98fd1503bb9ca6a39862f0 100644 (file)
--- a/src/testdir/test_netbeans.vim
+++ b/src/testdir/test_netbeans.vim
@@ -501,7 +501,7 @@ func Nb_basic(port)
   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)
+  call assert_match('.*/Xfile4" 3L, 0B', v:statusmsg)
   let g:last += 3
 
   " saveDone test
@@ -511,7 +511,7 @@ func Nb_basic(port)
   let l = readfile('Xnetbeans')
   call assert_equal('send: 3:saveDone!79', l[-1])
   sleep 1m
-  call assert_match('.*/Xfile4" 3L, 0C', v:statusmsg)
+  call assert_match('.*/Xfile4" 3L, 0B', v:statusmsg)
   let g:last += 3
 
   " unimplemented command test

diff --git a/src/version.c b/src/version.c
index b406a6957768ad0d56a01b130dde1faa85bfcfea..880051efa6069c5ef19db4ae5829fc8dd806c88b 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1128,
 /**/
     1127,
 /**/