summaryrefslogtreecommitdiffstats
path: root/library
diff options
context:
space:
mode:
authorKevin B Kenny <kennykb@acm.org>2004-10-26 02:08:28 (GMT)
committerKevin B Kenny <kennykb@acm.org>2004-10-26 02:08:28 (GMT)
commit52f762e4fcb9a31c8866c6986198adb282fa4e7a (patch)
treea8bd70dbc4bd6d67549da8416496da9c4bc0f10e /library
parent638940015d9a4ae55ba8d130a78c4e662655a6fb (diff)
downloadtcl-52f762e4fcb9a31c8866c6986198adb282fa4e7a.zip
tcl-52f762e4fcb9a31c8866c6986198adb282fa4e7a.tar.gz
tcl-52f762e4fcb9a31c8866c6986198adb282fa4e7a.tar.bz2
fixes for Bug 1054101
Diffstat (limited to 'library')
-rw-r--r--library/clock.tcl6
1 files changed, 4 insertions, 2 deletions
diff --git a/library/clock.tcl b/library/clock.tcl
index 15456d2..0f91cca 100644
--- a/library/clock.tcl
+++ b/library/clock.tcl
@@ -13,7 +13,7 @@
# See the file "license.terms" for information on usage and redistribution
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
#
-# RCS: @(#) $Id: clock.tcl,v 1.9 2004/10/25 17:24:39 dgp Exp $
+# RCS: @(#) $Id: clock.tcl,v 1.10 2004/10/26 02:08:38 kennykb Exp $
#
#----------------------------------------------------------------------
@@ -1280,9 +1280,11 @@ proc ::tcl::clock::FreeScan { string base timezone locale } {
[expr { -210866803200
+ ( 86400 * wide([dict get $date julianDay]) )
+ [dict get $date secondOfDay] }]
+ dict set date tzName $timezone
set date [ConvertLocalToUTC $date[set date {}]]
set seconds [dict get $date seconds]
+
# Do relative times
if { [llength $parseRel] > 0 } {
@@ -1320,7 +1322,7 @@ proc ::tcl::clock::FreeScan { string base timezone locale } {
[expr { -210866803200
+ ( 86400 * wide([dict get $date2 julianDay]) )
+ [dict get $date secondOfDay] }]
- dict set date2 tzname $timezone
+ dict set date2 tzName $timezone
set date2 [ConvertLocalToUTC $date2[set date2 {}]]
set seconds [dict get $date2 seconds]