Lots of ANSIfying of function decls.

Also a few spots where code has been cleaned up more completely.

1 files changed, 583 insertions, 587 deletions

diff --git a/generic/tkTextWind.c b/generic/tkTextWind.c
index 73ea3a8..0988fee 100644
--- a/generic/tkTextWind.c
+++ b/generic/tkTextWind.c
@@ -1,17 +1,17 @@
-/* 
+/*
  * tkTextWind.c --
  *
- *	This file contains code that allows arbitrary windows to be
- *	nested inside text widgets.  It also implements the "window"
- *	widget command for texts.
+ *	This file contains code that allows arbitrary windows to be nested
+ *	inside text widgets. It also implements the "window" widget command
+ *	for texts.
  *
  * Copyright (c) 1994 The Regents of the University of California.
  * Copyright (c) 1994-1997 Sun Microsystems, Inc.
  *
- * See the file "license.terms" for information on usage and redistribution
- * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ * See the file "license.terms" for information on usage and redistribution of
+ * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkTextWind.c,v 1.16 2005/11/10 11:38:29 dkf Exp $
+ * RCS: @(#) $Id: tkTextWind.c,v 1.17 2005/11/17 10:57:35 dkf Exp $
  */
 
 #include "tk.h"
@@ -19,14 +19,14 @@
 #include "tkPort.h"
 
 /*
- * The following structure is the official type record for the
- * embedded window geometry manager:
+ * The following structure is the official type record for the embedded window
+ * geometry manager:
  */
 
-static void		EmbWinRequestProc _ANSI_ARGS_((ClientData clientData,
-			    Tk_Window tkwin));
-static void		EmbWinLostSlaveProc _ANSI_ARGS_((ClientData clientData,
-			    Tk_Window tkwin));
+static void		EmbWinRequestProc(ClientData clientData,
+			    Tk_Window tkwin);
+static void		EmbWinLostSlaveProc(ClientData clientData,
+			    Tk_Window tkwin);
 
 static Tk_GeomMgr textGeomType = {
     "text",			/* name */
@@ -42,49 +42,48 @@ static Tk_GeomMgr textGeomType = {
 	+ sizeof(TkTextEmbWindow)))
 
 /*
- * Prototypes for procedures defined in this file:
+ * Prototypes for functions defined in this file:
  */
 
-static TkTextSegment *	EmbWinCleanupProc _ANSI_ARGS_((TkTextSegment *segPtr,
-			    TkTextLine *linePtr));
-static void		EmbWinCheckProc _ANSI_ARGS_((TkTextSegment *segPtr,
-			    TkTextLine *linePtr));
-static void		EmbWinBboxProc _ANSI_ARGS_((TkText *textPtr, 
+static TkTextSegment *	EmbWinCleanupProc(TkTextSegment *segPtr,
+			    TkTextLine *linePtr);
+static void		EmbWinCheckProc(TkTextSegment *segPtr,
+			    TkTextLine *linePtr);
+static void		EmbWinBboxProc(TkText *textPtr,
 			    TkTextDispChunk *chunkPtr,
 			    int index, int y, int lineHeight, int baseline,
 			    int *xPtr, int *yPtr, int *widthPtr,
-			    int *heightPtr));
-static int		EmbWinConfigure _ANSI_ARGS_((TkText *textPtr,
-			    TkTextSegment *ewPtr, int objc, Tcl_Obj *CONST objv[]));
-static void		EmbWinDelayedUnmap _ANSI_ARGS_((
-			    ClientData clientData));
-static int		EmbWinDeleteProc _ANSI_ARGS_((TkTextSegment *segPtr,
-			    TkTextLine *linePtr, int treeGone));
-static int		EmbWinLayoutProc _ANSI_ARGS_((TkText *textPtr,
+			    int *heightPtr);
+static int		EmbWinConfigure(TkText *textPtr, TkTextSegment *ewPtr,
+			    int objc, Tcl_Obj *CONST objv[]);
+static void		EmbWinDelayedUnmap(ClientData clientData);
+static int		EmbWinDeleteProc(TkTextSegment *segPtr,
+			    TkTextLine *linePtr, int treeGone);
+static int		EmbWinLayoutProc(TkText *textPtr,
 			    TkTextIndex *indexPtr, TkTextSegment *segPtr,
 			    int offset, int maxX, int maxChars,
 			    int noCharsYet, TkWrapMode wrapMode,
-			    TkTextDispChunk *chunkPtr));
-static void		EmbWinStructureProc _ANSI_ARGS_((ClientData clientData,
-			    XEvent *eventPtr));
-static void		EmbWinUndisplayProc _ANSI_ARGS_((TkText *textPtr,
-			    TkTextDispChunk *chunkPtr));
-static TkTextEmbWindowClient* EmbWinGetClient _ANSI_ARGS_((CONST TkText *textPtr,
-							   TkTextSegment *ewPtr));
+			    TkTextDispChunk *chunkPtr);
+static void		EmbWinStructureProc(ClientData clientData,
+			    XEvent *eventPtr);
+static void		EmbWinUndisplayProc(TkText *textPtr,
+			    TkTextDispChunk *chunkPtr);
+static TkTextEmbWindowClient* EmbWinGetClient(CONST TkText *textPtr,
+			    TkTextSegment *ewPtr);
 
 /*
  * The following structure declares the "embedded window" segment type.
  */
 
 static Tk_SegType tkTextEmbWindowType = {
-    "window",					/* name */
-    0,						/* leftGravity */
-    (Tk_SegSplitProc *) NULL,			/* splitProc */
-    EmbWinDeleteProc,				/* deleteProc */
-    EmbWinCleanupProc,				/* cleanupProc */
-    (Tk_SegLineChangeProc *) NULL,		/* lineChangeProc */
-    EmbWinLayoutProc,				/* layoutProc */
-    EmbWinCheckProc				/* checkProc */
+    "window",			/* name */
+    0,				/* leftGravity */
+    NULL,			/* splitProc */
+    EmbWinDeleteProc,		/* deleteProc */
+    EmbWinCleanupProc,		/* cleanupProc */
+    NULL,			/* lineChangeProc */
+    EmbWinLayoutProc,		/* layoutProc */
+    EmbWinCheckProc		/* checkProc */
 };
 
 /*
@@ -92,10 +91,10 @@ static Tk_SegType tkTextEmbWindowType = {
  */
 
 static char *alignStrings[] = {
-    "baseline", "bottom", "center", "top", (char *) NULL
+    "baseline", "bottom", "center", "top", NULL
 };
 
