Merge 8.7

doc/TextLayout.3

@@ -48,7 +48,7 @@ stored in the text layout.  The \fIstring\fR must remain valid for the
 lifetime of the text layout.
 .AP int numChars in
 The number of characters to consider from \fIstring\fR.  If
-\fInumChars\fR is less than 0, then assumes \fIstring\fR is null
+\fInumChars\fR is negative, then assumes \fIstring\fR is null
 terminated and uses \fBTcl_NumUtfChars\fR to determine the length of
 \fIstring\fR.
 .AP int wrapLength in
@@ -176,7 +176,7 @@ located at (0, 0).  Any point whose \fIy\fR-value is less that 0 will be
 considered closest to the first character in the text layout; any point
 whose \fIy\fR-value is greater than the height of the text layout will be
 considered closest to the last character in the text layout.  Any point
-whose \fIx\fR-value is less than 0 will be considered closest to the first
+whose \fIx\fR-value is negative will be considered closest to the first
 character on that line; any point whose \fIx\fR-value is greater than the
 width of the text layout will be considered closest to the last character on
 that line.  The return value is the index of the character that was closest

doc/canvas.n

@@ -67,7 +67,7 @@ the canvas x coordinate at the left edge of the window is always an even
 multiple of \fBxScrollIncrement\fR; furthermore, the units for scrolling
 (e.g., the change in view when the left and right arrows of a scrollbar
 are selected) will also be \fBxScrollIncrement\fR. If the value of
-this option is less than or equal to zero, then horizontal scrolling
+this option is negative or zero, then horizontal scrolling
 is unconstrained.
 .OP \-yscrollincrement yScrollIncrement ScrollIncrement
 Specifies an increment for vertical scrolling, in any of the usual forms
@@ -77,7 +77,7 @@ the canvas y coordinate at the top edge of the window is always an even
 multiple of \fByScrollIncrement\fR; furthermore, the units for scrolling
 (e.g., the change in view when the top and bottom arrows of a scrollbar
 are selected) will also be \fByScrollIncrement\fR. If the value of
-this option is less than or equal to zero, then vertical scrolling
+this option is negative or zero, then vertical scrolling
 is unconstrained.
 .BE
 .SH INTRODUCTION
@@ -262,10 +262,10 @@ within the text item.
 0 refers to the first character, 1 to the next character, and
 so on. If indexes are odd for lines and polygons, they will be
 automatically decremented by one.
-A number less than 0 is treated as if it were zero, and a
+A negative number  is treated as if it were zero, and a
 number greater than the length of the text item is treated
 as if it were equal to the length of the text item. For
-polygons, numbers less than 0 or greater than the length
+polygons, negative numbers or numbers greater than the length
 of the coordinate list will be adjusted by adding or subtracting
 the length until the result is between zero and the length,
 inclusive.

doc/dialog.n

@@ -35,7 +35,7 @@ If this is an empty string then no bitmap is displayed in the dialog.
 If this is an integer greater than or equal to zero, then it gives
 the index of the button that is to be the default button for the dialog
 (0 for the leftmost button, and so on).
-If less than zero or an empty string then there will not be any default
+If negative or an empty string then there will not be any default
 button.
 .IP \fIstring\fR
 There will be one button for each of these arguments.

doc/entry.n

@@ -77,7 +77,7 @@ See \fBVALIDATION\fR below for more information.
 .OP \-width width Width
 Specifies an integer value indicating the desired width of the entry window,
 in average-size characters of the widget's font.
-If the value is less than or equal to zero, the widget picks a
+If the value is negative or zero, the widget picks a
 size just large enough to hold its current text.
 .BE
 .SH DESCRIPTION

doc/frame.n

@@ -66,8 +66,8 @@ Note that \fB\-borderwidth\fR, \fB\-padx\fR and \fB\-pady\fR are ignored when
 configured as a container since a container has no border.
 .OP \-height height Height
 Specifies the desired height for the window in any of the forms
-acceptable to \fBTk_GetPixels\fR.  If this option is less than or equal
-to zero then the window will not request any size at all.  Note that this
+acceptable to \fBTk_GetPixels\fR.  If this option is negative or
+zero then the window will not request any size at all.  Note that this
 sets the total height of the frame, any \fB\-borderwidth\fR or similar is
 not added.  Normally \fB\-height\fR should not be used if a propagating
 geometry manager, such as \fBgrid\fR or \fBpack\fR, is used within the
@@ -90,8 +90,8 @@ The \fB\-visual\fR option may not be modified with the \fBconfigure\fR
 widget command.
 .OP \-width width Width
 Specifies the desired width for the window in any of the forms
