0
0
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00

patch 8.2.1547: various comment problems

Problem:    Various comment problems.
Solution:   Update comments.
This commit is contained in:
Bram Moolenaar
2020-08-30 19:26:45 +02:00
parent cd80006ecb
commit 02c037a4be
9 changed files with 26 additions and 13 deletions

View File

@@ -778,7 +778,7 @@ ex_argdelete(exarg_T *eap)
if (eap->addr_count > 0 || *eap->arg == NUL)
{
// ":argdel" works like ":argdel"
// ":argdel" works like ":.argdel"
if (eap->addr_count == 0)
{
if (curwin->w_arg_idx >= ARGCOUNT)

View File

@@ -11,8 +11,11 @@ Modifications:
- 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:
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:

View File

@@ -1952,7 +1952,7 @@ put_escstr(FILE *fd, char_u *strstart, int what)
// when they are read back.
if (c == K_SPECIAL && what != 2)
{
modifiers = 0x0;
modifiers = 0;
if (str[1] == KS_MODIFIER)
{
modifiers = str[2];

View File

@@ -1607,7 +1607,7 @@ utf_ptr2cells(
{
int c;
// Need to convert to a wide character.
// Need to convert to a character number.
if (*p >= 0x80)
{
c = utf_ptr2char(p);
@@ -1762,7 +1762,7 @@ dbcs_ptr2char(char_u *p)
}
/*
* Convert a UTF-8 byte sequence to a wide character.
* 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.

View File

@@ -687,7 +687,7 @@ do_tag(
{
VIM_CLEAR(tagstack[tagstackidx].user_data);
tagstack[tagstackidx].user_data = vim_strnsave(
tagp.user_data, tagp.user_data_end - tagp.user_data);
tagp.user_data, tagp.user_data_end - tagp.user_data);
}
++tagstackidx;

View File

@@ -49,3 +49,12 @@ TO ADD A SCREEN DUMP TEST:
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.

View File

@@ -22,15 +22,13 @@ endfunc
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\<c-v>2j2l\"ap"
call assert_equal(['L one 1', '', 'L one 3', ''], getline(1,4))
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()
@@ -38,7 +36,7 @@ func Test_put_lines()
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,'$'))
call assert_equal(['Line 3', '', 'Line 1', 'Line2'], getline(1, '$'))
" clean up
bw!
eval a[0]->setreg('a', a[1])
@@ -53,7 +51,7 @@ func Test_put_expr()
exec "4norm! \"=\<cr>P"
norm! j0.
norm! j0.
call assert_equal(['A1','A2','A3','4A','5A','6A'], getline(1,'$'))
call assert_equal(['A1','A2','A3','4A','5A','6A'], getline(1, '$'))
bw!
endfunc

View File

@@ -3520,7 +3520,8 @@ u_undoline(void)
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);
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;

View File

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