diff options
| author | James McCoy <jamessan@jamessan.com> | 2016-11-23 20:37:37 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-23 20:37:37 -0500 |
| commit | b1854cefeaead27c6e53ec9c31b7246cf70d28fc (patch) | |
| tree | eba95cff521fe7d6c14d6b4942b8805e121ddd00 | |
| parent | a46fc0d7540316eedd454a344e66cb79bc1c1eed (diff) | |
| parent | 81591b146aadadc52f0216d38e7d19ae25dcabc8 (diff) | |
| download | rneovim-b1854cefeaead27c6e53ec9c31b7246cf70d28fc.tar.gz rneovim-b1854cefeaead27c6e53ec9c31b7246cf70d28fc.tar.bz2 rneovim-b1854cefeaead27c6e53ec9c31b7246cf70d28fc.zip | |
Merge pull request #5641 from Shougo/vim-7.4.1696
vim-patch:7.4.1696
| -rw-r--r-- | src/nvim/edit.c | 1 | ||||
| -rw-r--r-- | src/nvim/ex_docmd.c | 3 | ||||
| -rw-r--r-- | src/nvim/screen.c | 8 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
4 files changed, 10 insertions, 4 deletions
diff --git a/src/nvim/edit.c b/src/nvim/edit.c index dcb772e23c..9d07878f24 100644 --- a/src/nvim/edit.c +++ b/src/nvim/edit.c @@ -2322,7 +2322,6 @@ static int ins_compl_make_cyclic(void) return count; } - // Set variables that store noselect and noinsert behavior from the // 'completeopt' value. void completeopt_was_set(void) diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c index 76dddf874d..23b1a50fc8 100644 --- a/src/nvim/ex_docmd.c +++ b/src/nvim/ex_docmd.c @@ -7970,7 +7970,8 @@ static void ex_startinsert(exarg_T *eap) static void ex_stopinsert(exarg_T *eap) { restart_edit = 0; - stop_insert_mode = TRUE; + stop_insert_mode = true; + clearmode(); } /* diff --git a/src/nvim/screen.c b/src/nvim/screen.c index cee3c62f43..5bf743c4df 100644 --- a/src/nvim/screen.c +++ b/src/nvim/screen.c @@ -6827,12 +6827,18 @@ void unshowmode(bool force) if (!redrawing() || (!force && char_avail() && !KeyTyped)) { redraw_cmdline = true; // delete mode later } else { + clearmode(); + } +} + +// Clear the mode message. +void clearmode(void) +{ msg_pos_mode(); if (Recording) { recording_mode(hl_attr(HLF_CM)); } msg_clr_eos(); - } } static void recording_mode(int attr) diff --git a/src/nvim/version.c b/src/nvim/version.c index f7dacb17df..8bda2f5701 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -748,7 +748,7 @@ static int included_patches[] = { // 1699, // 1698 NA 1697, - // 1696, + 1696, 1695, // 1694 NA // 1693 NA |