summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2022-04-25 18:59:25 +0100
committerBram Moolenaar <Bram@vim.org>2022-04-25 18:59:25 +0100
commit87f74106f96737e7b8ceaafe1a131aa718077de6 (patch)
tree662910141521e064fbf889b7cc14ccd9d3f1b10d /src
parent1f435dafff2452e0b55d1ca457ce7402e526e92a (diff)
patch 8.2.4827: typo in variable namev8.2.4827
Problem: Typo in variable name. (Gabriel Dupras) Solution: Rename the variable.
Diffstat (limited to 'src')
-rw-r--r--src/map.c10
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 5 deletions
diff --git a/src/map.c b/src/map.c
index c7de5a15a6..ea7567e8d5 100644
--- a/src/map.c
+++ b/src/map.c
@@ -508,7 +508,7 @@ do_map(
{
int did_it = FALSE;
int did_local = FALSE;
- int keyround1_simplfied = keyround == 1 && did_simplify;
+ int keyround1_simplified = keyround == 1 && did_simplify;
int round;
int hash;
int new_hash;
@@ -726,7 +726,7 @@ do_map(
mpp = &(mp->m_next);
continue;
}
- if (keyround1_simplfied && !mp->m_simplified)
+ if (keyround1_simplified && !mp->m_simplified)
break;
// We reset the indicated mode bits. If nothing
// is left the entry is deleted below.
@@ -779,7 +779,7 @@ do_map(
mp->m_nowait = nowait;
mp->m_silent = silent;
mp->m_mode = mode;
- mp->m_simplified = keyround1_simplfied;
+ mp->m_simplified = keyround1_simplified;
#ifdef FEAT_EVAL
mp->m_expr = expr;
mp->m_script_ctx = current_sctx;
@@ -817,7 +817,7 @@ do_map(
// delete entry
if (!did_it)
{
- if (!keyround1_simplfied)
+ if (!keyround1_simplified)
retval = 2; // no match
}
else if (*keys == Ctrl_C)
@@ -853,7 +853,7 @@ do_map(
#ifdef FEAT_EVAL
expr, /* sid */ -1, /* scriptversion */ 0, /* lnum */ 0,
#endif
- keyround1_simplfied) == FAIL)
+ keyround1_simplified) == FAIL)
{
retval = 4; // no mem
goto theend;
diff --git a/src/version.c b/src/version.c
index 8017f830b8..2998d2d360 100644
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 4827,
+/**/
4826,
/**/
4825,