diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-12-12 13:32:07 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-12-12 13:32:07 +0100 |
| commit | cc2335896ba707bf0d8cf03cca2de7c66fab62a0 (patch) | |
| tree | 152b336bb2486e6f299e53b325cade4b99fe1388 | |
| parent | 0ea7421ae6618fe8efe9e3afc8fdcf7a4d89739a (diff) | |
patch 8.2.2130: Insert mode completion messages end up in message historyv8.2.2130
Problem: Insert mode completion messages end up in message history.
Solution: Set msg_hist_off. (closes #7452
| -rw-r--r-- | src/insexpand.c | 9 | ||||
| -rw-r--r-- | src/testdir/test_ins_complete.vim | 14 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 24 insertions, 1 deletions
diff --git a/src/insexpand.c b/src/insexpand.c index eebf01dc47..28017d4366 100644 --- a/src/insexpand.c +++ b/src/insexpand.c @@ -1298,6 +1298,7 @@ ins_compl_files( fp = mch_fopen((char *)files[i], "r"); // open dictionary file if (flags != DICT_EXACT) { + msg_hist_off = TRUE; // reset in msg_trunc_attr() vim_snprintf((char *)IObuff, IOSIZE, _("Scanning dictionary: %s"), (char *)files[i]); (void)msg_trunc_attr((char *)IObuff, TRUE, HL_ATTR(HLF_R)); @@ -2778,6 +2779,7 @@ ins_compl_get_exp(pos_T *ini) dict = ins_buf->b_fname; dict_f = DICT_EXACT; } + msg_hist_off = TRUE; // reset in msg_trunc_attr() vim_snprintf((char *)IObuff, IOSIZE, _("Scanning: %s"), ins_buf->b_fname == NULL ? buf_spname(ins_buf) @@ -2812,6 +2814,7 @@ ins_compl_get_exp(pos_T *ini) #endif else if (*e_cpt == ']' || *e_cpt == 't') { + msg_hist_off = TRUE; // reset in msg_trunc_attr() type = CTRL_X_TAGS; vim_snprintf((char *)IObuff, IOSIZE, _("Scanning tags.")); (void)msg_trunc_attr((char *)IObuff, TRUE, HL_ATTR(HLF_R)); @@ -3423,9 +3426,11 @@ ins_compl_next( MB_PTR_ADV(s); } } + msg_hist_off = TRUE; vim_snprintf((char *)IObuff, IOSIZE, "%s %s%s", lead, s > compl_shown_match->cp_fname ? "<" : "", s); msg((char *)IObuff); + msg_hist_off = FALSE; redraw_cmdline = FALSE; // don't overwrite! } } @@ -4105,9 +4110,13 @@ ins_complete(int c, int enable_pum) if (edit_submode_extra != NULL) { if (!p_smd) + { + msg_hist_off = TRUE; msg_attr((char *)edit_submode_extra, edit_submode_highl < HLF_COUNT ? HL_ATTR(edit_submode_highl) : 0); + msg_hist_off = FALSE; + } } else msg_clr_cmdline(); // necessary for "noshowmode" diff --git a/src/testdir/test_ins_complete.vim b/src/testdir/test_ins_complete.vim index 5e2bebbf54..b1a2a9e307 100644 --- a/src/testdir/test_ins_complete.vim +++ b/src/testdir/test_ins_complete.vim @@ -114,7 +114,7 @@ func Test_omni_dash() set omnifunc=Omni new exe "normal Gofind -\<C-x>\<C-o>" - call assert_equal("\n-\nmatch 1 of 2", execute(':2mess')) + call assert_equal("find -help", getline('$')) bwipe! delfunc Omni @@ -714,4 +714,16 @@ func Test_issue_7021() set completeslash= endfunc +" Test to ensure 'Scanning...' messages are not recorded in messages history +func Test_z1_complete_no_history() + new + messages clear + let currmess = execute('messages') + setlocal dictionary=README.txt + exe "normal owh\<C-X>\<C-K>" + exe "normal owh\<C-N>" + call assert_equal(currmess, execute('messages')) + close! +endfunc + " vim: shiftwidth=2 sts=2 expandtab diff --git a/src/version.c b/src/version.c index 9dae296a1e..65b2857b04 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2130, +/**/ 2129, /**/ 2128, |