-typedef enum {	
+typedef enum {
     ALIGN_BASELINE, ALIGN_BOTTOM, ALIGN_CENTER, ALIGN_TOP
 } alignMode;
 
@@ -104,24 +103,19 @@ typedef enum {
  */
 
 static Tk_OptionSpec optionSpecs[] = {
-    {TK_OPTION_STRING_TABLE, "-align", (char *) NULL, (char *) NULL,
-        "center", -1, Tk_Offset(TkTextEmbWindow, align), 
+    {TK_OPTION_STRING_TABLE, "-align", NULL, NULL,
+	"center", -1, Tk_Offset(TkTextEmbWindow, align),
 	0, (ClientData) alignStrings, 0},
-    {TK_OPTION_STRING, "-create", (char *) NULL, (char *) NULL,
-	(char *) NULL, -1, Tk_Offset(TkTextEmbWindow, create),
-	TK_OPTION_NULL_OK, 0, 0},
-    {TK_OPTION_PIXELS, "-padx", (char *) NULL, (char *) NULL,
-	"0", -1, Tk_Offset(TkTextEmbWindow, padX), 
-	0, 0, 0},
-    {TK_OPTION_PIXELS, "-pady", (char *) NULL, (char *) NULL,
-	"0", -1, Tk_Offset(TkTextEmbWindow, padY), 
-	0, 0, 0},
-    {TK_OPTION_BOOLEAN, "-stretch", (char *) NULL, (char *) NULL,
-	"0", -1, Tk_Offset(TkTextEmbWindow, stretch), 
-	0, 0, 0},
-    {TK_OPTION_WINDOW, "-window", (char *) NULL, (char *) NULL,
-	(char *) NULL, -1, Tk_Offset(TkTextEmbWindow, tkwin),
-	TK_OPTION_NULL_OK, 0, 0},
+    {TK_OPTION_STRING, "-create", NULL, NULL,
+	NULL, -1, Tk_Offset(TkTextEmbWindow, create), TK_OPTION_NULL_OK, 0, 0},
+    {TK_OPTION_PIXELS, "-padx", NULL, NULL,
+	"0", -1, Tk_Offset(TkTextEmbWindow, padX), 0, 0, 0},
+    {TK_OPTION_PIXELS, "-pady", NULL, NULL,
+	"0", -1, Tk_Offset(TkTextEmbWindow, padY), 0, 0, 0},
+    {TK_OPTION_BOOLEAN, "-stretch", NULL, NULL,
+	"0", -1, Tk_Offset(TkTextEmbWindow, stretch), 0, 0, 0},
+    {TK_OPTION_WINDOW, "-window", NULL, NULL,
+	NULL, -1, Tk_Offset(TkTextEmbWindow, tkwin), TK_OPTION_NULL_OK, 0, 0},
     {TK_OPTION_END}
 };
 
@@ -130,9 +124,8 @@ static Tk_OptionSpec optionSpecs[] = {
  *
  * TkTextWindowCmd --
  *
- *	This procedure implements the "window" widget command
- *	for text widgets.  See the user documentation for details
- *	on what it does.
+ *	This function implements the "window" widget command for text widgets.
+ *	See the user documentation for details on what it does.
  *
  * Results:
  *	A standard Tcl result or error.
@@ -144,18 +137,18 @@ static Tk_OptionSpec optionSpecs[] = {
  */
 
 int
-TkTextWindowCmd(textPtr, interp, objc, objv)
-    register TkText *textPtr;	/* Information about text widget. */
-    Tcl_Interp *interp;		/* Current interpreter. */
-    int objc;			/* Number of arguments. */
-    Tcl_Obj *CONST objv[];	/* Argument objects. Someone else has already
+TkTextWindowCmd(
+    register TkText *textPtr,	/* Information about text widget. */
+    Tcl_Interp *interp,		/* Current interpreter. */
+    int objc,			/* Number of arguments. */
+    Tcl_Obj *CONST objv[])	/* Argument objects. Someone else has already
 				 * parsed this command enough to know that
 				 * objv[1] is "window". */
 {
     int optionIndex;
-    
+
     static CONST char *windOptionStrings[] = {
-	"cget", "configure", "create", "names", (char *) NULL 
+	"cget", "configure", "create", "names", NULL
     };
     enum windOptions {
 	WIND_CGET, WIND_CONFIGURE, WIND_CREATE, WIND_NAMES
@@ -167,193 +160,197 @@ TkTextWindowCmd(textPtr, interp, objc, objv)
 	Tcl_WrongNumArgs(interp, 2, objv, "option ?arg arg ...?");
 	return TCL_ERROR;
     }
-    if (Tcl_GetIndexFromObj(interp, objv[2], windOptionStrings, 
-			    "window option", 0, &optionIndex) != TCL_OK) {
+    if (Tcl_GetIndexFromObj(interp, objv[2], windOptionStrings,
+	    "window option", 0, &optionIndex) != TCL_OK) {
 	return TCL_ERROR;
     }
     switch ((enum windOptions)optionIndex) {
-	case WIND_CGET: {
-	    TkTextIndex index;
-	    TkTextSegment *ewPtr;
-	    Tcl_Obj *objPtr;
+    case WIND_CGET: {
+	TkTextIndex index;
+	TkTextSegment *ewPtr;
+	Tcl_Obj *objPtr;
+	TkTextEmbWindowClient *client;
+
+	if (objc != 5) {
+	    Tcl_WrongNumArgs(interp, 3, objv, "index option");
+	    return TCL_ERROR;
+	}
+	if (TkTextGetObjIndex(interp, textPtr, objv[3], &index) != TCL_OK) {
+	    return TCL_ERROR;
+	}
+	ewPtr = TkTextIndexToSeg(&index, NULL);
+	if (ewPtr->typePtr != &tkTextEmbWindowType) {
+	    Tcl_AppendResult(interp, "no embedded window at index \"",
+		    Tcl_GetString(objv[3]), "\"", NULL);
+	    return TCL_ERROR;
+	}
+
+	/*
+	 * Copy over client specific value before querying.
+	 */
+
+	client = EmbWinGetClient(textPtr, ewPtr);
+	if (client != NULL) {
+	    ewPtr->body.ew.tkwin = client->tkwin;
+	} else {
+	    ewPtr->body.ew.tkwin = NULL;
+	}
+
+	objPtr = Tk_GetOptionValue(interp, (char *) &ewPtr->body.ew,
+		ewPtr->body.ew.optionTable, objv[4], textPtr->tkwin);
+	if (objPtr == NULL) {
+	    return TCL_ERROR;
+	}
+	Tcl_SetObjResult(interp, objPtr);
+	return TCL_OK;
+    }
+    case WIND_CONFIGURE: {
+	TkTextIndex index;
+	TkTextSegment *ewPtr;
+
+	if (objc < 4) {
+	    Tcl_WrongNumArgs(interp, 3, objv, "index ?option value ...?");
+	    return TCL_ERROR;
+	}
+	if (TkTextGetObjIndex(interp, textPtr, objv[3], &index) != TCL_OK) {
+	    return TCL_ERROR;
+	}
+	ewPtr = TkTextIndexToSeg(&index, NULL);
+	if (ewPtr->typePtr != &tkTextEmbWindowType) {
+	    Tcl_AppendResult(interp, "no embedded window at index \"",
+		    Tcl_GetString(objv[3]), "\"", NULL);
+	    return TCL_ERROR;
+	}
+	if (objc <= 5) {
 	    TkTextEmbWindowClient *client;
-	    
-	    if (objc != 5) {
-		Tcl_WrongNumArgs(interp, 3, objv, "index option");
-		return TCL_ERROR;
-	    }
-	    if (TkTextGetObjIndex(interp, textPtr, objv[3], &index) != TCL_OK) {
-		return TCL_ERROR;
-	    }
-	    ewPtr = TkTextIndexToSeg(&index, (int *) NULL);
-	    if (ewPtr->typePtr != &tkTextEmbWindowType) {
-		Tcl_AppendResult(interp, "no embedded window at index \"",
-				 Tcl_GetString(objv[3]), "\"", (char *) NULL);
-		return TCL_ERROR;
-	    }
-	    
-	    /* Copy over client specific value before querying */
+	    Tcl_Obj* objPtr;
+
+	    /*
+	     * Copy over client specific value before querying.
+	     */
+
 	    client = EmbWinGetClient(textPtr, ewPtr);
 	    if (client != NULL) {
 		ewPtr->body.ew.tkwin = client->tkwin;
 	    } else {
 		ewPtr->body.ew.tkwin = NULL;
 	    }
-	    
-	    objPtr = Tk_GetOptionValue(interp, (char *) &ewPtr->body.ew,
-			ewPtr->body.ew.optionTable, objv[4], textPtr->tkwin);
+
+	    objPtr = Tk_GetOptionInfo(interp, (char *) &ewPtr->body.ew,
+		    ewPtr->body.ew.optionTable, (objc == 5) ? objv[4] : NULL,
+		    textPtr->tkwin);
 	    if (objPtr == NULL) {
 		return TCL_ERROR;
-	    } else {
-		Tcl_SetObjResult(interp, objPtr);
-		return TCL_OK;
 	    }
-	    break;
-	}
-	case WIND_CONFIGURE: {
-	    TkTextIndex index;
-	    TkTextSegment *ewPtr;
+	    Tcl_SetObjResult(interp, objPtr);
+	    return TCL_OK;
+	} else {
+	    TkTextChanged(textPtr->sharedTextPtr, NULL, &index, &index);
 
-	    if (objc < 4) {
-		Tcl_WrongNumArgs(interp, 3, objv, "index ?option value ...?");
-		return TCL_ERROR;
-	    }
-	    if (TkTextGetObjIndex(interp, textPtr, objv[3], &index) != TCL_OK) {
-		return TCL_ERROR;
-	    }
-	    ewPtr = TkTextIndexToSeg(&index, (int *) NULL);
-	    if (ewPtr->typePtr != &tkTextEmbWindowType) {
-		Tcl_AppendResult(interp, "no embedded window at index \"",
-				 Tcl_GetString(objv[3]), "\"", (char *) NULL);
-		return TCL_ERROR;
-	    }
-	    if (objc <= 5) {
-		TkTextEmbWindowClient *client;
-		Tcl_Obj* objPtr;
-		
-		/* Copy over client specific value before querying */
-		client = EmbWinGetClient(textPtr, ewPtr);
-		if (client != NULL) {
-		    ewPtr->body.ew.tkwin = client->tkwin;
-		} else {
-		    ewPtr->body.ew.tkwin = NULL;
-		}
-		
-		objPtr = Tk_GetOptionInfo(interp, (char *) &ewPtr->body.ew,
-			ewPtr->body.ew.optionTable,
-			(objc == 5) ? objv[4] : (Tcl_Obj *) NULL,
-					  textPtr->tkwin);
-		if (objPtr == NULL) {
-		    return TCL_ERROR;
-		} else {
-		    Tcl_SetObjResult(interp, objPtr);
-		    return TCL_OK;
-		}
-	    } else {
-		TkTextChanged(textPtr->sharedTextPtr, NULL, &index, &index);
-		/* 
-		 * It's probably not true that all window configuration
-		 * can change the line height, so we could be more
-		 * efficient here and only call this when necessary.
-		 */
-		TkTextInvalidateLineMetrics(textPtr->sharedTextPtr, NULL, 
-					    index.linePtr, 0,
-					    TK_TEXT_INVALIDATE_ONLY);
-		return EmbWinConfigure(textPtr, ewPtr, objc-4, objv+4);
-	    }
-	    break;
-	}
-	case WIND_CREATE: {
-	    TkTextIndex index;
-	    int lineIndex;
-	    TkTextEmbWindowClient *client;
-	    int res;
-	    
 	    /*
-	     * Add a new window.  Find where to put the new window, and
-	     * mark that position for redisplay.
+	     * It's probably not true that all window configuration can change
+	     * the line height, so we could be more efficient here and only
+	     * call this when necessary.
 	     */
 
-	    if (objc < 4) {
-		Tcl_WrongNumArgs(interp, 3, objv, "index ?option value ...?");
-		return TCL_ERROR;
-	    }
-	    if (TkTextGetObjIndex(interp, textPtr, objv[3], &index) != TCL_OK) {
-		return TCL_ERROR;
-	    }
+	    TkTextInvalidateLineMetrics(textPtr->sharedTextPtr, NULL,
+		    index.linePtr, 0, TK_TEXT_INVALIDATE_ONLY);
+	    return EmbWinConfigure(textPtr, ewPtr, objc-4, objv+4);
+	}
+    }
+    case WIND_CREATE: {
+	TkTextIndex index;
+	int lineIndex;
+	TkTextEmbWindowClient *client;
+	int res;
 
-	    /*
-	     * Don't allow insertions on the last (dummy) line of the text.
-	     */
-	
-	    lineIndex = TkBTreeLinesTo(textPtr, index.linePtr);
-	    if (lineIndex == TkBTreeNumLines(textPtr->sharedTextPtr->tree, textPtr)) {
-		lineIndex--;
-		TkTextMakeByteIndex(textPtr->sharedTextPtr->tree, textPtr, 
-				    lineIndex, 1000000, &index);
-	    }
+	/*
+	 * Add a new window. Find where to put the new window, and mark that
+	 * position for redisplay.
+	 */
 
-	    /*
-	     * Create the new window segment and initialize it.
-	     */
+	if (objc < 4) {
+	    Tcl_WrongNumArgs(interp, 3, objv, "index ?option value ...?");
+	    return TCL_ERROR;
+	}
+	if (TkTextGetObjIndex(interp, textPtr, objv[3], &index) != TCL_OK) {
+	    return TCL_ERROR;
+	}
 
-	    ewPtr = (TkTextSegment *) ckalloc(EW_SEG_SIZE);
-	    ewPtr->typePtr = &tkTextEmbWindowType;
-	    ewPtr->size = 1;
-	    ewPtr->body.ew.sharedTextPtr = textPtr->sharedTextPtr;
-	    ewPtr->body.ew.linePtr = NULL;
-	    ewPtr->body.ew.tkwin = NULL;
-	    ewPtr->body.ew.create = NULL;
-	    ewPtr->body.ew.align = ALIGN_CENTER;
-	    ewPtr->body.ew.padX = ewPtr->body.ew.padY = 0;
-	    ewPtr->body.ew.stretch = 0;
-	    ewPtr->body.ew.optionTable = Tk_CreateOptionTable(interp, optionSpecs);
-
-	    client = (TkTextEmbWindowClient*) ckalloc(sizeof(TkTextEmbWindowClient));
-	    client->next = NULL;
-	    client->textPtr = textPtr;
-	    client->tkwin = NULL;
-	    client->chunkCount = 0;
-	    client->displayed = 0;
-	    client->parent = ewPtr;
-	    ewPtr->body.ew.clients = client;
+	/*
+	 * Don't allow insertions on the last (dummy) line of the text.
+	 */
 
-	    /*
-	     * Link the segment into the text widget, then configure it (delete
-	     * it again if the configuration fails).
-	     */
+	lineIndex = TkBTreeLinesTo(textPtr, index.linePtr);
+	if (lineIndex == TkBTreeNumLines(textPtr->sharedTextPtr->tree,
+		textPtr)) {
+	    lineIndex--;
+	    TkTextMakeByteIndex(textPtr->sharedTextPtr->tree, textPtr,
+		    lineIndex, 1000000, &index);
+	}
 
-	    TkTextChanged(textPtr->sharedTextPtr, NULL, &index, &index);
-	    TkBTreeLinkSegment(ewPtr, &index);
-	    res = EmbWinConfigure(textPtr, ewPtr, objc-4, objv+4);
-	    client->tkwin = ewPtr->body.ew.tkwin;
-	    if (res != TCL_OK) {
-		TkTextIndex index2;
+	/*
+	 * Create the new window segment and initialize it.
+	 */
 
-		TkTextIndexForwChars(NULL, &index, 1, &index2, COUNT_INDICES);
-		TkBTreeDeleteIndexRange(textPtr->sharedTextPtr->tree, &index, &index2);
-		return TCL_ERROR;
-	    }
-	    TkTextInvalidateLineMetrics(textPtr->sharedTextPtr, NULL, 
-					index.linePtr, 0,
-					TK_TEXT_INVALIDATE_ONLY);
-	    break;
+	ewPtr = (TkTextSegment *) ckalloc(EW_SEG_SIZE);
+	ewPtr->typePtr = &tkTextEmbWindowType;
+	ewPtr->size = 1;
+	ewPtr->body.ew.sharedTextPtr = textPtr->sharedTextPtr;
+	ewPtr->body.ew.linePtr = NULL;
+	ewPtr->body.ew.tkwin = NULL;
+	ewPtr->body.ew.create = NULL;
+	ewPtr->body.ew.align = ALIGN_CENTER;
+	ewPtr->body.ew.padX = ewPtr->body.ew.padY = 0;
+	ewPtr->body.ew.stretch = 0;
+	ewPtr->body.ew.optionTable = Tk_CreateOptionTable(interp, optionSpecs);
+
+	client = (TkTextEmbWindowClient *)
+		ckalloc(sizeof(TkTextEmbWindowClient));
+	client->next = NULL;
+	client->textPtr = textPtr;
+	client->tkwin = NULL;
+	client->chunkCount = 0;
+	client->displayed = 0;
+	client->parent = ewPtr;
+	ewPtr->body.ew.clients = client;
+
+	/*
+	 * Link the segment into the text widget, then configure it (delete it
+	 * again if the configuration fails).
+	 */
+
+	TkTextChanged(textPtr->sharedTextPtr, NULL, &index, &index);
+	TkBTreeLinkSegment(ewPtr, &index);
+	res = EmbWinConfigure(textPtr, ewPtr, objc-4, objv+4);
+	client->tkwin = ewPtr->body.ew.tkwin;
+	if (res != TCL_OK) {
+	    TkTextIndex index2;
+
+	    TkTextIndexForwChars(NULL, &index, 1, &index2, COUNT_INDICES);
+	    TkBTreeDeleteIndexRange(textPtr->sharedTextPtr->tree, &index,
+		    &index2);
+	    return TCL_ERROR;
 	}
-	case WIND_NAMES: {
-	    Tcl_HashSearch search;
-	    Tcl_HashEntry *hPtr;
+	TkTextInvalidateLineMetrics(textPtr->sharedTextPtr, NULL,
+		index.linePtr, 0, TK_TEXT_INVALIDATE_ONLY);
+	break;
+    }
+    case WIND_NAMES: {
+	Tcl_HashSearch search;
+	Tcl_HashEntry *hPtr;
 
-	    if (objc != 3) {
-		Tcl_WrongNumArgs(interp, 3, objv, NULL);
-		return TCL_ERROR;
-	    }
-	    for (hPtr = Tcl_FirstHashEntry(&textPtr->sharedTextPtr->windowTable, &search);
-		    hPtr != NULL; hPtr = Tcl_NextHashEntry(&search)) {
-		Tcl_AppendElement(interp,
-			Tcl_GetHashKey(&textPtr->sharedTextPtr->markTable, hPtr));
-	    }
-	    break;
+	if (objc != 3) {
+	    Tcl_WrongNumArgs(interp, 3, objv, NULL);
+	    return TCL_ERROR;
+	}
+	for (hPtr = Tcl_FirstHashEntry(&textPtr->sharedTextPtr->windowTable,
+		&search); hPtr != NULL; hPtr = Tcl_NextHashEntry(&search)) {
+	    Tcl_AppendElement(interp,
+		    Tcl_GetHashKey(&textPtr->sharedTextPtr->markTable, hPtr));
 	}
+	break;
+    }
     }
     return TCL_OK;
 }
@@ -363,62 +360,63 @@ TkTextWindowCmd(textPtr, interp, objc, objv)
  *
  * EmbWinConfigure --
  *
- *	This procedure is called to handle configuration options
- *	for an embedded window, using an objc/objv list.
+ *	This function is called to handle configuration options for an
+ *	embedded window, using an objc/objv list.
  *
  * Results:
- *	The return value is a standard Tcl result.  If TCL_ERROR is
- *	returned, then the interp's result contains an error message..
+ *	The return value is a standard Tcl result. If TCL_ERROR is returned,
+ *	then the interp's result contains an error message..
  *
  * Side effects:
- *	Configuration information for the embedded window changes,
- *	such as alignment, stretching, or name of the embedded
- *	window.
- *	
- *	Note that this procedure may leave widget specific client
- *	information with a NULL tkwin attached to ewPtr.  While we could
- *	choose to clean up the client data structure here, there is no
- *	need to do so, and it is likely that the user is going to adjust
- *	the tkwin again soon.
+ *	Configuration information for the embedded window changes, such as
+ *	alignment, stretching, or name of the embedded window.
+ *
+ *	Note that this function may leave widget specific client information
+ *	with a NULL tkwin attached to ewPtr. While we could choose to clean up
+ *	the client data structure here, there is no need to do so, and it is
+ *	likely that the user is going to adjust the tkwin again soon.
  *
  *--------------------------------------------------------------
  */
 
 static int
-EmbWinConfigure(textPtr, ewPtr, objc, objv)
-    TkText *textPtr;		/* Information about text widget that
-				 * contains embedded window. */
-    TkTextSegment *ewPtr;	/* Embedded window to be configured. */
-    int objc;			/* Number of strings in objv. */
-    Tcl_Obj *CONST objv[];	/* Array of objects describing configuration
+EmbWinConfigure(
+    TkText *textPtr,		/* Information about text widget that contains
+				 * embedded window. */
+    TkTextSegment *ewPtr,	/* Embedded window to be configured. */
+    int objc,			/* Number of strings in objv. */
+    Tcl_Obj *CONST objv[])	/* Array of objects describing configuration
 				 * options. */
 {
     Tk_Window oldWindow;
     TkTextEmbWindowClient *client;
 
-    /* Copy over client specific value before querying or setting */
+    /*
+     * Copy over client specific value before querying or setting.
+     */
+
     client = EmbWinGetClient(textPtr, ewPtr);
     if (client != NULL) {
 	ewPtr->body.ew.tkwin = client->tkwin;
     } else {
 	ewPtr->body.ew.tkwin = NULL;
     }
-    
+
     oldWindow = ewPtr->body.ew.tkwin;
-    if (Tk_SetOptions(textPtr->interp, (char*)&ewPtr->body.ew, 
-            ewPtr->body.ew.optionTable,
-	    objc, objv, textPtr->tkwin, NULL, NULL) != TCL_OK) {
+    if (Tk_SetOptions(textPtr->interp, (char *) &ewPtr->body.ew,
+	    ewPtr->body.ew.optionTable, objc, objv, textPtr->tkwin, NULL,
+	    NULL) != TCL_OK) {
 	return TCL_ERROR;
     }
 
     if (oldWindow != ewPtr->body.ew.tkwin) {
 	if (oldWindow != NULL) {
-	    Tcl_DeleteHashEntry(Tcl_FindHashEntry(&textPtr->sharedTextPtr->windowTable,
+	    Tcl_DeleteHashEntry(Tcl_FindHashEntry(
+		    &textPtr->sharedTextPtr->windowTable,
 		    Tk_PathName(oldWindow)));
 	    Tk_DeleteEventHandler(oldWindow, StructureNotifyMask,
 		    EmbWinStructureProc, (ClientData) client);
-	    Tk_ManageGeometry(oldWindow, (Tk_GeomMgr *) NULL,
-		    (ClientData) NULL);
+	    Tk_ManageGeometry(oldWindow, NULL, (ClientData) NULL);
 	    if (textPtr->tkwin != Tk_Parent(oldWindow)) {
 		Tk_UnmaintainGeometry(oldWindow, textPtr->tkwin);
 	    } else {
@@ -431,26 +429,24 @@ EmbWinConfigure(textPtr, ewPtr, objc, objv)
 	if (ewPtr->body.ew.tkwin != NULL) {
 	    Tk_Window ancestor, parent;
 	    Tcl_HashEntry *hPtr;
-	    int new;
-	    
+	    int isNew;
+
 	    /*
-	     * Make sure that the text is either the parent of the
-	     * embedded window or a descendant of that parent.  Also,
-	     * don't allow a top-level window to be managed inside
-	     * a text.
+	     * Make sure that the text is either the parent of the embedded
+	     * window or a descendant of that parent. Also, don't allow a
+	     * top-level window to be managed inside a text.
 	     */
 
 	    parent = Tk_Parent(ewPtr->body.ew.tkwin);
-	    for (ancestor = textPtr->tkwin; ;
-		    ancestor = Tk_Parent(ancestor)) {
+	    for (ancestor = textPtr->tkwin; ; ancestor = Tk_Parent(ancestor)) {
 		if (ancestor == parent) {
 		    break;
 		}
 		if (Tk_TopWinHierarchy(ancestor)) {
-		    badMaster:
+		badMaster:
 		    Tcl_AppendResult(textPtr->interp, "can't embed ",
 			    Tk_PathName(ewPtr->body.ew.tkwin), " in ",
-			    Tk_PathName(textPtr->tkwin), (char *) NULL);
+			    Tk_PathName(textPtr->tkwin), NULL);
 		    ewPtr->body.ew.tkwin = NULL;
 		    if (client != NULL) {
 			client->tkwin = NULL;
@@ -462,10 +458,14 @@ EmbWinConfigure(textPtr, ewPtr, objc, objv)
 		    || (ewPtr->body.ew.tkwin == textPtr->tkwin)) {
 		goto badMaster;
 	    }
-	    
+
 	    if (client == NULL) {
-		/* Have to make the new client */
-		client = (TkTextEmbWindowClient*) ckalloc(sizeof(TkTextEmbWindowClient));
+		/*
+		 * Have to make the new client.
+		 */
+
+		client = (TkTextEmbWindowClient *)
+			ckalloc(sizeof(TkTextEmbWindowClient));
 		client->next = ewPtr->body.ew.clients;
 		client->textPtr = textPtr;
 		client->tkwin = NULL;
@@ -477,8 +477,8 @@ EmbWinConfigure(textPtr, ewPtr, objc, objv)
 	    client->tkwin = ewPtr->body.ew.tkwin;
 
 	    /*
-	     * Take over geometry management for the window, plus create
-	     * an event handler to find out when it is deleted.
+	     * Take over geometry management for the window, plus create an
+	     * event handler to find out when it is deleted.
 	     */
 
 	    Tk_ManageGeometry(ewPtr->body.ew.tkwin, &textGeomType,
@@ -487,17 +487,15 @@ EmbWinConfigure(textPtr, ewPtr, objc, objv)
 		    EmbWinStructureProc, (ClientData) client);
 
 	    /*
-	     * Special trick!  Must enter into the hash table *after*
-	     * calling Tk_ManageGeometry:  if the window was already managed
-	     * elsewhere in this text, the Tk_ManageGeometry call will cause
-	     * the entry to be removed, which could potentially lose the new
-	     * entry.
+	     * Special trick!  Must enter into the hash table *after* calling
+	     * Tk_ManageGeometry: if the window was already managed elsewhere
+	     * in this text, the Tk_ManageGeometry call will cause the entry
+	     * to be removed, which could potentially lose the new entry.
 	     */
 
 	    hPtr = Tcl_CreateHashEntry(&textPtr->sharedTextPtr->windowTable,
-		    Tk_PathName(ewPtr->body.ew.tkwin), &new);
+		    Tk_PathName(ewPtr->body.ew.tkwin), &isNew);
 	    Tcl_SetHashValue(hPtr, ewPtr);
-
 	}
     }
     return TCL_OK;
@@ -508,50 +506,52 @@ EmbWinConfigure(textPtr, ewPtr, objc, objv)
  *
  * EmbWinStructureProc --
  *
- *	This procedure is invoked by the Tk event loop whenever
- *	StructureNotify events occur for a window that's embedded
- *	in a text widget.  This procedure's only purpose is to
- *	clean up when windows are deleted.
+ *	This function is invoked by the Tk event loop whenever StructureNotify
+ *	events occur for a window that's embedded in a text widget. This
+ *	function's only purpose is to clean up when windows are deleted.
  *
  * Results:
  *	None.
  *
  * Side effects:
- *	The window is disassociated from the window segment, and
- *	the portion of the text is redisplayed.
+ *	The window is disassociated from the window segment, and the portion
+ *	of the text is redisplayed.
  *
  *--------------------------------------------------------------
  */
 
 static void
-EmbWinStructureProc(clientData, eventPtr)
-    ClientData clientData;	/* Pointer to record describing window item. */
-    XEvent *eventPtr;		/* Describes what just happened. */
+EmbWinStructureProc(
+    ClientData clientData,	/* Pointer to record describing window item. */
+    XEvent *eventPtr)		/* Describes what just happened. */
 {
     TkTextEmbWindowClient *client = (TkTextEmbWindowClient*)clientData;
     TkTextSegment *ewPtr = client->parent;
     TkTextIndex index;
     Tcl_HashEntry *hPtr;
-    
+
     if (eventPtr->type != DestroyNotify) {
 	return;
     }
 
     hPtr = Tcl_FindHashEntry(&ewPtr->body.ew.sharedTextPtr->windowTable,
-			     Tk_PathName(client->tkwin));
+	    Tk_PathName(client->tkwin));
     if (hPtr != NULL) {
-	/* This may not exist if the entire widget is being deleted */
-        Tcl_DeleteHashEntry(hPtr);
+	/*
+	 * This may not exist if the entire widget is being deleted.
+	 */
+
+	Tcl_DeleteHashEntry(hPtr);
     }
-    
+
     ewPtr->body.ew.tkwin = NULL;
     client->tkwin = NULL;
     index.tree = ewPtr->body.ew.sharedTextPtr->tree;
     index.linePtr = ewPtr->body.ew.linePtr;
     index.byteIndex = TkTextSegToOffset(ewPtr, ewPtr->body.ew.linePtr);
     TkTextChanged(ewPtr->body.ew.sharedTextPtr, NULL, &index, &index);
-    TkTextInvalidateLineMetrics(ewPtr->body.ew.sharedTextPtr, NULL, 
-				index.linePtr, 0, TK_TEXT_INVALIDATE_ONLY);
+    TkTextInvalidateLineMetrics(ewPtr->body.ew.sharedTextPtr, NULL,
+	    index.linePtr, 0, TK_TEXT_INVALIDATE_ONLY);
 }
 
 /*
@@ -559,8 +559,8 @@ EmbWinStructureProc(clientData, eventPtr)
  *
  * EmbWinRequestProc --
  *
- *	This procedure is invoked whenever a window that's associated
- *	with a window canvas item changes its requested dimensions.
+ *	This function is invoked whenever a window that's associated with a
+ *	window canvas item changes its requested dimensions.
  *
  * Results:
  *	None.
@@ -574,10 +574,9 @@ EmbWinStructureProc(clientData, eventPtr)
 
 	/* ARGSUSED */
 static void
-EmbWinRequestProc(clientData, tkwin)
-    ClientData clientData;		/* Pointer to record for window item. */
-    Tk_Window tkwin;			/* Window that changed its desired
-					 * size. */
+EmbWinRequestProc(
+    ClientData clientData,	/* Pointer to record for window item. */
+    Tk_Window tkwin)		/* Window that changed its desired size. */
 {
     TkTextEmbWindowClient *client = (TkTextEmbWindowClient*)clientData;
     TkTextSegment *ewPtr = client->parent;
@@ -587,8 +586,8 @@ EmbWinRequestProc(clientData, tkwin)
     index.linePtr = ewPtr->body.ew.linePtr;
     index.byteIndex = TkTextSegToOffset(ewPtr, ewPtr->body.ew.linePtr);
     TkTextChanged(ewPtr->body.ew.sharedTextPtr, NULL, &index, &index);
-    TkTextInvalidateLineMetrics(ewPtr->body.ew.sharedTextPtr, NULL, 
-				index.linePtr, 0, TK_TEXT_INVALIDATE_ONLY);
+    TkTextInvalidateLineMetrics(ewPtr->body.ew.sharedTextPtr, NULL,
+	    index.linePtr, 0, TK_TEXT_INVALIDATE_ONLY);
 }
 
 /*
@@ -596,24 +595,24 @@ EmbWinRequestProc(clientData, tkwin)
  *
  * EmbWinLostSlaveProc --
  *
- *	This procedure is invoked by the Tk geometry manager when
- *	a slave window managed by a text widget is claimed away
- *	by another geometry manager.
+ *	This function is invoked by the Tk geometry manager when a slave
+ *	window managed by a text widget is claimed away by another geometry
+ *	manager.
  *
  * Results:
  *	None.
  *
  * Side effects:
- *	The window is disassociated from the window segment, and
- *	the portion of the text is redisplayed.
+ *	The window is disassociated from the window segment, and the portion
+ *	of the text is redisplayed.
  *
  *--------------------------------------------------------------
  */
 
 static void
-EmbWinLostSlaveProc(clientData, tkwin)
-    ClientData clientData;	/* Pointer to record describing window item. */
-    Tk_Window tkwin;		/* Window that was claimed away by another
+EmbWinLostSlaveProc(
+    ClientData clientData,	/* Pointer to record describing window item. */
+    Tk_Window tkwin)		/* Window that was claimed away by another
 				 * geometry manager. */
 {
     TkTextEmbWindowClient *client = (TkTextEmbWindowClient*)clientData;
@@ -621,7 +620,7 @@ EmbWinLostSlaveProc(clientData, tkwin)
     TkTextIndex index;
     Tcl_HashEntry *hPtr;
     TkTextEmbWindowClient *loop;
-    
+
     Tk_DeleteEventHandler(client->tkwin, StructureNotifyMask,
 	    EmbWinStructureProc, (ClientData) client);
     Tcl_CancelIdleCall(EmbWinDelayedUnmap, (ClientData) client);
@@ -631,16 +630,18 @@ EmbWinLostSlaveProc(clientData, tkwin)
 	Tk_UnmapWindow(tkwin);
     }
     hPtr = Tcl_FindHashEntry(&ewPtr->body.ew.sharedTextPtr->windowTable,
-			     Tk_PathName(client->tkwin));
+	    Tk_PathName(client->tkwin));
     Tcl_DeleteHashEntry(hPtr);
     client->tkwin = NULL;
     ewPtr->body.ew.tkwin = NULL;
-    
-    /* Free up the memory allocation for this client */
-    
+
+    /*
+     * Free up the memory allocation for this client.
+     */
+
     loop = ewPtr->body.ew.clients;
     if (loop == client) {
-        ewPtr->body.ew.clients = client->next;
+	ewPtr->body.ew.clients = client->next;
     } else {
 	while (loop->next != client) {
 	    loop = loop->next;
@@ -648,13 +649,13 @@ EmbWinLostSlaveProc(clientData, tkwin)
 	loop->next = client->next;
     }
     ckfree((char *)client);
-    
+
     index.tree = ewPtr->body.ew.sharedTextPtr->tree;
     index.linePtr = ewPtr->body.ew.linePtr;
     index.byteIndex = TkTextSegToOffset(ewPtr, ewPtr->body.ew.linePtr);
     TkTextChanged(ewPtr->body.ew.sharedTextPtr, NULL, &index, &index);
-    TkTextInvalidateLineMetrics(ewPtr->body.ew.sharedTextPtr, NULL, 
-				index.linePtr, 0, TK_TEXT_INVALIDATE_ONLY);
+    TkTextInvalidateLineMetrics(ewPtr->body.ew.sharedTextPtr, NULL,
+	    index.linePtr, 0, TK_TEXT_INVALIDATE_ONLY);
 }
 
 /*
@@ -662,55 +663,57 @@ EmbWinLostSlaveProc(clientData, tkwin)
  *
  * TkTextWinFreeClient --
  *
- *	Free up the hash entry and client information for a 
- *	given embedded window.
- *	
- *	It is assumed the caller will manage the linked list
- *	of clients associated with the relevant TkTextSegment.
+ *	Free up the hash entry and client information for a given embedded
+ *	window.
+ *
+ *	It is assumed the caller will manage the linked list of clients
+ *	associated with the relevant TkTextSegment.
  *
  * Results:
  *	Nothing.
  *
  * Side effects:
- *	The embedded window information for a single client is deleted,
- *	if it exists, and any resources associated with it are released.
+ *	The embedded window information for a single client is deleted, if it
+ *	exists, and any resources associated with it are released.
  *
  *--------------------------------------------------------------
  */
 
 void
-TkTextWinFreeClient(hPtr, client) 
-    Tcl_HashEntry *hPtr;             /* Hash entry corresponding to
-                                      * this client, or NULL */
-    TkTextEmbWindowClient *client;   /* Client data structure, with
-                                      * the 'tkwin' field to be
-                                      * cleaned up. */
+TkTextWinFreeClient(
+    Tcl_HashEntry *hPtr,	/* Hash entry corresponding to this client, or
+				 * NULL */
+    TkTextEmbWindowClient *client)
+				/* Client data structure, with the 'tkwin'
+				 * field to be cleaned up. */
 {
     if (hPtr != NULL) {
 	/*
-	 * (It's possible for there to be no hash table entry
-	 * for this window, if an error occurred while creating
-	 * the window segment but before the window got added to
-	 * the table)
+	 * (It's possible for there to be no hash table entry for this window,
+	 * if an error occurred while creating the window segment but before
+	 * the window got added to the table)
 	 */
 
 	Tcl_DeleteHashEntry(hPtr);
     }
-    
+
     /*
-     * Delete the event handler for the window before destroying
-     * the window, so that EmbWinStructureProc doesn't get called
-     * (we'll already do everything that it would have done, and
-     * it will just get confused).
+     * Delete the event handler for the window before destroying the window,
+     * so that EmbWinStructureProc doesn't get called (we'll already do
+     * everything that it would have done, and it will just get confused).
      */
 
     if (client->tkwin != NULL) {
 	Tk_DeleteEventHandler(client->tkwin, StructureNotifyMask,
-	    EmbWinStructureProc, (ClientData) client);
+		EmbWinStructureProc, (ClientData) client);
 	Tk_DestroyWindow(client->tkwin);
     }
     Tcl_CancelIdleCall(EmbWinDelayedUnmap, (ClientData) client);
-    /* Free up this client */
+
+    /*
+     * Free up this client.
+     */
+
     ckfree((char *) client);
 }
 
@@ -719,8 +722,8 @@ TkTextWinFreeClient(hPtr, client)
  *
  * EmbWinDeleteProc --
  *
- *	This procedure is invoked by the text B-tree code whenever
- *	an embedded window lies in a range of characters being deleted.
+ *	This function is invoked by the text B-tree code whenever an embedded
+ *	window lies in a range of characters being deleted.
  *
  * Results:
  *	Returns 0 to indicate that the deletion has been accepted.
@@ -734,35 +737,38 @@ TkTextWinFreeClient(hPtr, client)
 
 	/* ARGSUSED */
 static int
-EmbWinDeleteProc(ewPtr, linePtr, treeGone)
-    TkTextSegment *ewPtr;		/* Segment being deleted. */
-    TkTextLine *linePtr;		/* Line containing segment. */
-    int treeGone;			/* Non-zero means the entire tree is
-					 * being deleted, so everything must
-					 * get cleaned up. */
+EmbWinDeleteProc(
+    TkTextSegment *ewPtr,	/* Segment being deleted. */
+    TkTextLine *linePtr,	/* Line containing segment. */
+    int treeGone)		/* Non-zero means the entire tree is being
+				 * deleted, so everything must get cleaned
+				 * up. */
 {
     TkTextEmbWindowClient *client;
     client = ewPtr->body.ew.clients;
-    
+
     while (client != NULL) {
 	TkTextEmbWindowClient *next = client->next;
 	Tcl_HashEntry *hPtr = NULL;
-	
-        if (client->tkwin != NULL) {
-	    hPtr = Tcl_FindHashEntry(&ewPtr->body.ew.sharedTextPtr->windowTable,
-				     Tk_PathName(client->tkwin));
-        }
+
+	if (client->tkwin != NULL) {
+	    hPtr = Tcl_FindHashEntry(
+		    &ewPtr->body.ew.sharedTextPtr->windowTable,
+		    Tk_PathName(client->tkwin));
+	}
 	TkTextWinFreeClient(hPtr, client);
 	client = next;
     }
     ewPtr->body.ew.clients = NULL;
-    
+
     Tk_FreeConfigOptions((char *) &ewPtr->body.ew, ewPtr->body.ew.optionTable,
-			 NULL);
-    
-    /* Free up all memory allocated */
+	    NULL);
+
+    /*
+     * Free up all memory allocated
+     */
+
     ckfree((char *) ewPtr);
-    
     return 0;
 }
 
@@ -771,9 +777,8 @@ EmbWinDeleteProc(ewPtr, linePtr, treeGone)
  *
  * EmbWinCleanupProc --
  *
- *	This procedure is invoked by the B-tree code whenever a
- *	segment containing an embedded window is moved from one
- *	line to another.
+ *	This function is invoked by the B-tree code whenever a segment
+ *	containing an embedded window is moved from one line to another.
  *
  * Results:
  *	None.
@@ -785,9 +790,9 @@ EmbWinDeleteProc(ewPtr, linePtr, treeGone)
  */
 
 static TkTextSegment *
-EmbWinCleanupProc(ewPtr, linePtr)
-    TkTextSegment *ewPtr;		/* Mark segment that's being moved. */
-    TkTextLine *linePtr;		/* Line that now contains segment. */
+EmbWinCleanupProc(
+    TkTextSegment *ewPtr,	/* Mark segment that's being moved. */
+    TkTextLine *linePtr)	/* Line that now contains segment. */
 {
     ewPtr->body.ew.linePtr = linePtr;
     return ewPtr;
@@ -798,12 +803,11 @@ EmbWinCleanupProc(ewPtr, linePtr)
  *
  * EmbWinLayoutProc --
  *
- *	This procedure is the "layoutProc" for embedded window
- *	segments.
+ *	This function is the "layoutProc" for embedded window segments.
  *
  * Results:
- *	1 is returned to indicate that the segment should be
- *	displayed.  The chunkPtr structure is filled in.
+ *	1 is returned to indicate that the segment should be displayed. The
+ *	chunkPtr structure is filled in.
  *
  * Side effects:
  *	None, except for filling in chunkPtr.
@@ -813,29 +817,29 @@ EmbWinCleanupProc(ewPtr, linePtr)
 
 	/*ARGSUSED*/
 static int
-EmbWinLayoutProc(textPtr, indexPtr, ewPtr, offset, maxX, maxChars,
-	noCharsYet, wrapMode, chunkPtr)
-    TkText *textPtr;		/* Text widget being layed out. */
-    TkTextIndex *indexPtr;	/* Identifies first character in chunk. */
-    TkTextSegment *ewPtr;	/* Segment corresponding to indexPtr. */
-    int offset;			/* Offset within segPtr corresponding to
+EmbWinLayoutProc(
+    TkText *textPtr,		/* Text widget being layed out. */
+    TkTextIndex *indexPtr,	/* Identifies first character in chunk. */
+    TkTextSegment *ewPtr,	/* Segment corresponding to indexPtr. */
+    int offset,			/* Offset within segPtr corresponding to
 				 * indexPtr (always 0). */
-    int maxX;			/* Chunk must not occupy pixels at this
+    int maxX,			/* Chunk must not occupy pixels at this
 				 * position or higher. */
-    int maxChars;		/* Chunk must not include more than this
-				 * many characters. */
-    int noCharsYet;		/* Non-zero means no characters have been
+    int maxChars,		/* Chunk must not include more than this many
+				 * characters. */
+    int noCharsYet,		/* Non-zero means no characters have been
 				 * assigned to this line yet. */
-    TkWrapMode wrapMode;	/* Wrap mode to use for line: TEXT_WRAPMODE_CHAR,
-				 * TEXT_WRAPMODE_NONE, or TEXT_WRAPMODE_WORD. */
-    register TkTextDispChunk *chunkPtr;
-				/* Structure to fill in with information
-				 * about this chunk.  The x field has already
-				 * been set by the caller. */
+    TkWrapMode wrapMode,	/* Wrap mode to use for line:
+				 * TEXT_WRAPMODE_CHAR, TEXT_WRAPMODE_NONE, or
+				 * TEXT_WRAPMODE_WORD. */
+    register TkTextDispChunk *chunkPtr)
+				/* Structure to fill in with information about
+				 * this chunk. The x field has already been
+				 * set by the caller. */
 {
     int width, height;
     TkTextEmbWindowClient *client;
-    
+
     if (offset != 0) {
 	Tcl_Panic("Non-zero offset in EmbWinLayoutProc");
     }
@@ -846,9 +850,9 @@ EmbWinLayoutProc(textPtr, indexPtr, ewPtr, offset, maxX, maxChars,
     } else {
 	ewPtr->body.ew.tkwin = client->tkwin;
     }
-    
+
     if ((ewPtr->body.ew.tkwin == NULL) && (ewPtr->body.ew.create != NULL)) {
-	int code, new;
+	int code, isNew;
 	Tcl_DString name;
 	Tk_Window ancestor;
 	Tcl_HashEntry *hPtr;
@@ -858,66 +862,63 @@ EmbWinLayoutProc(textPtr, indexPtr, ewPtr, offset, maxX, maxChars,
 	Tcl_DString *dsPtr = NULL;
 
 	before = ewPtr->body.ew.create;
-	
+
 	/*
-	 * Find everything up to the next % character and append it
-	 * to the result string.
+	 * Find everything up to the next % character and append it to the
+	 * result string.
 	 */
+
 	string = before;
 	while (*string != 0) {
-	    if (*string == '%') {
-		if (string[1] == '%' || string[1] == 'W') {
-		    if (dsPtr == NULL) {
-			Tcl_DStringInit(&buf);
-			dsPtr = &buf;
-		    }
-		    if (string != before) {
-			Tcl_DStringAppend(dsPtr, before, 
-					  (int) (string-before));
-			before = string;
-		    }
-		    if (string[1] == '%') {
-			Tcl_DStringAppend(dsPtr, "%", 1);
-		    } else {
-			/* 
-			 * Substitute string as proper Tcl
-			 * list element. 
-			 */
-			int spaceNeeded, cvtFlags, length;
-			CONST char *str = Tk_PathName(textPtr->tkwin);
-			spaceNeeded = Tcl_ScanElement(str, &cvtFlags);
-			length = Tcl_DStringLength(dsPtr);
-			Tcl_DStringSetLength(dsPtr, length + spaceNeeded);
-			spaceNeeded = Tcl_ConvertElement(str,
-				Tcl_DStringValue(dsPtr) + length,
-				cvtFlags | TCL_DONT_USE_BRACES);
-			Tcl_DStringSetLength(dsPtr, length + spaceNeeded);
-		    }
-		    before += 2;
-		    string++;
+	    if ((*string == '%') && (string[1] == '%' || string[1] == 'W')) {
+		if (dsPtr == NULL) {
+		    Tcl_DStringInit(&buf);
+		    dsPtr = &buf;
 		}
+		if (string != before) {
+		    Tcl_DStringAppend(dsPtr, before, (int) (string-before));
+		    before = string;
+		}
+		if (string[1] == '%') {
+		    Tcl_DStringAppend(dsPtr, "%", 1);
+		} else {
+		    /*
+		     * Substitute string as proper Tcl list element.
+		     */
+
+		    int spaceNeeded, cvtFlags, length;
+		    CONST char *str = Tk_PathName(textPtr->tkwin);
+
+		    spaceNeeded = Tcl_ScanElement(str, &cvtFlags);
+		    length = Tcl_DStringLength(dsPtr);
+		    Tcl_DStringSetLength(dsPtr, length + spaceNeeded);
+		    spaceNeeded = Tcl_ConvertElement(str,
+			    Tcl_DStringValue(dsPtr) + length,
+			    cvtFlags | TCL_DONT_USE_BRACES);
+		    Tcl_DStringSetLength(dsPtr, length + spaceNeeded);
+		}
+		before += 2;
+		string++;
 	    }
 	    string++;
 	}
-	
+
 	/*
-	 * The window doesn't currently exist.  Create it by evaluating
-	 * the creation script.  The script must return the window's
-	 * path name:  look up that name to get back to the window
-	 * token.  Then register ourselves as the geometry manager for
-	 * the window.
+	 * The window doesn't currently exist. Create it by evaluating the
+	 * creation script. The script must return the window's path name:
+	 * look up that name to get back to the window token. Then register
+	 * ourselves as the geometry manager for the window.
 	 */
 
 	if (dsPtr != NULL) {
-	    Tcl_DStringAppend(dsPtr, before, 
-			      (int) (string-before));
+	    Tcl_DStringAppend(dsPtr, before, (int) (string-before));
 	    code = Tcl_GlobalEval(textPtr->interp, Tcl_DStringValue(dsPtr));
 	    Tcl_DStringFree(dsPtr);
 	} else {
 	    code = Tcl_GlobalEval(textPtr->interp, ewPtr->body.ew.create);
 	}
 	if (code != TCL_OK) {
-	    createError:
+	createError:
 	    Tcl_BackgroundError(textPtr->interp);
 	    goto gotWindow;
 	}
@@ -930,16 +931,15 @@ EmbWinLayoutProc(textPtr, indexPtr, ewPtr, offset, maxX, maxChars,
 	if (ewPtr->body.ew.tkwin == NULL) {
 	    goto createError;
 	}
-	for (ancestor = textPtr->tkwin; ;
-		ancestor = Tk_Parent(ancestor)) {
+	for (ancestor = textPtr->tkwin; ; ancestor = Tk_Parent(ancestor)) {
 	    if (ancestor == Tk_Parent(ewPtr->body.ew.tkwin)) {
 		break;
 	    }
 	    if (Tk_TopWinHierarchy(ancestor)) {
-		badMaster:
+	    badMaster:
 		Tcl_AppendResult(textPtr->interp, "can't embed ",
 			Tk_PathName(ewPtr->body.ew.tkwin), " relative to ",
-			Tk_PathName(textPtr->tkwin), (char *) NULL);
+			Tk_PathName(textPtr->tkwin), NULL);
 		Tcl_BackgroundError(textPtr->interp);
 		ewPtr->body.ew.tkwin = NULL;
 		goto gotWindow;
@@ -949,13 +949,15 @@ EmbWinLayoutProc(textPtr, indexPtr, ewPtr, offset, maxX, maxChars,
 		|| (textPtr->tkwin == ewPtr->body.ew.tkwin)) {
 	    goto badMaster;
 	}
-	
+
 	if (client == NULL) {
-	    /* 
-	     * We just used a '-create' script to make a new window,
-	     * which we now need to add to our client list.
+	    /*
+	     * We just used a '-create' script to make a new window, which we
+	     * now need to add to our client list.
 	     */
-	    client = (TkTextEmbWindowClient*) ckalloc(sizeof(TkTextEmbWindowClient));
+
+	    client = (TkTextEmbWindowClient *)
+		    ckalloc(sizeof(TkTextEmbWindowClient));
 	    client->next = ewPtr->body.ew.clients;
 	    client->textPtr = textPtr;
 	    client->tkwin = NULL;
@@ -964,7 +966,7 @@ EmbWinLayoutProc(textPtr, indexPtr, ewPtr, offset, maxX, maxChars,
 	    client->parent = ewPtr;
 	    ewPtr->body.ew.clients = client;
 	}
-	
+
 	client->tkwin = ewPtr->body.ew.tkwin;
 	Tk_ManageGeometry(client->tkwin, &textGeomType,
 		(ClientData) client);
@@ -972,15 +974,14 @@ EmbWinLayoutProc(textPtr, indexPtr, ewPtr, offset, maxX, maxChars,
 		EmbWinStructureProc, (ClientData) client);
 
 	/*
-	 * Special trick!  Must enter into the hash table *after*
-	 * calling Tk_ManageGeometry:  if the window was already managed
-	 * elsewhere in this text, the Tk_ManageGeometry call will cause
-	 * the entry to be removed, which could potentially lose the new
-	 * entry.
+	 * Special trick! Must enter into the hash table *after* calling
+	 * Tk_ManageGeometry: if the window was already managed elsewhere in
+	 * this text, the Tk_ManageGeometry call will cause the entry to be
+	 * removed, which could potentially lose the new entry.
 	 */
 
 	hPtr = Tcl_CreateHashEntry(&textPtr->sharedTextPtr->windowTable,
-				   Tk_PathName(client->tkwin), &new);
+		Tk_PathName(client->tkwin), &isNew);
 	Tcl_SetHashValue(hPtr, ewPtr);
     }
 
@@ -988,7 +989,7 @@ EmbWinLayoutProc(textPtr, indexPtr, ewPtr, offset, maxX, maxChars,
      * See if there's room for this window on this line.
      */
 
-    gotWindow:
+  gotWindow:
     if (ewPtr->body.ew.tkwin == NULL) {
 	width = 0;
 	height = 0;
@@ -1007,7 +1008,7 @@ EmbWinLayoutProc(textPtr, indexPtr, ewPtr, offset, maxX, maxChars,
 
     chunkPtr->displayProc = TkTextEmbWinDisplayProc;
     chunkPtr->undisplayProc = EmbWinUndisplayProc;
-    chunkPtr->measureProc = (Tk_ChunkMeasureProc *) NULL;
+    chunkPtr->measureProc = NULL;
     chunkPtr->bboxProc = EmbWinBboxProc;
     chunkPtr->numBytes = 1;
     if (ewPtr->body.ew.align == ALIGN_BASELINE) {
@@ -1024,7 +1025,7 @@ EmbWinLayoutProc(textPtr, indexPtr, ewPtr, offset, maxX, maxChars,
     chunkPtr->breakIndex = 1;
     chunkPtr->clientData = (ClientData) ewPtr;
     if (client != NULL) {
-        client->chunkCount += 1;
+	client->chunkCount += 1;
     }
     return 1;
 }
@@ -1034,23 +1035,23 @@ EmbWinLayoutProc(textPtr, indexPtr, ewPtr, offset, maxX, maxChars,
  *
  * EmbWinCheckProc --
  *
- *	This procedure is invoked by the B-tree code to perform
- *	consistency checks on embedded windows.
+ *	This function is invoked by the B-tree code to perform consistency
+ *	checks on embedded windows.
  *
  * Results:
  *	None.
  *
  * Side effects:
- *	The procedure panics if it detects anything wrong with
- *	the embedded window.
+ *	The function panics if it detects anything wrong with the embedded
+ *	window.
  *
  *--------------------------------------------------------------
  */
 
 static void
-EmbWinCheckProc(ewPtr, linePtr)
-    TkTextSegment *ewPtr;		/* Segment to check. */
-    TkTextLine *linePtr;		/* Line containing segment. */
+EmbWinCheckProc(
+    TkTextSegment *ewPtr,	/* Segment to check. */
+    TkTextLine *linePtr)	/* Line containing segment. */
 {
     if (ewPtr->nextPtr == NULL) {
 	Tcl_Panic("EmbWinCheckProc: embedded window is last segment in line");
@@ -1065,59 +1066,54 @@ EmbWinCheckProc(ewPtr, linePtr)
  *
  * TkTextEmbWinDisplayProc --
  *
- *	This procedure is invoked by the text displaying code
- *	when it is time to actually draw an embedded window
- *	chunk on the screen.
+ *	This function is invoked by the text displaying code when it is time
+ *	to actually draw an embedded window chunk on the screen.
  *
  * Results:
  *	None.
  *
  * Side effects:
- *	The embedded window gets moved to the correct location
- *	and mapped onto the screen.
+ *	The embedded window gets moved to the correct location and mapped onto
+ *	the screen.
  *
  *--------------------------------------------------------------
  */
 
 void
-TkTextEmbWinDisplayProc(textPtr, chunkPtr, x, y, lineHeight, baseline, 
-			display, dst, screenY)
-    TkText *textPtr;                    /* Information about text widget. */
-    TkTextDispChunk *chunkPtr;		/* Chunk that is to be drawn. */
-    int x;				/* X-position in dst at which to
-					 * draw this chunk (differs from
-					 * the x-position in the chunk because
-					 * of scrolling). */
-    int y;				/* Top of rectangular bounding box
-					 * for line: tells where to draw this
-					 * chunk in dst (x-position is in
-					 * the chunk itself). */
-    int lineHeight;			/* Total height of line. */
-    int baseline;			/* Offset of baseline from y. */
-    Display *display;			/* Display to use for drawing 
-                     			 * (unused).  */
-    Drawable dst;			/* Pixmap or window in which to draw
-                 			 * (unused).  */
-    int screenY;			/* Y-coordinate in text window that
-					 * corresponds to y. */
+TkTextEmbWinDisplayProc(
+    TkText *textPtr,		/* Information about text widget. */
+    TkTextDispChunk *chunkPtr,	/* Chunk that is to be drawn. */
+    int x,			/* X-position in dst at which to draw this
+				 * chunk (differs from the x-position in the
+				 * chunk because of scrolling). */
+    int y,			/* Top of rectangular bounding box for line:
+				 * tells where to draw this chunk in dst
+				 * (x-position is in the chunk itself). */
+    int lineHeight,		/* Total height of line. */
+    int baseline,		/* Offset of baseline from y. */
+    Display *display,		/* Display to use for drawing (unused).  */
+    Drawable dst,		/* Pixmap or window in which to draw
+				 * (unused).  */
+    int screenY)		/* Y-coordinate in text window that
+				 * corresponds to y. */
 {
     int lineX, windowX, windowY, width, height;
     Tk_Window tkwin;
     TkTextSegment *ewPtr = (TkTextSegment*) chunkPtr->clientData;
     TkTextEmbWindowClient *client = EmbWinGetClient(textPtr, ewPtr);
-    
+
     if (client == NULL) {
-        return;
+	return;
     }
-    
+
     tkwin = client->tkwin;
     if (tkwin == NULL) {
 	return;
     }
-    
+
     if ((x + chunkPtr->width) <= 0) {
 	/*
-	 * The window is off-screen;  just unmap it.
+	 * The window is off-screen; just unmap it.
 	 */
 
 	if (textPtr->tkwin != Tk_Parent(tkwin)) {
@@ -1129,11 +1125,11 @@ TkTextEmbWinDisplayProc(textPtr, chunkPtr, x, y, lineHeight, baseline,
     }
 
     /*
-     * Compute the window's location and size in the text widget, taking
-     * into account the align and stretch values for the window.
+     * Compute the window's location and size in the text widget, taking into
+     * account the align and stretch values for the window.
      */
 
-    EmbWinBboxProc(textPtr, chunkPtr, 0, screenY, lineHeight, baseline, 
+    EmbWinBboxProc(textPtr, chunkPtr, 0, screenY, lineHeight, baseline,
 		   &lineX, &windowY, &width, &height);
     windowX = lineX - chunkPtr->x + x;
 
@@ -1146,7 +1142,7 @@ TkTextEmbWinDisplayProc(textPtr, chunkPtr, x, y, lineHeight, baseline,
 	Tk_MapWindow(tkwin);
     } else {
 	Tk_MaintainGeometry(tkwin, textPtr->tkwin,
-			    windowX, windowY, width, height);
+		windowX, windowY, width, height);
     }
 
     /*
@@ -1161,9 +1157,9 @@ TkTextEmbWinDisplayProc(textPtr, chunkPtr, x, y, lineHeight, baseline,
  *
  * EmbWinUndisplayProc --
  *
- *	This procedure is called when the chunk for an embedded
- *	window is no longer going to be displayed.  It arranges
- *	for the window associated with the chunk to be unmapped.
+ *	This function is called when the chunk for an embedded window is no
+ *	longer going to be displayed. It arranges for the window associated
+ *	with the chunk to be unmapped.
  *
  * Results:
  *	None.
@@ -1175,24 +1171,23 @@ TkTextEmbWinDisplayProc(textPtr, chunkPtr, x, y, lineHeight, baseline,
  */
 
 static void
-EmbWinUndisplayProc(textPtr, chunkPtr)
-    TkText *textPtr;			/* Overall information about text
-					 * widget. */
-    TkTextDispChunk *chunkPtr;		/* Chunk that is about to be freed. */
+EmbWinUndisplayProc(
+    TkText *textPtr,		/* Overall information about text widget. */
+    TkTextDispChunk *chunkPtr)	/* Chunk that is about to be freed. */
 {
     TkTextSegment *ewPtr = (TkTextSegment*) chunkPtr->clientData;
     TkTextEmbWindowClient *client = EmbWinGetClient(textPtr, ewPtr);
-    
+
     if (client == NULL) return;
-    
+
     client->chunkCount--;
     if (client->chunkCount == 0) {
 	/*
 	 * Don't unmap the window immediately, since there's a good chance
-	 * that it will immediately be redisplayed, perhaps even in the
-	 * same place.  Instead, schedule the window to be unmapped later;
-	 * the call to EmbWinDelayedUnmap will be cancelled in the likely
-	 * event that the unmap becomes unnecessary.
+	 * that it will immediately be redisplayed, perhaps even in the same
+	 * place. Instead, schedule the window to be unmapped later; the call
+	 * to EmbWinDelayedUnmap will be cancelled in the likely event that
+	 * the unmap becomes unnecessary.
 	 */
 
 	client->displayed = 0;
@@ -1205,17 +1200,16 @@ EmbWinUndisplayProc(textPtr, chunkPtr)
  *
  * EmbWinBboxProc --
  *
- *	This procedure is called to compute the bounding box of
- *	the area occupied by an embedded window.
+ *	This function is called to compute the bounding box of the area
+ *	occupied by an embedded window.
  *
  * Results:
- *	There is no return value.  *xPtr and *yPtr are filled in
- *	with the coordinates of the upper left corner of the
- *	window, and *widthPtr and *heightPtr are filled in with
- *	the dimensions of the window in pixels.  Note:  not all
- *	of the returned bbox is necessarily visible on the screen
- *	(the rightmost part might be off-screen to the right,
- *	and the bottommost part might be off-screen to the bottom).
+ *	There is no return value. *xPtr and *yPtr are filled in with the
+ *	coordinates of the upper left corner of the window, and *widthPtr and
+ *	*heightPtr are filled in with the dimensions of the window in pixels.
+ *	Note: not all of the returned bbox is necessarily visible on the
+ *	screen (the rightmost part might be off-screen to the right, and the
+ *	bottommost part might be off-screen to the bottom).
  *
  * Side effects:
  *	None.
@@ -1224,30 +1218,29 @@ EmbWinUndisplayProc(textPtr, chunkPtr)
  */
 
 static void
-EmbWinBboxProc(textPtr, chunkPtr, index, y, lineHeight, baseline, xPtr, yPtr,
-	widthPtr, heightPtr)
-    TkText *textPtr;                    /* Information about text widget. */
-    TkTextDispChunk *chunkPtr;		/* Chunk containing desired char. */
-    int index;				/* Index of desired character within
-					 * the chunk. */
-    int y;				/* Topmost pixel in area allocated
-					 * for this line. */
-    int lineHeight;			/* Total height of line. */
-    int baseline;			/* Location of line's baseline, in
-					 * pixels measured down from y. */
-    int *xPtr, *yPtr;			/* Gets filled in with coords of
-					 * character's upper-left pixel. */
-    int *widthPtr;			/* Gets filled in with width of
-					 * window, in pixels. */
-    int *heightPtr;			/* Gets filled in with height of
-					 * window, in pixels. */
+EmbWinBboxProc(
+    TkText *textPtr,		/* Information about text widget. */
+    TkTextDispChunk *chunkPtr,	/* Chunk containing desired char. */
+    int index,			/* Index of desired character within the
+				 * chunk. */
+    int y,			/* Topmost pixel in area allocated for this
+				 * line. */
+    int lineHeight,		/* Total height of line. */
+    int baseline,		/* Location of line's baseline, in pixels
+				 * measured down from y. */
+    int *xPtr, int *yPtr,	/* Gets filled in with coords of character's
+				 * upper-left pixel. */
+    int *widthPtr,		/* Gets filled in with width of window, in
+				 * pixels. */
+    int *heightPtr)		/* Gets filled in with height of window, in
+				 * pixels. */
 {
     Tk_Window tkwin;
     TkTextSegment *ewPtr = (TkTextSegment*) chunkPtr->clientData;
     TkTextEmbWindowClient *client = EmbWinGetClient(textPtr, ewPtr);
 
     if (client == NULL) {
-        tkwin = NULL;
+	tkwin = NULL;
     } else {
 	tkwin = client->tkwin;
     }
@@ -1267,18 +1260,18 @@ EmbWinBboxProc(textPtr, chunkPtr, index, y, lineHeight, baseline, xPtr, yPtr,
 	}
     }
     switch (ewPtr->body.ew.align) {
-	case ALIGN_BOTTOM:
-	    *yPtr = y + (lineHeight - *heightPtr - ewPtr->body.ew.padY);
-	    break;
-	case ALIGN_CENTER:
-	    *yPtr = y + (lineHeight - *heightPtr)/2;
-	    break;
-	case ALIGN_TOP:
-	    *yPtr = y + ewPtr->body.ew.padY;
-	    break;
-	case ALIGN_BASELINE:
-	    *yPtr = y + (baseline - *heightPtr);
-	    break;
+    case ALIGN_BOTTOM:
+	*yPtr = y + (lineHeight - *heightPtr - ewPtr->body.ew.padY);
+	break;
+    case ALIGN_CENTER:
+	*yPtr = y + (lineHeight - *heightPtr)/2;
+	break;
+    case ALIGN_TOP:
+	*yPtr = y + ewPtr->body.ew.padY;
+	break;
+    case ALIGN_BASELINE:
+	*yPtr = y + (baseline - *heightPtr);
+	break;
     }
 }
 
@@ -1287,31 +1280,29 @@ EmbWinBboxProc(textPtr, chunkPtr, index, y, lineHeight, baseline, xPtr, yPtr,
  *
  * EmbWinDelayedUnmap --
  *
- *	This procedure is an idle handler that does the actual
- *	work of unmapping an embedded window.  See the comment
- *	in EmbWinUndisplayProc for details.
+ *	This function is an idle handler that does the actual work of
+ *	unmapping an embedded window. See the comment in EmbWinUndisplayProc
+ *	for details.
  *
  * Results:
  *	None.
  *
  * Side effects:
- *	The window gets unmapped, unless its chunk reference count
- *	has become non-zero again.
+ *	The window gets unmapped, unless its chunk reference count has become
+ *	non-zero again.
  *
  *--------------------------------------------------------------
  */
 
 static void
-EmbWinDelayedUnmap(clientData)
-    ClientData clientData;		/* Token for the window to
-					 * be unmapped. */
+EmbWinDelayedUnmap(
+    ClientData clientData)	/* Token for the window to be unmapped. */
 {
     TkTextEmbWindowClient *client = (TkTextEmbWindowClient*) clientData;
 
     if (!client->displayed && (client->tkwin != NULL)) {
 	if (client->textPtr->tkwin != Tk_Parent(client->tkwin)) {
-	    Tk_UnmaintainGeometry(client->tkwin,
-				  client->textPtr->tkwin);
+	    Tk_UnmaintainGeometry(client->tkwin, client->textPtr->tkwin);
 	} else {
 	    Tk_UnmapWindow(client->tkwin);
 	}
@@ -1323,14 +1314,13 @@ EmbWinDelayedUnmap(clientData)
  *
  * TkTextWindowIndex --
  *
- *	Given the name of an embedded window within a text widget,
- *	returns an index corresponding to the window's position
- *	in the text.
+ *	Given the name of an embedded window within a text widget, returns an
+ *	index corresponding to the window's position in the text.
  *
  * Results:
- *	The return value is 1 if there is an embedded window by
- *	the given name in the text widget, 0 otherwise.  If the
- *	window exists, *indexPtr is filled in with its index.
+ *	The return value is 1 if there is an embedded window by the given name
+ *	in the text widget, 0 otherwise. If the window exists, *indexPtr is
+ *	filled in with its index.
  *
  * Side effects:
  *	None.
@@ -1339,10 +1329,10 @@ EmbWinDelayedUnmap(clientData)
  */
 
 int
-TkTextWindowIndex(textPtr, name, indexPtr)
-    TkText *textPtr;		/* Text widget containing window. */
-    CONST char *name;		/* Name of window. */
-    TkTextIndex *indexPtr;	/* Index information gets stored here. */
+TkTextWindowIndex(
+    TkText *textPtr,		/* Text widget containing window. */
+    CONST char *name,		/* Name of window. */
+    TkTextIndex *indexPtr)	/* Index information gets stored here. */
 {
     Tcl_HashEntry *hPtr;
     TkTextSegment *ewPtr;
@@ -1351,6 +1341,7 @@ TkTextWindowIndex(textPtr, name, indexPtr)
     if (hPtr == NULL) {
 	return 0;
     }
+
     ewPtr = (TkTextSegment *) Tcl_GetHashValue(hPtr);
     indexPtr->tree = textPtr->sharedTextPtr->tree;
     indexPtr->linePtr = ewPtr->body.ew.linePtr;
@@ -1363,19 +1354,18 @@ TkTextWindowIndex(textPtr, name, indexPtr)
  *
  * EmbWinGetClient --
  *
- *	Given a text widget and a segment which contains an
- *	embedded window, find the text-widget specific 
- *	information about the embedded window, if any.
- *	
- *	This procedure performs a completely linear lookup
- *	for a matching data structure.  If we envisage using
- *	this code with dozens of peer widgets, then performance
- *	could become an issue and a more sophisticated lookup
+ *	Given a text widget and a segment which contains an embedded window,
+ *	find the text-widget specific information about the embedded window,
+ *	if any.
+ *
+ *	This function performs a completely linear lookup for a matching data
+ *	structure. If we envisage using this code with dozens of peer widgets,
+ *	then performance could become an issue and a more sophisticated lookup
  *	mechanism might be desirable.
  *
  * Results:
- *	NULL if no widget-specific info exists, otherwise
- *	the structure is returned.
+ *	NULL if no widget-specific info exists, otherwise the structure is
+ *	returned.
  *
  * Side effects:
  *	None.
@@ -1384,18 +1374,24 @@ TkTextWindowIndex(textPtr, name, indexPtr)
  */
 
 static TkTextEmbWindowClient*
-EmbWinGetClient(textPtr, ewPtr)
-    CONST TkText *textPtr;            /* Information about text widget. */
-    TkTextSegment *ewPtr;             /* Segment containing embedded 
-                                       * window. */
+EmbWinGetClient(
+    CONST TkText *textPtr,	/* Information about text widget. */
+    TkTextSegment *ewPtr)	/* Segment containing embedded window. */
 {
     TkTextEmbWindowClient *client = ewPtr->body.ew.clients;
     while (client != NULL) {
-        if (client->textPtr == textPtr) {
-            return client;
-        }
-        client = client->next;
+	if (client->textPtr == textPtr) {
+	    return client;
+	}
+	client = client->next;
     }
     return NULL;
 }
-
+
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 4
+ * fill-column: 78
+ * End:
+ */