diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-04-12 16:41:00 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2024-04-12 16:41:00 (GMT) |
commit | 1e68c55e8cb08c12893149cf9ad885559e1e7dd8 (patch) | |
tree | 6c9ecfef1c63642b74055c9c5d99926f33badf1e | |
parent | 10d9c1d837807e684b22ac03e1b1716a30d86909 (diff) | |
download | tcl-1e68c55e8cb08c12893149cf9ad885559e1e7dd8.zip tcl-1e68c55e8cb08c12893149cf9ad885559e1e7dd8.tar.gz tcl-1e68c55e8cb08c12893149cf9ad885559e1e7dd8.tar.bz2 |
In Tcl 9, we don't need "-encoding utf-8" here any more
-rw-r--r-- | library/safe.tcl | 4 | ||||
-rw-r--r-- | unix/Makefile.in | 2 | ||||
-rw-r--r-- | win/Makefile.in | 2 | ||||
-rw-r--r-- | win/makefile.vc | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/library/safe.tcl b/library/safe.tcl index 80bb227..cc4a194 100644 --- a/library/safe.tcl +++ b/library/safe.tcl @@ -623,14 +623,14 @@ proc ::safe::InterpInit { # other procedures defined: if {[catch {::interp eval $child { - source -encoding utf-8 [file join $tcl_library init.tcl] + source [file join $tcl_library init.tcl] }} msg opt]} { Log $child "can't source init.tcl ($msg)" return -options $opt "can't source init.tcl into child $child ($msg)" } if {[catch {::interp eval $child { - source -encoding utf-8 [file join $tcl_library tm.tcl] + source [file join $tcl_library tm.tcl] }} msg opt]} { Log $child "can't source tm.tcl ($msg)" return -options $opt "can't source tm.tcl into child $child ($msg)" diff --git a/unix/Makefile.in b/unix/Makefile.in index e06f749..801a3f5 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -2488,7 +2488,7 @@ html-tk: ${NATIVE_TCLSH} @EXTRA_BUILD_HTML@ BUILD_HTML = \ - @${NATIVE_TCLSH} -encoding utf-8 $(TOOL_DIR)/tcltk-man2html.tcl \ + @${NATIVE_TCLSH} $(TOOL_DIR)/tcltk-man2html.tcl \ --useversion=$(MAJOR_VERSION).$(MINOR_VERSION) \ --htmldir="$(HTML_INSTALL_DIR)" \ --srcdir=$(TOP_DIR) $(BUILD_HTML_FLAGS) diff --git a/win/Makefile.in b/win/Makefile.in index 799c584..14e518e 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -1020,7 +1020,7 @@ runtest: tcltest # `make shell SCRIPT=foo.tcl` shell: binaries @TCL_LIBRARY="$(LIBRARY_DIR)"; export TCL_LIBRARY; \ - $(WINE) ./$(TCLSH) -encoding utf-8 $(SCRIPT) + $(WINE) ./$(TCLSH) $(SCRIPT) # This target can be used to run tclsh inside either gdb or insight gdb: binaries diff --git a/win/makefile.vc b/win/makefile.vc index 261e0a2..152fc1e 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -734,7 +734,7 @@ CHMFILE=$(HTMLDIR)\$(HTMLBASE).chm htmlhelp: chmsetup $(CHMFILE)
$(CHMFILE): $(DOCDIR)\*
- @$(TCLSH) -encoding utf-8 $(TOOLSDIR)\tcltk-man2html.tcl "--htmldir=$(HTMLDIR)"
+ @$(TCLSH) $(TOOLSDIR)\tcltk-man2html.tcl "--htmldir=$(HTMLDIR)"
@echo Compiling HTML help project
-"$(HHC)" <<$(HHPFILE) >NUL
[OPTIONS]
|