aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/nvim/testdir/test_profile.vim3
-rw-r--r--src/nvim/version.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/nvim/testdir/test_profile.vim b/src/nvim/testdir/test_profile.vim
index 36c05683d5..23d148e47d 100644
--- a/src/nvim/testdir/test_profile.vim
+++ b/src/nvim/testdir/test_profile.vim
@@ -113,7 +113,8 @@ func Test_profile_file()
call assert_equal(' " a comment', lines[9])
call assert_match('^\s*20\s\+\d\+\.\d\+\s\+\d\+\.\d\+\s\+call Foo()$', lines[10])
call assert_match('^\s*20\s\+\d\+\.\d\+\s\+endfor$', lines[11])
- call assert_match('^\s*2\s\+\d\+\.\d\+\s\+\d\+\.\d\+\s\+call Foo()$', lines[12])
+ " if self and total are equal we only get one number
+ call assert_match('^\s*2\s\+\(\d\+\.\d\+\s\+\)\=\d\+\.\d\+\s\+call Foo()$', lines[12])
call assert_equal('', lines[13])
call delete('Xprofile_file.vim')
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 3e4d51d70c..7c2cb4d580 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -910,7 +910,7 @@ static const int included_patches[] = {
// 197,
// 196,
195,
- // 194,
+ 194,
// 193 NA
// 192 NA
// 191 NA