Attachment "registry.patch" to
ticket [455645ffff]
added by
dgp
2001-08-27 09:30:47.
? patch
? registry.patch
? doc/control.n
? unix/buffer.tcl
? unix/httpd
Index: ChangeLog
===================================================================
RCS file: /cvsroot/tcl/tcl/ChangeLog,v
retrieving revision 1.543
diff -u -r1.543 ChangeLog
--- ChangeLog 2001/08/27 02:14:08 1.543
+++ ChangeLog 2001/08/27 02:27:31
@@ -1,5 +1,11 @@
2001-08-26 Don Porter <[email protected]>
+ * generic/tclInitScript.h (initScript):
+ * win/tclWinInit.c (TCL_REGISTRY_KEY, TclpSetVariables): Removed
+ vestiges of Tcl's old initialization from registry variables.
+
+2001-08-26 Don Porter <[email protected]>
+
* library/auto.tcl (tcl_findLibrary):
* tests/unixInit.test (unixInit-2.{1,9}):
* unix/tclUnixInit.c (TclpInitLibraryPath):
Index: generic/tclInitScript.h
===================================================================
RCS file: /cvsroot/tcl/tcl/generic/tclInitScript.h,v
retrieving revision 1.12
diff -u -r1.12 tclInitScript.h
--- generic/tclInitScript.h 1999/08/19 02:59:10 1.12
+++ generic/tclInitScript.h 2001/08/27 02:27:36
@@ -49,8 +49,10 @@
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\
Index: win/tclWinInit.c
===================================================================
RCS file: /cvsroot/tcl/tcl/win/tclWinInit.c,v
retrieving revision 1.28
diff -u -r1.28 tclWinInit.c
--- win/tclWinInit.c 2001/08/27 02:14:08 1.28
+++ win/tclWinInit.c 2001/08/27 02:27:49
@@ -11,20 +11,10 @@
*/
#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 @@
* None.
*
* Side effects:
- * Sets "tclDefaultLibrary", "tcl_platform", and "env(HOME)" Tcl
- * variables.
+ * Sets "tcl_platform", and "env(HOME)" Tcl variables.
*
*----------------------------------------------------------------------
*/
@@ -570,12 +559,6 @@
oemId = (OemId *) &sysInfo;
GetSystemInfo(&sysInfo);
-
- /*
- * Initialize the tclDefaultLibrary variable from the registry.
- */
-
- Tcl_SetVar(interp, "tclDefaultLibrary", "", TCL_GLOBAL_ONLY);
/*
* Define the tcl_platform array.
