To: vim_dev@googlegroups.com Subject: Patch 7.4.1696 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ 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 #718) Files: src/ex_docmd.c, src/proto/screen.pro, src/screen.c *** ../vim-7.4.1695/src/ex_docmd.c 2016-03-19 22:11:47.420675007 +0100 --- src/ex_docmd.c 2016-04-02 19:36:10.655086188 +0200 *************** *** 10040,10045 **** --- 10040,10046 ---- { restart_edit = 0; stop_insert_mode = TRUE; + clearmode(); } /* *** ../vim-7.4.1695/src/proto/screen.pro 2016-03-15 23:10:26.412712095 +0100 --- src/proto/screen.pro 2016-04-02 19:35:29.235504224 +0200 *************** *** 47,52 **** --- 47,53 ---- 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); *** ../vim-7.4.1695/src/screen.c 2016-03-19 22:11:47.432674878 +0100 --- src/screen.c 2016-04-02 19:35:25.963537247 +0200 *************** *** 10184,10195 **** 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(); ! } } static void --- 10184,10202 ---- if (!redrawing() || (!force && char_avail() && !KeyTyped)) redraw_cmdline = TRUE; /* delete mode later */ else ! clearmode(); ! } ! ! /* ! * Clear the mode message. ! */ ! void ! clearmode() ! { ! msg_pos_mode(); ! if (Recording) ! recording_mode(hl_attr(HLF_CM)); ! msg_clr_eos(); } static void *** ../vim-7.4.1695/src/version.c 2016-04-02 19:01:53.471779187 +0200 --- src/version.c 2016-04-02 19:33:16.460844255 +0200 *************** *** 750,751 **** --- 750,753 ---- { /* Add new patch number below this line */ + /**/ + 1696, /**/ -- hundred-and-one symptoms of being an internet addict: 197. Your desk collapses under the weight of your computer peripherals. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///