Mirror of the Vim source from https://github.com/vim/vim
Revisão | d3cff90680f3f985c21e34e03607a5808ed4dcbe (tree) |
---|---|
Hora | 2006-10-18 01:48:26 |
Autor | vimboss |
Commiter | vimboss |
updated for version 7.0-144
@@ -3777,8 +3777,8 @@ | ||
3777 | 3777 | |
3778 | 3778 | op = OP(scan); |
3779 | 3779 | /* Check for character class with NL added. */ |
3780 | - if (!reg_line_lbr && WITH_NL(op) && *reginput == NUL | |
3781 | - && reglnum <= reg_maxline) | |
3780 | + if (!reg_line_lbr && WITH_NL(op) && REG_MULTI | |
3781 | + && *reginput == NUL && reglnum <= reg_maxline) | |
3782 | 3782 | { |
3783 | 3783 | reg_nextline(); |
3784 | 3784 | } |
@@ -4855,8 +4855,8 @@ | ||
4855 | 4855 | break; |
4856 | 4856 | |
4857 | 4857 | case NEWL: |
4858 | - if ((c != NUL || reglnum > reg_maxline || reg_line_lbr) | |
4859 | - && (c != '\n' || !reg_line_lbr)) | |
4858 | + if ((c != NUL || !REG_MULTI || reglnum > reg_maxline | |
4859 | + || reg_line_lbr) && (c != '\n' || !reg_line_lbr)) | |
4860 | 4860 | status = RA_NOMATCH; |
4861 | 4861 | else if (reg_line_lbr) |
4862 | 4862 | ADVANCE_REGINPUT(); |
@@ -5316,8 +5316,8 @@ | ||
5316 | 5316 | ++count; |
5317 | 5317 | mb_ptr_adv(scan); |
5318 | 5318 | } |
5319 | - if (!WITH_NL(OP(p)) || reglnum > reg_maxline || reg_line_lbr | |
5320 | - || count == maxcount) | |
5319 | + if (!REG_MULTI || !WITH_NL(OP(p)) || reglnum > reg_maxline | |
5320 | + || reg_line_lbr || count == maxcount) | |
5321 | 5321 | break; |
5322 | 5322 | ++count; /* count the line-break */ |
5323 | 5323 | reg_nextline(); |
@@ -5341,7 +5341,8 @@ | ||
5341 | 5341 | } |
5342 | 5342 | else if (*scan == NUL) |
5343 | 5343 | { |
5344 | - if (!WITH_NL(OP(p)) || reglnum > reg_maxline || reg_line_lbr) | |
5344 | + if (!REG_MULTI || !WITH_NL(OP(p)) || reglnum > reg_maxline | |
5345 | + || reg_line_lbr) | |
5345 | 5346 | break; |
5346 | 5347 | reg_nextline(); |
5347 | 5348 | scan = reginput; |
@@ -5370,7 +5371,8 @@ | ||
5370 | 5371 | } |
5371 | 5372 | else if (*scan == NUL) |
5372 | 5373 | { |
5373 | - if (!WITH_NL(OP(p)) || reglnum > reg_maxline || reg_line_lbr) | |
5374 | + if (!REG_MULTI || !WITH_NL(OP(p)) || reglnum > reg_maxline | |
5375 | + || reg_line_lbr) | |
5374 | 5376 | break; |
5375 | 5377 | reg_nextline(); |
5376 | 5378 | scan = reginput; |
@@ -5399,7 +5401,8 @@ | ||
5399 | 5401 | } |
5400 | 5402 | else if (*scan == NUL) |
5401 | 5403 | { |
5402 | - if (!WITH_NL(OP(p)) || reglnum > reg_maxline || reg_line_lbr) | |
5404 | + if (!REG_MULTI || !WITH_NL(OP(p)) || reglnum > reg_maxline | |
5405 | + || reg_line_lbr) | |
5403 | 5406 | break; |
5404 | 5407 | reg_nextline(); |
5405 | 5408 | scan = reginput; |
@@ -5424,7 +5427,8 @@ | ||
5424 | 5427 | { |
5425 | 5428 | if (*scan == NUL) |
5426 | 5429 | { |
5427 | - if (!WITH_NL(OP(p)) || reglnum > reg_maxline || reg_line_lbr) | |
5430 | + if (!REG_MULTI || !WITH_NL(OP(p)) || reglnum > reg_maxline | |
5431 | + || reg_line_lbr) | |
5428 | 5432 | break; |
5429 | 5433 | reg_nextline(); |
5430 | 5434 | scan = reginput; |
@@ -5454,7 +5458,8 @@ | ||
5454 | 5458 | #endif |
5455 | 5459 | if (*scan == NUL) |
5456 | 5460 | { |
5457 | - if (!WITH_NL(OP(p)) || reglnum > reg_maxline || reg_line_lbr) | |
5461 | + if (!REG_MULTI || !WITH_NL(OP(p)) || reglnum > reg_maxline | |
5462 | + || reg_line_lbr) | |
5458 | 5463 | break; |
5459 | 5464 | reg_nextline(); |
5460 | 5465 | scan = reginput; |
@@ -5617,7 +5622,8 @@ | ||
5617 | 5622 | #endif |
5618 | 5623 | if (*scan == NUL) |
5619 | 5624 | { |
5620 | - if (!WITH_NL(OP(p)) || reglnum > reg_maxline || reg_line_lbr) | |
5625 | + if (!REG_MULTI || !WITH_NL(OP(p)) || reglnum > reg_maxline | |
5626 | + || reg_line_lbr) | |
5621 | 5627 | break; |
5622 | 5628 | reg_nextline(); |
5623 | 5629 | scan = reginput; |
@@ -5646,8 +5652,8 @@ | ||
5646 | 5652 | |
5647 | 5653 | case NEWL: |
5648 | 5654 | while (count < maxcount |
5649 | - && ((*scan == NUL && reglnum <= reg_maxline && !reg_line_lbr) | |
5650 | - || (*scan == '\n' && reg_line_lbr))) | |
5655 | + && ((*scan == NUL && reglnum <= reg_maxline && !reg_line_lbr | |
5656 | + && REG_MULTI) || (*scan == '\n' && reg_line_lbr))) | |
5651 | 5657 | { |
5652 | 5658 | count++; |
5653 | 5659 | if (reg_line_lbr) |
@@ -667,6 +667,8 @@ | ||
667 | 667 | static int included_patches[] = |
668 | 668 | { /* Add new patch number below this line */ |
669 | 669 | /**/ |
670 | + 144, | |
671 | +/**/ | |
670 | 672 | 143, |
671 | 673 | /**/ |
672 | 674 | 142, |