Getting more systematic about style

Also start removing _ANSI_ARGS_; the core's required ANSI C for a while now
Also fix [Bug 1252702]; size_t doesn't mix with Tcl_GetStringFromObj

1 files changed, 905 insertions, 877 deletions

diff --git a/generic/tkTextTag.c b/generic/tkTextTag.c
index eb09566..00d350a 100644
--- a/generic/tkTextTag.c
+++ b/generic/tkTextTag.c
@@ -1,17 +1,17 @@
-/* 
+/*
  * tkTextTag.c --
  *
- *	This module implements the "tag" subcommand of the widget command
- *	for text widgets, plus most of the other high-level functions
- *	related to tags.
+ *	This module implements the "tag" subcommand of the widget command for
+ *	text widgets, plus most of the other high-level functions related to
+ *	tags.
  *
  * Copyright (c) 1992-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: tkTextTag.c,v 1.19 2004/10/05 01:26:10 hobbs Exp $
+ * RCS: @(#) $Id: tkTextTag.c,v 1.20 2005/08/10 22:02:22 dkf Exp $
  */
 
 #include "default.h"
@@ -20,10 +20,10 @@
 #include "tkText.h"
 
 /*
- * The 'TkWrapMode' enum in tkText.h is used to define a type for the
- * -wrap option of tags in a Text widget.  These values are used as
- * indices into the string table below.  Tags are allowed an empty wrap
- * value, but the widget as a whole is not.
+ * The 'TkWrapMode' enum in tkText.h is used to define a type for the -wrap
+ * option of tags in a Text widget. These values are used as indices into the
+ * string table below. Tags are allowed an empty wrap value, but the widget as
+ * a whole is not.
  */
 
 static char *wrapStrings[] = {
@@ -32,9 +32,9 @@ static char *wrapStrings[] = {
 
 static Tk_OptionSpec tagOptionSpecs[] = {
     {TK_OPTION_BORDER, "-background", (char *) NULL, (char *) NULL,
-	(char *) NULL, -1, Tk_Offset(TkTextTag, border), TK_OPTION_NULL_OK, 0, 0},
+	NULL, -1, Tk_Offset(TkTextTag, border), TK_OPTION_NULL_OK, 0, 0},
     {TK_OPTION_BITMAP, "-bgstipple", (char *) NULL, (char *) NULL,
-	(char *) NULL, -1, Tk_Offset(TkTextTag, bgStipple), TK_OPTION_NULL_OK, 0, 0},
+	NULL, -1, Tk_Offset(TkTextTag, bgStipple), TK_OPTION_NULL_OK, 0, 0},
     {TK_OPTION_PIXELS, "-borderwidth", (char *) NULL, (char *) NULL,
 	"0", Tk_Offset(TkTextTag, borderWidthPtr), Tk_Offset(TkTextTag, borderWidth),
 	TK_OPTION_DONT_SET_DEFAULT|TK_OPTION_NULL_OK, 0, 0},
@@ -42,34 +42,34 @@ static Tk_OptionSpec tagOptionSpecs[] = {
 	"0", -1, Tk_Offset(TkTextTag, elideString),
 	TK_OPTION_DONT_SET_DEFAULT|TK_OPTION_NULL_OK, 0, 0},
     {TK_OPTION_BITMAP, "-fgstipple", (char *) NULL, (char *) NULL,
-	(char *) NULL, -1, Tk_Offset(TkTextTag, fgStipple), TK_OPTION_NULL_OK, 0, 0},
+	NULL, -1, Tk_Offset(TkTextTag, fgStipple), TK_OPTION_NULL_OK, 0, 0},
     {TK_OPTION_FONT, "-font", (char *) NULL, (char *) NULL,
-	(char *) NULL, -1, Tk_Offset(TkTextTag, tkfont), TK_OPTION_NULL_OK, 0, 0},
+	NULL, -1, Tk_Offset(TkTextTag, tkfont), TK_OPTION_NULL_OK, 0, 0},
     {TK_OPTION_COLOR, "-foreground", (char *) NULL, (char *) NULL,
-	(char *) NULL, -1, Tk_Offset(TkTextTag, fgColor), TK_OPTION_NULL_OK, 0, 0},
+	NULL, -1, Tk_Offset(TkTextTag, fgColor), TK_OPTION_NULL_OK, 0, 0},
     {TK_OPTION_STRING, "-justify", (char *) NULL, (char *) NULL,
-	(char *) NULL, -1, Tk_Offset(TkTextTag, justifyString), TK_OPTION_NULL_OK, 0, 0},
+	NULL, -1, Tk_Offset(TkTextTag, justifyString), TK_OPTION_NULL_OK, 0,0},
     {TK_OPTION_STRING, "-lmargin1", (char *) NULL, (char *) NULL,
-	(char *) NULL, -1, Tk_Offset(TkTextTag, lMargin1String), TK_OPTION_NULL_OK, 0, 0},
+	NULL, -1, Tk_Offset(TkTextTag, lMargin1String), TK_OPTION_NULL_OK,0,0},
     {TK_OPTION_STRING, "-lmargin2", (char *) NULL, (char *) NULL,
-	(char *) NULL, -1, Tk_Offset(TkTextTag, lMargin2String), TK_OPTION_NULL_OK, 0, 0},
+	NULL, -1, Tk_Offset(TkTextTag, lMargin2String), TK_OPTION_NULL_OK,0,0},
     {TK_OPTION_STRING, "-offset", (char *) NULL, (char *) NULL,
-	(char *) NULL, -1, Tk_Offset(TkTextTag, offsetString), TK_OPTION_NULL_OK, 0, 0},
+	NULL, -1, Tk_Offset(TkTextTag, offsetString), TK_OPTION_NULL_OK, 0, 0},
     {TK_OPTION_STRING, "-overstrike", (char *) NULL, (char *) NULL,
 	(char *) NULL, -1, Tk_Offset(TkTextTag, overstrikeString),
 	TK_OPTION_NULL_OK, 0, 0},
     {TK_OPTION_STRING, "-relief", (char *) NULL, (char *) NULL,
-	(char *) NULL, -1, Tk_Offset(TkTextTag, reliefString), TK_OPTION_NULL_OK, 0, 0},
+	NULL, -1, Tk_Offset(TkTextTag, reliefString), TK_OPTION_NULL_OK, 0, 0},
     {TK_OPTION_STRING, "-rmargin", (char *) NULL, (char *) NULL,
-	(char *) NULL, -1, Tk_Offset(TkTextTag, rMarginString), TK_OPTION_NULL_OK, 0, 0},
+	NULL, -1, Tk_Offset(TkTextTag, rMarginString), TK_OPTION_NULL_OK, 0,0},
     {TK_OPTION_STRING, "-spacing1", (char *) NULL, (char *) NULL,
-	(char *) NULL, -1, Tk_Offset(TkTextTag, spacing1String), TK_OPTION_NULL_OK, 0, 0},
+	NULL, -1, Tk_Offset(TkTextTag, spacing1String), TK_OPTION_NULL_OK,0,0},
     {TK_OPTION_STRING, "-spacing2", (char *) NULL, (char *) NULL,
-	(char *) NULL, -1, Tk_Offset(TkTextTag, spacing2String), TK_OPTION_NULL_OK, 0, 0},
+	NULL, -1, Tk_Offset(TkTextTag, spacing2String), TK_OPTION_NULL_OK,0,0},
     {TK_OPTION_STRING, "-spacing3", (char *) NULL, (char *) NULL,
-	(char *) NULL, -1, Tk_Offset(TkTextTag, spacing3String), TK_OPTION_NULL_OK, 0, 0},
+	NULL, -1, Tk_Offset(TkTextTag, spacing3String), TK_OPTION_NULL_OK,0,0},
     {TK_OPTION_STRING, "-tabs", (char *) NULL, (char *) NULL,
-	(char *) NULL, Tk_Offset(TkTextTag, tabStringPtr), -1, TK_OPTION_NULL_OK, 0, 0},
+	NULL, Tk_Offset(TkTextTag, tabStringPtr), -1, TK_OPTION_NULL_OK, 0, 0},
     {TK_OPTION_STRING, "-underline", (char *) NULL, (char *) NULL,
 	(char *) NULL, -1, Tk_Offset(TkTextTag, underlineString),
 	TK_OPTION_NULL_OK, 0, 0},
@@ -80,29 +80,26 @@ static Tk_OptionSpec tagOptionSpecs[] = {
 };
 
 /*
- * Forward declarations for procedures defined later in this file:
+ * Forward declarations for functions defined later in this file:
  */
 
