From 306d96cd10da8ca1dd3ca22e71a4815403e819a4 Mon Sep 17 00:00:00 2001
From: Stanley Chan <pocketgamer5000@gmail.com>
Date: Thu, 1 Oct 2020 22:56:46 -0500
Subject: 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
---
 src/nvim/message.c                |  2 +-
 src/nvim/testdir/test_display.vim | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

(limited to 'src')

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
diff --git a/src/nvim/testdir/test_display.vim b/src/nvim/testdir/test_display.vim
index e853b046dc..a177f6140e 100644
--- a/src/nvim/testdir/test_display.vim
+++ b/src/nvim/testdir/test_display.vim
@@ -185,6 +185,23 @@ func Test_scroll_CursorLineNr_update()
   call delete(filename)
 endfunc
 
+" check a long file name does not result in the hit-enter prompt
+func Test_edit_long_file_name()
+  CheckScreendump
+
+  let longName = 'x'->repeat(&columns)
+  call writefile([], longName)
+  let buf = RunVimInTerminal('-N -u NONE ' .. longName, #{rows: 8})
+
+  call VerifyScreenDump(buf, 'Test_long_file_name_1', {})
+
+  call term_sendkeys(buf, ":q\<cr>")
+
+  " clean up
+  call StopVimInTerminal(buf)
+  call delete(longName)
+endfunc
+
 " Test for scrolling that modifies buffer during visual block
 func Test_visual_block_scroll()
   " See test/functional/legacy/visual_mode_spec.lua
-- 
cgit