diff options
| author | dgp <dgp@users.sourceforge.net> | 2017-07-18 13:34:16 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2017-07-18 13:34:16 (GMT) |
| commit | 7476b21bf8a35f56d05437f64fe30dc843994a55 (patch) | |
| tree | 37a655c263bfffbf1ef6a285b9bd9b9abbded617 | |
| parent | 8d954800b0b6d6a1b8a20b6972a83e746171e5ae (diff) | |
| parent | 8db6f4075215c8964c606217dd98508ddca8b389 (diff) | |
| download | tcl-7476b21bf8a35f56d05437f64fe30dc843994a55.zip tcl-7476b21bf8a35f56d05437f64fe30dc843994a55.tar.gz tcl-7476b21bf8a35f56d05437f64fe30dc843994a55.tar.bz2 | |
merge trunk
| -rw-r--r-- | generic/tclInt.h | 2 | ||||
| -rw-r--r-- | library/auto.tcl | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/generic/tclInt.h b/generic/tclInt.h index 5f96914..ce490c2 100644 --- a/generic/tclInt.h +++ b/generic/tclInt.h @@ -4338,7 +4338,7 @@ MODULE_SCOPE void TclDbInitNewObj(Tcl_Obj *objPtr, const char *file, #define TclUtfToUniChar(str, chPtr) \ ((((unsigned char) *(str)) < 0xC0) ? \ - ((*(chPtr) = (Tcl_UniChar) *(str)), 1) \ + ((*(chPtr) = (unsigned char) *(str)), 1) \ : Tcl_UtfToUniChar(str, chPtr)) /* diff --git a/library/auto.tcl b/library/auto.tcl index 97ea8af..a7a8979 100644 --- a/library/auto.tcl +++ b/library/auto.tcl @@ -203,7 +203,7 @@ proc auto_mkindex {dir args} { } auto_mkindex_parser::init - foreach file [glob -- {*}$args] { + foreach file [lsort [glob -- {*}$args]] { try { append index [auto_mkindex_parser::mkindex $file] } on error {msg opts} { @@ -236,7 +236,7 @@ proc auto_mkindex_old {dir args} { if {![llength $args]} { set args *.tcl } - foreach file [glob -- {*}$args] { + foreach file [lsort [glob -- {*}$args]] { set f "" set error [catch { set f [open $file] |