Mercurial > octave
changeset 30646:7677d53497c9
maint: Merge stable to default.
author | Markus Mützel <markus.muetzel@gmx.de> |
---|---|
date | Fri, 14 Jan 2022 17:55:53 +0100 |
parents | 1aa0456ecb18 (current diff) beac32c0e9c7 (diff) |
children | e9bfb92dab01 |
files | |
diffstat | 1 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/time/datevec.m Fri Jan 14 08:31:07 2022 -0800 +++ b/scripts/time/datevec.m Fri Jan 14 17:55:53 2022 +0100 @@ -251,9 +251,10 @@ elseif (numel (strfind (f, "%m")) + numel (strfind (f, "%b")) + numel (strfind (f, "%B")) > 1) err_or_warn ("datevec: multiple month specifiers in %s", original_f); - elseif (numel (strfind (f, "%d")) + numel (strfind (f, "%a")) - + numel (strfind (f, "%A")) > 1) + elseif (numel (strfind (f, "%d")) > 1) err_or_warn ("datevec: multiple day specifiers in %s", original_f); + elseif (numel (strfind (f, "%a"))+ numel (strfind (f, "%A")) > 1) + err_or_warn ("datevec: multiple day of week specifiers in %s", original_f); elseif (numel (strfind (f, "%H")) + numel (strfind (f, "%I")) > 1) err_or_warn ("datevec: multiple hour specifiers in %s", original_f); elseif (numel (strfind (f, "%M")) > 1)