Merge 8.6

1 files changed, 6 insertions, 4 deletions

diff --git a/library/init.tcl b/library/init.tcl
index 8952172..5cc0fee 100644
--- a/library/init.tcl
+++ b/library/init.tcl
@@ -16,7 +16,7 @@
 if {[info commands package] == ""} {
     error "version mismatch: library\nscripts expect Tcl version 7.5b1 or later but the loaded version is\nonly [info patchlevel]"
 }
-package require -exact Tcl 8.6.9
+package require -exact Tcl 8.6.10
 
 # Compute the auto path to use in this interpreter.
 # The values on the path come from several locations:
@@ -57,13 +57,13 @@ namespace eval tcl {
     if {$Dir ni $::auto_path} {
 	lappend ::auto_path $Dir
     }
-    catch {
+    if {[info exists ::tcl_pkgPath]} { catch {
 	foreach Dir $::tcl_pkgPath {
 	    if {$Dir ni $::auto_path} {
 		lappend ::auto_path $Dir
 	    }
 	}
-    }
+    }}
 
     if {![interp issafe]} {
         variable Path [encoding dirs]
@@ -668,7 +668,9 @@ proc auto_execok name {
     }
 
     set path "[file dirname [info nameof]];.;"
-    if {[info exists env(WINDIR)]} {
+    if {[info exists env(SystemRoot)]} {
+	set windir $env(SystemRoot)
+    } elseif {[info exists env(WINDIR)]} {
 	set windir $env(WINDIR)
     }
     if {[info exists windir]} {