merge 8.7

2 files changed, 26 insertions, 21 deletions

diff --git a/library/clock.tcl b/library/clock.tcl
index 706bc98..9d41b80 100644
--- a/library/clock.tcl
+++ b/library/clock.tcl
@@ -60,7 +60,7 @@ namespace eval ::tcl::clock {
 
     namespace import ::msgcat::mcload
     namespace import ::msgcat::mclocale
-    namespace import ::msgcat::mc
+    proc mc {args} { tailcall ::msgcat::mcn [namespace current] {*}$args }
     namespace import ::msgcat::mcpackagelocale
 
 }
diff --git a/library/msgcat/msgcat.tcl b/library/msgcat/msgcat.tcl
index fa21685..589da7a 100644
--- a/library/msgcat/msgcat.tcl
+++ b/library/msgcat/msgcat.tcl
@@ -1220,27 +1220,32 @@ proc msgcat::mcutil::ConvertLocale {value} {
 # - called from an class defined oo object
 # - called from a classless oo object
 proc ::msgcat::PackageNamespaceGet {} {
-    uplevel 2 {
-	# Check self namespace to determine environment
-	switch -exact -- [namespace which self] {
-	    {::oo::define::self} {
-		# We are within a class definition
-		return [namespace qualifiers [self]]
-	    }
-	    {::oo::Helpers::self} {
-		# We are within an object
-		set Class [info object class [self]]
-		# Check for classless defined object
-		if {$Class eq {::oo::object}} {
-		    return [namespace qualifiers [self]]
-		}
-		# Class defined object
-		return [namespace qualifiers $Class]
-	    }
-	    default {
-		# Not in object environment
-		return [namespace current]
+    set ns [uplevel 2 { namespace current }]
+    
+    if {![string match {::oo::*} $ns]} {
+	# Not in object environment
+	return $ns
+    }
+
+    # Check self namespace to determine environment
+    switch -exact -- [uplevel 2 { namespace which -command self }] {
+	{::oo::define::self} {
+	    # We are within a class definition
+	    return [namespace qualifiers [uplevel 2 { self }]]
+	}
+	{::oo::Helpers::self} {
+	    # We are within an object
+	    set Class [info object class [uplevel 2 { self }]]
+	    # Check for classless defined object
+	    if {$Class eq {::oo::object}} {
+		return [namespace qualifiers [uplevel 2 { self }]]
 	    }
+	    # Class defined object
+	    return [namespace qualifiers $Class]
+	}
+	default {
+	    # Not in object environment
+	    return $ns
 	}
     }
 }