To: vim_dev@googlegroups.com
Subject: Patch 8.2.4827
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.4827
Problem:    Typo in variable name. (Gabriel Dupras)
Solution:   Rename the variable.
Files:      src/map.c


*** ../vim-8.2.4826/src/map.c	2022-04-25 14:37:42.410308492 +0100
--- src/map.c	2022-04-25 18:22:52.718964606 +0100
***************
*** 508,514 ****
      {
  	int	did_it = FALSE;
  	int	did_local = FALSE;
! 	int	keyround1_simplfied = keyround == 1 && did_simplify;
  	int	round;
  	int	hash;
  	int	new_hash;
--- 508,514 ----
      {
  	int	did_it = FALSE;
  	int	did_local = FALSE;
! 	int	keyround1_simplified = keyround == 1 && did_simplify;
  	int	round;
  	int	hash;
  	int	new_hash;
***************
*** 726,732 ****
  				    mpp = &(mp->m_next);
  				    continue;
  				}
! 				if (keyround1_simplfied && !mp->m_simplified)
  				    break;
  				// We reset the indicated mode bits. If nothing
  				// is left the entry is deleted below.
--- 726,732 ----
  				    mpp = &(mp->m_next);
  				    continue;
  				}
! 				if (keyround1_simplified && !mp->m_simplified)
  				    break;
  				// We reset the indicated mode bits. If nothing
  				// is left the entry is deleted below.
***************
*** 779,785 ****
  				    mp->m_nowait = nowait;
  				    mp->m_silent = silent;
  				    mp->m_mode = mode;
! 				    mp->m_simplified = keyround1_simplfied;
  #ifdef FEAT_EVAL
  				    mp->m_expr = expr;
  				    mp->m_script_ctx = current_sctx;
--- 779,785 ----
  				    mp->m_nowait = nowait;
  				    mp->m_silent = silent;
  				    mp->m_mode = mode;
! 				    mp->m_simplified = keyround1_simplified;
  #ifdef FEAT_EVAL
  				    mp->m_expr = expr;
  				    mp->m_script_ctx = current_sctx;
***************
*** 817,823 ****
  	    // delete entry
  	    if (!did_it)
  	    {
! 		if (!keyround1_simplfied)
  		    retval = 2;		// no match
  	    }
  	    else if (*keys == Ctrl_C)
--- 817,823 ----
  	    // delete entry
  	    if (!did_it)
  	    {
! 		if (!keyround1_simplified)
  		    retval = 2;		// no match
  	    }
  	    else if (*keys == Ctrl_C)
***************
*** 853,859 ****
  #ifdef FEAT_EVAL
  		    expr, /* sid */ -1, /* scriptversion */ 0, /* lnum */ 0,
  #endif
! 		    keyround1_simplfied) == FAIL)
  	{
  	    retval = 4;	    // no mem
  	    goto theend;
--- 853,859 ----
  #ifdef FEAT_EVAL
  		    expr, /* sid */ -1, /* scriptversion */ 0, /* lnum */ 0,
  #endif
! 		    keyround1_simplified) == FAIL)
  	{
  	    retval = 4;	    // no mem
  	    goto theend;
*** ../vim-8.2.4826/src/version.c	2022-04-25 17:40:39.796669963 +0100
--- src/version.c	2022-04-25 18:26:01.046529500 +0100
***************
*** 748,749 ****
--- 748,751 ----
  {   /* Add new patch number below this line */
+ /**/
+     4827,
  /**/

-- 
hundred-and-one symptoms of being an internet addict:
53. To find out what time it is, you send yourself an e-mail and check the
    "Date:" field.

 /// 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    ///