diff options
author | seandeelywoods <seandeelywoods> | 2013-03-18 12:41:14 (GMT) |
---|---|---|
committer | seandeelywoods <seandeelywoods> | 2013-03-18 12:41:14 (GMT) |
commit | 87d0bd2b565cc904bdd135291c1baa5ff5cea4d5 (patch) | |
tree | 63b370c68febf9ed24fc630644117cf735313b40 /library/tm.tcl | |
parent | 3faa92fe264c5671bd8dad903cb13ca5ce302781 (diff) | |
parent | 3fda4f0df6f0fdabe84372aee281ffb4ca7108e1 (diff) | |
download | tcl-hypnotoad_bug_3598385.zip tcl-hypnotoad_bug_3598385.tar.gz tcl-hypnotoad_bug_3598385.tar.bz2 |
Merging in changes from trunkhypnotoad_bug_3598385
Diffstat (limited to 'library/tm.tcl')
-rw-r--r-- | library/tm.tcl | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/library/tm.tcl b/library/tm.tcl index ce8a013..d2af4f5 100644 --- a/library/tm.tcl +++ b/library/tm.tcl @@ -54,7 +54,7 @@ namespace eval ::tcl::tm { # Export the public API namespace export path - namespace ensemble create -command path -subcommand {add remove list} + namespace ensemble create -command path -subcommands {add remove list} } # ::tcl::tm::path implementations -- @@ -260,10 +260,8 @@ proc ::tcl::tm::UnknownHandler {original name args} { # Otherwise we still have to fallback to the regular # package search to complete the processing. - if { - ($pkgname eq $name) && - [package vsatisfies $pkgversion {*}$args] - } then { + if {($pkgname eq $name) + && [package vsatisfies $pkgversion {*}$args]} { set satisfied 1 # We do not abort the loop, and keep adding provide @@ -347,7 +345,7 @@ proc ::tcl::tm::Defaults {} { # Calls 'path add' to paths to the list of module search paths. proc ::tcl::tm::roots {paths} { - foreach {major minor} [split [info tclversion] .] break + lassign [split [package present Tcl] .] major minor foreach pa $paths { set p [file join $pa tcl$major] for {set n $minor} {$n >= 0} {incr n -1} { |