Merge trunk

1 files changed, 11 insertions, 10 deletions

diff --git a/generic/tclObj.c b/generic/tclObj.c
index 88d5098..6a2d7d7 100644
--- a/generic/tclObj.c
+++ b/generic/tclObj.c
@@ -80,7 +80,7 @@ typedef struct {
     Tcl_HashTable *lineCLPtr;   /* This table remembers for each Tcl_Obj
                                  * generated by a call to the function
                                  * TclSubstTokens() from a literal text
-                                 * where bs+nl sequences occured in it, if
+                                 * where bs+nl sequences occurred in it, if
                                  * any. I.e. this table keeps track of
                                  * invisible and stripped continuation lines.
                                  * Its keys are Tcl_Obj pointers, the values
@@ -111,14 +111,14 @@ static ThreadSpecificData *TclGetContLineTable(void);
  */
 
 typedef struct PendingObjData {
-    int deletionCount;		/* Count of the number of invokations of
+    int deletionCount;		/* Count of the number of invocations of
 				 * TclFreeObj() are on the stack (at least
 				 * conceptually; many are actually expanded
 				 * macros). */
     Tcl_Obj *deletionStack;	/* Stack of objects that have had TclFreeObj()
 				 * invoked upon them but which can't be
 				 * deleted yet because they are in a nested
-				 * invokation of TclFreeObj(). By postponing
+				 * invocation of TclFreeObj(). By postponing
 				 * this way, we limit the maximum overall C
 				 * stack depth when deleting a complex object.
 				 * The down-side is that we alter the overall
@@ -346,9 +346,9 @@ typedef struct ResolvedCmdName {
 				 * structure can be freed when refCount
 				 * becomes zero. */
 } ResolvedCmdName;
- 
+
 #ifdef TCL_MEM_DEBUG
-/* 
+/*
  * Filler matches the value used for filling freed memory in tclCkalloc.
  * On 32-bit systems, the ref counts do not cross 0x7fffffff. On 64-bit
  * implementations, ref counts will never reach this value (unless explicitly
@@ -569,7 +569,7 @@ TclContinuationsEnter(
 	 * the switch command is identical, mapping them all to the same
 	 * literal. An interesting result of this is that the number and
 	 * locations (offset) of invisible continuation lines in the literal
-	 * are the same for all occurences.
+	 * are the same for all occurrences.
 	 *
 	 * Note that while reusing the existing entry is possible it requires
 	 * the same actions as for a new entry because we have to copy the
@@ -1380,7 +1380,7 @@ TclFreeObj(
      * We have to access it using the low-level call and then check for
      * validity. This function can be called after TclFinalizeThreadData() has
      * already killed the thread-global data structures. Performing
-     * TCL_TSD_INIT will leave us with an un-initialized memory block upon
+     * TCL_TSD_INIT will leave us with an uninitialized memory block upon
      * which we crash (if we where to access the uninitialized hashtable).
      */
 
@@ -1471,7 +1471,7 @@ TclFreeObj(
      * We have to access it using the low-level call and then check for
      * validity. This function can be called after TclFinalizeThreadData() has
      * already killed the thread-global data structures. Performing
-     * TCL_TSD_INIT will leave us with an un-initialized memory block upon
+     * TCL_TSD_INIT will leave us with an uninitialized memory block upon
      * which we crash (if we where to access the uninitialized hashtable).
      */
 
@@ -1665,7 +1665,7 @@ Tcl_GetString(
  *----------------------------------------------------------------------
  */
 
-#undef TclGetStringFromObj
+#if !defined(TCL_NO_DEPRECATED)
 char *
 TclGetStringFromObj(
     Tcl_Obj *objPtr,	/* Object whose string rep byte pointer should
@@ -1708,6 +1708,7 @@ TclGetStringFromObj(
     }
     return objPtr->bytes;
 }
+#endif /* !defined(TCL_NO_DEPRECATED) */
 
 #undef Tcl_GetStringFromObj
 char *
@@ -3470,7 +3471,7 @@ Tcl_GetBignumFromObj(
  *
  * Side effects:
  *	A copy of bignum is stored in *bignumValue, which is expected to be
- *	uninitialized or cleared. If conversion fails, an the 'interp'
+ *	uninitialized or cleared. If conversion fails and the 'interp'
  *	argument is not NULL, an error message is stored in the interpreter
  *	result.
  *