To: vim_dev@googlegroups.com
Subject: Patch 8.1.2332
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.1.2332 (after 8.2.2331)
Problem:    Missing file in refactoring.
Solution:   Update missing file.
Files:	    src/search.c


*** ../vim-8.1.2331/src/search.c	2019-11-21 20:55:22.217163423 +0100
--- src/search.c	2019-11-21 22:05:17.594995009 +0100
***************
*** 1918,1923 ****
--- 1918,2019 ----
  }
  
  /*
+  * Check matchpairs option for "*initc".
+  * If there is a match set "*initc" to the matching character and "*findc" to
+  * the opposite character.  Set "*backwards" to the direction.
+  * When "switchit" is TRUE swap the direction.
+  */
+     static void
+ find_mps_values(
+     int	    *initc,
+     int	    *findc,
+     int	    *backwards,
+     int	    switchit)
+ {
+     char_u	*ptr;
+ 
+     ptr = curbuf->b_p_mps;
+     while (*ptr != NUL)
+     {
+ 	if (has_mbyte)
+ 	{
+ 	    char_u *prev;
+ 
+ 	    if (mb_ptr2char(ptr) == *initc)
+ 	    {
+ 		if (switchit)
+ 		{
+ 		    *findc = *initc;
+ 		    *initc = mb_ptr2char(ptr + mb_ptr2len(ptr) + 1);
+ 		    *backwards = TRUE;
+ 		}
+ 		else
+ 		{
+ 		    *findc = mb_ptr2char(ptr + mb_ptr2len(ptr) + 1);
+ 		    *backwards = FALSE;
+ 		}
+ 		return;
+ 	    }
+ 	    prev = ptr;
+ 	    ptr += mb_ptr2len(ptr) + 1;
+ 	    if (mb_ptr2char(ptr) == *initc)
+ 	    {
+ 		if (switchit)
+ 		{
+ 		    *findc = *initc;
+ 		    *initc = mb_ptr2char(prev);
+ 		    *backwards = FALSE;
+ 		}
+ 		else
+ 		{
+ 		    *findc = mb_ptr2char(prev);
+ 		    *backwards = TRUE;
+ 		}
+ 		return;
+ 	    }
+ 	    ptr += mb_ptr2len(ptr);
+ 	}
+ 	else
+ 	{
+ 	    if (*ptr == *initc)
+ 	    {
+ 		if (switchit)
+ 		{
+ 		    *backwards = TRUE;
+ 		    *findc = *initc;
+ 		    *initc = ptr[2];
+ 		}
+ 		else
+ 		{
+ 		    *backwards = FALSE;
+ 		    *findc = ptr[2];
+ 		}
+ 		return;
+ 	    }
+ 	    ptr += 2;
+ 	    if (*ptr == *initc)
+ 	    {
+ 		if (switchit)
+ 		{
+ 		    *backwards = FALSE;
+ 		    *findc = *initc;
+ 		    *initc = ptr[-2];
+ 		}
+ 		else
+ 		{
+ 		    *backwards = TRUE;
+ 		    *findc =  ptr[-2];
+ 		}
+ 		return;
+ 	    }
+ 	    ++ptr;
+ 	}
+ 	if (*ptr == ',')
+ 	    ++ptr;
+     }
+ }
+ 
+ /*
   * findmatchlimit -- find the matching paren or brace, if it exists within
   * maxtravel lines of the cursor.  A maxtravel of 0 means search until falling
   * off the edge of the file.
*** ../vim-8.1.2331/src/version.c	2019-11-21 22:14:14.357810945 +0100
--- src/version.c	2019-11-21 22:26:49.435369711 +0100
***************
*** 739,740 ****
--- 739,742 ----
  {   /* Add new patch number below this line */
+ /**/
+     2332,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
102. When filling out your driver's license application, you give
     your IP address.

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