Merge 8.7

5 files changed, 8 insertions, 10 deletions

diff --git a/doc/ttk_combobox.n b/doc/ttk_combobox.n
index 20688f1..bd41bf1 100644
--- a/doc/ttk_combobox.n
+++ b/doc/ttk_combobox.n
@@ -69,7 +69,7 @@ the last element of the list, moreover the same simple interpretation as
 for the command \fBstring index\fR is supported, with simple integer index
 arithmetic and indexing relative to \fBend\fR).
 Otherwise, returns the index of the current value in the list of
-\fB\-values\fR or \fB\{}\fR if the current value does not appear in the list.
+\fB\-values\fR or \fB{}\fR if the current value does not appear in the list.
 .TP
 \fIpathName \fBget\fR
 Returns the current value of the combobox.
diff --git a/generic/tkMenu.c b/generic/tkMenu.c
index 27134dd..44ff3b3 100644
--- a/generic/tkMenu.c
+++ b/generic/tkMenu.c
@@ -278,7 +278,7 @@ static const Tk_OptionSpec tkMenuConfigSpecs[] = {
 	DEF_MENU_POST_COMMAND,
 	offsetof(TkMenu, postCommandPtr), TCL_INDEX_NONE, TK_OPTION_NULL_OK, NULL, 0},
     {TK_OPTION_RELIEF, "-relief", "relief", "Relief",
-	DEF_MENU_RELIEF, offsetof(TkMenu, reliefPtr), TCL_INDEX_NONE, 0, NULL, 0},
+	DEF_MENU_RELIEF, TCL_INDEX_NONE, offsetof(TkMenu, relief), 0, NULL, 0},
     {TK_OPTION_COLOR, "-selectcolor", "selectColor", "Background",
 	DEF_MENU_SELECT_COLOR, offsetof(TkMenu, indicatorFgPtr), TCL_INDEX_NONE, 0,
 	DEF_MENU_SELECT_MONO, 0},
diff --git a/generic/tkMenu.h b/generic/tkMenu.h
index ffe6770..fdb9ae9 100644
--- a/generic/tkMenu.h
+++ b/generic/tkMenu.h
@@ -284,7 +284,7 @@ typedef struct TkMenu {
 				 * active element (if any). */
     Tcl_Obj *activeBorderWidthPtr;
 				/* Width of border around active element. */
-    Tcl_Obj *reliefPtr;		/* 3-d effect: TK_RELIEF_RAISED, etc. */
+    int relief;		/* 3-d effect: TK_RELIEF_RAISED, etc. */
     Tcl_Obj *fontPtr;		/* Text font for menu entries. */
     Tcl_Obj *fgPtr;		/* Foreground color for entries. */
     Tcl_Obj *disabledFgPtr;	/* Foreground color when disabled. NULL means
diff --git a/generic/tkMenuDraw.c b/generic/tkMenuDraw.c
index 62ab105..275b9f5 100644
--- a/generic/tkMenuDraw.c
+++ b/generic/tkMenuDraw.c
@@ -626,7 +626,6 @@ DisplayMenu(
     int width;
     int borderWidth;
     Tk_3DBorder border;
-    int relief;
 
 
     menuPtr->menuFlags &= ~REDRAW_PENDING;
@@ -732,10 +731,9 @@ DisplayMenu(
 		width, height, 0, TK_RELIEF_FLAT);
     }
 
-    Tk_GetReliefFromObj(NULL, menuPtr->reliefPtr, &relief);
     Tk_Draw3DRectangle(menuPtr->tkwin, Tk_WindowId(tkwin),
 	    border, 0, 0, Tk_Width(tkwin), Tk_Height(tkwin), borderWidth,
-	    relief);
+	    menuPtr->relief);
 }
 
 /*
diff --git a/tests/textTag.test b/tests/textTag.test
index 2ca6b28..d0c8676 100644
--- a/tests/textTag.test
+++ b/tests/textTag.test
@@ -113,7 +113,7 @@ test textTag-1.12 {tag configuration options} -body {
 } -cleanup {
     .t tag configure x -justify [lindex [.t tag configure x -justify] 3]
 } -result {left}
-test textTag-1.13 {configuration options} -constraint needsTcl87 -body {
+test textTag-1.13 {configuration options} -body {
     .t tag configure x -justify middle
 } -cleanup {
     .t tag configure x -justify [lindex [.t tag configure x -justify] 3]
@@ -190,7 +190,7 @@ test textTag-1.22 {tag configuration options} -body {
 } -cleanup {
     .t tag configure x -relief [lindex [.t tag configure x -relief] 3]
 } -result {raised}
-test textTag-1.23 {configuration options} -constraint needsTcl87 -body {
+test textTag-1.23 {configuration options} -body {
     .t tag configure x -relief stupid
 } -cleanup {
     .t tag configure x -relief [lindex [.t tag configure x -relief] 3]
@@ -538,13 +538,13 @@ test textTag-5.8 {TkTextTagCmd - "configure" option} -body {
 } -cleanup {
     .t tag delete x
 } -result {-justify {} {} {} left}
-test textTag-5.9 {TkTextTagCmd - "configure" option} -constraint needsTcl87 -body {
+test textTag-5.9 {TkTextTagCmd - "configure" option} -body {
     .t tag delete x
     .t tag configure x -justify bogus
 } -cleanup {
     .t tag delete x
 } -returnCodes error -result {bad justification "bogus": must be left, right, center, or ""}
-test textTag-5.10 {TkTextTagCmd - "configure" option} -constraint needsTcl87 -body {
+test textTag-5.10 {TkTextTagCmd - "configure" option} -body {
     .t tag delete x
     .t tag configure x -justify fill
 } -cleanup {