From b4d16722f16de1bf440e21ae568e7c9896c381d3 Mon Sep 17 00:00:00 2001
From: "Mirar (Pontus Hagland)" <pike@sort.mirar.org>
Date: Sun, 30 Jul 2000 11:10:10 +0200
Subject: [PATCH] dwim_second update
Rev: lib/modules/Calendar.pmod/YMD.pmod:1.2
Rev: lib/modules/Calendar.pmod/mkrules.pike:1.2
---
lib/modules/Calendar.pmod/YMD.pmod | 6 ++++--
lib/modules/Calendar.pmod/mkrules.pike | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/lib/modules/Calendar.pmod/YMD.pmod b/lib/modules/Calendar.pmod/YMD.pmod
index ca9bbd0c0d..32c1b550b3 100644
--- a/lib/modules/Calendar.pmod/YMD.pmod
+++ b/lib/modules/Calendar.pmod/YMD.pmod
@@ -2523,7 +2523,8 @@ TimeofDay dwim_time(string what)
string zone )
foreach ( ({ "%t",
"%h:%*[ :]%m%*[ :]:%s",
- "%h:%*[ :]%m" }),
+ "%h:%*[ :]%m",
+ "T%t"}),
string todformat )
foreach ( ({ "%y-%M-%D (%*s) -W%W-%e (%e)",
"%D%*[ /]%M%*[- /,]%y",
@@ -2538,7 +2539,8 @@ TimeofDay dwim_time(string what)
"%D%*[- /]%M",
"%M%*[- /]%D",
"%e%*[- /wv]%W%*[ -/]%y",
- "%e%*[- /wv]%W" }),
+ "%e%*[- /wv]%W",
+ ""}),
string dayformat )
{
if ( (t=parse(dayformat+" "+todformat+zone,what)) ) return t;
diff --git a/lib/modules/Calendar.pmod/mkrules.pike b/lib/modules/Calendar.pmod/mkrules.pike
index 84d46b82b1..ddd7c8a7a1 100644
--- a/lib/modules/Calendar.pmod/mkrules.pike
+++ b/lib/modules/Calendar.pmod/mkrules.pike
@@ -10,7 +10,7 @@
// and zic(8) is the usual compiler.
// pike mkrules.pike ../data/{africa,antarctica,asia,australasia,backward,etcetera,europe,northamerica,pacificnew,southamerica,systemv}
-// $Id: mkrules.pike,v 1.1 2000/07/12 19:36:16 mirar Exp $
+// $Id: mkrules.pike,v 1.2 2000/07/30 09:10:10 mirar Exp $
object cal=Calendar.ISO->set_timezone("UTC");
--
GitLab