summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2012-06-27 18:53:01 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2012-06-27 18:53:01 (GMT)
commitbbcb71e800dbb2b4c59173acb61d1a324a0e84a6 (patch)
treea4a20bfb4187c4cc2efd80553b1875389b6748c5
parentc2a2202e7609a30562675bd878323e887cffd284 (diff)
parent3275986a1aad85bc313bd0c5ce901b5124dc61de (diff)
downloadtcl-bbcb71e800dbb2b4c59173acb61d1a324a0e84a6.zip
tcl-bbcb71e800dbb2b4c59173acb61d1a324a0e84a6.tar.gz
tcl-bbcb71e800dbb2b4c59173acb61d1a324a0e84a6.tar.bz2
merge
-rw-r--r--unix/tclConfig.sh.in2
-rw-r--r--unix/tclUnixFile.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/unix/tclConfig.sh.in b/unix/tclConfig.sh.in
index 7e1d4af..d47e686 100644
--- a/unix/tclConfig.sh.in
+++ b/unix/tclConfig.sh.in
@@ -1,5 +1,5 @@
# tclConfig.sh --
-#
+#
# This shell script (for sh) is generated automatically by Tcl's
# configure script. It will create shell variables for most of
# the configuration options discovered by the configure script.
diff --git a/unix/tclUnixFile.c b/unix/tclUnixFile.c
index 0c68d64..e676215 100644
--- a/unix/tclUnixFile.c
+++ b/unix/tclUnixFile.c
@@ -51,9 +51,9 @@ TclpFindExecutable(
/* Strip '.exe' part. */
length -= 4;
}
- encoding = Tcl_GetEncoding(NULL, NULL);
- TclSetObjNameOfExecutable(
- Tcl_NewStringObj(name, length), encoding);
+ encoding = Tcl_GetEncoding(NULL, NULL);
+ TclSetObjNameOfExecutable(
+ Tcl_NewStringObj(name, length), encoding);
#else
const char *name, *p;
Tcl_StatBuf statBuf;