diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-10-31 19:55:55 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-10-31 19:55:55 +0100 |
| commit | 7a641ca1e113c813fc39cca26f69cd6fc19f71c2 (patch) | |
| tree | 2a639a87634e81599b6f561e30cc9f62183835b2 | |
| parent | bb26596242fa7db477e2cd706dd99f9a426b5f71 (diff) | |
| download | vim-git-7a641ca1e113c813fc39cca26f69cd6fc19f71c2.tar.gz | |
patch 8.1.2237: mode() result depends on whether CURSOR_SHAPE is definedv8.1.2237
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().
| -rw-r--r-- | src/normal.c | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/normal.c b/src/normal.c index f2527e144..c20c072fd 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 9766d656a..3eaf21fa3 100644 --- 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, |