Mercurial > vim
changeset 18866:a686560cf6c9 v8.1.2419
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 | 1b50a0a7fdc1 |
children | c9409f359583 |
files | src/message.c src/testdir/dumps/Test_long_file_name_1.dump src/testdir/test_display.vim src/version.c |
diffstat | 4 files changed, 29 insertions(+), 1 deletions(-) [+] |
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)))))
new file mode 100644 --- /dev/null +++ b/src/testdir/dumps/Test_long_file_name_1.dump @@ -0,0 +1,8 @@ +> +0&#ffffff0@74 +|~+0#4040ff13&| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|<+0#0000000&|x@64|"| |0|L|,| |0|C|
--- a/src/testdir/test_display.vim +++ b/src/testdir/test_display.vim @@ -181,3 +181,21 @@ func Test_scroll_CursorLineNr_update() call StopVimInTerminal(buf) 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 +