From 7a641ca1e113c813fc39cca26f69cd6fc19f71c2 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 31 Oct 2019 19:55:55 +0100
Subject: [PATCH] patch 8.1.2237: mode() result depends on whether CURSOR_SHAPE
 is defined

Problem:    Mode() result after usign "r" depends on whether CURSOR_SHAPE is
            defined. (Christian Brabandt)
Solution:   Move the #ifdef to only skip ui_cursor_shape().
---
 src/normal.c  | 6 ++----
 src/version.c | 2 ++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/normal.c b/src/normal.c
index f2527e144b..c20c072fd0 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -870,13 +870,13 @@ getcount:
 	 */
 	if (cp != NULL)
 	{
-#ifdef CURSOR_SHAPE
 	    if (repl)
 	    {
 		State = REPLACE;	/* pretend Replace mode */
+#ifdef CURSOR_SHAPE
 		ui_cursor_shape();	/* show different cursor shape */
-	    }
 #endif
+	    }
 	    if (lang && curbuf->b_p_iminsert == B_IMODE_LMAP)
 	    {
 		/* Allow mappings defined with ":lmap". */
@@ -913,9 +913,7 @@ getcount:
 	    }
 	    p_smd = save_smd;
 #endif
-#ifdef CURSOR_SHAPE
 	    State = NORMAL_BUSY;
-#endif
 #ifdef FEAT_CMDL_INFO
 	    need_flushbuf |= add_to_showcmd(*cp);
 #endif
diff --git a/src/version.c b/src/version.c
index 9766d656a4..3eaf21fa33 100644
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2237,
 /**/
     2236,
 /**/