merge 8.5

tcltk · Nov 13, 2024 · 1ae7087 · 1ae7087
2 parents 070fe88 + 53e0d37
commit 1ae7087
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/generic/tclInterp.c b/generic/tclInterp.c
@@ -420,8 +420,7 @@ Tcl_Init(
 "    set dirs {}\n"
 "    set errors {}\n"
 "    foreach script $scripts {\n"
-"	lappend dirs [set tcl_library [eval $script]]\n"
-"	if {$tcl_library eq \"\"} continue\n"
+"	if {[set tcl_library [eval $script]] eq \"\"} continue\n"
 "	set tclfile [file join $tcl_library init.tcl]\n"
 "	if {[file exists $tclfile]} {\n"
 "	    if {[catch {uplevel #0 [list source $tclfile]} msg opts]} {\n"
@@ -432,6 +431,7 @@ Tcl_Init(
 "	    unset -nocomplain tclDefaultLibrary\n"
 "	    return\n"
 "	}\n"
+"	lappend dirs $tcl_library\n"
 "    }\n"
 "    unset -nocomplain tclDefaultLibrary\n"
 "    set msg \"Can't find a usable init.tcl in the following directories: \n\"\n"