Merge 8.6 branch

Author: dkfellows

doc/object.n

@@ -64,6 +64,11 @@ The \fBoo::object\fR class supports the following non-exported methods:
 This method concatenates the arguments, \fIarg\fR, as if with \fBconcat\fR,
 and then evaluates the resulting script in the namespace that is uniquely
 associated with \fIobj\fR, returning the result of the evaluation.
+.RS
+.PP
+Note that object-internal commands such as \fBmy\fR and \fBself\fR can be
+invoked in this context.
+.RE
 .TP
 \fIobj \fBunknown ?\fImethodName\fR? ?\fIarg ...\fR?
 .

generic/tclOOBasic.c

@@ -442,7 +442,8 @@ TclOO_Object_Eval(
      */
 
     (void) TclPushStackFrame(interp, (Tcl_CallFrame **) framePtrPtr,
-	    Tcl_GetObjectNamespace(object), 0);
+	    Tcl_GetObjectNamespace(object), FRAME_IS_METHOD);
+    framePtr->clientData = context;
     framePtr->objc = objc;
     framePtr->objv = objv;	/* Reference counts do not need to be
 				 * incremented here. */

tests/oo.test

@@ -3002,6 +3002,16 @@ test oo-18.11 {OO: define/self command support} -setup {
     (in definition script for class "::foo" line 1)
     invoked from within
 "oo::define foo {rename ::foo {}; self {error foobar}}"}
+test oo-18.12 {OO: self callable via eval method} -setup {
+    oo::class create parent {
+	export eval
+    }
+    parent create ::foo
+} -body {
+    foo eval { self }
+} -cleanup {
+    parent destroy
+} -result ::foo
 
 test oo-19.1 {OO: varname method} -setup {
     oo::object create inst