Rename "yupdate" to "sync" and fix various test-cases

3 files changed, 38 insertions, 38 deletions

diff --git a/generic/tkText.c b/generic/tkText.c
index 15c6e73..9047911 100644
--- a/generic/tkText.c
+++ b/generic/tkText.c
@@ -689,16 +689,16 @@ TextWidgetObjCmd(
     static const char *optionStrings[] = {
 	"bbox", "cget", "compare", "configure", "count", "debug", "delete",
 	"dlineinfo", "dump", "edit", "get", "image", "index", "insert",
-	"mark", "peer", "pendingyupdate", "replace", "scan", "search",
-	"see", "tag", "window", "xview", "yupdate", "yview", NULL
+	"mark", "peer", "pendingsync", "replace", "scan", "search",
+	"see", "sync", "tag", "window", "xview", "yview", NULL
     };
     enum options {
 	TEXT_BBOX, TEXT_CGET, TEXT_COMPARE, TEXT_CONFIGURE, TEXT_COUNT,
 	TEXT_DEBUG, TEXT_DELETE, TEXT_DLINEINFO, TEXT_DUMP, TEXT_EDIT,
 	TEXT_GET, TEXT_IMAGE, TEXT_INDEX, TEXT_INSERT, TEXT_MARK,
-	TEXT_PEER, TEXT_PENDINGYUPDATE, TEXT_REPLACE, TEXT_SCAN,
-	TEXT_SEARCH, TEXT_SEE, TEXT_TAG, TEXT_WINDOW, TEXT_XVIEW,
-	TEXT_YUPDATE, TEXT_YVIEW
+	TEXT_PEER, TEXT_PENDINGSYNC, TEXT_REPLACE, TEXT_SCAN,
+	TEXT_SEARCH, TEXT_SEE, TEXT_SYNC, TEXT_TAG, TEXT_WINDOW,
+	TEXT_XVIEW, TEXT_YVIEW
     };
 
     if (objc < 2) {
@@ -1373,7 +1373,7 @@ TextWidgetObjCmd(
     case TEXT_PEER:
 	result = TextPeerCmd(textPtr, interp, objc, objv);
 	break;
-    case TEXT_PENDINGYUPDATE: {
+    case TEXT_PENDINGSYNC: {
         int number;
 
         if (objc != 2) {
@@ -1381,7 +1381,7 @@ TextWidgetObjCmd(
             result = TCL_ERROR;
             goto done;
         }
-        number = TkTextPendingyupdate(textPtr);
+        number = TkTextPendingsync(textPtr);
         Tcl_SetObjResult(interp, Tcl_NewIntObj(number));
         break;
     }
@@ -1507,26 +1507,26 @@ TextWidgetObjCmd(
     case TEXT_XVIEW:
 	result = TkTextXviewCmd(textPtr, interp, objc, objv);
 	break;
-    case TEXT_YUPDATE: {
+    case TEXT_SYNC: {
 	if (objc == 4) {
-		Tcl_Obj *cmd = objv[3];
-		const char *option = Tcl_GetString(objv[2]);
-		if (strncmp(option, "-command", objv[2]->length)) {
-		    Tcl_AppendResult(interp, "wrong option \"", option, "\": should be \"-command\"", NULL);
-		    result = TCL_ERROR;
-		    goto done;
-		}
-		Tcl_IncrRefCount(cmd);
-		if (TkTextPendingyupdate(textPtr)) {
-		    if (textPtr->afterSyncCmd) {
-			Tcl_DecrRefCount(textPtr->afterSyncCmd);
-		    }
-			textPtr->afterSyncCmd = cmd;
-		} else {
-			result = Tcl_EvalObjEx(interp, cmd, TCL_EVAL_GLOBAL);
-			Tcl_DecrRefCount(cmd);
+	    Tcl_Obj *cmd = objv[3];
+	    const char *option = Tcl_GetString(objv[2]);
+	    if (strncmp(option, "-command", objv[2]->length)) {
+		Tcl_AppendResult(interp, "wrong option \"", option, "\": should be \"-command\"", NULL);
+		result = TCL_ERROR;
+		goto done;
+	    }
+	    Tcl_IncrRefCount(cmd);
+	    if (TkTextPendingsync(textPtr)) {
+		if (textPtr->afterSyncCmd) {
+		    Tcl_DecrRefCount(textPtr->afterSyncCmd);
 		}
-		break;
+		    textPtr->afterSyncCmd = cmd;
+	    } else {
+		    result = Tcl_EvalObjEx(interp, cmd, TCL_EVAL_GLOBAL);
+		    Tcl_DecrRefCount(cmd);
+	    }
+	break;
 	} else if (objc != 2) {
 		Tcl_WrongNumArgs(interp, 2, objv, "?-command command?");
 		result = TCL_ERROR;
diff --git a/generic/tkText.h b/generic/tkText.h
index 2aa8d59..1c4be68 100644
--- a/generic/tkText.h
+++ b/generic/tkText.h
@@ -1125,7 +1125,7 @@ MODULE_SCOPE int	TkTextMarkNameToIndex(TkText *textPtr,
 MODULE_SCOPE void	TkTextMarkSegToIndex(TkText *textPtr,
 			    TkTextSegment *markPtr, TkTextIndex *indexPtr);
 MODULE_SCOPE void	TkTextEventuallyRepick(TkText *textPtr);
-MODULE_SCOPE int	TkTextPendingyupdate(TkText *textPtr);
+MODULE_SCOPE int	TkTextPendingsync(TkText *textPtr);
 MODULE_SCOPE void	TkTextPickCurrent(TkText *textPtr, XEvent *eventPtr);
 MODULE_SCOPE void	TkTextPixelIndex(TkText *textPtr, int x, int y,
 			    TkTextIndex *indexPtr, int *nearest);
diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c
index a8a8f85..3cee288 100644
--- a/generic/tkTextDisp.c
+++ b/generic/tkTextDisp.c
@@ -590,7 +590,7 @@ static int		TextGetScrollInfoObj(Tcl_Interp *interp,
 			    Tcl_Obj *CONST objv[], double *dblPtr,
 			    int *intPtr);
 static void		AsyncUpdateLineMetrics(ClientData clientData);
-static void		GenerateTextLineHeightsInvalidEvent(TkText *textPtr);
+static void		GenerateWidgetViewSyncEvent(TkText *textPtr);
 static void		AsyncUpdateYScrollbar(ClientData clientData);
 static int              IsStartOfNotMergedLine(TkText *textPtr,
                             CONST TkTextIndex *indexPtr);
@@ -2930,7 +2930,7 @@ AsyncUpdateLineMetrics(
 	LOG("tk_textInvalidateLine", buffer);
     }
 
-    GenerateTextLineHeightsInvalidEvent(textPtr);
+    GenerateWidgetViewSyncEvent(textPtr);
 
     /*
      * If we're not in the middle of a long-line calculation (metricEpoch==-1)
@@ -2942,7 +2942,7 @@ AsyncUpdateLineMetrics(
 	/*
 	 * We have looped over all lines, so we're done. We must release our
 	 * refCount on the widget (the timer token was already set to NULL
-	 * above). If there is a registered command, run that first.
+	 * above). If there is a registered aftersync command, run that first.
 	 */
 
 	if (textPtr->afterSyncCmd != NULL) {
@@ -2951,7 +2951,7 @@ AsyncUpdateLineMetrics(
 	    code = Tcl_EvalObjEx(textPtr->interp, textPtr->afterSyncCmd, TCL_EVAL_GLOBAL);
 	    if (code != TCL_OK && code != TCL_CONTINUE
 			&& code != TCL_BREAK) {
-		    Tcl_AddErrorInfo(textPtr->interp, "\n    (text yupdate)");
+		    Tcl_AddErrorInfo(textPtr->interp, "\n    (text sync)");
 		    Tcl_BackgroundError(textPtr->interp);
 	    }
 	    Tcl_Release((ClientData)textPtr->interp);
@@ -2978,12 +2978,12 @@ AsyncUpdateLineMetrics(
 /*
  *----------------------------------------------------------------------
  *
- * GenerateTextLineHeightsInvalidEvent --
+ * GenerateWidgetViewSyncEvent --
  *
- *      Send the <<TextLineHeightsInvalid>> event related to the text widget
+ *      Send the <<WidgetViewSync>> event related to the text widget
  *      line metrics asynchronous update.
  *      This is equivalent to:
- *         event generate $textWidget <<TextLineHeightsInvalid>> -detail $N
+ *         event generate $textWidget <<WidgetViewSync>> -detail $N
  *      where $N is the number of lines for which the height is outdated.
  *
  * Results:
@@ -2996,7 +2996,7 @@ AsyncUpdateLineMetrics(
  */
 
 static void
-GenerateTextLineHeightsInvalidEvent(
+GenerateWidgetViewSyncEvent(
     TkText *textPtr)		/* Information about text widget. */
 {
     union {XEvent general; XVirtualEvent virtual;} event;
@@ -3007,8 +3007,8 @@ GenerateTextLineHeightsInvalidEvent(
     event.general.xany.send_event = False;
     event.general.xany.window = Tk_WindowId(textPtr->tkwin);
     event.general.xany.display = Tk_Display(textPtr->tkwin);
-    event.virtual.name = Tk_GetUid("TextLineHeightsInvalid");
-    event.virtual.user_data = Tcl_NewIntObj(TkTextPendingyupdate(textPtr));
+    event.virtual.name = Tk_GetUid("WidgetViewSync");
+    event.virtual.user_data = Tcl_NewIntObj(TkTextPendingsync(textPtr));
     Tk_HandleEvent(&event.general);
 }
 
@@ -6089,7 +6089,7 @@ TkTextYviewCmd(
 /*
  *--------------------------------------------------------------
  *
- * TkTextPendingyupdate --
+ * TkTextPendingsync --
  *
  *	This function computes how many lines are not up-to-date regarding
  *	asynchronous height calculations.
@@ -6105,7 +6105,7 @@ TkTextYviewCmd(
  */
 
 int
-TkTextPendingyupdate(
+TkTextPendingsync(
     TkText *textPtr)		/* Information about text widget. */
 {
     TextDInfo *dInfoPtr = textPtr->dInfoPtr;