Skip to content

Commit 02c037a

Browse files
committed
patch 8.2.1547: various comment problems
Problem: Various comment problems. Solution: Update comments.
1 parent cd80006 commit 02c037a

9 files changed

Lines changed: 26 additions & 13 deletions

File tree

src/arglist.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -778,7 +778,7 @@ ex_argdelete(exarg_T *eap)
778778

779779
if (eap->addr_count > 0 || *eap->arg == NUL)
780780
{
781-
// ":argdel" works like ":argdel"
781+
// ":argdel" works like ":.argdel"
782782
if (eap->addr_count == 0)
783783
{
784784
if (curwin->w_arg_idx >= ARGCOUNT)

src/libvterm/README

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,11 @@ Modifications:
1111
- Convert from C99 to C90.
1212
- Other changes to support embedding in Vim.
1313

14-
To find the diff of a libvterm patch edit this URL, changing "999" to the patch
15-
number:
14+
To get the latest version of libvterm you need the "bzr" command and do:
15+
bzr co http://bazaar.leonerd.org.uk/c/libvterm/
16+
17+
To find the diff of a libvterm revision edit this URL, changing "999" to the
18+
patch number:
1619
https://bazaar.launchpad.net/~libvterm/libvterm/trunk/diff/999?context=3
1720

1821
To merge in changes from Github, do this:

src/map.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1952,7 +1952,7 @@ put_escstr(FILE *fd, char_u *strstart, int what)
19521952
// when they are read back.
19531953
if (c == K_SPECIAL && what != 2)
19541954
{
1955-
modifiers = 0x0;
1955+
modifiers = 0;
19561956
if (str[1] == KS_MODIFIER)
19571957
{
19581958
modifiers = str[2];

src/mbyte.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1607,7 +1607,7 @@ utf_ptr2cells(
16071607
{
16081608
int c;
16091609

1610-
// Need to convert to a wide character.
1610+
// Need to convert to a character number.
16111611
if (*p >= 0x80)
16121612
{
16131613
c = utf_ptr2char(p);
@@ -1762,7 +1762,7 @@ dbcs_ptr2char(char_u *p)
17621762
}
17631763

17641764
/*
1765-
* Convert a UTF-8 byte sequence to a wide character.
1765+
* Convert a UTF-8 byte sequence to a character number.
17661766
* If the sequence is illegal or truncated by a NUL the first byte is
17671767
* returned.
17681768
* For an overlong sequence this may return zero.

src/tag.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -687,7 +687,7 @@ do_tag(
687687
{
688688
VIM_CLEAR(tagstack[tagstackidx].user_data);
689689
tagstack[tagstackidx].user_data = vim_strnsave(
690-
tagp.user_data, tagp.user_data_end - tagp.user_data);
690+
tagp.user_data, tagp.user_data_end - tagp.user_data);
691691
}
692692

693693
++tagstackidx;

src/testdir/README.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,3 +49,12 @@ TO ADD A SCREEN DUMP TEST:
4949
Mostly the same as writing a new style test. Additionally, see help on
5050
"terminal-dumptest". Put the reference dump in "dumps/Test_func_name.dump".
5151

52+
53+
OLD STYLE TESTS:
54+
55+
There are a few tests that are used when Vim was built without the +eval
56+
feature. These cannot use the "assert" functions, therefore they consist of a
57+
.in file that contains Normal mode commands between STARTTEST and ENDTEST.
58+
They modify the file and the result gets writtein in the test.out file. This
59+
is then compared with the .ok file. If they are equal the test passed. If
60+
they differ the test failed.

src/testdir/test_put.vim

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,23 +22,21 @@ endfunc
2222

2323
func Test_put_char_block2()
2424
new
25-
let a = [ 'a'->getreg(), 'a'->getregtype() ]
2625
call setreg('a', ' one ', 'v')
2726
call setline(1, ['Line 1', '', 'Line 3', ''])
2827
" visually select the first 3 lines and put register a over it
2928
exe "norm! ggl\<c-v>2j2l\"ap"
30-
call assert_equal(['L one 1', '', 'L one 3', ''], getline(1,4))
29+
call assert_equal(['L one 1', '', 'L one 3', ''], getline(1, 4))
3130
" clean up
3231
bw!
33-
call setreg('a', a[0], a[1])
3432
endfunc
3533

3634
func Test_put_lines()
3735
new
3836
let a = [ getreg('a'), getregtype('a') ]
3937
call setline(1, ['Line 1', 'Line2', 'Line 3', ''])
4038
exe 'norm! gg"add"AddG""p'
41-
call assert_equal(['Line 3', '', 'Line 1', 'Line2'], getline(1,'$'))
39+
call assert_equal(['Line 3', '', 'Line 1', 'Line2'], getline(1, '$'))
4240
" clean up
4341
bw!
4442
eval a[0]->setreg('a', a[1])
@@ -53,7 +51,7 @@ func Test_put_expr()
5351
exec "4norm! \"=\<cr>P"
5452
norm! j0.
5553
norm! j0.
56-
call assert_equal(['A1','A2','A3','4A','5A','6A'], getline(1,'$'))
54+
call assert_equal(['A1','A2','A3','4A','5A','6A'], getline(1, '$'))
5755
bw!
5856
endfunc
5957

src/undo.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3520,7 +3520,8 @@ u_undoline(void)
35203520
do_outofmem_msg((long_u)0);
35213521
return;
35223522
}
3523-
ml_replace_len(curbuf->b_u_line_lnum, curbuf->b_u_line_ptr.ul_line, curbuf->b_u_line_ptr.ul_len, TRUE, FALSE);
3523+
ml_replace_len(curbuf->b_u_line_lnum, curbuf->b_u_line_ptr.ul_line,
3524+
curbuf->b_u_line_ptr.ul_len, TRUE, FALSE);
35243525
changed_bytes(curbuf->b_u_line_lnum, 0);
35253526
curbuf->b_u_line_ptr = oldp;
35263527

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -754,6 +754,8 @@ static char *(features[]) =
754754

755755
static int included_patches[] =
756756
{ /* Add new patch number below this line */
757+
/**/
758+
1547,
757759
/**/
758760
1546,
759761
/**/

0 commit comments

Comments
 (0)