To: vim_dev@googlegroups.com
Subject: Patch 8.2.2829
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 8.2.2829
Problem:    Some comments are not correct or clear.
Solution:   Adjust the comments.  Add test for cursor position.
Files:      src/regexp_bt.c, src/regexp_nfa.c,
            src/testdir/test_exec_while_if.vim,
            src/testdir/test_substitute.vim


*** ../vim-8.2.2828/src/regexp_bt.c	2021-04-05 13:59:48.720005966 +0200
--- src/regexp_bt.c	2021-05-03 19:54:25.903129748 +0200
***************
*** 4764,4770 ****
  
  /*
   * Match a regexp against a string ("line" points to the string) or multiple
!  * lines ("line" is NULL, use reg_getline()).
   * Returns 0 for failure, number of lines contained in the match otherwise.
   */
      static long
--- 4764,4770 ----
  
  /*
   * Match a regexp against a string ("line" points to the string) or multiple
!  * lines (if "line" is NULL, use reg_getline()).
   * Returns 0 for failure, number of lines contained in the match otherwise.
   */
      static long
*** ../vim-8.2.2828/src/regexp_nfa.c	2021-04-05 13:59:48.720005966 +0200
--- src/regexp_nfa.c	2021-05-03 19:52:07.647511085 +0200
***************
*** 7287,7293 ****
  
  /*
   * Match a regexp against a string ("line" points to the string) or multiple
!  * lines ("line" is NULL, use reg_getline()).
   *
   * Returns <= 0 for failure, number of lines contained in the match otherwise.
   */
--- 7287,7293 ----
  
  /*
   * Match a regexp against a string ("line" points to the string) or multiple
!  * lines (if "line" is NULL, use reg_getline()).
   *
   * Returns <= 0 for failure, number of lines contained in the match otherwise.
   */
*** ../vim-8.2.2828/src/testdir/test_exec_while_if.vim	2020-08-12 18:50:31.875655822 +0200
--- src/testdir/test_exec_while_if.vim	2021-03-26 19:58:06.500575726 +0100
***************
*** 1,6 ****
! " Test for :execute, :while and :if
  
! function Test_exec_while_if()
    new
  
    let i = 0
--- 1,6 ----
! " Test for :execute, :while, :for and :if
  
! func Test_exec_while_if()
    new
  
    let i = 0
***************
*** 50,55 ****
          \ "7x999999999888888887777777666666555554444333221",
          \ "8",
          \ "9x"], getline(1, 10))
! endfunction
  
  " vim: shiftwidth=2 sts=2 expandtab
--- 50,55 ----
          \ "7x999999999888888887777777666666555554444333221",
          \ "8",
          \ "9x"], getline(1, 10))
! endfunc
  
  " vim: shiftwidth=2 sts=2 expandtab
*** ../vim-8.2.2828/src/testdir/test_substitute.vim	2020-09-23 22:38:01.507927503 +0200
--- src/testdir/test_substitute.vim	2021-01-28 19:45:29.231263452 +0100
***************
*** 926,929 ****
--- 926,938 ----
    close!
  endfunc
  
+ func Test_substitute_skipped_range()
+   new
+   if 0
+     /1/5/2/2/\n
+   endif
+   call assert_equal([0, 1, 1, 0, 1], getcurpos())
+   bwipe!
+ endfunc
+ 
  " vim: shiftwidth=2 sts=2 expandtab
*** ../vim-8.2.2828/src/version.c	2021-05-03 19:49:48.447891682 +0200
--- src/version.c	2021-05-03 20:00:53.857968113 +0200
***************
*** 752,753 ****
--- 752,755 ----
  {   /* Add new patch number below this line */
+ /**/
+     2829,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
224. You set up your own Web page. You set up a Web page for each
     of your kids... and your pets.

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///                                                                      \\\
\\\        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///