Mercurial > vim

diff src/message.c @ 18866:a686560cf6c9 v8.1.2419

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.2419: with a long file name the hit-enter prompt appears Commit: https://github.com/vim/vim/commit/0efd1bdcf4891f9ef2537e4c3d50a379186dca5f Author: Bram Moolenaar <Bram@vim.org> Date: Wed Dec 11 19:00:04 2019 +0100 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.
author Bram Moolenaar <Bram@vim.org>
date Wed, 11 Dec 2019 19:15:04 +0100
parents eff8d8f72a82
children 80b40bd5ec1a
line wrap: on
line diff
--- a/src/message.c
+++ b/src/message.c
@@ -2080,7 +2080,7 @@ msg_puts_display(
 		      || (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)))))