summaryrefslogtreecommitdiffstats
path: root/library/tm.tcl
diff options
context:
space:
mode:
authormig <mig>2013-02-11 13:50:47 (GMT)
committermig <mig>2013-02-11 13:50:47 (GMT)
commit0055995ec13ad8f27603d140ca19d7858725ef95 (patch)
tree14f5697a44b71bd7eb3091709c9cac4fe3868025 /library/tm.tcl
parenteb1adf553cfd18472faa6c11b1d46434c15e064f (diff)
parent30f60173c4738c76675b58db3a7a5aaa62ca79ea (diff)
downloadtcl-mig_alloc_reform.zip
tcl-mig_alloc_reform.tar.gz
tcl-mig_alloc_reform.tar.bz2
merge trunkmig_alloc_reform
Diffstat (limited to 'library/tm.tcl')
-rw-r--r--library/tm.tcl10
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} {