diff options
author | dgp <dgp@users.sourceforge.net> | 2006-02-08 21:41:27 (GMT) |
---|---|---|
committer | dgp <dgp@users.sourceforge.net> | 2006-02-08 21:41:27 (GMT) |
commit | c02df4db03405fcafcc2112fb34211157748e459 (patch) | |
tree | feaabb969de44d4d6c82c59dab708581780f8666 /library | |
parent | 828b7e282d4e1591be7f44c77c513ed0bf170b06 (diff) | |
download | tcl-c02df4db03405fcafcc2112fb34211157748e459.zip tcl-c02df4db03405fcafcc2112fb34211157748e459.tar.gz tcl-c02df4db03405fcafcc2112fb34211157748e459.tar.bz2 |
TIP#258 IMPLEMENTATION
* doc/Encoding.3: New subcommand [encoding dirs].
* doc/encoding.n: New routine Tcl_GetEncodingNameFromEnvironment.
* generic/tcl.decls: Made public:
* generic/tclBasic.c: TclGetEncodingFromObj
* generic/tclCmdAH.c: -> Tcl_GetEncodingFromObj
* generic/tclEncoding.c:TclGetEncodingSearchPath
* generic/tclInt.decls: -> Tcl_GetEncodingSearchPath
* generic/tclInt.h: TclSetEncodingSearchPath
* generic/tclTest.c: -> Tcl_SetEncodingSearchPath
* library/init.tcl: Removed commands:
* tests/cmdAH.test: [tcl::unsupported::EncodingDirs]
* tests/encoding.test: [testencoding path] (Tcltest)
* unix/tclUnixInit.c: [Patch 1413934].
* win/tclWinInit.c:
* generic/tclDecls.h: make genstubs
* generic/tclIntDecls.h:
* generic/tclStubInit.c:
Diffstat (limited to 'library')
-rw-r--r-- | library/init.tcl | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/library/init.tcl b/library/init.tcl index 483e79e..c67a6e9 100644 --- a/library/init.tcl +++ b/library/init.tcl @@ -3,7 +3,7 @@ # Default system startup file for Tcl-based applications. Defines # "unknown" procedure and auto-load facilities. # -# RCS: @(#) $Id: init.tcl,v 1.84 2005/09/30 18:53:33 hobbs Exp $ +# RCS: @(#) $Id: init.tcl,v 1.85 2006/02/08 21:41:28 dgp Exp $ # # Copyright (c) 1991-1993 The Regents of the University of California. # Copyright (c) 1994-1996 Sun Microsystems, Inc. @@ -66,11 +66,13 @@ namespace eval tcl { } } - variable Path [unsupported::EncodingDirs] - set Dir [file join $::tcl_library encoding] - if {$Dir ni $Path} { - lappend Path $Dir - unsupported::EncodingDirs $Path + if {![interp issafe]} { + variable Path [encoding dirs] + set Dir [file join $::tcl_library encoding] + if {$Dir ni $Path} { + lappend Path $Dir + encoding dirs $Path + } } # Set up the 'chan' ensemble (TIP #208). |