Mercurial > vim

changeset 18485:63ee3c2b140f v8.1.2237

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.2237: mode() result depends on whether CURSOR_SHAPE is defined Commit: https://github.com/vim/vim/commit/7a641ca1e113c813fc39cca26f69cd6fc19f71c2 Author: Bram Moolenaar <Bram@vim.org> Date: Thu Oct 31 19:55:55 2019 +0100 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().
author Bram Moolenaar <Bram@vim.org>
date Thu, 31 Oct 2019 20:00:04 +0100
parents 3e50e573ca25
children 9d887cad7315
files src/normal.c src/version.c
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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
 	    }
-#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
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2237,
+/**/
     2236,
 /**/
     2235,