Merge 8.7

5 files changed, 20 insertions, 17 deletions

diff --git a/generic/tclParse.c b/generic/tclParse.c
index e2aedd1..7b5de0f 100644
--- a/generic/tclParse.c
+++ b/generic/tclParse.c
@@ -891,7 +891,7 @@ TclParseBackslash(
 	count += TclParseHex(p+1, (numBytes > 3) ? 2 : numBytes-2, &result);
 	if (count == 2) {
 	    /*
-	     * No hexadigits -> This is just "x".
+	     * No hexdigits -> This is just "x".
 	     */
 
 	    result = 'x';
@@ -906,7 +906,7 @@ TclParseBackslash(
 	count += TclParseHex(p+1, (numBytes > 5) ? 4 : numBytes-2, &result);
 	if (count == 2) {
 	    /*
-	     * No hexadigits -> This is just "u".
+	     * No hexdigits -> This is just "u".
 	     */
 	    result = 'u';
 	}
@@ -915,7 +915,7 @@ TclParseBackslash(
 	count += TclParseHex(p+1, (numBytes > 9) ? 8 : numBytes-2, &result);
 	if (count == 2) {
 	    /*
-	     * No hexadigits -> This is just "U".
+	     * No hexdigits -> This is just "U".
 	     */
 	    result = 'U';
 	}
diff --git a/library/msgcat/msgcat.tcl b/library/msgcat/msgcat.tcl
index db1231c..9f7d54a 100644
--- a/library/msgcat/msgcat.tcl
+++ b/library/msgcat/msgcat.tcl
@@ -187,7 +187,7 @@ namespace eval msgcat::mcutil {
 #	Find the translation for the given string based on the current
 #	locale setting. Check the local namespace first, then look in each
 #	parent namespace until the source is found.  If additional args are
-#	specified, use the format command to work them into the traslated
+#	specified, use the format command to work them into the translated
 #	string.
 #	If no catalog item is found, mcunknown is called in the caller frame
 #	and its result is returned.
@@ -209,7 +209,7 @@ proc msgcat::mc {args} {
 #	Find the translation for the given string based on the current
 #	locale setting. Check the passed namespace first, then look in each
 #	parent namespace until the source is found.  If additional args are
-#	specified, use the format command to work them into the traslated
+#	specified, use the format command to work them into the translated
 #	string.
 #	If no catalog item is found, mcunknown is called in the caller frame
 #	and its result is returned.
@@ -1116,7 +1116,7 @@ proc msgcat::mcflmset {pairs} {
 #	by an application specific routine for error reporting
 #	purposes.  The default behavior is to return the source string.
 #	If additional args are specified, the format command will be used
-#	to work them into the traslated string.
+#	to work them into the translated string.
 #
 # Arguments:
 #	locale		The current locale.
@@ -1137,9 +1137,9 @@ proc msgcat::mcunknown {args} {
 #	- Default global handler, if mcunknown is not redefined.
 #	- Per package handler, if the package sets unknowncmd to the empty
 #	  string.
-#	It returna the source string if the argument list is empty.
+#	It returns the source string if the argument list is empty.
 #	If additional args are specified, the format command will be used
-#	to work them into the traslated string.
+#	to work them into the translated string.
 #
 # Arguments:
 #	locale		(unused) The current locale.
@@ -1279,7 +1279,7 @@ proc msgcat::mcutil::getsystemlocale {} {
 
     # On Vista and later:
     # HCU/Control Panel/Desktop : PreferredUILanguages is for language packs,
-    # HCU/Control Pannel/International : localName is the default locale.
+    # HCU/Control Panel/International : localName is the default locale.
     #
     # They contain the local string as RFC5646, composed of:
     # [a-z]{2,3} : language
@@ -1315,8 +1315,8 @@ proc msgcat::mcutil::getsystemlocale {} {
     }
     #
     # Keep trying to match against smaller and smaller suffixes
-    # of the registry value, since the latter hexadigits appear
-    # to determine general language and earlier hexadigits determine
+    # of the registry value, since the latter hexdigits appear
+    # to determine general language and earlier hexdigits determine
     # more precise information, such as territory.  For example,
     #     0409 - English - United States
     #     0809 - English - United Kingdom
diff --git a/library/package.tcl b/library/package.tcl
index c72fbfb..974cbf0 100644
--- a/library/package.tcl
+++ b/library/package.tcl
@@ -493,7 +493,8 @@ proc tclPkgUnknown {name args} {
 			# $file was not readable; silently ignore
 			continue
 		    } on error msg {
-			tclLog "error reading package index file $file: $msg"
+			# $file is not usable; silently ignore
+			continue
 		    } on ok {} {
 			set procdDirs($dir) 1
 		    }
@@ -511,7 +512,8 @@ proc tclPkgUnknown {name args} {
 		    # $file was not readable; silently ignore
 		    continue
 		} on error msg {
-		    tclLog "error reading package index file $file: $msg"
+		    # $file is not usable; silently ignore
+		    continue
 		} on ok {} {
 		    set procdDirs($dir) 1
 		}
@@ -595,7 +597,8 @@ proc tcl::MacOSXPkgUnknown {original name args} {
 		    # $file was not readable; silently ignore
 		    continue
 		} on error msg {
-		    tclLog "error reading package index file $file: $msg"
+		    # $file is not usable; silently ignore
+		    continue
 		} on ok {} {
 		    set procdDirs($dir) 1
 		}
diff --git a/unix/configure b/unix/configure
index 0768833..4ad4930 100755
--- a/unix/configure
+++ b/unix/configure
@@ -10098,7 +10098,7 @@ else
 fi
 
     if test -f "$ac_cv_path_zip" ; then
-        ZIP_PROG="$ac_cv_path_zip "
+        ZIP_PROG="$ac_cv_path_zip"
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ZIP_PROG" >&5
 $as_echo "$ZIP_PROG" >&6; }
         ZIP_PROG_OPTIONS="-rq"
diff --git a/win/configure b/win/configure
index 5dfb1b1..eb4e62b 100755
--- a/win/configure
+++ b/win/configure
@@ -4855,7 +4855,7 @@ else
 fi
 
     if test -f "$ac_cv_path_zip" ; then
-        ZIP_PROG="$ac_cv_path_zip "
+        ZIP_PROG="$ac_cv_path_zip"
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ZIP_PROG" >&5
 $as_echo "$ZIP_PROG" >&6; }
         ZIP_PROG_OPTIONS="-rq"
@@ -4866,7 +4866,7 @@ $as_echo "Found INFO Zip in environment" >&6; }
     else
         # It is not an error if an installed version of Zip can't be located.
         # We can use the locally distributed minizip instead
-        ZIP_PROG="../minizip${EXEEXT_FOR_BUILD}"
+        ZIP_PROG="./minizip${EXEEXT_FOR_BUILD}"
         ZIP_PROG_OPTIONS="-o -r"
         ZIP_PROG_VFSSEARCH="."
         ZIP_INSTALL_OBJS="minizip${EXEEXT_FOR_BUILD}"