diff options
| author | James McCoy <jamessan@jamessan.com> | 2017-02-22 17:07:47 -0500 |
|---|---|---|
| committer | James McCoy <jamessan@jamessan.com> | 2017-02-22 19:23:20 -0500 |
| commit | bc76ce2c4f26a1ceabc8ba7dc8d5ff3378648a40 (patch) | |
| tree | b5b295f6a593f77f6995e6d6478afdf37043b11d /src/nvim/tag.c | |
| parent | 10c9ecc2117a69d2b83e983082f53c1779547035 (diff) | |
| parent | ddab4661f7acad985096138b0c29a2b7e569022a (diff) | |
| download | rneovim-bc76ce2c4f26a1ceabc8ba7dc8d5ff3378648a40.tar.gz rneovim-bc76ce2c4f26a1ceabc8ba7dc8d5ff3378648a40.tar.bz2 rneovim-bc76ce2c4f26a1ceabc8ba7dc8d5ff3378648a40.zip | |
Merge remote-tracking branch 'origin/master' into lambda
Diffstat (limited to 'src/nvim/tag.c')
| -rw-r--r-- | src/nvim/tag.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/src/nvim/tag.c b/src/nvim/tag.c index 0b76e36a6b..e723ea20c9 100644 --- a/src/nvim/tag.c +++ b/src/nvim/tag.c @@ -540,10 +540,11 @@ do_tag ( } vim_snprintf((char *)IObuff + 1, IOSIZE - 1, "%2d %s ", i + 1, mt_names[matches[i][0] & MT_MASK]); - msg_puts(IObuff); - if (tagp.tagkind != NULL) + msg_puts((const char *)IObuff); + if (tagp.tagkind != NULL) { msg_outtrans_len(tagp.tagkind, - (int)(tagp.tagkind_end - tagp.tagkind)); + (int)(tagp.tagkind_end - tagp.tagkind)); + } msg_advance(13); msg_outtrans_len_attr(tagp.tagname, (int)(tagp.tagname_end - tagp.tagname), @@ -595,7 +596,7 @@ do_tag ( } p = msg_outtrans_one(p, attr); if (*p == TAB) { - msg_puts_attr((char_u *)" ", attr); + msg_puts_attr(" ", attr); break; } if (*p == ':') @@ -858,13 +859,15 @@ do_tag ( STRCAT(IObuff, _(" Using tag with different case!")); if ((num_matches > prev_num_matches || new_tag) && num_matches > 1) { - if (ic) - msg_attr(IObuff, hl_attr(HLF_W)); - else + if (ic) { + msg_attr((const char *)IObuff, hl_attr(HLF_W)); + } else { msg(IObuff); - msg_scroll = TRUE; /* don't overwrite this message */ - } else + } + msg_scroll = true; // Don't overwrite this message. + } else { give_warning(IObuff, ic); + } if (ic && !msg_scrolled && msg_silent == 0) { ui_flush(); os_delay(1000L, true); |