diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-12-06 12:45:01 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-12-06 12:45:01 +0100 |
| commit | 9a838fe543b69582b0773f7c38a57f16fb32d765 (patch) | |
| tree | a369f5e3e2e41a1077f7b3b9110bf6a306e1ff29 /src | |
| parent | e7dd0deb3c4c4b1f55e28e5fe9a4ef4b76951b85 (diff) | |
patch 8.1.2398: strptime() test fails on Japanese Macv8.1.2398
Problem: strptime() test fails on Japanese Mac.
Solution: Use %T instead of %X.
Diffstat (limited to 'src')
| -rw-r--r-- | src/testdir/test_functions.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
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 @@ -743,6 +743,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2398, +/**/ 2397, /**/ 2396, |