To: vim_dev@googlegroups.com Subject: Patch 8.1.1970 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.1.1970 Problem: Search stat space wrong, no test for 8.1.1965. Solution: Fix check for cmd_silent. Add a test. (Christian Brabandt) Files: src/search.c, src/testdir/test_search_stat.vim *** ../vim-8.1.1969/src/search.c 2019-09-02 21:44:55.594219408 +0200 --- src/search.c 2019-09-03 22:21:24.384953080 +0200 *************** *** 1391,1397 **** // search stat. Use all the space available, so that the // search state is right aligned. If there is not enough space // msg_strtrunc() will shorten in the middle. ! if (msg_scrolled != 0 || cmd_silent) // Use all the columns. len = (int)(Rows - msg_row) * Columns - 1; else --- 1391,1397 ---- // search stat. Use all the space available, so that the // search state is right aligned. If there is not enough space // msg_strtrunc() will shorten in the middle. ! if (msg_scrolled != 0 && !cmd_silent) // Use all the columns. len = (int)(Rows - msg_row) * Columns - 1; else *** ../vim-8.1.1969/src/testdir/test_search_stat.vim 2019-05-24 22:08:11.366273819 +0200 --- src/testdir/test_search_stat.vim 2019-09-03 22:18:28.553858152 +0200 *************** *** 160,166 **** let stat = '\[1/2\]' call assert_notmatch(pat .. stat, g:a) ! " close the window set shortmess+=S bwipe! endfunc --- 160,187 ---- let stat = '\[1/2\]' call assert_notmatch(pat .. stat, g:a) ! " normal, n comes from a silent mapping ! " First test a normal mapping, then a silent mapping ! call cursor(1,1) ! nnoremap n n ! let @/ = 'find this' ! let pat = '/find this\s\+' ! let g:a = execute(':unsilent :norm n') ! let g:b = split(g:a, "\n")[-1] ! let stat = '\[1/2\]' ! call assert_match(pat .. stat, g:b) ! nnoremap n n ! call cursor(1,1) ! let g:a = execute(':unsilent :norm n') ! let g:b = split(g:a, "\n")[-1] ! let stat = '\[1/2\]' ! call assert_notmatch(pat .. stat, g:b) ! call assert_match(stat, g:b) ! unmap n ! ! " Clean up set shortmess+=S + + " close the window bwipe! endfunc *** ../vim-8.1.1969/src/version.c 2019-09-03 22:08:13.677035013 +0200 --- src/version.c 2019-09-03 22:20:38.433189483 +0200 *************** *** 763,764 **** --- 763,766 ---- { /* Add new patch number below this line */ + /**/ + 1970, /**/ -- hundred-and-one symptoms of being an internet addict: 173. You keep tracking down the email addresses of all your friends (even childhood friends). /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///