summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2001-09-10 21:06:55 (GMT)
committerdgp <dgp@users.sourceforge.net>2001-09-10 21:06:55 (GMT)
commit8008090a71e74c81242dbd6334829a5a5b29fba9 (patch)
tree865f1fef1ed44402561a1ded8c8a389b880856f0
parent4b150f866b9cf91bb9974d7cd40a817c428d019e (diff)
downloadtcl-8008090a71e74c81242dbd6334829a5a5b29fba9.zip
tcl-8008090a71e74c81242dbd6334829a5a5b29fba9.tar.gz
tcl-8008090a71e74c81242dbd6334829a5a5b29fba9.tar.bz2
* Removed
vestiges of Tcl's old initialization from registry variables. [Bug 455645]
-rw-r--r--ChangeLog7
-rw-r--r--generic/tclInitScript.h8
-rw-r--r--win/tclWinInit.c21
3 files changed, 14 insertions, 22 deletions
diff --git a/ChangeLog b/ChangeLog
index c17d445..f3367a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-09-10 Don Porter <dgp@users.sourceforge.net>
+
+ * generic/tclInitScript.h (initScript):
+ * win/tclWinInit.c (TCL_REGISTRY_KEY, TclpSetVariables): Removed
+ vestiges of Tcl's old initialization from registry variables.
+ [Bug 455645]
+
2001-09-10 Andreas Kupries <andreas_kupries@users.sourceforge.net>
* generic/tclInt.decls: Also added 'TclWinFlushDirtyChannels' to
diff --git a/generic/tclInitScript.h b/generic/tclInitScript.h
index 1d8ffe0..0d52623 100644
--- a/generic/tclInitScript.h
+++ b/generic/tclInitScript.h
@@ -8,7 +8,7 @@
* Copyright (c) 1999 by Scriptics Corporation.
* All rights reserved.
*
- * RCS: @(#) $Id: tclInitScript.h,v 1.12 1999/08/19 02:59:10 hobbs Exp $
+ * RCS: @(#) $Id: tclInitScript.h,v 1.13 2001/09/10 21:06:55 dgp Exp $
*/
/*
@@ -49,8 +49,10 @@ static char initScript[] = "if {[info proc tclInit]==\"\"} {\n\
if {[info exists env(TCL_LIBRARY)]} {\n\
lappend dirs $env(TCL_LIBRARY)\n\
}\n\
- lappend dirs $tclDefaultLibrary\n\
- unset tclDefaultLibrary\n\
+ catch {\n\
+ lappend dirs $tclDefaultLibrary\n\
+ unset tclDefaultLibrary\n\
+ }\n\
set dirs [concat $dirs $tcl_libPath]\n\
}\n\
foreach i $dirs {\n\
diff --git a/win/tclWinInit.c b/win/tclWinInit.c
index f90738c..8ea1655 100644
--- a/win/tclWinInit.c
+++ b/win/tclWinInit.c
@@ -7,24 +7,14 @@
* Copyright (c) 1998-1999 by Scriptics Corporation.
* All rights reserved.
*
- * RCS: @(#) $Id: tclWinInit.c,v 1.28 2001/08/27 02:14:08 dgp Exp $
+ * RCS: @(#) $Id: tclWinInit.c,v 1.29 2001/09/10 21:06:55 dgp Exp $
*/
#include "tclWinInt.h"
-#include <winreg.h>
#include <winnt.h>
#include <winbase.h>
/*
- * The following macro can be defined at compile time to specify
- * the root of the Tcl registry keys.
- */
-
-#ifndef TCL_REGISTRY_KEY
-#define TCL_REGISTRY_KEY "Software\\Scriptics\\Tcl\\" TCL_VERSION
-#endif
-
-/*
* The following declaration is a workaround for some Microsoft brain damage.
* The SYSTEM_INFO structure is different in various releases, even though the
* layout is the same. So we overlay our own structure on top of it so we
@@ -548,8 +538,7 @@ TclpSetInitialEncodings()
* None.
*
* Side effects:
- * Sets "tclDefaultLibrary", "tcl_platform", and "env(HOME)" Tcl
- * variables.
+ * Sets "tcl_platform", and "env(HOME)" Tcl variables.
*
*----------------------------------------------------------------------
*/
@@ -572,12 +561,6 @@ TclpSetVariables(interp)
GetSystemInfo(&sysInfo);
/*
- * Initialize the tclDefaultLibrary variable from the registry.
- */
-
- Tcl_SetVar(interp, "tclDefaultLibrary", "", TCL_GLOBAL_ONLY);
-
- /*
* Define the tcl_platform array.
*/