-static void		ChangeTagPriority _ANSI_ARGS_((TkText *textPtr,
-			    TkTextTag *tagPtr, int prio));
-static TkTextTag *	FindTag _ANSI_ARGS_((Tcl_Interp *interp,
-			    TkText *textPtr, Tcl_Obj *tagName));
-static void		SortTags _ANSI_ARGS_((int numTags,
-			    TkTextTag **tagArrayPtr));
-static int		TagSortProc _ANSI_ARGS_((CONST VOID *first,
-			    CONST VOID *second));
-static void             TagBindEvent _ANSI_ARGS_((TkText *textPtr, XEvent *eventPtr, 
-						  int numTags, TkTextTag **tagArrayPtr));
-
+static void		ChangeTagPriority(TkText *textPtr, TkTextTag *tagPtr,
+			    int prio);
+static TkTextTag *	FindTag(Tcl_Interp *interp, TkText *textPtr,
+			    Tcl_Obj *tagName);
+static void		SortTags(int numTags, TkTextTag **tagArrayPtr);
+static int		TagSortProc(CONST VOID *first, CONST VOID *second);
+static void             TagBindEvent(TkText *textPtr, XEvent *eventPtr,
+			    int numTags, TkTextTag **tagArrayPtr);
 
 /*
  *--------------------------------------------------------------
  *
  * TkTextTagCmd --
  *
- *	This procedure is invoked to process the "tag" options of
- *	the widget command for text widgets. See the user documentation
- *	for details on what it does.
+ *	This function is invoked to process the "tag" options of the widget
+ *	command for text widgets. See the user documentation for details on
+ *	what it does.
  *
  * Results:
  *	A standard Tcl result.
@@ -123,11 +120,11 @@ TkTextTagCmd(textPtr, interp, objc, objv)
 				 * objv[1] is "tag". */
 {
     int optionIndex;
-    
+
     static CONST char *tagOptionStrings[] = {
 	"add", "bind", "cget", "configure", "delete", "lower",
-	"names", "nextrange", "prevrange", "raise", "ranges", 
-	"remove", (char *) NULL 
+	"names", "nextrange", "prevrange", "raise", "ranges",
+	"remove", (char *) NULL
     };
     enum tagOptions {
 	TAG_ADD, TAG_BIND, TAG_CGET, TAG_CONFIGURE, TAG_DELETE,
@@ -143,753 +140,764 @@ TkTextTagCmd(textPtr, interp, objc, objv)
 	Tcl_WrongNumArgs(interp, 2, objv, "option ?arg arg ...?");
 	return TCL_ERROR;
     }
-    
-    if (Tcl_GetIndexFromObj(interp, objv[2], tagOptionStrings, 
-			    "tag option", 0, &optionIndex) != TCL_OK) {
+
+    if (Tcl_GetIndexFromObj(interp, objv[2], tagOptionStrings,
+	    "tag option", 0, &optionIndex) != TCL_OK) {
 	return TCL_ERROR;
     }
 
     switch ((enum tagOptions)optionIndex) {
-	case TAG_ADD: 
-	case TAG_REMOVE: {
-	    int addTag;
-	    if (((enum tagOptions)optionIndex) == TAG_ADD) {
-	        addTag = 1;
-	    } else {
-		addTag = 0;
-	    }
-	    if (objc < 5) {
-		Tcl_WrongNumArgs(interp, 3, objv, 
-				 "tagName index1 ?index2 index1 index2 ...?");
+    case TAG_ADD:
+    case TAG_REMOVE: {
+	int addTag;
+
+	if (((enum tagOptions)optionIndex) == TAG_ADD) {
+	    addTag = 1;
+	} else {
+	    addTag = 0;
+	}
+	if (objc < 5) {
+	    Tcl_WrongNumArgs(interp, 3, objv,
+		    "tagName index1 ?index2 index1 index2 ...?");
+	    return TCL_ERROR;
+	}
+	tagPtr = TkTextCreateTag(textPtr, Tcl_GetString(objv[3]), NULL);
+	for (i = 4; i < objc; i += 2) {
+	    if (TkTextGetObjIndex(interp, textPtr, objv[i],
+		    &index1) != TCL_OK) {
 		return TCL_ERROR;
 	    }
-	    tagPtr = TkTextCreateTag(textPtr, Tcl_GetString(objv[3]), NULL);
-	    for (i = 4; i < objc; i += 2) {
-		if (TkTextGetObjIndex(interp, textPtr, objv[i], 
-				      &index1) != TCL_OK) {
+	    if (objc > (i+1)) {
+		if (TkTextGetObjIndex(interp, textPtr, objv[i+1],
+			&index2) != TCL_OK) {
 		    return TCL_ERROR;
 		}
-		if (objc > (i+1)) {
-		    if (TkTextGetObjIndex(interp, textPtr, objv[i+1], &index2)
-			    != TCL_OK) {
-			return TCL_ERROR;
-		    }
-		    if (TkTextIndexCmp(&index1, &index2) >= 0) {
-			return TCL_OK;
-		    }
-		} else {
-		    index2 = index1;
-		    TkTextIndexForwChars(NULL,&index2, 1, &index2, 
-					 COUNT_INDICES);
+		if (TkTextIndexCmp(&index1, &index2) >= 0) {
+		    return TCL_OK;
 		}
+	    } else {
+		index2 = index1;
+		TkTextIndexForwChars(NULL,&index2, 1, &index2, COUNT_INDICES);
+	    }
 
-		if (tagPtr->affectsDisplay) {
-		    TkTextRedrawTag(textPtr->sharedTextPtr, NULL, 
-				    &index1, &index2, tagPtr, !addTag);
-		} else {
-		    /*
-		     * Still need to trigger enter/leave events on tags that
-		     * have changed.
-		     */
+	    if (tagPtr->affectsDisplay) {
+		TkTextRedrawTag(textPtr->sharedTextPtr, NULL, &index1, &index2,
+			tagPtr, !addTag);
+	    } else {
+		/*
+		 * Still need to trigger enter/leave events on tags that have
+		 * changed.
+		 */
 
-		    TkTextEventuallyRepick(textPtr);
-		}
-		if (TkBTreeTag(&index1, &index2, tagPtr, addTag)) {
+		TkTextEventuallyRepick(textPtr);
+	    }
+	    if (TkBTreeTag(&index1, &index2, tagPtr, addTag)) {
+		/*
+		 * If the tag is "sel", and we actually adjusted something
+		 * then grab the selection if we're supposed to export it and
+		 * don't already have it.
+		 *
+		 * Also, invalidate partially-completed selection retrievals.
+		 * We only need to check whether the tag is "sel" for this
+		 * textPtr (not for other peer widget's "sel" tags) because we
+		 * cannot reach this code path with a different widget's "sel"
+		 * tag.
+		 */
+
+		if (tagPtr == textPtr->selTagPtr) {
 		    /*
-		     * If the tag is "sel", and we actually adjusted
-		     * something then grab the selection if we're
-		     * supposed to export it and don't already have it.
-		     * 
-		     * Also, invalidate partially-completed selection
-		     * retrievals.  We only need to check whether the
-		     * tag is "sel" for this textPtr (not for other peer
-		     * widget's "sel" tags) because we cannot reach this
-		     * code path with a different widget's "sel" tag.
+		     * Send an event that the selection changed.  This is
+		     * equivalent to:
+		     *	   event generate $textWidget <<Selection>>
 		     */
 
-		    if (tagPtr == textPtr->selTagPtr) {
-			/*
-			 * Send an event that the selection changed.
-			 * This is equivalent to
-			 * "event generate $textWidget <<Selection>>"
-			 */
-
-			TkTextSelectionEvent(textPtr);
+		    TkTextSelectionEvent(textPtr);
 
-			if (addTag && textPtr->exportSelection
-				&& !(textPtr->flags & GOT_SELECTION)) {
-			    Tk_OwnSelection(textPtr->tkwin, XA_PRIMARY,
-				    TkTextLostSelection, (ClientData) textPtr);
-			    textPtr->flags |= GOT_SELECTION;
-			}
-			textPtr->abortSelections = 1;
+		    if (addTag && textPtr->exportSelection
+			    && !(textPtr->flags & GOT_SELECTION)) {
+			Tk_OwnSelection(textPtr->tkwin, XA_PRIMARY,
+				TkTextLostSelection, (ClientData) textPtr);
+			textPtr->flags |= GOT_SELECTION;
 		    }
+		    textPtr->abortSelections = 1;
 		}
 	    }
-	    break;
 	}
-	case TAG_BIND: {
-	    if ((objc < 4) || (objc > 6)) {
-		Tcl_WrongNumArgs(interp, 3, objv, 
-				 "tagName ?sequence? ?command?");
-		return TCL_ERROR;
-	    }
-	    tagPtr = TkTextCreateTag(textPtr, Tcl_GetString(objv[3]), NULL);
+	break;
+    }
+    case TAG_BIND:
+	if ((objc < 4) || (objc > 6)) {
+	    Tcl_WrongNumArgs(interp, 3, objv, "tagName ?sequence? ?command?");
+	    return TCL_ERROR;
+	}
+	tagPtr = TkTextCreateTag(textPtr, Tcl_GetString(objv[3]), NULL);
 
-	    /*
-	     * Make a binding table if the widget doesn't already have
-	     * one.
-	     */
+	/*
+	 * Make a binding table if the widget doesn't already have one.
+	 */
 
-	    if (textPtr->sharedTextPtr->bindingTable == NULL) {
-		textPtr->sharedTextPtr->bindingTable = Tk_CreateBindingTable(interp);
-	    }
+	if (textPtr->sharedTextPtr->bindingTable == NULL) {
+	    textPtr->sharedTextPtr->bindingTable =
+		    Tk_CreateBindingTable(interp);
+	}
 
-	    if (objc == 6) {
-		int append = 0;
-		unsigned long mask;
-		char *fifth = Tcl_GetString(objv[5]);
+	if (objc == 6) {
+	    int append = 0;
+	    unsigned long mask;
+	    char *fifth = Tcl_GetString(objv[5]);
 
-		if (fifth[0] == 0) {
-		    return Tk_DeleteBinding(interp, textPtr->sharedTextPtr->bindingTable,
-			    (ClientData) tagPtr->name, Tcl_GetString(objv[4]));
-		}
-		if (fifth[0] == '+') {
-		    fifth++;
-		    append = 1;
-		}
-		mask = Tk_CreateBinding(interp, textPtr->sharedTextPtr->bindingTable,
-			(ClientData) tagPtr->name, Tcl_GetString(objv[4]), 
-					fifth, append);
-		if (mask == 0) {
-		    return TCL_ERROR;
-		}
-		if (mask & (unsigned) ~(ButtonMotionMask|Button1MotionMask
-			|Button2MotionMask|Button3MotionMask|Button4MotionMask
-			|Button5MotionMask|ButtonPressMask|ButtonReleaseMask
-			|EnterWindowMask|LeaveWindowMask|KeyPressMask
-			|KeyReleaseMask|PointerMotionMask|VirtualEventMask)) {
-		    Tk_DeleteBinding(interp, textPtr->sharedTextPtr->bindingTable,
-			    (ClientData) tagPtr->name, Tcl_GetString(objv[4]));
-		    Tcl_ResetResult(interp);
-		    Tcl_AppendResult(interp, "requested illegal events; ",
-			 "only key, button, motion, enter, leave, and virtual ",
-			 "events may be used", (char *) NULL);
-		    return TCL_ERROR;
-		}
-	    } else if (objc == 5) {
-		CONST char *command;
-	
-		command = Tk_GetBinding(interp, textPtr->sharedTextPtr->bindingTable,
+	    if (fifth[0] == 0) {
+		return Tk_DeleteBinding(interp,
+			textPtr->sharedTextPtr->bindingTable,
+			(ClientData) tagPtr->name, Tcl_GetString(objv[4]));
+	    }
+	    if (fifth[0] == '+') {
+		fifth++;
+		append = 1;
+	    }
+	    mask = Tk_CreateBinding(interp,
+		    textPtr->sharedTextPtr->bindingTable,
+		    (ClientData) tagPtr->name, Tcl_GetString(objv[4]), fifth,
+		    append);
+	    if (mask == 0) {
+		return TCL_ERROR;
+	    }
+	    if (mask & (unsigned) ~(ButtonMotionMask|Button1MotionMask
+		    |Button2MotionMask|Button3MotionMask|Button4MotionMask
+		    |Button5MotionMask|ButtonPressMask|ButtonReleaseMask
+		    |EnterWindowMask|LeaveWindowMask|KeyPressMask
+		    |KeyReleaseMask|PointerMotionMask|VirtualEventMask)) {
+		Tk_DeleteBinding(interp, textPtr->sharedTextPtr->bindingTable,
 			(ClientData) tagPtr->name, Tcl_GetString(objv[4]));
-		if (command == NULL) {
-		    CONST char *string = Tcl_GetStringResult(interp); 
+		Tcl_ResetResult(interp);
+		Tcl_AppendResult(interp, "requested illegal events; ",
+			"only key, button, motion, enter, leave, and virtual ",
+			"events may be used", (char *) NULL);
+		return TCL_ERROR;
+	    }
+	} else if (objc == 5) {
+	    CONST char *command;
 
-		    /*
-		     * Ignore missing binding errors.  This is a special hack
-		     * that relies on the error message returned by FindSequence
-		     * in tkBind.c.
-		     */
+	    command = Tk_GetBinding(interp,
+		    textPtr->sharedTextPtr->bindingTable,
+		    (ClientData) tagPtr->name, Tcl_GetString(objv[4]));
+	    if (command == NULL) {
+		CONST char *string = Tcl_GetStringResult(interp);
 
-		    if (string[0] != '\0') {
-			return TCL_ERROR;
-		    } else {
-			Tcl_ResetResult(interp);
-		    }
+		/*
+		 * Ignore missing binding errors. This is a special hack that
+		 * relies on the error message returned by FindSequence in
+		 * tkBind.c.
+		 */
+
+		if (string[0] != '\0') {
+		    return TCL_ERROR;
 		} else {
-		    Tcl_SetResult(interp, (char *) command, TCL_STATIC);
+		    Tcl_ResetResult(interp);
 		}
 	    } else {
-		Tk_GetAllBindings(interp, textPtr->sharedTextPtr->bindingTable,
-			(ClientData) tagPtr->name);
+		Tcl_SetResult(interp, (char *) command, TCL_STATIC);
 	    }
-	    break;
+	} else {
+	    Tk_GetAllBindings(interp, textPtr->sharedTextPtr->bindingTable,
+		    (ClientData) tagPtr->name);
 	}
-	case TAG_CGET: {
-	    if (objc != 5) {
-		Tcl_WrongNumArgs(interp, 1, objv, "tag cget tagName option");
+	break;
+    case TAG_CGET:
+	if (objc != 5) {
+	    Tcl_WrongNumArgs(interp, 1, objv, "tag cget tagName option");
+	    return TCL_ERROR;
+	} else {
+	    Tcl_Obj *objPtr;
+
+	    tagPtr = FindTag(interp, textPtr, objv[3]);
+	    if (tagPtr == NULL) {
+		return TCL_ERROR;
+	    }
+	    objPtr = Tk_GetOptionValue(interp, (char *) tagPtr,
+		    tagPtr->optionTable, objv[4], textPtr->tkwin);
+	    if (objPtr == NULL) {
 		return TCL_ERROR;
 	    } else {
-		Tcl_Obj *objPtr;
-		
-		tagPtr = FindTag(interp, textPtr, objv[3]);
-		if (tagPtr == NULL) {
-		    return TCL_ERROR;
-		}
-		objPtr = Tk_GetOptionValue(interp, (char *) tagPtr,
-					   tagPtr->optionTable, objv[4], 
-					   textPtr->tkwin);
-		if (objPtr == NULL) {
-		    return TCL_ERROR;
-		} else {
-		    Tcl_SetObjResult(interp, objPtr);
-		    return TCL_OK;
-		}
+		Tcl_SetObjResult(interp, objPtr);
+		return TCL_OK;
 	    }
-	    break;
 	}
-	case TAG_CONFIGURE: {
-	    int newTag;
-	    if (objc < 4) {
-		Tcl_WrongNumArgs(interp, 3, objv, 
-				 "tagName ?option? ?value? ?option value ...?");
+	break;
+    case TAG_CONFIGURE: {
+	int newTag;
+
+	if (objc < 4) {
+	    Tcl_WrongNumArgs(interp, 3, objv,
+		    "tagName ?option? ?value? ?option value ...?");
+	    return TCL_ERROR;
+	}
+	tagPtr = TkTextCreateTag(textPtr, Tcl_GetString(objv[3]), &newTag);
+	if (objc <= 5) {
+	    Tcl_Obj *objPtr = Tk_GetOptionInfo(interp, (char *) tagPtr,
+		    tagPtr->optionTable,
+		    (objc == 5) ? objv[4] : (Tcl_Obj *) NULL, textPtr->tkwin);
+
+	    if (objPtr == NULL) {
 		return TCL_ERROR;
-	    }
-	    tagPtr = TkTextCreateTag(textPtr, Tcl_GetString(objv[3]), &newTag);
-	    if (objc <= 5) {
-		Tcl_Obj* objPtr = Tk_GetOptionInfo(interp, (char *) tagPtr,
-						   tagPtr->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 {
-		int result = TCL_OK;
+		Tcl_SetObjResult(interp, objPtr);
+		return TCL_OK;
+	    }
+	} else {
+	    int result = TCL_OK;
+
+	    if (Tk_SetOptions(interp, (char*)tagPtr, tagPtr->optionTable,
+		    objc-4, objv+4, textPtr->tkwin, NULL, NULL) != TCL_OK) {
+		return TCL_ERROR;
+	    }
 
-		if (Tk_SetOptions(interp, (char*)tagPtr, tagPtr->optionTable,
-			objc-4, objv+4, textPtr->tkwin, NULL, NULL) != TCL_OK) {
+	    /*
+	     * Some of the configuration options, like -underline and
+	     * -justify, require additional translation (this is needed
+	     * because we need to distinguish a particular value of an option
+	     * from "unspecified").
+	     */
+
+	    if (tagPtr->borderWidth < 0) {
+		tagPtr->borderWidth = 0;
+	    }
+	    if (tagPtr->reliefString != NULL) {
+		if (Tk_GetRelief(interp, tagPtr->reliefString,
+			&tagPtr->relief) != TCL_OK) {
 		    return TCL_ERROR;
 		}
-		/*
-		 * Some of the configuration options, like -underline
-		 * and -justify, require additional translation (this is
-		 * needed because we need to distinguish a particular value
-		 * of an option from "unspecified").
-		 */
-
-		if (tagPtr->borderWidth < 0) {
-		    tagPtr->borderWidth = 0;
+	    }
+	    if (tagPtr->justifyString != NULL) {
+		if (Tk_GetJustify(interp, tagPtr->justifyString,
+			&tagPtr->justify) != TCL_OK) {
+		    return TCL_ERROR;
 		}
-		if (tagPtr->reliefString != NULL) {
-		    if (Tk_GetRelief(interp, tagPtr->reliefString,
-			    &tagPtr->relief) != TCL_OK) {
-			return TCL_ERROR;
-		    }
+	    }
+	    if (tagPtr->lMargin1String != NULL) {
+		if (Tk_GetPixels(interp, textPtr->tkwin,
+			tagPtr->lMargin1String, &tagPtr->lMargin1) != TCL_OK) {
+		    return TCL_ERROR;
 		}
-		if (tagPtr->justifyString != NULL) {
-		    if (Tk_GetJustify(interp, tagPtr->justifyString,
-			    &tagPtr->justify) != TCL_OK) {
-			return TCL_ERROR;
-		    }
+	    }
+	    if (tagPtr->lMargin2String != NULL) {
+		if (Tk_GetPixels(interp, textPtr->tkwin,
+			tagPtr->lMargin2String, &tagPtr->lMargin2) != TCL_OK) {
+		    return TCL_ERROR;
 		}
-		if (tagPtr->lMargin1String != NULL) {
-		    if (Tk_GetPixels(interp, textPtr->tkwin,
-		      tagPtr->lMargin1String, &tagPtr->lMargin1) != TCL_OK) {
-			return TCL_ERROR;
-		    }
+	    }
+	    if (tagPtr->offsetString != NULL) {
+		if (Tk_GetPixels(interp, textPtr->tkwin, tagPtr->offsetString,
+			&tagPtr->offset) != TCL_OK) {
+		    return TCL_ERROR;
 		}
-		if (tagPtr->lMargin2String != NULL) {
-		    if (Tk_GetPixels(interp, textPtr->tkwin,
-		      tagPtr->lMargin2String, &tagPtr->lMargin2) != TCL_OK) {
-			return TCL_ERROR;
-		    }
+	    }
+	    if (tagPtr->overstrikeString != NULL) {
+		if (Tcl_GetBoolean(interp, tagPtr->overstrikeString,
+			&tagPtr->overstrike) != TCL_OK) {
+		    return TCL_ERROR;
 		}
-		if (tagPtr->offsetString != NULL) {
-		    if (Tk_GetPixels(interp, textPtr->tkwin, 
-				     tagPtr->offsetString,
-			    &tagPtr->offset) != TCL_OK) {
-			return TCL_ERROR;
-		    }
+	    }
+	    if (tagPtr->rMarginString != NULL) {
+		if (Tk_GetPixels(interp, textPtr->tkwin,
+			tagPtr->rMarginString, &tagPtr->rMargin) != TCL_OK) {
+		    return TCL_ERROR;
 		}
-		if (tagPtr->overstrikeString != NULL) {
-		    if (Tcl_GetBoolean(interp, tagPtr->overstrikeString,
-			    &tagPtr->overstrike) != TCL_OK) {
-			return TCL_ERROR;
-		    }
+	    }
+	    if (tagPtr->spacing1String != NULL) {
+		if (Tk_GetPixels(interp, textPtr->tkwin,
+			tagPtr->spacing1String, &tagPtr->spacing1) != TCL_OK) {
+		    return TCL_ERROR;
 		}
-		if (tagPtr->rMarginString != NULL) {
-		    if (Tk_GetPixels(interp, textPtr->tkwin,
-			  tagPtr->rMarginString, &tagPtr->rMargin) != TCL_OK) {
-			return TCL_ERROR;
-		    }
+		if (tagPtr->spacing1 < 0) {
+		    tagPtr->spacing1 = 0;
 		}
-		if (tagPtr->spacing1String != NULL) {
-		    if (Tk_GetPixels(interp, textPtr->tkwin,
-		      tagPtr->spacing1String, &tagPtr->spacing1) != TCL_OK) {
-			return TCL_ERROR;
-		    }
-		    if (tagPtr->spacing1 < 0) {
-			tagPtr->spacing1 = 0;
-		    }
+	    }
+	    if (tagPtr->spacing2String != NULL) {
+		if (Tk_GetPixels(interp, textPtr->tkwin,
+			tagPtr->spacing2String, &tagPtr->spacing2) != TCL_OK) {
+		    return TCL_ERROR;
 		}
-		if (tagPtr->spacing2String != NULL) {
-		    if (Tk_GetPixels(interp, textPtr->tkwin,
-		      tagPtr->spacing2String, &tagPtr->spacing2) != TCL_OK) {
-			return TCL_ERROR;
-		    }
-		    if (tagPtr->spacing2 < 0) {
-			tagPtr->spacing2 = 0;
-		    }
+		if (tagPtr->spacing2 < 0) {
+		    tagPtr->spacing2 = 0;
 		}
-		if (tagPtr->spacing3String != NULL) {
-		    if (Tk_GetPixels(interp, textPtr->tkwin,
-		      tagPtr->spacing3String, &tagPtr->spacing3) != TCL_OK) {
-			return TCL_ERROR;
-		    }
-		    if (tagPtr->spacing3 < 0) {
-			tagPtr->spacing3 = 0;
-		    }
+	    }
+	    if (tagPtr->spacing3String != NULL) {
+		if (Tk_GetPixels(interp, textPtr->tkwin,
+			tagPtr->spacing3String, &tagPtr->spacing3) != TCL_OK) {
+		    return TCL_ERROR;
 		}
-		if (tagPtr->tabArrayPtr != NULL) {
-		    ckfree((char *) tagPtr->tabArrayPtr);
-		    tagPtr->tabArrayPtr = NULL;
+		if (tagPtr->spacing3 < 0) {
+		    tagPtr->spacing3 = 0;
 		}
-		if (tagPtr->tabStringPtr != NULL) {
-		    tagPtr->tabArrayPtr = TkTextGetTabs(interp, textPtr,
-			    tagPtr->tabStringPtr);
-		    if (tagPtr->tabArrayPtr == NULL) {
-			return TCL_ERROR;
-		    }
+	    }
+	    if (tagPtr->tabArrayPtr != NULL) {
+		ckfree((char *) tagPtr->tabArrayPtr);
+		tagPtr->tabArrayPtr = NULL;
+	    }
+	    if (tagPtr->tabStringPtr != NULL) {
+		tagPtr->tabArrayPtr =
+			TkTextGetTabs(interp, textPtr, tagPtr->tabStringPtr);
+		if (tagPtr->tabArrayPtr == NULL) {
+		    return TCL_ERROR;
 		}
-		if (tagPtr->underlineString != NULL) {
-		    if (Tcl_GetBoolean(interp, tagPtr->underlineString,
-			    &tagPtr->underline) != TCL_OK) {
-			return TCL_ERROR;
-		    }
+	    }
+	    if (tagPtr->underlineString != NULL) {
+		if (Tcl_GetBoolean(interp, tagPtr->underlineString,
+			&tagPtr->underline) != TCL_OK) {
+		    return TCL_ERROR;
 		}
-		if (tagPtr->elideString != NULL) {
-		    if (Tcl_GetBoolean(interp, tagPtr->elideString,
-			    &tagPtr->elide) != TCL_OK) {
-			return TCL_ERROR;
-		    }
+	    }
+	    if (tagPtr->elideString != NULL) {
+		if (Tcl_GetBoolean(interp, tagPtr->elideString,
+			&tagPtr->elide) != TCL_OK) {
+		    return TCL_ERROR;
 		}
+	    }
+
+	    /*
+	     * If the "sel" tag was changed, be sure to mirror information
+	     * from the tag back into the text widget record. NOTE: we don't
+	     * have to free up information in the widget record before
+	     * overwriting it, because it was mirrored in the tag and hence
+	     * freed when the tag field was overwritten.
+	     */
+
+	    if (tagPtr == textPtr->selTagPtr) {
+		textPtr->selBorder = tagPtr->border;
+		textPtr->selBorderWidth = tagPtr->borderWidth;
+		textPtr->selBorderWidthPtr = tagPtr->borderWidthPtr;
+		textPtr->selFgColorPtr = tagPtr->fgColor;
+	    }
 
+	    tagPtr->affectsDisplay = 0;
+	    tagPtr->affectsDisplayGeometry = 0;
+	    if ((tagPtr->elideString != NULL)
+		    || (tagPtr->tkfont != None)
+		    || (tagPtr->justifyString != NULL)
+		    || (tagPtr->lMargin1String != NULL)
+		    || (tagPtr->lMargin2String != NULL)
+		    || (tagPtr->offsetString != NULL)
+		    || (tagPtr->rMarginString != NULL)
+		    || (tagPtr->spacing1String != NULL)
+		    || (tagPtr->spacing2String != NULL)
+		    || (tagPtr->spacing3String != NULL)
+		    || (tagPtr->tabStringPtr != NULL)
+		    || (tagPtr->wrapMode != TEXT_WRAPMODE_NULL)) {
+		tagPtr->affectsDisplay = 1;
+		tagPtr->affectsDisplayGeometry = 1;
+	    }
+	    if ((tagPtr->border != NULL)
+		    || (tagPtr->reliefString != NULL)
+		    || (tagPtr->bgStipple != None)
+		    || (tagPtr->fgColor != NULL)
+		    || (tagPtr->fgStipple != None)
+		    || (tagPtr->overstrikeString != NULL)
+		    || (tagPtr->underlineString != NULL)) {
+		tagPtr->affectsDisplay = 1;
+	    }
+	    if (!newTag) {
 		/*
-		 * If the "sel" tag was changed, be sure to mirror information
-		 * from the tag back into the text widget record.   NOTE: we
-		 * don't have to free up information in the widget record
-		 * before overwriting it, because it was mirrored in the tag
-		 * and hence freed when the tag field was overwritten.
+		 * This line is not necessary if this is a new tag, since it
+		 * can't possibly have been applied to anything yet.
 		 */
 
-		if (tagPtr == textPtr->selTagPtr) {
-		    textPtr->selBorder = tagPtr->border;
-		    textPtr->selBorderWidth = tagPtr->borderWidth;
-		    textPtr->selBorderWidthPtr = tagPtr->borderWidthPtr;
-		    textPtr->selFgColorPtr = tagPtr->fgColor;
-		}
-		tagPtr->affectsDisplay = 0;
-		tagPtr->affectsDisplayGeometry = 0;
-		if ((tagPtr->elideString != NULL)
-			|| (tagPtr->tkfont != None)
-			|| (tagPtr->justifyString != NULL)
-			|| (tagPtr->lMargin1String != NULL)
-			|| (tagPtr->lMargin2String != NULL)
-			|| (tagPtr->offsetString != NULL)
-			|| (tagPtr->rMarginString != NULL)
-			|| (tagPtr->spacing1String != NULL)
-			|| (tagPtr->spacing2String != NULL)
-			|| (tagPtr->spacing3String != NULL)
-			|| (tagPtr->tabStringPtr != NULL)
-			|| (tagPtr->wrapMode != TEXT_WRAPMODE_NULL)) {
-		    tagPtr->affectsDisplay = 1;
-		    tagPtr->affectsDisplayGeometry = 1;
-		}
-		if ((tagPtr->border != NULL)
-			|| (tagPtr->reliefString != NULL)
-			|| (tagPtr->bgStipple != None)
-			|| (tagPtr->fgColor != NULL)
-			|| (tagPtr->fgStipple != None)
-			|| (tagPtr->overstrikeString != NULL)
-			|| (tagPtr->underlineString != NULL)) {
-		    tagPtr->affectsDisplay = 1;
-		}
-		if (!newTag) {
-		    /* 
-		     * This line is not necessary if this is a new tag,
-		     * since it can't possibly have been applied to
-		     * anything yet.
-		     */
-		    
-		    /*
-		     * VMD: If this is the 'sel' tag, then we don't
-		     * need to call this for all peers, unless we 
-		     * actually want to synchronize sel-style changes
-		     * across the peers.
-		     */
-		    TkTextRedrawTag(textPtr->sharedTextPtr, NULL, 
-				    (TkTextIndex *) NULL,
-				    (TkTextIndex *) NULL, tagPtr, 1);
-		}
-		return result;
+		/*
+		 * VMD: If this is the 'sel' tag, then we don't need to call
+		 * this for all peers, unless we actually want to synchronize
+		 * sel-style changes across the peers.
+		 */
+
+		TkTextRedrawTag(textPtr->sharedTextPtr, NULL,
+			(TkTextIndex *) NULL, (TkTextIndex *) NULL, tagPtr, 1);
 	    }
-	    break;
+	    return result;
 	}
-	case TAG_DELETE: {
-	    Tcl_HashEntry *hPtr;
+	break;
+    }
+    case TAG_DELETE: {
+	Tcl_HashEntry *hPtr;
 
-	    if (objc < 4) {
-		Tcl_WrongNumArgs(interp, 3, objv, "tagName ?tagName ...?");
-		return TCL_ERROR;
-	    }
-	    for (i = 3; i < objc; i++) {
-		hPtr = Tcl_FindHashEntry(&textPtr->sharedTextPtr->tagTable, 
-					 Tcl_GetString(objv[i]));
-		if (hPtr == NULL) {
-		    /* Either this tag doesn't exist or it's the 'sel'
-		     * tag (which is not in the hash table).  Either
-		     * way we don't want to delete it.
-		     */
-		    continue;
-		}
-		tagPtr = (TkTextTag *) Tcl_GetHashValue(hPtr);
-		if (tagPtr == textPtr->selTagPtr) {
-		    continue;
-		}
-		if (tagPtr->affectsDisplay) {
-		    TkTextRedrawTag(textPtr->sharedTextPtr, NULL, 
-				    (TkTextIndex *) NULL,
-				    (TkTextIndex *) NULL, tagPtr, 1);
-		}
-		TkTextDeleteTag(textPtr, tagPtr);
-		Tcl_DeleteHashEntry(hPtr);
-	    }
-	    break;
+	if (objc < 4) {
+	    Tcl_WrongNumArgs(interp, 3, objv, "tagName ?tagName ...?");
+	    return TCL_ERROR;
 	}
-	case TAG_LOWER: {
-	    TkTextTag *tagPtr2;
-	    int prio;
+	for (i = 3; i < objc; i++) {
+	    hPtr = Tcl_FindHashEntry(&textPtr->sharedTextPtr->tagTable,
+		    Tcl_GetString(objv[i]));
+	    if (hPtr == NULL) {
+		/*
+		 * Either this tag doesn't exist or it's the 'sel' tag (which
+		 * is not in the hash table). Either way we don't want to
+		 * delete it.
+		 */
 
-	    if ((objc != 4) && (objc != 5)) {
-		Tcl_WrongNumArgs(interp, 3, objv, "tagName ?belowThis?");
-		return TCL_ERROR;
+		continue;
 	    }
-	    tagPtr = FindTag(interp, textPtr, objv[3]);
-	    if (tagPtr == NULL) {
-		return TCL_ERROR;
+	    tagPtr = (TkTextTag *) Tcl_GetHashValue(hPtr);
+	    if (tagPtr == textPtr->selTagPtr) {
+		continue;
 	    }
-	    if (objc == 5) {
-		tagPtr2 = FindTag(interp, textPtr, objv[4]);
-		if (tagPtr2 == NULL) {
-		    return TCL_ERROR;
-		}
-		if (tagPtr->priority < tagPtr2->priority) {
-		    prio = tagPtr2->priority - 1;
-		} else {
-		    prio = tagPtr2->priority;
-		}
-	    } else {
-		prio = 0;
+	    if (tagPtr->affectsDisplay) {
+		TkTextRedrawTag(textPtr->sharedTextPtr, NULL,
+			(TkTextIndex *) NULL, (TkTextIndex *) NULL, tagPtr, 1);
 	    }
-	    ChangeTagPriority(textPtr, tagPtr, prio);
-	    /* 
-	     * If this is the 'sel' tag, then we don't actually need
-	     * to call this for all peers.
-	     */
-	    TkTextRedrawTag(textPtr->sharedTextPtr, NULL, 
-			    (TkTextIndex *) NULL, 
-			    (TkTextIndex *) NULL,
-			    tagPtr, 1);
-	    break;
+	    TkTextDeleteTag(textPtr, tagPtr);
+	    Tcl_DeleteHashEntry(hPtr);
 	}
-	case TAG_NAMES: {
-	    TkTextTag **arrayPtr;
-	    int arraySize;
-	    Tcl_Obj *listObj;
-	    
-	    if ((objc != 3) && (objc != 4)) {
-		Tcl_WrongNumArgs(interp, 3, objv, "?index?");
+	break;
+    }
+    case TAG_LOWER: {
+	TkTextTag *tagPtr2;
+	int prio;
+
+	if ((objc != 4) && (objc != 5)) {
+	    Tcl_WrongNumArgs(interp, 3, objv, "tagName ?belowThis?");
+	    return TCL_ERROR;
+	}
+	tagPtr = FindTag(interp, textPtr, objv[3]);
+	if (tagPtr == NULL) {
+	    return TCL_ERROR;
+	}
+	if (objc == 5) {
+	    tagPtr2 = FindTag(interp, textPtr, objv[4]);
+	    if (tagPtr2 == NULL) {
 		return TCL_ERROR;
 	    }
-	    if (objc == 3) {
-		Tcl_HashSearch search;
-		Tcl_HashEntry *hPtr;
-
-		arrayPtr = (TkTextTag **) ckalloc((unsigned)
-			(textPtr->sharedTextPtr->numTags * sizeof(TkTextTag *)));
-		for (i = 0, 
-		     hPtr = Tcl_FirstHashEntry(&textPtr->sharedTextPtr->tagTable, 
-					       &search);
-		     hPtr != NULL; i++, hPtr = Tcl_NextHashEntry(&search)) {
-		    arrayPtr[i] = (TkTextTag *) Tcl_GetHashValue(hPtr);
-		}
-		/* The 'sel' tag is not in the hash table */
-		arrayPtr[i] = textPtr->selTagPtr;
-		arraySize = textPtr->sharedTextPtr->numTags;
+	    if (tagPtr->priority < tagPtr2->priority) {
+		prio = tagPtr2->priority - 1;
 	    } else {
-		if (TkTextGetObjIndex(interp, textPtr, objv[3], &index1)
-			!= TCL_OK) {
-		    return TCL_ERROR;
-		}
-		arrayPtr = TkBTreeGetTags(&index1, textPtr, &arraySize);
-		if (arrayPtr == NULL) {
-		    return TCL_OK;
-		}
-	    }
-	    SortTags(arraySize, arrayPtr);
-	    listObj = Tcl_NewListObj(0, NULL);
-	    for (i = 0; i < arraySize; i++) {
-		tagPtr = arrayPtr[i];
-		Tcl_ListObjAppendElement(interp, listObj, 
-					 Tcl_NewStringObj(tagPtr->name,-1));
+		prio = tagPtr2->priority;
 	    }
-	    Tcl_SetObjResult(interp, listObj);
-	    ckfree((char *) arrayPtr);
-	    break;
+	} else {
+	    prio = 0;
 	}
-	case TAG_NEXTRANGE: {
-	    TkTextIndex last;
-	    TkTextSearch tSearch;
-	    char position[TK_POS_CHARS];
+	ChangeTagPriority(textPtr, tagPtr, prio);
 
-	    if ((objc != 5) && (objc != 6)) {
-		Tcl_WrongNumArgs(interp, 3, objv, "tagName index1 ?index2?");
-		return TCL_ERROR;
-	    }
-	    tagPtr = FindTag((Tcl_Interp *) NULL, textPtr, objv[3]);
-	    if (tagPtr == NULL) {
-		return TCL_OK;
+	/*
+	 * If this is the 'sel' tag, then we don't actually need to call this
+	 * for all peers.
+	 */
+
+	TkTextRedrawTag(textPtr->sharedTextPtr, NULL, (TkTextIndex *) NULL,
+		(TkTextIndex *) NULL, tagPtr, 1);
+	break;
+    }
+    case TAG_NAMES: {
+	TkTextTag **arrayPtr;
+	int arraySize;
+	Tcl_Obj *listObj;
+
+	if ((objc != 3) && (objc != 4)) {
+	    Tcl_WrongNumArgs(interp, 3, objv, "?index?");
+	    return TCL_ERROR;
+	}
+	if (objc == 3) {
+	    Tcl_HashSearch search;
+	    Tcl_HashEntry *hPtr;
+
+	    arrayPtr = (TkTextTag **) ckalloc((unsigned)
+		    (textPtr->sharedTextPtr->numTags * sizeof(TkTextTag *)));
+	    for (i=0, hPtr = Tcl_FirstHashEntry(
+		    &textPtr->sharedTextPtr->tagTable, &search);
+		    hPtr != NULL; i++, hPtr = Tcl_NextHashEntry(&search)) {
+		arrayPtr[i] = (TkTextTag *) Tcl_GetHashValue(hPtr);
 	    }
-	    if (TkTextGetObjIndex(interp, textPtr, objv[4], &index1) != TCL_OK) {
+
+	    /*
+	     * The 'sel' tag is not in the hash table.
+	     */
+
+	    arrayPtr[i] = textPtr->selTagPtr;
+	    arraySize = textPtr->sharedTextPtr->numTags;
+	} else {
+	    if (TkTextGetObjIndex(interp, textPtr, objv[3],
+		    &index1) != TCL_OK) {
 		return TCL_ERROR;
 	    }
-	    TkTextMakeByteIndex(textPtr->sharedTextPtr->tree, textPtr,
-			TkBTreeNumLines(textPtr->sharedTextPtr->tree, textPtr),
-			0, &last);
-	    if (objc == 5) {
-		index2 = last;
-	    } else if (TkTextGetObjIndex(interp, textPtr, objv[5], &index2)
-		    != TCL_OK) {
-		return TCL_ERROR;
+	    arrayPtr = TkBTreeGetTags(&index1, textPtr, &arraySize);
+	    if (arrayPtr == NULL) {
+		return TCL_OK;
 	    }
+	}
 
-	    /*
-	     * The search below is a bit tricky.  Rather than use the B-tree
-	     * facilities to stop the search at index2, let it search up
-	     * until the end of the file but check for a position past index2
-	     * ourselves.  The reason for doing it this way is that we only
-	     * care whether the *start* of the range is before index2;  once
-	     * we find the start, we don't want TkBTreeNextTag to abort the
-	     * search because the end of the range is after index2.
-	     */
+	SortTags(arraySize, arrayPtr);
+	listObj = Tcl_NewListObj(0, NULL);
 
-	    TkBTreeStartSearch(&index1, &last, tagPtr, &tSearch);
-	    if (TkBTreeCharTagged(&index1, tagPtr)) {
-		TkTextSegment *segPtr;
-		int offset;
+	for (i = 0; i < arraySize; i++) {
+	    tagPtr = arrayPtr[i];
+	    Tcl_ListObjAppendElement(interp, listObj,
+		    Tcl_NewStringObj(tagPtr->name,-1));
+	}
+	Tcl_SetObjResult(interp, listObj);
+	ckfree((char *) arrayPtr);
+	break;
+    }
+    case TAG_NEXTRANGE: {
+	TkTextIndex last;
+	TkTextSearch tSearch;
+	char position[TK_POS_CHARS];
+
+	if ((objc != 5) && (objc != 6)) {
+	    Tcl_WrongNumArgs(interp, 3, objv, "tagName index1 ?index2?");
+	    return TCL_ERROR;
+	}
+	tagPtr = FindTag((Tcl_Interp *) NULL, textPtr, objv[3]);
+	if (tagPtr == NULL) {
+	    return TCL_OK;
+	}
+	if (TkTextGetObjIndex(interp, textPtr, objv[4], &index1) != TCL_OK) {
+	    return TCL_ERROR;
+	}
+	TkTextMakeByteIndex(textPtr->sharedTextPtr->tree, textPtr,
+		TkBTreeNumLines(textPtr->sharedTextPtr->tree, textPtr),
+		0, &last);
+	if (objc == 5) {
+	    index2 = last;
+	} else if (TkTextGetObjIndex(interp, textPtr, objv[5],
+		&index2) != TCL_OK) {
+	    return TCL_ERROR;
+	}
 
-		/*
-		 * The first character is tagged.  See if there is an
-		 * on-toggle just before the character.  If not, then
-		 * skip to the end of this tagged range.
-		 */
+	/*
+	 * The search below is a bit tricky. Rather than use the B-tree
+	 * facilities to stop the search at index2, let it search up until the
+	 * end of the file but check for a position past index2 ourselves.
+	 * The reason for doing it this way is that we only care whether the
+	 * *start* of the range is before index2; once we find the start, we
+	 * don't want TkBTreeNextTag to abort the search because the end of
+	 * the range is after index2.
+	 */
 
-		for (segPtr = index1.linePtr->segPtr, offset = index1.byteIndex; 
-			offset >= 0;
-			offset -= segPtr->size, segPtr = segPtr->nextPtr) {
-		    if ((offset == 0) && (segPtr->typePtr == &tkTextToggleOnType)
-			    && (segPtr->body.toggle.tagPtr == tagPtr)) {
-			goto gotStart;
-		    }
-		}
-		if (!TkBTreeNextTag(&tSearch)) {
-		     return TCL_OK;
-		}
-	    }
+	TkBTreeStartSearch(&index1, &last, tagPtr, &tSearch);
+	if (TkBTreeCharTagged(&index1, tagPtr)) {
+	    TkTextSegment *segPtr;
+	    int offset;
 
 	    /*
-	     * Find the start of the tagged range.
+	     * The first character is tagged. See if there is an on-toggle
+	     * just before the character. If not, then skip to the end of this
+	     * tagged range.
 	     */
 
-	    if (!TkBTreeNextTag(&tSearch)) {
-		return TCL_OK;
+	    for (segPtr = index1.linePtr->segPtr, offset = index1.byteIndex;
+		    offset >= 0;
+		    offset -= segPtr->size, segPtr = segPtr->nextPtr) {
+		if ((offset == 0) && (segPtr->typePtr == &tkTextToggleOnType)
+			&& (segPtr->body.toggle.tagPtr == tagPtr)) {
+		    goto gotStart;
+		}
 	    }
-	    gotStart:
-	    if (TkTextIndexCmp(&tSearch.curIndex, &index2) >= 0) {
+	    if (!TkBTreeNextTag(&tSearch)) {
 		return TCL_OK;
 	    }
-	    TkTextPrintIndex(textPtr, &tSearch.curIndex, position);
-	    Tcl_AppendElement(interp, position);
-	    TkBTreeNextTag(&tSearch);
-	    TkTextPrintIndex(textPtr, &tSearch.curIndex, position);
-	    Tcl_AppendElement(interp, position);
-	    break;
 	}
-	case TAG_PREVRANGE: {
-	    TkTextIndex last;
-	    TkTextSearch tSearch;
-	    char position1[TK_POS_CHARS];
-	    char position2[TK_POS_CHARS];
-
-	    if ((objc != 5) && (objc != 6)) {
-		Tcl_WrongNumArgs(interp, 3, objv, "tagName index1 ?index2?");
-		return TCL_ERROR;
-	    }
-	    tagPtr = FindTag((Tcl_Interp *) NULL, textPtr, objv[3]);
-	    if (tagPtr == NULL) {
-		return TCL_OK;
-	    }
-	    if (TkTextGetObjIndex(interp, textPtr, objv[4], &index1) != TCL_OK) {
-		return TCL_ERROR;
-	    }
-	    if (objc == 5) {
-		TkTextMakeByteIndex(textPtr->sharedTextPtr->tree, textPtr, 
-				    0, 0, &index2);
-	    } else if (TkTextGetObjIndex(interp, textPtr, objv[5], &index2)
-		    != TCL_OK) {
-		return TCL_ERROR;
-	    }
 
+	/*
+	 * Find the start of the tagged range.
+	 */
+
+	if (!TkBTreeNextTag(&tSearch)) {
+	    return TCL_OK;
+	}
+
+    gotStart:
+	if (TkTextIndexCmp(&tSearch.curIndex, &index2) >= 0) {
+	    return TCL_OK;
+	}
+	TkTextPrintIndex(textPtr, &tSearch.curIndex, position);
+	Tcl_AppendElement(interp, position);
+	TkBTreeNextTag(&tSearch);
+	TkTextPrintIndex(textPtr, &tSearch.curIndex, position);
+	Tcl_AppendElement(interp, position);
+	break;
+    }
+    case TAG_PREVRANGE: {
+	TkTextIndex last;
+	TkTextSearch tSearch;
+	char position1[TK_POS_CHARS];
+	char position2[TK_POS_CHARS];
+
+	if ((objc != 5) && (objc != 6)) {
+	    Tcl_WrongNumArgs(interp, 3, objv, "tagName index1 ?index2?");
+	    return TCL_ERROR;
+	}
+	tagPtr = FindTag((Tcl_Interp *) NULL, textPtr, objv[3]);
+	if (tagPtr == NULL) {
+	    return TCL_OK;
+	}
+	if (TkTextGetObjIndex(interp, textPtr, objv[4], &index1) != TCL_OK) {
+	    return TCL_ERROR;
+	}
+	if (objc == 5) {
+	    TkTextMakeByteIndex(textPtr->sharedTextPtr->tree, textPtr, 0, 0,
+		    &index2);
+	} else if (TkTextGetObjIndex(interp, textPtr, objv[5],
+		&index2) != TCL_OK) {
+	    return TCL_ERROR;
+	}
+
+	/*
+	 * The search below is a bit weird. The previous toggle can be either
+	 * an on or off toggle. If it is an on toggle, then we need to turn
+	 * around and search forward for the end toggle. Otherwise we keep
+	 * searching backwards.
+	 */
+
+	TkBTreeStartSearchBack(&index1, &index2, tagPtr, &tSearch);
+
+	if (!TkBTreePrevTag(&tSearch)) {
 	    /*
-	     * The search below is a bit weird.  The previous toggle can be
-	     * either an on or off toggle. If it is an on toggle, then we
-	     * need to turn around and search forward for the end toggle.
-	     * Otherwise we keep searching backwards.
+	     * Special case, there may be a tag off toggle at index1, and a
+	     * tag on toggle before the start of a partial peer widget. In
+	     * this case we missed it.
 	     */
 
-	    TkBTreeStartSearchBack(&index1, &index2, tagPtr, &tSearch);
-
-	    if (!TkBTreePrevTag(&tSearch)) {
-		/* 
-		 * Special case, there may be a tag off toggle at
-		 * index1, and a tag on toggle before the start of a
-		 * partial peer widget.  In this case we missed it.
-		 */
-		if (textPtr->start != NULL && (textPtr->start == index2.linePtr)
-		    && (index2.byteIndex == 0) && TkBTreeCharTagged(&index2, tagPtr)
+	    if (textPtr->start != NULL && (textPtr->start == index2.linePtr)
+		    && (index2.byteIndex == 0)
+		    && TkBTreeCharTagged(&index2, tagPtr)
 		    && (TkTextIndexCmp(&index2, &index1) < 0)) {
-		    /* 
-		     * The first character is tagged, so just add the 
-		     * range from the first char to the start of the
-		     * range.
-		     */
-		    TkTextPrintIndex(textPtr, &index2, position1);
-		    TkTextPrintIndex(textPtr, &index1, position2);
-		    Tcl_AppendElement(interp, position1);
-		    Tcl_AppendElement(interp, position2);
-		}
-		return TCL_OK;
+		/*
+		 * The first character is tagged, so just add the range from
+		 * the first char to the start of the range.
+		 */
+
+		TkTextPrintIndex(textPtr, &index2, position1);
+		TkTextPrintIndex(textPtr, &index1, position2);
+		Tcl_AppendElement(interp, position1);
+		Tcl_AppendElement(interp, position2);
 	    }
-	    if (tSearch.segPtr->typePtr == &tkTextToggleOnType) {
-		TkTextPrintIndex(textPtr, &tSearch.curIndex, position1);
-		if (textPtr->start != NULL) {
-		    /* 
-		     * Make sure the first index is not before the
-		     * first allowed text index in this widget.
-		     */
-		    TkTextIndex firstIndex;
-		    firstIndex.linePtr = textPtr->start;
-		    firstIndex.byteIndex = 0;
-		    firstIndex.textPtr = NULL;
-		    if (TkTextIndexCmp(&tSearch.curIndex, &firstIndex) < 0) {
-			if (TkTextIndexCmp(&firstIndex, &index1) >= 0) {
-			    /* 
-			     * But now the new first index is actually
-			     * too far along in the text, so nothing
-			     * is returned.
-			     */
-			    return TCL_OK;
-			}
-			TkTextPrintIndex(textPtr, &firstIndex, position1);
+	    return TCL_OK;
+	}
+
+	if (tSearch.segPtr->typePtr == &tkTextToggleOnType) {
+	    TkTextPrintIndex(textPtr, &tSearch.curIndex, position1);
+	    if (textPtr->start != NULL) {
+		/*
+		 * Make sure the first index is not before the first allowed
+		 * text index in this widget.
+		 */
+
+		TkTextIndex firstIndex;
+
+		firstIndex.linePtr = textPtr->start;
+		firstIndex.byteIndex = 0;
+		firstIndex.textPtr = NULL;
+		if (TkTextIndexCmp(&tSearch.curIndex, &firstIndex) < 0) {
+		    if (TkTextIndexCmp(&firstIndex, &index1) >= 0) {
+			/*
+			 * But now the new first index is actually too far
+			 * along in the text, so nothing is returned.
+			 */
+
+			return TCL_OK;
 		    }
+		    TkTextPrintIndex(textPtr, &firstIndex, position1);
 		}
-		TkTextMakeByteIndex(textPtr->sharedTextPtr->tree, textPtr,
-			TkBTreeNumLines(textPtr->sharedTextPtr->tree, textPtr),
-			0, &last);
-		TkBTreeStartSearch(&tSearch.curIndex, &last, tagPtr, &tSearch);
-		TkBTreeNextTag(&tSearch);
-		TkTextPrintIndex(textPtr, &tSearch.curIndex, position2);
-	    } else {
-		TkTextPrintIndex(textPtr, &tSearch.curIndex, position2);
-		TkBTreePrevTag(&tSearch);
-		TkTextPrintIndex(textPtr, &tSearch.curIndex, position1);
-		if (TkTextIndexCmp(&tSearch.curIndex, &index2) < 0) {
-		    if (textPtr->start != NULL 
-			&& index2.linePtr == textPtr->start
+	    }
+	    TkTextMakeByteIndex(textPtr->sharedTextPtr->tree, textPtr,
+		    TkBTreeNumLines(textPtr->sharedTextPtr->tree, textPtr),
+		    0, &last);
+	    TkBTreeStartSearch(&tSearch.curIndex, &last, tagPtr, &tSearch);
+	    TkBTreeNextTag(&tSearch);
+	    TkTextPrintIndex(textPtr, &tSearch.curIndex, position2);
+	} else {
+	    TkTextPrintIndex(textPtr, &tSearch.curIndex, position2);
+	    TkBTreePrevTag(&tSearch);
+	    TkTextPrintIndex(textPtr, &tSearch.curIndex, position1);
+	    if (TkTextIndexCmp(&tSearch.curIndex, &index2) < 0) {
+		if (textPtr->start != NULL && index2.linePtr == textPtr->start
 			&& index2.byteIndex == 0) {
-			/* It's ok */
-			TkTextPrintIndex(textPtr, &index2, position1);
-		    } else {
-			return TCL_OK;
-		    }
+		    /* It's ok */
+		    TkTextPrintIndex(textPtr, &index2, position1);
+		} else {
+		    return TCL_OK;
 		}
 	    }
-	    Tcl_AppendElement(interp, position1);
-	    Tcl_AppendElement(interp, position2);
-	    break;
 	}
-	case TAG_RAISE: {
-	    TkTextTag *tagPtr2;
-	    int prio;
+	Tcl_AppendElement(interp, position1);
+	Tcl_AppendElement(interp, position2);
+	break;
+    }
+    case TAG_RAISE: {
+	TkTextTag *tagPtr2;
+	int prio;
 
-	    if ((objc != 4) && (objc != 5)) {
-		Tcl_WrongNumArgs(interp, 3, objv, "tagName ?aboveThis?");
-		return TCL_ERROR;
-	    }
-	    tagPtr = FindTag(interp, textPtr, objv[3]);
-	    if (tagPtr == NULL) {
+	if ((objc != 4) && (objc != 5)) {
+	    Tcl_WrongNumArgs(interp, 3, objv, "tagName ?aboveThis?");
+	    return TCL_ERROR;
+	}
+	tagPtr = FindTag(interp, textPtr, objv[3]);
+	if (tagPtr == NULL) {
+	    return TCL_ERROR;
+	}
+	if (objc == 5) {
+	    tagPtr2 = FindTag(interp, textPtr, objv[4]);
+	    if (tagPtr2 == NULL) {
 		return TCL_ERROR;
 	    }
-	    if (objc == 5) {
-		tagPtr2 = FindTag(interp, textPtr, objv[4]);
-		if (tagPtr2 == NULL) {
-		    return TCL_ERROR;
-		}
-		if (tagPtr->priority <= tagPtr2->priority) {
-		    prio = tagPtr2->priority;
-		} else {
-		    prio = tagPtr2->priority + 1;
-		}
+	    if (tagPtr->priority <= tagPtr2->priority) {
+		prio = tagPtr2->priority;
 	    } else {
-		prio = textPtr->sharedTextPtr->numTags-1;
+		prio = tagPtr2->priority + 1;
 	    }
-	    ChangeTagPriority(textPtr, tagPtr, prio);
-	    /* 
-	     * If this is the 'sel' tag, then we don't actually need
-	     * to call this for all peers.
-	     */
-	    TkTextRedrawTag(textPtr->sharedTextPtr, NULL, 
-			    (TkTextIndex *) NULL, (TkTextIndex *) NULL,
-			    tagPtr, 1);
-	    break;
+	} else {
+	    prio = textPtr->sharedTextPtr->numTags-1;
 	}
-	case TAG_RANGES: {
-	    TkTextIndex first, last;
-	    TkTextSearch tSearch;
-	    Tcl_Obj *listObj = Tcl_NewListObj(0, NULL);
-	    int count = 0;
-	    
-	    if (objc != 4) {
-		Tcl_WrongNumArgs(interp, 3, objv, "tagName");
-		return TCL_ERROR;
-	    }
-	    tagPtr = FindTag((Tcl_Interp *) NULL, textPtr, objv[3]);
-	    if (tagPtr == NULL) {
-		return TCL_OK;
-	    }
-	    TkTextMakeByteIndex(textPtr->sharedTextPtr->tree, textPtr, 
-				0, 0, &first);
-	    TkTextMakeByteIndex(textPtr->sharedTextPtr->tree, textPtr,
-		    TkBTreeNumLines(textPtr->sharedTextPtr->tree, textPtr),
-		    0, &last);
-	    TkBTreeStartSearch(&first, &last, tagPtr, &tSearch);
-	    if (TkBTreeCharTagged(&first, tagPtr)) {
-		Tcl_ListObjAppendElement(interp, listObj, 
+	ChangeTagPriority(textPtr, tagPtr, prio);
+
+	/*
+	 * If this is the 'sel' tag, then we don't actually need to call this
+	 * for all peers.
+	 */
+
+	TkTextRedrawTag(textPtr->sharedTextPtr, NULL, (TkTextIndex *) NULL,
+		(TkTextIndex *) NULL, tagPtr, 1);
+	break;
+    }
+    case TAG_RANGES: {
+	TkTextIndex first, last;
+	TkTextSearch tSearch;
+	Tcl_Obj *listObj = Tcl_NewListObj(0, NULL);
+	int count = 0;
+
+	if (objc != 4) {
+	    Tcl_WrongNumArgs(interp, 3, objv, "tagName");
+	    return TCL_ERROR;
+	}
+	tagPtr = FindTag((Tcl_Interp *) NULL, textPtr, objv[3]);
+	if (tagPtr == NULL) {
+	    return TCL_OK;
+	}
+	TkTextMakeByteIndex(textPtr->sharedTextPtr->tree, textPtr, 0, 0,
+		&first);
+	TkTextMakeByteIndex(textPtr->sharedTextPtr->tree, textPtr,
+		TkBTreeNumLines(textPtr->sharedTextPtr->tree, textPtr),
+		0, &last);
+	TkBTreeStartSearch(&first, &last, tagPtr, &tSearch);
+	if (TkBTreeCharTagged(&first, tagPtr)) {
+	    Tcl_ListObjAppendElement(interp, listObj,
 		    TkTextNewIndexObj(textPtr, &first));
-		count++;
-	    }
-	    while (TkBTreeNextTag(&tSearch)) {
-		Tcl_ListObjAppendElement(interp, listObj,
+	    count++;
+	}
+	while (TkBTreeNextTag(&tSearch)) {
+	    Tcl_ListObjAppendElement(interp, listObj,
 		    TkTextNewIndexObj(textPtr, &tSearch.curIndex));
-		count++;
-	    }
-	    if (count % 2 == 1) {
-		/* 
-		 * If a text widget uses '-end', it won't necessarily
-		 * run to the end of the B-tree, and therefore the
-		 * tag range might not be closed.  In this case we
-		 * add the end of the range.
-		 */
-		Tcl_ListObjAppendElement(interp, listObj,
+	    count++;
+	}
+	if (count % 2 == 1) {
+	    /*
+	     * If a text widget uses '-end', it won't necessarily run to the
+	     * end of the B-tree, and therefore the tag range might not be
+	     * closed. In this case we add the end of the range.
+	     */
+
+	    Tcl_ListObjAppendElement(interp, listObj,
 		    TkTextNewIndexObj(textPtr, &last));
-	    }
-	    Tcl_SetObjResult(interp, listObj);
-	    break;
 	}
+	Tcl_SetObjResult(interp, listObj);
+	break;
+    }
     }
     return TCL_OK;
 }
@@ -899,15 +907,15 @@ TkTextTagCmd(textPtr, interp, objc, objv)
  *
  * TkTextCreateTag --
  *
- *	Find the record describing a tag within a given text widget,
- *	creating a new record if one doesn't already exist.
+ *	Find the record describing a tag within a given text widget, creating
+ *	a new record if one doesn't already exist.
  *
  * Results:
  *	The return value is a pointer to the TkTextTag record for tagName.
  *
  * Side effects:
- *	A new tag record is created if there isn't one already defined
- *	for tagName.
+ *	A new tag record is created if there isn't one already defined for
+ *	tagName.
  *
  *----------------------------------------------------------------------
  */
@@ -916,14 +924,14 @@ TkTextTag *
 TkTextCreateTag(textPtr, tagName, newTag)
     TkText *textPtr;		/* Widget in which tag is being used. */
     CONST char *tagName;	/* Name of desired tag. */
-    int *newTag;                /* If non-NULL, then return 1 if new,
-                                 * or 0 if already exists. */
+    int *newTag;		/* If non-NULL, then return 1 if new, or 0 if
+				 * already exists. */
 {
     register TkTextTag *tagPtr;
     Tcl_HashEntry *hPtr = NULL;
     int new;
     CONST char *name;
-    
+
     if (!strcmp(tagName, "sel")) {
         if (textPtr->selTagPtr != NULL) {
 	    if (newTag != NULL) {
@@ -937,8 +945,8 @@ TkTextCreateTag(textPtr, tagName, newTag)
         }
 	name = "sel";
     } else {
-	hPtr = Tcl_CreateHashEntry(&textPtr->sharedTextPtr->tagTable, 
-				   tagName, &new);
+	hPtr = Tcl_CreateHashEntry(&textPtr->sharedTextPtr->tagTable,
+		tagName, &new);
 	if (newTag != NULL) {
 	    *newTag = new;
 	}
@@ -949,8 +957,8 @@ TkTextCreateTag(textPtr, tagName, newTag)
     }
 
     /*
-     * No existing entry.  Create a new one, initialize it, and add a
-     * pointer to it to the hash table entry.
+     * No existing entry. Create a new one, initialize it, and add a pointer
+     * to it to the hash table entry.
      */
 
     tagPtr = (TkTextTag *) ckalloc(sizeof(TkTextTag));
@@ -1002,7 +1010,8 @@ TkTextCreateTag(textPtr, tagName, newTag)
     } else {
 	Tcl_SetHashValue(hPtr, tagPtr);
     }
-    tagPtr->optionTable = Tk_CreateOptionTable(textPtr->interp, tagOptionSpecs);
+    tagPtr->optionTable =
+	    Tk_CreateOptionTable(textPtr->interp, tagOptionSpecs);
     return tagPtr;
 }
 
@@ -1014,10 +1023,9 @@ TkTextCreateTag(textPtr, tagName, newTag)
  *	See if tag is defined for a given widget.
  *
  * Results:
- *	If tagName is defined in textPtr, a pointer to its TkTextTag
- *	structure is returned.  Otherwise NULL is returned and an
- *	error message is recorded in the interp's result unless interp
- *	is NULL.
+ *	If tagName is defined in textPtr, a pointer to its TkTextTag structure
+ *	is returned. Otherwise NULL is returned and an error message is
+ *	recorded in the interp's result unless interp is NULL.
  *
  * Side effects:
  *	None.
@@ -1027,8 +1035,8 @@ TkTextCreateTag(textPtr, tagName, newTag)
 
 static TkTextTag *
 FindTag(interp, textPtr, tagName)
-    Tcl_Interp *interp;		/* Interpreter to use for error message;
-				 * if NULL, then don't record an error
+    Tcl_Interp *interp;		/* Interpreter to use for error message; if
+				 * NULL, then don't record an error
 				 * message. */
     TkText *textPtr;		/* Widget in which tag is being used. */
     Tcl_Obj *tagName;	        /* Name of desired tag. */
@@ -1036,12 +1044,13 @@ FindTag(interp, textPtr, tagName)
     Tcl_HashEntry *hPtr;
     int len;
     CONST char *str;
+
     str = Tcl_GetStringFromObj(tagName, &len);
     if (len == 3 && !strcmp(str,"sel")) {
         return textPtr->selTagPtr;
     }
-    hPtr = Tcl_FindHashEntry(&textPtr->sharedTextPtr->tagTable, 
-			     Tcl_GetString(tagName));
+    hPtr = Tcl_FindHashEntry(&textPtr->sharedTextPtr->tagTable,
+	    Tcl_GetString(tagName));
     if (hPtr != NULL) {
 	return (TkTextTag *) Tcl_GetHashValue(hPtr);
     }
@@ -1057,47 +1066,44 @@ FindTag(interp, textPtr, tagName)
  *
  * TkTextDeleteTag --
  *
- *	This procedure is called to carry out most actions associated
- *	with the 'tag delete' sub-command.  It will remove all 
- *	evidence of the tag from the B-tree, and then call
- *	TkTextFreeTag to clean up the tag structure itself.
- *	
- *	The only actions this doesn't carry out it to check if
- *	the deletion of the tag requires something to be
- *	re-displayed, and to remove the tag from the tagTable
- *	(hash table) if that is necessary (i.e. if it's not the
- *	'sel' tag).  It is expected that the caller carry out both
- *	of these actions.
+ *	This function is called to carry out most actions associated with the
+ *	'tag delete' sub-command. It will remove all evidence of the tag from
+ *	the B-tree, and then call TkTextFreeTag to clean up the tag structure
+ *	itself.
+ *
+ *	The only actions this doesn't carry out it to check if the deletion of
+ *	the tag requires something to be re-displayed, and to remove the tag
+ *	from the tagTable (hash table) if that is necessary (i.e. if it's not
+ *	the 'sel' tag). It is expected that the caller carry out both of these
+ *	actions.
  *
  * Results:
  *	None.
  *
  * Side effects:
- *	Memory and other resources are freed, the B-tree is
- *	manipulated.
+ *	Memory and other resources are freed, the B-tree is manipulated.
  *
  *----------------------------------------------------------------------
  */
 
 void
 TkTextDeleteTag(textPtr, tagPtr)
-    TkText *textPtr;			/* Info about overall widget. */
-    register TkTextTag *tagPtr;		/* Tag being deleted. */
+    TkText *textPtr;		/* Info about overall widget. */
+    register TkTextTag *tagPtr;	/* Tag being deleted. */
 {
     TkTextIndex first, last;
 
     TkTextMakeByteIndex(textPtr->sharedTextPtr->tree, textPtr, 0, 0, &first);
     TkTextMakeByteIndex(textPtr->sharedTextPtr->tree, textPtr,
-			TkBTreeNumLines(textPtr->sharedTextPtr->tree, textPtr),
-			0, &last),
+	    TkBTreeNumLines(textPtr->sharedTextPtr->tree, textPtr), 0, &last),
     TkBTreeTag(&first, &last, tagPtr, 0);
-    
+
     if (tagPtr == textPtr->selTagPtr) {
 	/*
-	 * Send an event that the selection changed.
-	 * This is equivalent to
-	 * "event generate $textWidget <<Selection>>"
+	 * Send an event that the selection changed. This is equivalent to:
+	 *	event generate $textWidget <<Selection>>
 	 */
+
 	TkTextSelectionEvent(textPtr);
     } else {
 	/*
@@ -1105,6 +1111,7 @@ TkTextDeleteTag(textPtr, tagPtr)
 	 * don't want removal of one sel tag to remove bindings which
 	 * are still valid in other peer widgets.
 	 */
+
 	if (textPtr->sharedTextPtr->bindingTable != NULL) {
 	    Tk_DeleteAllBindings(textPtr->sharedTextPtr->bindingTable,
 		    (ClientData) tagPtr->name);
@@ -1115,11 +1122,10 @@ TkTextDeleteTag(textPtr, tagPtr)
      * Update the tag priorities to reflect the deletion of this tag.
      */
 
-    ChangeTagPriority(textPtr, tagPtr, 
-		      textPtr->sharedTextPtr->numTags-1);
+    ChangeTagPriority(textPtr, tagPtr,
+	    textPtr->sharedTextPtr->numTags-1);
     textPtr->sharedTextPtr->numTags -= 1;
     TkTextFreeTag(textPtr, tagPtr);
-
 }
 
 /*
@@ -1127,8 +1133,8 @@ TkTextDeleteTag(textPtr, tagPtr)
  *
  * TkTextFreeTag --
  *
- *	This procedure is called when a tag is deleted to free up the
- *	memory and other resources associated with the tag.
+ *	This function is called when a tag is deleted to free up the memory
+ *	and other resources associated with the tag.
  *
  * Results:
  *	None.
@@ -1141,19 +1147,30 @@ TkTextDeleteTag(textPtr, tagPtr)
 
 void
 TkTextFreeTag(textPtr, tagPtr)
-    TkText *textPtr;			/* Info about overall widget. */
-    register TkTextTag *tagPtr;		/* Tag being deleted. */
+    TkText *textPtr;		/* Info about overall widget. */
+    register TkTextTag *tagPtr;	/* Tag being deleted. */
 {
     int i;
-    
-    /* Let Tk do most of the hard work for us */
+
+    /*
+     * Let Tk do most of the hard work for us.
+     */
+
     Tk_FreeConfigOptions((char *) tagPtr, tagPtr->optionTable,
-			 textPtr->tkwin);
-    /* This associated information is managed by us */
+	    textPtr->tkwin);
+
+    /*
+     * This associated information is managed by us.
+     */
+
     if (tagPtr->tabArrayPtr != NULL) {
 	ckfree((char *) tagPtr->tabArrayPtr);
     }
-    /* Make sure this tag isn't referenced from the 'current' tag array */
+
+    /*
+     * Make sure this tag isn't referenced from the 'current' tag array.
+     */
+
     for (i = 0; i < textPtr->numCurTags; i++) {
 	if (textPtr->curTagArrayPtr[i] == tagPtr) {
 	    for (; i < textPtr->numCurTags-1; i++) {
@@ -1164,10 +1181,12 @@ TkTextFreeTag(textPtr, tagPtr)
 	    break;
 	}
     }
-    /* 
-     * If this tag is widget-specific (peer widgets) then clean
-     * up the refCount it holds.
+
+    /*
+     * If this tag is widget-specific (peer widgets) then clean up the
+     * refCount it holds.
      */
+
     if (tagPtr->textPtr != NULL) {
 	if (textPtr != tagPtr->textPtr) {
 	    Tcl_Panic("Tag being deleted from wrong widget");
@@ -1178,7 +1197,11 @@ TkTextFreeTag(textPtr, tagPtr)
 	}
 	tagPtr->textPtr = NULL;
     }
-    /* Finally free the tag's memory */
+
+    /*
+     * Finally free the tag's memory.
+     */
+
     ckfree((char *) tagPtr);
 }
 
@@ -1187,9 +1210,8 @@ TkTextFreeTag(textPtr, tagPtr)
  *
  * SortTags --
  *
- *	This procedure sorts an array of tag pointers in increasing
- *	order of priority, optimizing for the common case where the
- *	array is small.
+ *	This function sorts an array of tag pointers in increasing order of
+ *	priority, optimizing for the common case where the array is small.
  *
  * Results:
  *	None.
@@ -1228,7 +1250,7 @@ SortTags(numTags, tagArrayPtr)
 	}
     } else {
 	qsort((VOID *) tagArrayPtr, (unsigned) numTags, sizeof (TkTextTag *),
-		    TagSortProc);
+		TagSortProc);
     }
 }
 
@@ -1237,14 +1259,14 @@ SortTags(numTags, tagArrayPtr)
  *
  * TagSortProc --
  *
- *	This procedure is called by qsort when sorting an array of
- *	tags in priority order.
+ *	This function is called by qsort() when sorting an array of tags in
+ *	priority order.
  *
  * Results:
- *	The return value is -1 if the first argument should be before
- *	the second element (i.e. it has lower priority), 0 if it's
- *	equivalent (this should never happen!), and 1 if it should be
- *	after the second element.
+ *	The return value is -1 if the first argument should be before the
+ *	second element (i.e. it has lower priority), 0 if it's equivalent
+ *	(this should never happen!), and 1 if it should be after the second
+ *	element.
  *
  * Side effects:
  *	None.
@@ -1268,29 +1290,26 @@ TagSortProc(first, second)
  *
  * ChangeTagPriority --
  *
- *	This procedure changes the priority of a tag by modifying
- *	its priority and the priorities of other tags that are affected
- *	by the change.
+ *	This function changes the priority of a tag by modifying its priority
+ *	and the priorities of other tags that are affected by the change.
  *
  * Results:
  *	None.
  *
  * Side effects:
- *	Priorities may be changed for some or all of the tags in
- *	textPtr.  The tags will be arranged so that there is exactly one
- *	tag at each priority level between 0 and
- *	textPtr->sharedTextPtr->numTags-1, with tagPtr at priority
- *	"prio".
+ *	Priorities may be changed for some or all of the tags in textPtr. The
+ *	tags will be arranged so that there is exactly one tag at each
+ *	priority level between 0 and textPtr->sharedTextPtr->numTags-1, with
+ *	tagPtr at priority "prio".
  *
  *----------------------------------------------------------------------
  */
 
 static void
 ChangeTagPriority(textPtr, tagPtr, prio)
-    TkText *textPtr;			/* Information about text widget. */
-    TkTextTag *tagPtr;			/* Tag whose priority is to be
-					 * changed. */
-    int prio;				/* New priority for tag. */
+    TkText *textPtr;		/* Information about text widget. */
+    TkTextTag *tagPtr;		/* Tag whose priority is to be changed. */
+    int prio;			/* New priority for tag. */
 {
     int low, high, delta;
     register TkTextTag *tagPtr2;
@@ -1314,11 +1333,13 @@ ChangeTagPriority(textPtr, tagPtr, prio)
 	high = prio;
 	delta = -1;
     }
-    /* 
+
+    /*
      * Adjust first the 'sel' tag, then all others from the hash table
      */
-    if ((textPtr->selTagPtr->priority >= low) 
-      && (textPtr->selTagPtr->priority <= high)) {
+
+    if ((textPtr->selTagPtr->priority >= low)
+	    && (textPtr->selTagPtr->priority <= high)) {
 	textPtr->selTagPtr->priority += delta;
     }
     for (hPtr = Tcl_FirstHashEntry(&textPtr->sharedTextPtr->tagTable, &search);
@@ -1336,37 +1357,36 @@ ChangeTagPriority(textPtr, tagPtr, prio)
  *
  * TkTextBindProc --
  *
- *	This procedure is invoked by the Tk dispatcher to handle
- *	events associated with bindings on items.
+ *	This function is invoked by the Tk dispatcher to handle events
+ *	associated with bindings on items.
  *
  * Results:
  *	None.
  *
  * Side effects:
- *	Depends on the command invoked as part of the binding
- *	(if there was any).
+ *	Depends on the command invoked as part of the binding (if there was
+ *	any).
  *
  *--------------------------------------------------------------
  */
 
 void
 TkTextBindProc(clientData, eventPtr)
-    ClientData clientData;		/* Pointer to canvas structure. */
-    XEvent *eventPtr;			/* Pointer to X event that just
-					 * happened. */
+    ClientData clientData;	/* Pointer to canvas structure. */
+    XEvent *eventPtr;		/* Pointer to X event that just happened. */
 {
     TkText *textPtr = (TkText *) clientData;
     int repick  = 0;
 
-# define AnyButtonMask (Button1Mask|Button2Mask|Button3Mask\
-	|Button4Mask|Button5Mask)
+# define AnyButtonMask \
+	(Button1Mask|Button2Mask|Button3Mask|Button4Mask|Button5Mask)
 
     textPtr->refCount++;
 
     /*
-     * This code simulates grabs for mouse buttons by keeping track
-     * of whether a button is pressed and refusing to pick a new current
-     * character while a button is pressed.
+     * This code simulates grabs for mouse buttons by keeping track of whether
+     * a button is pressed and refusing to pick a new current character while
+     * a button is pressed.
      */
 
     if (eventPtr->type == ButtonPress) {
@@ -1375,24 +1395,24 @@ TkTextBindProc(clientData, eventPtr)
 	int mask;
 
 	switch (eventPtr->xbutton.button) {
-	    case Button1:
-		mask = Button1Mask;
-		break;
-	    case Button2:
-		mask = Button2Mask;
-		break;
-	    case Button3:
-		mask = Button3Mask;
-		break;
-	    case Button4:
-		mask = Button4Mask;
-		break;
-	    case Button5:
-		mask = Button5Mask;
-		break;
-	    default:
-		mask = 0;
-		break;
+	case Button1:
+	    mask = Button1Mask;
+	    break;
+	case Button2:
+	    mask = Button2Mask;
+	    break;
+	case Button3:
+	    mask = Button3Mask;
+	    break;
+	case Button4:
+	    mask = Button4Mask;
+	    break;
+	case Button5:
+	    mask = Button5Mask;
+	    break;
+	default:
+	    mask = 0;
+	    break;
 	}
 	if ((eventPtr->xbutton.state & AnyButtonMask) == (unsigned) mask) {
 	    textPtr->flags &= ~BUTTON_DOWN;
@@ -1415,10 +1435,11 @@ TkTextBindProc(clientData, eventPtr)
 	}
 	TkTextPickCurrent(textPtr, eventPtr);
     }
-    if ((textPtr->numCurTags > 0) && (textPtr->sharedTextPtr->bindingTable != NULL)
+    if ((textPtr->numCurTags > 0)
+	    && (textPtr->sharedTextPtr->bindingTable != NULL)
 	    && (textPtr->tkwin != NULL) && !(textPtr->flags & DESTROYED)) {
-	TagBindEvent(textPtr, eventPtr, textPtr->numCurTags, 
-		     textPtr->curTagArrayPtr);
+	TagBindEvent(textPtr, eventPtr, textPtr->numCurTags,
+		textPtr->curTagArrayPtr);
     }
     if (repick) {
 	unsigned int oldState;
@@ -1432,7 +1453,7 @@ TkTextBindProc(clientData, eventPtr)
 	eventPtr->xbutton.state = oldState;
     }
 
-    done:
+  done:
     if (--textPtr->refCount == 0) {
 	ckfree((char *) textPtr);
     }
@@ -1443,57 +1464,55 @@ TkTextBindProc(clientData, eventPtr)
  *
  * TkTextPickCurrent --
  *
- *	Find the character containing the coordinates in an event
- *	and place the "current" mark on that character.  If the
- *	"current" mark has moved then generate a fake leave event
- *	on the old current character and a fake enter event on the new
- *	current character.
+ *	Find the character containing the coordinates in an event and place
+ *	the "current" mark on that character. If the "current" mark has moved
+ *	then generate a fake leave event on the old current character and a
+ *	fake enter event on the new current character.
  *
  * Results:
  *	None.
  *
  * Side effects:
- *	The current mark for textPtr may change.  If it does,
- *	then the commands associated with character entry and leave
- *	could do just about anything.  For example, the text widget
- *	might be deleted.  It is up to the caller to protect itself
- *	by incrementing the refCount of the text widget.
+ *	The current mark for textPtr may change. If it does, then the commands
+ *	associated with character entry and leave could do just about
+ *	anything. For example, the text widget might be deleted. It is up to
+ *	the caller to protect itself by incrementing the refCount of the text
+ *	widget.
  *
  *--------------------------------------------------------------
  */
 
 void
 TkTextPickCurrent(textPtr, eventPtr)
-    register TkText *textPtr;		/* Text widget in which to select
-					 * current character. */
-    XEvent *eventPtr;			/* Event describing location of
-					 * mouse cursor.  Must be EnterWindow,
-					 * LeaveWindow, ButtonRelease, or
-					 * MotionNotify. */
+    register TkText *textPtr;	/* Text widget in which to select current
+				 * character. */
+    XEvent *eventPtr;		/* Event describing location of mouse cursor.
+				 * Must be EnterWindow, LeaveWindow,
+				 * ButtonRelease, or MotionNotify. */
 {
     TkTextIndex index;
     TkTextTag **oldArrayPtr, **newArrayPtr;
-    TkTextTag **copyArrayPtr = NULL;	/* Initialization needed to prevent
-					 * compiler warning. */
-
+    TkTextTag **copyArrayPtr = NULL;
+				/* Initialization needed to prevent compiler
+				 * warning. */
     int numOldTags, numNewTags, i, j, size, nearby;
     XEvent event;
 
     /*
-     * If a button is down, then don't do anything at all;  we'll be
-     * called again when all buttons are up, and we can repick then.
-     * This implements a form of mouse grabbing.
+     * If a button is down, then don't do anything at all; we'll be called
+     * again when all buttons are up, and we can repick then. This implements
+     * a form of mouse grabbing.
      */
 
     if (textPtr->flags & BUTTON_DOWN) {
-	if (((eventPtr->type == EnterNotify) || (eventPtr->type == LeaveNotify))
+	if (((eventPtr->type == EnterNotify)
+		|| (eventPtr->type == LeaveNotify))
 		&& ((eventPtr->xcrossing.mode == NotifyGrab)
 		|| (eventPtr->xcrossing.mode == NotifyUngrab))) {
 	    /*
-	     * Special case:  the window is being entered or left because
-	     * of a grab or ungrab.  In this case, repick after all.
-	     * Furthermore, clear BUTTON_DOWN to release the simulated
-	     * grab.
+	     * Special case: the window is being entered or left because of a
+	     * grab or ungrab. In this case, repick after all. Furthermore,
+	     * clear BUTTON_DOWN to release the simulated grab.
 	     */
 
 	    textPtr->flags &= ~BUTTON_DOWN;
@@ -1503,12 +1522,12 @@ TkTextPickCurrent(textPtr, eventPtr)
     }
 
     /*
-     * Save information about this event in the widget in case we have
-     * to synthesize more enter and leave events later (e.g. because a
-     * character was deleted, causing a new character to be underneath
-     * the mouse cursor).  Also translate MotionNotify events into
-     * EnterNotify events, since that's what gets reported to event
-     * handlers when the current character changes.
+     * Save information about this event in the widget in case we have to
+     * synthesize more enter and leave events later (e.g. because a character
+     * was deleted, causing a new character to be underneath the mouse
+     * cursor). Also translate MotionNotify events into EnterNotify events,
+     * since that's what gets reported to event handlers when the current
+     * character changes.
      */
 
     if (eventPtr != &textPtr->pickEvent) {
@@ -1539,8 +1558,8 @@ TkTextPickCurrent(textPtr, eventPtr)
     }
 
     /*
-     * Find the new current character, then find and sort all of the
-     * tags associated with it.
+     * Find the new current character, then find and sort all of the tags
+     * associated with it.
      */
 
     if (textPtr->pickEvent.type != LeaveNotify) {
@@ -1559,11 +1578,10 @@ TkTextPickCurrent(textPtr, eventPtr)
     }
 
     /*
-     * Resort the tags associated with the previous marked character
-     * (the priorities might have changed), then make a copy of the
-     * new tags, and compare the old tags to the copy, nullifying
-     * any tags that are present in both groups (i.e. the tags that
-     * haven't changed).
+     * Resort the tags associated with the previous marked character (the
+     * priorities might have changed), then make a copy of the new tags, and
+     * compare the old tags to the copy, nullifying any tags that are present
+     * in both groups (i.e. the tags that haven't changed).
      */
 
     SortTags(textPtr->numCurTags, textPtr->curTagArrayPtr);
@@ -1583,13 +1601,12 @@ TkTextPickCurrent(textPtr, eventPtr)
     }
 
     /*
-     * Invoke the binding system with a LeaveNotify event for all of
-     * the tags that have gone away.  We have to be careful here,
-     * because it's possible that the binding could do something
-     * (like calling tkwait) that eventually modifies
-     * textPtr->curTagArrayPtr.  To avoid problems in situations like
-     * this, update curTagArrayPtr to its new value before invoking
-     * any bindings, and don't use it any more here.
+     * Invoke the binding system with a LeaveNotify event for all of the tags
+     * that have gone away. We have to be careful here, because it's possible
+     * that the binding could do something (like calling tkwait) that
+     * eventually modifies textPtr->curTagArrayPtr. To avoid problems in
+     * situations like this, update curTagArrayPtr to its new value before
+     * invoking any bindings, and don't use it any more here.
      */
 
     numOldTags = textPtr->numCurTags;
@@ -1597,15 +1614,16 @@ TkTextPickCurrent(textPtr, eventPtr)
     oldArrayPtr = textPtr->curTagArrayPtr;
     textPtr->curTagArrayPtr = newArrayPtr;
     if (numOldTags != 0) {
-	if ((textPtr->sharedTextPtr->bindingTable != NULL) && (textPtr->tkwin != NULL)
-	  && !(textPtr->flags & DESTROYED)) {
+	if ((textPtr->sharedTextPtr->bindingTable != NULL)
+		&& (textPtr->tkwin != NULL)
+		&& !(textPtr->flags & DESTROYED)) {
 	    event = textPtr->pickEvent;
 	    event.type = LeaveNotify;
 
 	    /*
-	     * Always use a detail of NotifyAncestor.  Besides being
-	     * consistent, this avoids problems where the binding code
-	     * will discard NotifyInferior events.
+	     * Always use a detail of NotifyAncestor. Besides being
+	     * consistent, this avoids problems where the binding code will
+	     * discard NotifyInferior events.
 	     */
 
 	    event.xcrossing.detail = NotifyAncestor;
@@ -1615,18 +1633,19 @@ TkTextPickCurrent(textPtr, eventPtr)
     }
 
     /*
-     * Reset the "current" mark (be careful to recompute its location,
-     * since it might have changed during an event binding).  Then
-     * invoke the binding system with an EnterNotify event for all of
-     * the tags that have just appeared.
+     * Reset the "current" mark (be careful to recompute its location, since
+     * it might have changed during an event binding). Then invoke the binding
+     * system with an EnterNotify event for all of the tags that have just
+     * appeared.
      */
 
     TkTextPixelIndex(textPtr, textPtr->pickEvent.xcrossing.x,
 	    textPtr->pickEvent.xcrossing.y, &index, &nearby);
     TkTextSetMark(textPtr, "current", &index);
     if (numNewTags != 0) {
-	if ((textPtr->sharedTextPtr->bindingTable != NULL) && (textPtr->tkwin != NULL)
-	  && !(textPtr->flags & DESTROYED) && !nearby) {
+	if ((textPtr->sharedTextPtr->bindingTable != NULL)
+		&& (textPtr->tkwin != NULL)
+		&& !(textPtr->flags & DESTROYED) && !nearby) {
 	    event = textPtr->pickEvent;
 	    event.type = EnterNotify;
 	    event.xcrossing.detail = NotifyAncestor;
@@ -1641,65 +1660,74 @@ TkTextPickCurrent(textPtr, eventPtr)
  *
  * TagBindEvent --
  *
- *	Trigger given events for all tags that match the
- *	relevant bindings.  To handle the "sel" tag 
- *	correctly in all peer widgets, we must use the
+ *	Trigger given events for all tags that match the relevant bindings.
+ *	To handle the "sel" tag correctly in all peer widgets, we must use the
  *	name of the tags as the binding table element.
  *
  * Results:
  *	None.
  *
  * Side effects:
- *	Almost anything can be triggered by tag bindings,
- *	including deletion of the text widget.
+ *	Almost anything can be triggered by tag bindings, including deletion
+ *	of the text widget.
  *
  *--------------------------------------------------------------
  */
 
 static void
 TagBindEvent(textPtr, eventPtr, numTags, tagArrayPtr)
-    TkText *textPtr;                    /* Text widget to fire bindings 
-                                         * in. */
-    XEvent *eventPtr;			/* What actually happened. */
-    int numTags;			/* Number of relevant tags. */
-    TkTextTag **tagArrayPtr;		/* Array of relevant tags. */
+    TkText *textPtr;		/* Text widget to fire bindings in. */
+    XEvent *eventPtr;		/* What actually happened. */
+    int numTags;		/* Number of relevant tags. */
+    TkTextTag **tagArrayPtr;	/* Array of relevant tags. */
 {
     #define NUM_BIND_TAGS 10
     CONST char *nameArray[NUM_BIND_TAGS];
     CONST char **nameArrPtr;
     int i;
-    
-    /* 
-     * Try to avoid allocation unless there are lots of tags 
+
+    /*
+     * Try to avoid allocation unless there are lots of tags.
      */
+
     if (numTags > NUM_BIND_TAGS) {
 	nameArrPtr = (CONST char**) ckalloc (numTags * sizeof(CONST char*));
     } else {
 	nameArrPtr = nameArray;
     }
-    /* 
-     * We use tag names as keys in the hash table.  We do this instead
-     * of using the actual tagPtr objects because we want one "sel" tag
-     * binding for all peer widgets, despite the fact that each has its
-     * own tagPtr object.
+
+    /*
+     * We use tag names as keys in the hash table. We do this instead of using
+     * the actual tagPtr objects because we want one "sel" tag binding for all
+     * peer widgets, despite the fact that each has its own tagPtr object.
      */
+
     for (i = 0; i < numTags; i++) {
 	TkTextTag *tagPtr = tagArrayPtr[i];
 	if (tagPtr != NULL) {
 	    nameArrPtr[i] = tagPtr->name;
 	} else {
-	    /* 
-	     * Tag has been deleted elsewhere, and therefore nulled
-	     * out in this array.  Tk_BindEvent is clever enough to
-	     * cope with NULLs being thrown at it.
+	    /*
+	     * Tag has been deleted elsewhere, and therefore nulled out in
+	     * this array. Tk_BindEvent is clever enough to cope with NULLs
+	     * being thrown at it.
 	     */
+
 	    nameArrPtr[i] = NULL;
 	}
     }
-    Tk_BindEvent(textPtr->sharedTextPtr->bindingTable, eventPtr, textPtr->tkwin,
-		 numTags, (ClientData *) nameArrPtr);
+    Tk_BindEvent(textPtr->sharedTextPtr->bindingTable, eventPtr,
+	    textPtr->tkwin, numTags, (ClientData *) nameArrPtr);
 
     if (numTags > NUM_BIND_TAGS) {
 	ckfree((char*)nameArrPtr);
     }
 }
+
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 4
+ * fill-column: 78
+ * End:
+ */