From 9a838fe543b69582b0773f7c38a57f16fb32d765 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Fri, 6 Dec 2019 12:45:01 +0100 Subject: [PATCH] patch 8.1.2398: strptime() test fails on Japanese Mac Problem: strptime() test fails on Japanese Mac. Solution: Use %T instead of %X. --- src/testdir/test_functions.vim | 2 +- src/version.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim index 7284787834..6c4e81369d 100644 --- a/src/testdir/test_functions.vim +++ b/src/testdir/test_functions.vim @@ -231,7 +231,7 @@ func Test_strptime() endif let $TZ = 'UTC' - call assert_equal(1484653763, strptime('%Y-%m-%d %X', '2017-01-17 11:49:23')) + call assert_equal(1484653763, strptime('%Y-%m-%d %T', '2017-01-17 11:49:23')) call assert_fails('call strptime()', 'E119:') call assert_fails('call strptime("xxx")', 'E119:') diff --git a/src/version.c b/src/version.c index f65803944a..0cb4bddff1 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 2398, /**/ 2397, /**/