To: vim_dev@googlegroups.com Subject: Patch 8.1.0321 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.1.0321 (after 8.1.0320) Problem: 'incsearch' regression: /\v highlights everything. Solution: Put back the empty_pattern() check. Files: src/ex_getln.c, src/testdir/test_search.vim, src/testdir/dumps/Test_incsearch_search_01.dump, src/testdir/dumps/Test_incsearch_search_02.dump *** ../vim-8.1.0320/src/ex_getln.c 2018-08-22 23:03:19.486827548 +0200 --- src/ex_getln.c 2018-08-23 20:51:58.597337138 +0200 *************** *** 572,577 **** --- 572,588 ---- else end_pos = curwin->w_cursor; // shutup gcc 4 + // Disable 'hlsearch' highlighting if the pattern matches everything. + // Avoids a flash when typing "foo\|". + if (!use_last_pat) + { + next_char = ccline.cmdbuff[skiplen + patlen]; + ccline.cmdbuff[skiplen + patlen] = NUL; + if (empty_pattern(ccline.cmdbuff)) + set_no_hlsearch(TRUE); + ccline.cmdbuff[skiplen + patlen] = next_char; + } + validate_cursor(); // May redraw the status line to show the cursor position. if (p_ru && curwin->w_status_height > 0) *** ../vim-8.1.0320/src/testdir/test_search.vim 2018-08-22 23:03:19.486827548 +0200 --- src/testdir/test_search.vim 2018-08-23 20:51:10.061621201 +0200 *************** *** 813,818 **** --- 813,853 ---- call delete('Xscript') endfunc + func Test_incsearch_search_dump() + if !exists('+incsearch') + return + endif + if !CanRunVimInTerminal() + return + endif + call writefile([ + \ 'set incsearch hlsearch scrolloff=0', + \ 'for n in range(1, 8)', + \ ' call setline(n, "foo " . n)', + \ 'endfor', + \ '3', + \ ], 'Xis_search_script') + let buf = RunVimInTerminal('-S Xis_search_script', {'rows': 9, 'cols': 70}) + " Give Vim a chance to redraw to get rid of the spaces in line 2 caused by + " the 'ambiwidth' check. + sleep 100m + + " Need to send one key at a time to force a redraw. + call term_sendkeys(buf, '/fo') + sleep 100m + call VerifyScreenDump(buf, 'Test_incsearch_search_01', {}) + call term_sendkeys(buf, "\") + sleep 100m + + call term_sendkeys(buf, '/\v') + sleep 100m + call VerifyScreenDump(buf, 'Test_incsearch_search_02', {}) + call term_sendkeys(buf, "\") + + call StopVimInTerminal(buf) + call delete('Xis_search_script') + endfunc + func Test_incsearch_substitute() if !exists('+incsearch') return *************** *** 926,932 **** endfunc " Similar to Test_incsearch_substitute_dump() for :sort ! func Test_incsearch_ssort_dump() if !exists('+incsearch') return endif --- 961,967 ---- endfunc " Similar to Test_incsearch_substitute_dump() for :sort ! func Test_incsearch_sort_dump() if !exists('+incsearch') return endif *** ../vim-8.1.0320/src/testdir/dumps/Test_incsearch_search_01.dump 2018-08-23 20:53:38.528751838 +0200 --- src/testdir/dumps/Test_incsearch_search_01.dump 2018-08-23 20:41:15.889079877 +0200 *************** *** 0 **** --- 1,9 ---- + |f+0&#ffff4012|o|o+0&#ffffff0| |1| @64 + |f+0&#ffff4012|o|o+0&#ffffff0| |2| @64 + |f+0&#ffff4012|o|o+0&#ffffff0| |3| @64 + |f+1&&|o|o+0&&| |4| @64 + |f+0&#ffff4012|o|o+0&#ffffff0| |5| @64 + |f+0&#ffff4012|o|o+0&#ffffff0| |6| @64 + |f+0&#ffff4012|o|o+0&#ffffff0| |7| @64 + |f+0&#ffff4012|o|o+0&#ffffff0| |8| @64 + |/|f|o> @66 *** ../vim-8.1.0320/src/testdir/dumps/Test_incsearch_search_02.dump 2018-08-23 20:53:38.536751791 +0200 --- src/testdir/dumps/Test_incsearch_search_02.dump 2018-08-23 20:52:11.605260981 +0200 *************** *** 0 **** --- 1,9 ---- + |f+0&#ffffff0|o@1| |1| @64 + |f|o@1| |2| @64 + |f|o+1&&|o+0&&| |3| @64 + |f|o@1| |4| @64 + |f|o@1| |5| @64 + |f|o@1| |6| @64 + |f|o@1| |7| @64 + |f|o@1| |8| @64 + |/|\|v> @66 *** ../vim-8.1.0320/src/version.c 2018-08-22 23:03:19.486827548 +0200 --- src/version.c 2018-08-23 20:53:21.256853038 +0200 *************** *** 796,797 **** --- 796,799 ---- { /* Add new patch number below this line */ + /**/ + 321, /**/ -- This computer is so slow, it takes forever to execute and endless loop! /// 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 ///