aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/message.c
diff options
context:
space:
mode:
authorStanley Chan <pocketgamer5000@gmail.com>2020-10-01 22:56:46 -0500
committerJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2020-10-16 21:56:55 -0400
commit306d96cd10da8ca1dd3ca22e71a4815403e819a4 (patch)
tree5f7eb912f3be317c5ead58aba4ca1797fc0acbde /src/nvim/message.c
parentc4cbf16c917c619057ad4711a0121146420a7d74 (diff)
downloadrneovim-306d96cd10da8ca1dd3ca22e71a4815403e819a4.tar.gz
rneovim-306d96cd10da8ca1dd3ca22e71a4815403e819a4.tar.bz2
rneovim-306d96cd10da8ca1dd3ca22e71a4815403e819a4.zip
vim-patch:8.1.2419: with a long file name the hit-enter prompt appears
Problem: With a long file name the hit-enter prompt appears. (J. Lewis Muir) Solution: When checking for text to wrap don't do this when outputing a CR. https://github.com/vim/vim/commit/0efd1bdcf4891f9ef2537e4c3d50a379186dca5f
Diffstat (limited to 'src/nvim/message.c')
-rw-r--r--src/nvim/message.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nvim/message.c b/src/nvim/message.c
index 594940ca10..6e2a221ab0 100644
--- a/src/nvim/message.c
+++ b/src/nvim/message.c
@@ -2000,7 +2000,7 @@ static void msg_puts_display(const char_u *str, int maxlen, int attr,
|| (*s == TAB && msg_col <= 7)
|| (utf_ptr2cells(s) > 1
&& msg_col <= 2))
- : (msg_col + t_col >= Columns - 1
+ : ((*s != '\r' && msg_col + t_col >= Columns - 1)
|| (*s == TAB
&& msg_col + t_col >= ((Columns - 1) & ~7))
|| (utf_ptr2cells(s) > 1