merge trunk

1 files changed, 11 insertions, 42 deletions

diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index 0206fa4..5231e30 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -6780,32 +6780,34 @@ Tcl_AddObjErrorInfo(
 }
 
 /*
- *---------------------------------------------------------------------------
+ *----------------------------------------------------------------------
  *
- * Tcl_VarEvalVA --
+ * Tcl_VarEval --
  *
  *	Given a variable number of string arguments, concatenate them all
  *	together and execute the result as a Tcl command.
  *
  * Results:
  *	A standard Tcl return result. An error message or other result may be
- *	left in the interp's result.
+ *	left in the interp.
  *
  * Side effects:
  *	Depends on what was done by the command.
  *
- *---------------------------------------------------------------------------
+ *----------------------------------------------------------------------
  */
-
+	/* ARGSUSED */
 int
-Tcl_VarEvalVA(
-    Tcl_Interp *interp,		/* Interpreter in which to evaluate command */
-    va_list argList)		/* Variable argument list. */
+Tcl_VarEval(
+    Tcl_Interp *interp,
+    ...)
 {
+    va_list argList;
+    int result;
     Tcl_DString buf;
     char *string;
-    int result;
 
+    va_start(argList, interp);
     /*
      * Copy the strings one after the other into a single larger string. Use
      * stack-allocated space for small commands, but if the command gets too
@@ -6829,39 +6831,6 @@ Tcl_VarEvalVA(
 /*
  *----------------------------------------------------------------------
  *
- * Tcl_VarEval --
- *
- *	Given a variable number of string arguments, concatenate them all
- *	together and execute the result as a Tcl command.
- *
- * Results:
- *	A standard Tcl return result. An error message or other result may be
- *	left in the interp.
- *
- * Side effects:
- *	Depends on what was done by the command.
- *
- *----------------------------------------------------------------------
- */
-	/* ARGSUSED */
-int
-Tcl_VarEval(
-    Tcl_Interp *interp,
-    ...)
-{
-    va_list argList;
-    int result;
-
-    va_start(argList, interp);
-    result = Tcl_VarEvalVA(interp, argList);
-    va_end(argList);
-
-    return result;
-}
-
-/*
- *----------------------------------------------------------------------
- *
  * Tcl_GlobalEval --
  *
  *	Evaluate a command at global level in an interpreter.