mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-07 20:08:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17288 from zeertzjq/vim-8.2.1128

Browse Source 
vim-patch:8.2.1128: the write message mentions characters, but it's bytes
This commit is contained in:
zeertzjq
2022-02-04 23:07:21 +08:00
committed by GitHub
parent c50cea3de4 9b0363d365
commit dcbf9f93e9
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runtime/doc/options.txt
View File

@@ -5462,7 +5462,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]"

4
src/nvim/fileio.c
View File

@@ -3863,7 +3863,7 @@ void msg_add_lines(int insert_space, long lnum, off_T nchars)
*p++ = ' '; *p++ = ' ';
} }
if (shortmess(SHM_LINES)) { if (shortmess(SHM_LINES)) {
vim_snprintf((char *)p, IOSIZE - (p - IObuff), "%" PRId64 "L, %" PRId64 "C", vim_snprintf((char *)p, IOSIZE - (p - IObuff), "%" PRId64 "L, %" PRId64 "B",
(int64_t)lnum, (int64_t)nchars); (int64_t)lnum, (int64_t)nchars);
} else { } else {
vim_snprintf((char *)p, IOSIZE - (p - IObuff), vim_snprintf((char *)p, IOSIZE - (p - IObuff),
@@ -3871,7 +3871,7 @@ void msg_add_lines(int insert_space, long lnum, off_T nchars)
(int64_t)lnum); (int64_t)lnum);
p += STRLEN(p); p += STRLEN(p);
vim_snprintf((char *)p, IOSIZE - (p - IObuff), vim_snprintf((char *)p, IOSIZE - (p - IObuff),
NGETTEXT("%" PRId64 " character", "%" PRId64 " characters", nchars), NGETTEXT("%" PRId64 " byte", "%" PRId64 " bytes", nchars),
(int64_t)nchars); (int64_t)nchars);
} }
} }

4
src/nvim/testdir/test_cscope.vim
View File

@@ -102,7 +102,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
@@ -112,7 +112,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

2
test/functional/autocmd/focus_spec.lua
View File

@@ -56,7 +56,7 @@ describe('autoread TUI FocusGained/FocusLost', function()
line 3 | line 3 |
line 4 | line 4 |
{5:xtest-foo }| {5:xtest-foo }|
"xtest-foo" 4L, 28C | "xtest-foo" 4L, 28B |
{3:-- TERMINAL --} | {3:-- TERMINAL --} |
]]} ]]}
end) end)

2
test/functional/ui/input_spec.lua
View File

@@ -165,7 +165,7 @@ describe('input non-printable chars', function()
{1:~ }| {1:~ }|
{1:~ }| {1:~ }|
{1:~ }| {1:~ }|
"Xtest-overwrite" [noeol] 1L, 6C | "Xtest-overwrite" [noeol] 1L, 6B |
]]) ]])
-- The timestamp is in second resolution, wait two seconds to be sure. -- The timestamp is in second resolution, wait two seconds to be sure.