diff options
| author | sebres <sebres@users.sourceforge.net> | 2018-11-22 22:15:00 (GMT) |
|---|---|---|
| committer | sebres <sebres@users.sourceforge.net> | 2018-11-22 22:15:00 (GMT) |
| commit | c772e86ac5f5e700aec861b094a4b66fc012f80f (patch) | |
| tree | 614795dd98d07368127e839868c57e84494215b4 | |
| parent | 4a077c3555d94fbcfbf97d44e68bfa9f39594ede (diff) | |
| parent | 1c22d353a9a3a0ea2d36a2009cfeb2c6a463d48f (diff) | |
| download | tcl-c772e86ac5f5e700aec861b094a4b66fc012f80f.zip tcl-c772e86ac5f5e700aec861b094a4b66fc012f80f.tar.gz tcl-c772e86ac5f5e700aec861b094a4b66fc012f80f.tar.bz2 | |
merge 8.7
| -rw-r--r-- | library/msgcat/msgcat.tcl | 2 | ||||
| -rw-r--r-- | tests/msgcat.test | 8 | ||||
| -rw-r--r-- | win/Makefile.in | 7 |
3 files changed, 10 insertions, 7 deletions
diff --git a/library/msgcat/msgcat.tcl b/library/msgcat/msgcat.tcl index 129cd9c..db1231c 100644 --- a/library/msgcat/msgcat.tcl +++ b/library/msgcat/msgcat.tcl @@ -1105,7 +1105,7 @@ proc msgcat::mcflmset {pairs} { return -code error "must only be used inside a message catalog loaded\ with ::msgcat::mcload" } - tailcal mcmset $FileLocale $pairs + tailcall mcmset $FileLocale $pairs } # msgcat::mcunknown -- diff --git a/tests/msgcat.test b/tests/msgcat.test index 3dde124..4ab3622 100644 --- a/tests/msgcat.test +++ b/tests/msgcat.test @@ -693,18 +693,18 @@ if {[package vsatisfies [package provide msgcat] 1.7]} { set msgdir3 [makeDirectory msgdir3] makeFile "::msgcat::mcflset k2 v2 ; ::msgcat::mcload [list $msgdir3]"\ l2.msg $msgdir2 - makeFile {::msgcat::mcflset k3 v3} l2.msg $msgdir3 + makeFile {::msgcat::mcflset k3 v3 ; ::msgcat::mcflmset {k4 v4 k5 v5}} l2.msg $msgdir3 # chained mcload - test msgcat-8.2 {mcflset} -setup { + test msgcat-8.2 {mcflset/mcflmset} -setup { variable locale [mclocale] mclocale l2 mcload $msgdir2 } -cleanup { mclocale $locale } -body { - return [mc k2][mc k3] - } -result v2v3 + return [mc k2][mc k3]--[mc k4][mc k5] + } -result v2v3--v4v5 removeFile l2.msg $msgdir2 removeDirectory msgdir2 diff --git a/win/Makefile.in b/win/Makefile.in index f065c0b..5fa875f 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -490,7 +490,9 @@ ${TCL_ZIP_FILE}: ${ZIP_INSTALL_OBJS} ${DDE_DLL_FILE} ${REG_DLL_FILE} $(COPY) -a ${TCL_VFS_PATH}/manifest.txt ${TCL_VFS_PATH}/pkgIndex.tcl $(COPY) ${DDE_DLL_FILE} ${TCL_VFS_PATH}/dde $(COPY) ${REG_DLL_FILE} ${TCL_VFS_PATH}/reg - cd ${TCL_VFS_ROOT} ; ${NATIVE_ZIP} ${ZIP_PROG_OPTIONS} ../${TCL_ZIP_FILE} ${ZIP_PROG_VFSSEARCH} + (cd ${TCL_VFS_ROOT} && \ + ${NATIVE_ZIP} ${ZIP_PROG_OPTIONS} ../${TCL_ZIP_FILE} ${ZIP_PROG_VFSSEARCH} && \ + cd ..) $(TCLSH): $(TCLSH_OBJS) @LIBRARIES@ $(TCL_STUB_LIB_FILE) tclsh.$(RES) $(CC) $(CFLAGS) $(TCLSH_OBJS) $(TCL_LIB_FILE) $(TCL_STUB_LIB_FILE) $(LIBS) \ @@ -517,7 +519,8 @@ ${TCL_DLL_FILE}: ${TCL_OBJS} tcl.$(RES) @ZLIB_DLL_FILE@ ${TCL_ZIP_FILE} @VC_MANIFEST_EMBED_DLL@ @if test "${ZIPFS_BUILD}" = "1" ; then \ cat ${TCL_ZIP_FILE} >> ${TCL_DLL_FILE}; \ - ${NATIVE_ZIP} -A ${TCL_DLL_FILE}; \ + ${NATIVE_ZIP} -A ${TCL_DLL_FILE} \ + || echo 'ignore zip-error by adjust sfx process (not executable?)'; \ fi ${TCL_LIB_FILE}: ${TCL_OBJS} ${DDE_OBJS} ${REG_OBJS} |