summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2003-08-06 23:02:40 (GMT)
committerdgp <dgp@users.sourceforge.net>2003-08-06 23:02:40 (GMT)
commit19a49f579c4a8e2fb5c4cc8da333de09e8f11395 (patch)
treecf36a0f99f46e79ff94fb7d6671f1a85320b0307
parentbd39475b4139a926053be2ef84d90bb43ac8fe80 (diff)
downloadtcl-19a49f579c4a8e2fb5c4cc8da333de09e8f11395.zip
tcl-19a49f579c4a8e2fb5c4cc8da333de09e8f11395.tar.gz
tcl-19a49f579c4a8e2fb5c4cc8da333de09e8f11395.tar.bz2
* library/msgcat/msgcat.tcl: Added escape so that non-Windows
* library/msgcat/pkgIndex.tcl: platforms do not try to use the registry package. This can save a costly and pointless package search. Bumped to 1.3.1. Thanks to "imdave1". [Bug 781609].
-rw-r--r--ChangeLog7
-rw-r--r--library/msgcat/msgcat.tcl15
-rw-r--r--library/msgcat/pkgIndex.tcl2
3 files changed, 19 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 79b722f..d9592e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-08-06 Don Porter <dgp@users.sourceforge.net>
+
+ * library/msgcat/msgcat.tcl: Added escape so that non-Windows
+ * library/msgcat/pkgIndex.tcl: platforms do not try to use the
+ registry package. This can save a costly and pointless package
+ search. Bumped to 1.3.1. Thanks to "imdave1". [Bug 781609].
+
2003-08-05 Miguel Sofer <msofer@users.sf.net>
* generic/tclExecute.c (INST_INVOKE, INST_EVAL, INST_PUSH_RESULT):
diff --git a/library/msgcat/msgcat.tcl b/library/msgcat/msgcat.tcl
index 13bf10d..ab47299 100644
--- a/library/msgcat/msgcat.tcl
+++ b/library/msgcat/msgcat.tcl
@@ -10,12 +10,12 @@
# See the file "license.terms" for information on usage and redistribution
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
#
-# RCS: @(#) $Id: msgcat.tcl,v 1.17 2002/08/20 15:33:32 dgp Exp $
+# RCS: @(#) $Id: msgcat.tcl,v 1.17.2.1 2003/08/06 23:02:41 dgp Exp $
package require Tcl 8.2
# When the version number changes, be sure to update the pkgIndex.tcl file,
# and the installation directory in the Makefiles.
-package provide msgcat 1.3
+package provide msgcat 1.3.1
namespace eval msgcat {
namespace export mc mcload mclocale mcmax mcmset mcpreferences mcset \
@@ -422,9 +422,16 @@ proc msgcat::Init {} {
}
}
#
+ # The rest of this routine is special processing for Windows;
+ # all other platforms, get out now.
+ #
+ if { ![string equal $::tcl_platform(platform) windows] } {
+ mclocale C
+ return
+ }
+ #
# On Windows, try to set locale depending on registry settings,
- # or fall back on locale of "C". Other platforms will return
- # when they fail to load the registry package.
+ # or fall back on locale of "C".
#
set key {HKEY_CURRENT_USER\Control Panel\International}
if {[catch {package require registry}] \
diff --git a/library/msgcat/pkgIndex.tcl b/library/msgcat/pkgIndex.tcl
index 9d16a19..90198df 100644
--- a/library/msgcat/pkgIndex.tcl
+++ b/library/msgcat/pkgIndex.tcl
@@ -1,2 +1,2 @@
if {![package vsatisfies [package provide Tcl] 8.2]} {return}
-package ifneeded msgcat 1.3 [list source [file join $dir msgcat.tcl]]
+package ifneeded msgcat 1.3.1 [list source [file join $dir msgcat.tcl]]