Diff

Differences From Artifact [fad62aecf7]:

To Artifact [877050aa4b]:


    85     85   			librarypath [info library]
    86     86   		} else {
    87     87   			encoding dirs [list [file join [info library] encoding]] ;# TIP 258
    88     88   		}
    89     89   
    90     90   		# fix system encoding, if it wasn't properly set up (200207.004 bug)
    91     91   		if {[encoding system] eq "identity"} {
    92         -			switch $::tcl_platform(platform) {
    93         -				windows		{ encoding system cp1252 }
    94         -				macintosh	{ encoding system macRoman }
    95         -			        default		{ encoding system iso8859-1 }
           92  +			if {[info exists ::tclkit_system_encoding] && $::tclkit_system_encoding != ""} {
           93  +				encoding system $::tclkit_system_encoding
           94  +			} else {
           95  +				switch $::tcl_platform(platform) {
           96  +					windows		{ encoding system cp1252 }
           97  +					macintosh	{ encoding system macRoman }
           98  +				        default		{ encoding system iso8859-1 }
           99  +				}
    96    100   			}
          101  +
          102  +			unset -nocomplain ::tclkit_system_encoding
    97    103   		}
    98    104   
    99    105   		# now remount the executable with the correct encoding
   100    106   		vfs::filesystem unmount [lindex [::vfs::filesystem info] 0]
   101    107   
   102    108   		set noe [info nameofexecutable]
   103    109