-acceptable to \fBTk_GetPixels\fR.  If this option is less than or equal
-to zero then the window will not request any size at all.  Note that this
+acceptable to \fBTk_GetPixels\fR.  If this option is negative or
+zero then the window will not request any size at all.  Note that this
 sets the total width of the frame, any \fB\-borderwidth\fR or similar is
 not added.  Normally \fB\-width\fR should not be used if a propagating
 geometry manager, such as \fBgrid\fR or \fBpack\fR, is used within the

doc/labelframe.n

@@ -47,7 +47,7 @@ widget command.
 .OP \-height height Height
 Specifies the desired height for the window in any of the forms
 acceptable to \fBTk_GetPixels\fR.
-If this option is less than or equal to zero then the window will
+If this option is negative or zero then the window will
 not request any size at all.
 .OP \-labelanchor labelAnchor LabelAnchor
 Specifies where to place the label. A label is only displayed if the
@@ -71,7 +71,7 @@ widget command.
 .OP \-width width Width
 Specifies the desired width for the window in any of the forms
 acceptable to \fBTk_GetPixels\fR.
-If this option is less than or equal to zero then the window will
+If this option is negative or zero then the window will
 not request any size at all.
 .BE
 .SH DESCRIPTION

doc/message.n

@@ -57,7 +57,7 @@ The value may have any of the forms acceptable to \fBTk_GetPixels\fR.
 If this option has a value greater than zero then the \fB\-aspect\fR
 option is ignored and the \fB\-width\fR option determines the line
 length.
-If this option has a value less than or equal to zero, then
+If this option value is negative or zero, then
 the \fB\-aspect\fR option determines the line length.
 .BE
 .SH DESCRIPTION

doc/options.n

@@ -325,7 +325,7 @@ Lines that would exceed this length are wrapped onto the next line,
 so that no line is longer than the specified length.
 The value may be specified in any of the standard forms for
 screen distances.
-If this value is less than or equal to 0 then no wrapping is done:  lines
+If this value is negative or zero then no wrapping is done:  lines
 will break only at newline characters in the text.
 .OP \-xscrollcommand xScrollCommand ScrollCommand
 Specifies the prefix for a command used to communicate with horizontal

doc/scale.n

@@ -36,7 +36,7 @@ new value of the scale.
 .OP \-digits digits Digits
 An integer specifying how many significant digits should be retained
 when converting the value of the scale to a string.
-If the number is less than or equal to zero, then the scale picks
+If the number is negative or zero, then the scale picks
 the smallest value that guarantees that every possible slider
 position prints as a different string.
 .OP \-from from From
@@ -56,7 +56,7 @@ it is the scale's width.
 A real value specifying the resolution for the scale.
 If this value is greater than zero then the scale's value will always be
 rounded to an even multiple of this value, as will
-the endpoints of the scale.  If the value is less than zero then no
+the endpoints of the scale.  If the value is negative then no
 rounding occurs.  Defaults to 1 (i.e., the value will be integral).
 .OP \-showvalue showValue ShowValue
 Specifies a boolean value indicating whether or not the current

doc/scrollbar.n

@@ -42,7 +42,7 @@ as described in \fBSCROLLING COMMANDS\fR below.
 Specifies the width of borders drawn around the internal elements
 of the scrollbar (the two arrows and the slider).  The value may
 have any of the forms acceptable to \fBTk_GetPixels\fR.
-If this value is the empth string (the default), the value of
+If this value is the empty string (the default), the value of
 the \fB\-borderwidth\fR option is used in its place.
 .OP \-width width Width
 Specifies the desired narrow dimension of the scrollbar window,

doc/spinbox.n

@@ -109,7 +109,7 @@ option has precedence over the \fB\-from\fR and \fB\-to\fR range.
 .OP \-width width Width
 Specifies an integer value indicating the desired width of the spinbox window,
 in average-size characters of the widget's font.
-If the value is less than or equal to zero, the widget picks a
+If the value is negative or zero, the widget picks a
 size just large enough to hold its current text.
 .OP \-wrap wrap wrap
 Must be a proper boolean value.  If on, the spinbox will wrap around the

doc/toplevel.n

@@ -68,7 +68,7 @@ widget command.
 .OP \-height height Height
 Specifies the desired height for the window in any of the forms
 acceptable to \fBTk_GetPixels\fR.
-If this option is less than or equal to zero then the window will
+If this option is negative or zero then the window will
 not request any size at all.
 .OP \-menu menu Menu
 Specifies a menu widget to be used as a menubar. On the Macintosh, the
@@ -113,7 +113,7 @@ widget command.
 .OP \-width width Width
 Specifies the desired width for the window in any of the forms
 acceptable to \fBTk_GetPixels\fR.
