aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-28 04:24:06 -04:00
Code Activity

patch 8.1.2237: mode() result depends on whether CURSOR_SHAPE is defined

Browse Source 
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().
This commit is contained in:
Bram Moolenaar
2019-10-31 19:55:55 +01:00
parent bb26596242
commit 7a641ca1e1
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/normal.c
View File

@@ -870,13 +870,13 @@ getcount:
*/ */
if (cp != NULL) if (cp != NULL)
{ {
#ifdef CURSOR_SHAPE
if (repl) if (repl)
{ {
State = REPLACE; /* pretend Replace mode */ State = REPLACE; /* pretend Replace mode */
#ifdef CURSOR_SHAPE
ui_cursor_shape(); /* show different cursor shape */ ui_cursor_shape(); /* show different cursor shape */
}
#endif #endif
}
if (lang && curbuf->b_p_iminsert == B_IMODE_LMAP) if (lang && curbuf->b_p_iminsert == B_IMODE_LMAP)
{ {
/* Allow mappings defined with ":lmap". */ /* Allow mappings defined with ":lmap". */
@@ -913,9 +913,7 @@ getcount:
} }
p_smd = save_smd; p_smd = save_smd;
#endif #endif
#ifdef CURSOR_SHAPE
State = NORMAL_BUSY; State = NORMAL_BUSY;
#endif
#ifdef FEAT_CMDL_INFO #ifdef FEAT_CMDL_INFO
need_flushbuf |= add_to_showcmd(*cp); need_flushbuf |= add_to_showcmd(*cp);
#endif #endif

2
src/version.c
View File

@@ -741,6 +741,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
2237,
/**/ /**/
2236, 2236,
/**/ /**/