Mercurial > vim
comparison src/normal.c @ 18485:63ee3c2b140f v8.1.2237
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 | e93cab5d0f0f |
| children | 8b0114ffde2b |
comparison
equal
deleted
inserted
replaced
| 18484:3e50e573ca25 | 18485:63ee3c2b140f |
|---|---|
| 868 /* | 868 /* |
| 869 * Get a second or third character. | 869 * Get a second or third character. |
| 870 */ | 870 */ |
| 871 if (cp != NULL) | 871 if (cp != NULL) |
| 872 { | 872 { |
| 873 #ifdef CURSOR_SHAPE | |
| 874 if (repl) | 873 if (repl) |
| 875 { | 874 { |
| 876 State = REPLACE; /* pretend Replace mode */ | 875 State = REPLACE; /* pretend Replace mode */ |
| 876 #ifdef CURSOR_SHAPE | |
| 877 ui_cursor_shape(); /* show different cursor shape */ | 877 ui_cursor_shape(); /* show different cursor shape */ |
| 878 #endif | |
| 878 } | 879 } |
| 879 #endif | |
| 880 if (lang && curbuf->b_p_iminsert == B_IMODE_LMAP) | 880 if (lang && curbuf->b_p_iminsert == B_IMODE_LMAP) |
| 881 { | 881 { |
| 882 /* Allow mappings defined with ":lmap". */ | 882 /* Allow mappings defined with ":lmap". */ |
| 883 --no_mapping; | 883 --no_mapping; |
| 884 --allow_keys; | 884 --allow_keys; |
| 911 im_save_status(&curbuf->b_p_iminsert); | 911 im_save_status(&curbuf->b_p_iminsert); |
| 912 im_set_active(FALSE); | 912 im_set_active(FALSE); |
| 913 } | 913 } |
| 914 p_smd = save_smd; | 914 p_smd = save_smd; |
| 915 #endif | 915 #endif |
| 916 #ifdef CURSOR_SHAPE | |
| 917 State = NORMAL_BUSY; | 916 State = NORMAL_BUSY; |
| 918 #endif | |
| 919 #ifdef FEAT_CMDL_INFO | 917 #ifdef FEAT_CMDL_INFO |
| 920 need_flushbuf |= add_to_showcmd(*cp); | 918 need_flushbuf |= add_to_showcmd(*cp); |
| 921 #endif | 919 #endif |
| 922 | 920 |
| 923 if (!lit) | 921 if (!lit) |