merged tcl 8.1 branch back into the main trunk

1 files changed, 8 insertions, 18 deletions

diff --git a/generic/tclHistory.c b/generic/tclHistory.c
index 495880f..5f2a9f2 100644
--- a/generic/tclHistory.c
+++ b/generic/tclHistory.c
@@ -12,7 +12,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclHistory.c,v 1.2 1998/09/14 18:39:59 stanton Exp $
+ * RCS: @(#) $Id: tclHistory.c,v 1.3 1999/04/16 00:46:47 stanton Exp $
  */
 
 #include "tclInt.h"
@@ -57,20 +57,16 @@ Tcl_RecordAndEval(interp, cmd, flags)
 	 * Call Tcl_RecordAndEvalObj to do the actual work.
 	 */
 
-	TclNewObj(cmdPtr);
-	TclInitStringRep(cmdPtr, cmd, length);
+	cmdPtr = Tcl_NewStringObj(cmd, length);
 	Tcl_IncrRefCount(cmdPtr);
-
 	result = Tcl_RecordAndEvalObj(interp, cmdPtr, flags);
 
 	/*
 	 * Move the interpreter's object result to the string result, 
 	 * then reset the object result.
-	 * FAILS IF OBJECT RESULT'S STRING REPRESENTATION CONTAINS NULLS.
 	 */
 
-	Tcl_SetResult(interp,
-	        TclGetStringFromObj(Tcl_GetObjResult(interp), (int *) NULL),
+	Tcl_SetResult(interp, TclGetString(Tcl_GetObjResult(interp)),
 	        TCL_VOLATILE);
 
 	/*
@@ -116,11 +112,10 @@ Tcl_RecordAndEvalObj(interp, cmdPtr, flags)
 				 * record and execute. */
     int flags;			/* Additional flags. TCL_NO_EVAL means
 				 * record only: don't execute the command.
-				 * TCL_EVAL_GLOBAL means use
-				 * Tcl_GlobalEvalObj instead of
-				 * Tcl_EvalObj. */
+				 * TCL_EVAL_GLOBAL means evaluate the
+				 * script in global variable context instead
+				 * of the current procedure. */
 {
-    Interp *iPtr = (Interp *) interp;
     int result;
     Tcl_Obj *list[3];
     register Tcl_Obj *objPtr;
@@ -135,7 +130,7 @@ Tcl_RecordAndEvalObj(interp, cmdPtr, flags)
     
     objPtr = Tcl_NewListObj(3, list);
     Tcl_IncrRefCount(objPtr);
-    (void) Tcl_GlobalEvalObj(interp, objPtr);
+    (void) Tcl_EvalObjEx(interp, objPtr, TCL_EVAL_GLOBAL);
     Tcl_DecrRefCount(objPtr);
 
     /*
@@ -144,12 +139,7 @@ Tcl_RecordAndEvalObj(interp, cmdPtr, flags)
 
     result = TCL_OK;
     if (!(flags & TCL_NO_EVAL)) {
-	iPtr->evalFlags = (flags & ~TCL_EVAL_GLOBAL);
-	if (flags & TCL_EVAL_GLOBAL) {
-	    result = Tcl_GlobalEvalObj(interp, cmdPtr);
-	} else {
-	    result = Tcl_EvalObj(interp, cmdPtr);
-	}
+	result = Tcl_EvalObjEx(interp, cmdPtr, flags & TCL_EVAL_GLOBAL);
     }
     return result;
 }