diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2020-02-16 23:18:24 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-16 23:18:24 -0800 |
| commit | 03f245c0b810fa2ff980bd3bf2530d94fd0f05d3 (patch) | |
| tree | dbbd77ecb94314d118f0a9a9a001d33ba1b74053 /src/nvim/message.c | |
| parent | 0c5d2ffebe92e710ca57d4e3f0b0789ccc369660 (diff) | |
| parent | 1ce4b3c9a7420227c3ecffab782cb8da732998f5 (diff) | |
| download | rneovim-03f245c0b810fa2ff980bd3bf2530d94fd0f05d3.tar.gz rneovim-03f245c0b810fa2ff980bd3bf2530d94fd0f05d3.tar.bz2 rneovim-03f245c0b810fa2ff980bd3bf2530d94fd0f05d3.zip | |
Merge #11873 from janlazo/vim-8.1.0786
vim-patch:8.0.1660,8.1.{43,786,1201,2129,2131,2187,2223,2259},8.2.{241,267}
Diffstat (limited to 'src/nvim/message.c')
| -rw-r--r-- | src/nvim/message.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/nvim/message.c b/src/nvim/message.c index 94729dfd2a..a12e665099 100644 --- a/src/nvim/message.c +++ b/src/nvim/message.c @@ -1521,7 +1521,8 @@ void msg_make(char_u *arg) /// the character/string -- webb int msg_outtrans_special( const char_u *strstart, - int from ///< true for LHS of a mapping + bool from, ///< true for LHS of a mapping + int maxlen ///< screen columns, 0 for unlimeted ) { if (strstart == NULL) { @@ -1541,6 +1542,9 @@ int msg_outtrans_special( string = str2special((const char **)&str, from, false); } const int len = vim_strsize((char_u *)string); + if (maxlen > 0 && retval + len >= maxlen) { + break; + } // Highlight special keys msg_puts_attr(string, (len > 1 && (*mb_ptr2len)((char_u *)string) <= 1 |