diff options
author | Kevin B Kenny <kennykb@acm.org> | 2006-08-24 21:47:48 (GMT) |
---|---|---|
committer | Kevin B Kenny <kennykb@acm.org> | 2006-08-24 21:47:48 (GMT) |
commit | ccfa5605f3ee0ddba99ef360e7c3bc5414558987 (patch) | |
tree | 1fa1aa47a165a4a871bedcbf07fba017d3bcf4d7 /library/clock.tcl | |
parent | 19fcbcae90c81e4b77399f68d9f7e7ba0df28df3 (diff) | |
download | tcl-ccfa5605f3ee0ddba99ef360e7c3bc5414558987.zip tcl-ccfa5605f3ee0ddba99ef360e7c3bc5414558987.tar.gz tcl-ccfa5605f3ee0ddba99ef360e7c3bc5414558987.tar.bz2 |
* library/tzdata: Regenerated, including several new files,
from Olson's tzdata2006j.
* library/clock.tcl:
* tests/clock.test: Removed an early testing hack that allowed
loading 'registry' from the build tree rather than an installed
one. This is a workaround for [Bug 15232730], which remains open
because it's a symptom of a deeper underlying problem.
Diffstat (limited to 'library/clock.tcl')
-rw-r--r-- | library/clock.tcl | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/library/clock.tcl b/library/clock.tcl index 663fac0..ab60089 100644 --- a/library/clock.tcl +++ b/library/clock.tcl @@ -13,36 +13,18 @@ # 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.34 2006/08/14 10:01:06 dkf Exp $ +# RCS: @(#) $Id: clock.tcl,v 1.35 2006/08/24 21:47:49 kennykb Exp $ # #---------------------------------------------------------------------- # We must have message catalogs that support the root locale, and -# we need access to the Registry on Windows systems. We also need -# Tcl 8.5 dictionaries. +# we need access to the Registry on Windows systems. uplevel \#0 { package require msgcat 1.4 if { $::tcl_platform(platform) eq {windows} } { if { [catch { package require registry 1.1 }] } { - - # HIDEOUS KLUDGE: [package require registry 1.1] has failed. - # This failure likely means that we're running in Tcl's build - # directory instead of the install directory. We recover by - # trying to load tclreg*.dll directly. - - if { [catch { - load [lindex \ - [glob -directory \ - [file join \ - [pwd] \ - [file dirname [info nameofexecutable]]] \ - tclReg*.dll] \ - 0] registry - }] } { - # Still no registry! - namespace eval ::tcl::clock [list variable NoRegistry {}] - } + namespace eval ::tcl::clock [list variable NoRegistry {}] } } } |