Mercurial > vim
changeset 8817:b7eb7bbd71d0 v7.4.1696
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Apr 2 19:39:16 2016 +0200
patch 7.4.1696
Problem: When using :stopinsert in a silent mapping the "INSERT" message
isn't cleared. (Coacher)
Solution: Always clear the message. (Christian Brabandt, closes https://github.com/vim/vim/issues/718)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 02 Apr 2016 19:45:04 +0200 |
| parents | a1ace9e4eda8 |
| children | f32102355dba |
| files | src/ex_docmd.c src/proto/screen.pro src/screen.c src/version.c |
| diffstat | 4 files changed, 17 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -10040,6 +10040,7 @@ ex_stopinsert(exarg_T *eap UNUSED) { restart_edit = 0; stop_insert_mode = TRUE; + clearmode(); } /*
--- a/src/proto/screen.pro +++ b/src/proto/screen.pro @@ -47,6 +47,7 @@ int screen_ins_lines(int off, int row, i int screen_del_lines(int off, int row, int line_count, int end, int force, win_T *wp); int showmode(void); void unshowmode(int force); +void clearmode(void); void get_trans_bufname(buf_T *buf); int redrawing(void); int messaging(void);
--- a/src/screen.c +++ b/src/screen.c @@ -10184,12 +10184,19 @@ unshowmode(int force) if (!redrawing() || (!force && char_avail() && !KeyTyped)) redraw_cmdline = TRUE; /* delete mode later */ else - { - msg_pos_mode(); - if (Recording) - recording_mode(hl_attr(HLF_CM)); - msg_clr_eos(); - } + clearmode(); +} + +/* + * Clear the mode message. + */ + void +clearmode() +{ + msg_pos_mode(); + if (Recording) + recording_mode(hl_attr(HLF_CM)); + msg_clr_eos(); } static void