Mercurial > vim

comparison 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
comparison
equal deleted inserted replaced
18865:1b50a0a7fdc1 18866:a686560cf6c9
2078 msg_col <= 1 2078 msg_col <= 1
2079 || (*s == TAB && msg_col <= 7) 2079 || (*s == TAB && msg_col <= 7)
2080 || (has_mbyte && (*mb_ptr2cells)(s) > 1 && msg_col <= 2)) 2080 || (has_mbyte && (*mb_ptr2cells)(s) > 1 && msg_col <= 2))
2081 : 2081 :
2082 #endif 2082 #endif
2083 (msg_col + t_col >= Columns - 1 2083 ((*s != '\r' && msg_col + t_col >= Columns - 1)
2084 || (*s == TAB && msg_col + t_col >= ((Columns - 1) & ~7)) 2084 || (*s == TAB && msg_col + t_col >= ((Columns - 1) & ~7))
2085 || (has_mbyte && (*mb_ptr2cells)(s) > 1 2085 || (has_mbyte && (*mb_ptr2cells)(s) > 1
2086 && msg_col + t_col >= Columns - 2))))) 2086 && msg_col + t_col >= Columns - 2)))))
2087 { 2087 {
2088 /* 2088 /*