summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2022-04-29 11:29:54 +0100
committerBram Moolenaar <Bram@vim.org>2022-04-29 11:29:54 +0100
commit590f365f91511c164253c5b5812d4d0fc4a238d6 (patch)
tree4eecd9fe17cf271642522f7bdf71da51036f92de
parent758a8d199988b5b25566b2820db60dc2c9de3e58 (diff)
patch 8.2.4845: duplicate codev8.2.4845
Problem: Duplicate code. Solution: Move code below if/else. (closes #10314)
-rw-r--r--src/misc1.c15
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 10 deletions
diff --git a/src/misc1.c b/src/misc1.c
index 28d49639bc..2d41e358be 100644
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -673,11 +673,6 @@ get_mode(char_u *buf)
{
buf[i++] = 'R';
buf[i++] = 'v';
-
- if (ins_compl_active())
- buf[i++] = 'c';
- else if (ctrl_x_mode_not_defined_yet())
- buf[i++] = 'x';
}
else
{
@@ -685,12 +680,12 @@ get_mode(char_u *buf)
buf[i++] = 'R';
else
buf[i++] = 'i';
-
- if (ins_compl_active())
- buf[i++] = 'c';
- else if (ctrl_x_mode_not_defined_yet())
- buf[i++] = 'x';
}
+
+ if (ins_compl_active())
+ buf[i++] = 'c';
+ else if (ctrl_x_mode_not_defined_yet())
+ buf[i++] = 'x';
}
else if ((State & CMDLINE) || exmode_active)
{
diff --git a/src/version.c b/src/version.c
index 5540985853..dc2c1ff3f1 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 */
/**/
+ 4845,
+/**/
4844,
/**/
4843,