From 5b1affefd0e96154517ec6f71300086ae6d22d24 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 17 Jun 2017 19:13:49 +0200 Subject: [PATCH] patch 8.0.0644: the timeout for 'hlsearch' is not tested Problem: There is no test for 'hlsearch' timing out. Solution: Add a test. --- src/testdir/test_hlsearch.vim | 18 ++++++++++++++++++ src/version.c | 2 ++ 2 files changed, 20 insertions(+) diff --git a/src/testdir/test_hlsearch.vim b/src/testdir/test_hlsearch.vim index 066fdd0250..b934d38e18 100644 --- a/src/testdir/test_hlsearch.vim +++ b/src/testdir/test_hlsearch.vim @@ -32,3 +32,21 @@ function! Test_hlsearch() call getchar(1) enew! endfunction + +func Test_hlsearch_hangs() + if !has('reltime') || !has('float') + return + endif + + " This pattern takes forever to match, it should timeout. + help + let start = reltime() + set hlsearch nolazyredraw redrawtime=101 + let @/ = '\%#=2\v(a|\1)*' + redraw + let elapsed = reltimefloat(reltime(start)) + call assert_true(elapsed > 0.1) + call assert_true(elapsed < 1.0) + set nohlsearch redrawtime& + quit +endfunc diff --git a/src/version.c b/src/version.c index 268d4d7d20..24bb8206b4 100644 --- a/src/version.c +++ b/src/version.c @@ -764,6 +764,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 644, /**/ 643, /**/