diff options
author | sebres <sebres@users.sourceforge.net> | 2017-05-10 12:28:46 (GMT) |
---|---|---|
committer | sebres <sebres@users.sourceforge.net> | 2017-05-10 12:28:46 (GMT) |
commit | fb3c424b5605a3c21de5c3ea3c72a7530a34de1d (patch) | |
tree | b2f7992afa76a26e513ab92ab8e7b65f9faf8593 /library/init.tcl | |
parent | 87313fd6795a5c95c6788ed3b8d3443bdf3740a2 (diff) | |
parent | 2c44e4887289d6b17deac377da76d117c1adc051 (diff) | |
download | tcl-fb3c424b5605a3c21de5c3ea3c72a7530a34de1d.zip tcl-fb3c424b5605a3c21de5c3ea3c72a7530a34de1d.tar.gz tcl-fb3c424b5605a3c21de5c3ea3c72a7530a34de1d.tar.bz2 |
[interim-merge-commit] back-ported branch sebres-clock-speedup (from trunk to 8.6): tcl-clock functionality rewritten in C.
Diffstat (limited to 'library/init.tcl')
-rw-r--r-- | library/init.tcl | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/library/init.tcl b/library/init.tcl index a202054..87e84e4 100644 --- a/library/init.tcl +++ b/library/init.tcl @@ -66,12 +66,12 @@ namespace eval tcl { } if {![interp issafe]} { - variable Path [encoding dirs] - set Dir [file join $::tcl_library encoding] - if {$Dir ni $Path} { + variable Path [encoding dirs] + set Dir [file join $::tcl_library encoding] + if {$Dir ni $Path} { lappend Path $Dir encoding dirs $Path - } + } } # TIP #255 min and max functions @@ -172,7 +172,7 @@ if {[interp issafe]} { proc ::tcl::initClock {} { # Auto-loading stubs for 'clock.tcl' - foreach cmd {add format scan} { + foreach cmd {mcget LocalizeFormat SetupTimeZone GetSystemTimeZone} { proc ::tcl::clock::$cmd args { variable TclLibDir source -encoding utf-8 [file join $TclLibDir clock.tcl] @@ -595,12 +595,12 @@ proc auto_import {pattern} { auto_load_index foreach pattern $patternList { - foreach name [array names auto_index $pattern] { - if {([namespace which -command $name] eq "") + foreach name [array names auto_index $pattern] { + if {([namespace which -command $name] eq "") && ([namespace qualifiers $pattern] eq [namespace qualifiers $name])} { - namespace eval :: $auto_index($name) - } - } + namespace eval :: $auto_index($name) + } + } } } |