0
0
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00

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".
This commit is contained in:
Bram Moolenaar 2020-07-05 14:10:13 +02:00
parent fb9d5c51c8
commit 3f40ce78f5
9 changed files with 13 additions and 11 deletions

View File

@ -6730,7 +6730,7 @@ A jump table for the options with a short description can be found at |Q_op|.
flag meaning when present ~ flag meaning when present ~
f use "(3 of 5)" instead of "(file 3 of 5)" f use "(3 of 5)" instead of "(file 3 of 5)"
i use "[noeol]" instead of "[Incomplete last line]" 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]" m use "[+]" instead of "[Modified]"
n use "[New]" instead of "[New File]" n use "[New]" instead of "[New File]"
r use "[RO]" instead of "[readonly]" r use "[RO]" instead of "[readonly]"

View File

@ -3039,13 +3039,13 @@ msg_add_lines(
*p++ = ' '; *p++ = ' ';
if (shortmess(SHM_LINES)) if (shortmess(SHM_LINES))
vim_snprintf((char *)p, IOSIZE - (p - IObuff), vim_snprintf((char *)p, IOSIZE - (p - IObuff),
"%ldL, %lldC", lnum, (varnumber_T)nchars); "%ldL, %lldB", lnum, (varnumber_T)nchars);
else else
{ {
sprintf((char *)p, NGETTEXT("%ld line, ", "%ld lines, ", lnum), lnum); sprintf((char *)p, NGETTEXT("%ld line, ", "%ld lines, ", lnum), lnum);
p += STRLEN(p); p += STRLEN(p);
vim_snprintf((char *)p, IOSIZE - (p - IObuff), vim_snprintf((char *)p, IOSIZE - (p - IObuff),
NGETTEXT("%lld character", "%lld characters", nchars), NGETTEXT("%lld byte", "%lld bytes", nchars),
(varnumber_T)nchars); (varnumber_T)nchars);
} }
} }

View File

@ -17,4 +17,4 @@
|~| @73 |~| @73
|~| @73 |~| @73
|X+1#0000000&|p|r|o|g|r|a|m|1|.|c| @45|1|,|1| @11|A|l@1 |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

View File

@ -6,4 +6,4 @@
|t|w|o| @46 |t|w|o| @46
|~+0#4040ff13&| @48 |~+0#4040ff13&| @48
|X+1#0000000&|u|n|i|x|.|t|x|t| @22|1|,|1| @11|A|l@1 |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

View File

@ -5,4 +5,4 @@
|~| @73 |~| @73
|~| @73 |~| @73
|~| @73 |~| @73
|<+0#0000000&|x@64|"| |0|L|,| |0|C| |<+0#0000000&|x@64|"| |0|L|,| |0|B|

View File

@ -7,4 +7,4 @@
|~| @48 |~| @48
|~| @48 |~| @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|

View File

@ -103,7 +103,7 @@ func Test_cscopeWithCscopeConnections()
for cmd in ['cs find f Xmemfile_test.c', 'cs find 7 Xmemfile_test.c'] for cmd in ['cs find f Xmemfile_test.c', 'cs find 7 Xmemfile_test.c']
enew enew
let a = execute(cmd) 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', @%) call assert_equal('Xmemfile_test.c', @%)
endfor endfor
@ -113,7 +113,7 @@ func Test_cscopeWithCscopeConnections()
let a = execute(cmd) let a = execute(cmd)
let alines = split(a, '\n', 1) let alines = split(a, '\n', 1)
call assert_equal('', alines[0]) 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('(1 of 1): <<global>> #include <assert.h>', alines[2])
call assert_equal('#include <assert.h>', getline('.')) call assert_equal('#include <assert.h>', getline('.'))
endfor endfor

View File

@ -501,7 +501,7 @@ func Nb_basic(port)
let l = readfile('Xnetbeans') let l = readfile('Xnetbeans')
call assert_equal('send: 3:insertDone!78 T F', l[-1]) call assert_equal('send: 3:insertDone!78 T F', l[-1])
sleep 1m sleep 1m
call assert_match('.*/Xfile4" 3L, 0C', v:statusmsg) call assert_match('.*/Xfile4" 3L, 0B', v:statusmsg)
let g:last += 3 let g:last += 3
" saveDone test " saveDone test
@ -511,7 +511,7 @@ func Nb_basic(port)
let l = readfile('Xnetbeans') let l = readfile('Xnetbeans')
call assert_equal('send: 3:saveDone!79', l[-1]) call assert_equal('send: 3:saveDone!79', l[-1])
sleep 1m sleep 1m
call assert_match('.*/Xfile4" 3L, 0C', v:statusmsg) call assert_match('.*/Xfile4" 3L, 0B', v:statusmsg)
let g:last += 3 let g:last += 3
" unimplemented command test " unimplemented command test

View File

@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1128,
/**/ /**/
1127, 1127,
/**/ /**/