# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1651228203 -7200
# Node ID 5be5151ad5104ca5ffde5d3ac424460e83b0c06e
# Parent  96f0542ebb221f5ff1c1315ec3b3f54ed7b6aab7
patch 8.2.4845: duplicate code

Commit: https://github.com/vim/vim/commit/590f365f91511c164253c5b5812d4d0fc4a238d6
Author: zeertzjq <zeertzjq@outlook.com>
Date:   Fri Apr 29 11:29:54 2022 +0100

    patch 8.2.4845: duplicate code

    Problem:    Duplicate code.
    Solution:   Move code below if/else. (closes https://github.com/vim/vim/issues/10314)

diff --git a/src/misc1.c b/src/misc1.c
--- 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
--- 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,