commit 0efd1bdcf4891f9ef2537e4c3d50a379186dca5f
author Bram Moolenaar <Bram@vim.org> Wed Dec 11 19:00:04 2019 +0100
committer Bram Moolenaar <Bram@vim.org> Wed Dec 11 19:00:04 2019 +0100
tree d30f4ed13d1ab221b2483b49b3ae4bd157e15633
parent 99ebf22c523e3fdb491b2c92b6f3a7d42721361d

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.

src/message.c

diff --git a/src/message.c b/src/message.c
index 9ecd194..0b690bb 100644
--- a/src/message.c
+++ b/src/message.c
@@ -2080,7 +2080,7 @@
 		      || (has_mbyte && (*mb_ptr2cells)(s) > 1 && msg_col <= 2))
 		    :
 #endif
-		      (msg_col + t_col >= Columns - 1
+		      ((*s != '\r' && msg_col + t_col >= Columns - 1)
 		       || (*s == TAB && msg_col + t_col >= ((Columns - 1) & ~7))
 		       || (has_mbyte && (*mb_ptr2cells)(s) > 1
 					 && msg_col + t_col >= Columns - 2)))))