diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2015-07-15 11:17:12 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2015-07-15 11:17:12 (GMT) |
| commit | bc9648f913a629f7845e64a802b2519bb5a729a7 (patch) | |
| tree | 9d409ee7e8ffe0438cb59bb04e9f3c8d2ea58455 /generic/tclNamesp.c | |
| parent | 2785816f6adac764ff1a93a100bc8cae1464227f (diff) | |
| parent | b4b28f993fd2ed7a128731d3d5cc73a1fec73e33 (diff) | |
| download | tcl-bug_57945b574a_without_stub.zip tcl-bug_57945b574a_without_stub.tar.gz tcl-bug_57945b574a_without_stub.tar.bz2 | |
merge trunkbug_57945b574a_without_stub
Diffstat (limited to 'generic/tclNamesp.c')
| -rw-r--r-- | generic/tclNamesp.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/generic/tclNamesp.c b/generic/tclNamesp.c index 8f2f10e..91239f0 100644 --- a/generic/tclNamesp.c +++ b/generic/tclNamesp.c @@ -343,7 +343,7 @@ Tcl_PushCallFrame( framePtr->clientData = NULL; framePtr->localCachePtr = NULL; framePtr->tailcallPtr = NULL; - + /* * Push the new call frame onto the interpreter's stack of procedure call * frames making it the current frame. @@ -3056,7 +3056,7 @@ NamespaceCodeCmd( */ arg = TclGetStringFromObj(objv[1], &length); - if (*arg==':' && length > 20 + if (*arg==':' && length > 20 && strncmp(arg, "::namespace inscope ", 20) == 0) { Tcl_SetObjResult(interp, objv[1]); return TCL_OK; @@ -4929,7 +4929,7 @@ TclLogCommandInfo( if (Tcl_IsShared(iPtr->errorStack)) { Tcl_Obj *newObj; - + newObj = Tcl_DuplicateObj(iPtr->errorStack); Tcl_DecrRefCount(iPtr->errorStack); Tcl_IncrRefCount(newObj); @@ -4961,7 +4961,7 @@ TclLogCommandInfo( Tcl_ListObjAppendElement(NULL, iPtr->errorStack, Tcl_NewStringObj(command, length)); } - } + } if (!iPtr->framePtr->objc) { /* @@ -5014,7 +5014,7 @@ TclErrorStackResetIf( if (Tcl_IsShared(iPtr->errorStack)) { Tcl_Obj *newObj; - + newObj = Tcl_DuplicateObj(iPtr->errorStack); Tcl_DecrRefCount(iPtr->errorStack); Tcl_IncrRefCount(newObj); @@ -5034,7 +5034,7 @@ TclErrorStackResetIf( Tcl_ListObjAppendElement(NULL, iPtr->errorStack, iPtr->innerLiteral); Tcl_ListObjAppendElement(NULL, iPtr->errorStack, Tcl_NewStringObj(msg, length)); - } + } } /* |