From 590f365f91511c164253c5b5812d4d0fc4a238d6 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Fri, 29 Apr 2022 11:29:54 +0100 Subject: [PATCH] patch 8.2.4845: duplicate code Problem: Duplicate code. Solution: Move code below if/else. (closes #10314) --- src/misc1.c | 15 +++++---------- src/version.c | 2 ++ 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 @@ -746,6 +746,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 4845, /**/ 4844, /**/