Merge 8.6

tcltk · Jan 15, 2025 · 0539e9f · 0539e9f
2 parents b46a2fe + 8cd7a01
commit 0539e9f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/generic/tkWindow.c b/generic/tkWindow.c
@@ -1024,6 +1024,9 @@ TkCreateMainWindow(
 #ifndef TCL_CFG_OPTIMIZED
 		".no-optimize"
 #endif
+#if !defined(_WIN32) && !defined(MAC_OSX_TK) && !defined(HAVE_XFT)
+		".no-xft"
+#endif
 #ifdef __OBJC__
 		".objective-c"
 #if defined(__cplusplus)
@@ -1044,9 +1047,6 @@ TkCreateMainWindow(
 #endif
 #if !defined(_WIN32) && !defined(MAC_OSX_TK)
 		".x11"
-#if !defined(HAVE_XFT)
-		".no-xft"
-#endif
 #endif
 		;
 #if TCL_MAJOR_VERSION > 8

diff --git a/tests/font.test b/tests/font.test
@@ -938,9 +938,9 @@ test font-21.6 {Tk_PostscriptFontName procedure: spaces} -constraints {
 } -body {
     set name {{new century schoolbook} 10}
     if {[font actual {{new century schoolbook} 10} -family] == "new century schoolbook"} {
-        set x [psfontname "{new century schoolbook} 10"]
+	set x [psfontname "{new century schoolbook} 10"]
     } else {
-        set x NewCenturySchlbk-Roman
+	set x NewCenturySchlbk-Roman
     }
 } -result {NewCenturySchlbk-Roman}
 test font-21.7 {Tk_PostscriptFontName procedure: exhaustive} -constraints {

diff --git a/tests/unixFont.test b/tests/unixFont.test
@@ -18,9 +18,9 @@ tcltest::loadTestedCommands
 
 if {[tk windowingsystem] eq "x11"} {
     if {[testConstraint withXft]} {
-        set fontsystemcmd [auto_execok fc-list]
+	set fontsystemcmd [auto_execok fc-list]
     } else {
-        set fontsystemcmd [auto_execok xlsfonts]
+	set fontsystemcmd [auto_execok xlsfonts]
     }
 }
 foreach {constraint font} {

diff --git a/unix/Makefile.in b/unix/Makefile.in
@@ -773,8 +773,8 @@ INSTALL_DOC_TARGETS = install-doc
 INSTALL_DEV_TARGETS = install-headers
 INSTALL_DEMO_TARGETS = install-demos
 INSTALL_EXTRA_TARGETS = @EXTRA_INSTALL@
-INSTALL_TARGETS = $(INSTALL_BASE_TARGETS) $(INSTALL_DOC_TARGETS) $(INSTALL_DEV_TARGETS) \
-		$(INSTALL_DEMO_TARGETS) $(INSTALL_EXTRA_TARGETS)
+INSTALL_TARGETS = $(INSTALL_BASE_TARGETS) $(INSTALL_DEV_TARGETS) \
+		$(INSTALL_DEMO_TARGETS) $(INSTALL_DOC_TARGETS) $(INSTALL_EXTRA_TARGETS)
 
 install: $(INSTALL_TARGETS)