-If this option is less than or equal to zero then the window will
+If this option is negative or zero then the window will
 not request any size at all.
 .BE
 .SH DESCRIPTION

doc/ttk_entry.n

@@ -82,7 +82,7 @@ See \fBVALIDATION\fR below.
 .OP \-width width Width
 Specifies an integer value indicating the desired width of the entry window,
 in average-size characters of the widget's font.
-.\" Not in ttk: If the value is less than or equal to zero, the widget picks a
+.\" Not in ttk: If the value is negative or zero, the widget picks a
 .\" Not in ttk: size just large enough to hold its current text.
 .SH NOTES
 .PP

doc/ttk_image.n

@@ -44,7 +44,7 @@ See \fBIMAGE STRETCHING\fR, below.
 \fB\-height \fIheight\fR
 .
 Specifies a minimum height for the element.
-If less than zero, the base image's height is used as a default.
+If negative, the base image's height is used as a default.
 .\" OPTION: -padding
 .TP
 \fB\-padding\fI padding\fR
@@ -76,7 +76,7 @@ or
 \fB\-width \fIwidth\fR
 .
 Specifies a minimum width for the element.
-If less than zero, the base image's width is used as a default.
+If negative, the base image's width is used as a default.
 .SH "IMAGE STRETCHING"
 .PP
 If the element's allocated parcel is larger than the image,

doc/ttk_label.n

@@ -37,7 +37,7 @@ Valid values are
 and \fBsunken\fR.
 .OP \-wraplength wrapLength WrapLength
 Specifies the maximum line length (in pixels).
-If this option is less than or equal to zero,
+If this option is negative or zero,
 then automatic wrapping is not performed; otherwise
 the text is split into lines such that no line is longer
 than the specified value.

doc/ttk_treeview.n

@@ -386,7 +386,7 @@ or the empty string \fB{}\fR
 to create a new top-level item.
 \fIindex\fR is an integer, or the value \fBend\fR, specifying where in the
 list of \fIparent\fR's children to insert the new item.
-If \fIindex\fR is less than or equal to zero,
+If \fIindex\fR is negative or zero,
 the new node is inserted at the beginning;
 if \fIindex\fR is greater than or equal to the current number of children,
 it is inserted at the end.
@@ -418,7 +418,7 @@ Moves \fIitem\fR to position \fIindex\fR in \fIparent\fR's list of children.
 It is illegal to move an item under one of its descendants.
 .RS
 .PP
-If \fIindex\fR is less than or equal to zero, \fIitem\fR is moved
+If \fIindex\fR is negative or zero, \fIitem\fR is moved
 to the beginning; if greater than or equal to the number of children,
 it is moved to the end.
 .RE

win/nmakehlp.c

@@ -91,7 +91,7 @@ main(
 	case 'c':
 	    if (argc != 3) {
 		chars = snprintf(msg, sizeof(msg) - 1,
-		        "usage: %s -c <compiler option>\n"
+			"usage: %s -c <compiler option>\n"
 			"Tests for whether cl.exe supports an option\n"
 			"exitcodes: 0 == no, 1 == yes, 2 == error\n", argv[0]);
 		WriteFile(GetStdHandle(STD_ERROR_HANDLE), msg, chars,
@@ -319,11 +319,11 @@ CheckForCompilerFeature(
      */
 
     return !(strstr(Out.buffer, "D4002") != NULL
-             || strstr(Err.buffer, "D4002") != NULL
-             || strstr(Out.buffer, "D9002") != NULL
-             || strstr(Err.buffer, "D9002") != NULL
-             || strstr(Out.buffer, "D2021") != NULL
-             || strstr(Err.buffer, "D2021") != NULL);
+	    || strstr(Err.buffer, "D4002") != NULL
+	    || strstr(Out.buffer, "D9002") != NULL
+	    || strstr(Err.buffer, "D9002") != NULL
+	    || strstr(Out.buffer, "D2021") != NULL
+	    || strstr(Err.buffer, "D2021") != NULL);
 }
 
 static int

win/tkWinClipboard.c

@@ -60,10 +60,10 @@ TkSelGetSelection(
 	goto error;
     }
     if (!OpenClipboard(NULL)) {
-        Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-	        "clipboard cannot be opened, another application grabbed it"));
-        Tcl_SetErrorCode(interp, "TK", "CLIPBOARD", "BUSY", NULL);
-        return TCL_ERROR;
+	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		"clipboard cannot be opened, another application grabbed it"));
+	Tcl_SetErrorCode(interp, "TK", "CLIPBOARD", "BUSY", NULL);
+	return TCL_ERROR;
     }
 
     /*