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().
diff --git a/src/normal.c b/src/normal.c
index f2527e1..c20c072 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -870,13 +870,13 @@
*/
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 @@
}
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 9766d65..3eaf21f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2237,
+/**/
2236,
/**/
2235,