* README: Bump version number to 8.6a0

        * generic/tcl.h:
        * library/init.tcl:
        * macosx/Tcl-Common.xcconfig:
        * macosx/Tcl.pbproj/default.pbxuser:
        * macosx/Tcl.pbproj/project.pbxproj:
        * tools/tcl.wse.in:
        * unix/configure.in:
        * unix/tcl.spec:
        * win/README:
        * win/configure.in:
        * win/makefile.bc:
        * win/tcl.m4:

        * unix/configure:       autoconf-2.59
        * win/configure:

        * generic/tclBasic.c:   Revised stubs-generation tool and interp
        * tools/genStubs.tcl:   creation so that "tclStubsPtr" is not present
        * unix/Makefile.in:     in libtcl.so, but is present only in
        libtclstub.a.  This tightens up the rules for users of the stubs
        interfaces. [Bug 1819422]

        * generic/tclDecls.h:           make genstubs
        * generic/tclIntDecls.h:
        * generic/tclIntPlatDecls.h:
        * generic/tclPlatDecls.h:
        * generic/tclTomMathDecls.h:

25 files changed, 131 insertions, 80 deletions

diff --git a/ChangeLog b/ChangeLog
index e183ba5..967f2ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,34 @@
+2008-04-01  Don Porter	<dgp@users.sourceforge.net>
+
+	* README:		Bump version number to 8.6a0
+	* generic/tcl.h:
+	* library/init.tcl:
+	* macosx/Tcl-Common.xcconfig:
+	* macosx/Tcl.pbproj/default.pbxuser:
+	* macosx/Tcl.pbproj/project.pbxproj:
+	* tools/tcl.wse.in:
+	* unix/configure.in:
+	* unix/tcl.spec:
+	* win/README:
+	* win/configure.in:
+	* win/makefile.bc:
+	* win/tcl.m4:
+
+	* unix/configure:	autoconf-2.59
+	* win/configure:
+
+	* generic/tclBasic.c:	Revised stubs-generation tool and interp
+	* tools/genStubs.tcl:	creation so that "tclStubsPtr" is not present
+	* unix/Makefile.in:	in libtcl.so, but is present only in 
+	libtclstub.a.  This tightens up the rules for users of the stubs
+	interfaces. [Bug 1819422]
+
+	* generic/tclDecls.h:		make genstubs
+	* generic/tclIntDecls.h:
+	* generic/tclIntPlatDecls.h:
+	* generic/tclPlatDecls.h:
+	* generic/tclTomMathDecls.h:
+
 2008-03-30  Kevin Kenny  <kennykb@acm.org>
 
 	* generic/tclInt.h (TclIsNaN):
diff --git a/README b/README
index 46f3f89..391ffb9 100644
--- a/README
+++ b/README
@@ -1,11 +1,11 @@
 README:  Tcl
-    This is the Tcl 8.5.2 source distribution.
+    This is the Tcl 8.6a0 source distribution.
     Tcl/Tk is also available through NetCVS:
 	http://tcl.sourceforge.net/
     You can get any source release of Tcl from the file distributions
     link at the above URL.
 
-RCS: @(#) $Id: README,v 1.67 2008/02/13 18:00:33 dgp Exp $
+RCS: @(#) $Id: README,v 1.68 2008/04/01 16:23:39 dgp Exp $
 
 Contents
 --------
@@ -48,7 +48,7 @@ and selling it either in whole or in part.  See the file
 
 Extensive documentation is available at our website.
 The home page for this release, including new features, is
-	http://www.tcl.tk/software/tcltk/8.5.html
+	http://www.tcl.tk/software/tcltk/8.6.html
 
 Detailed release notes can be found at the file distributions page
 by clicking on the relevant version.
diff --git a/generic/tcl.h b/generic/tcl.h
index 8f51eb1..1d4b94b 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -13,7 +13,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tcl.h,v 1.254 2008/03/28 17:31:44 dgp Exp $
+ * RCS: @(#) $Id: tcl.h,v 1.255 2008/04/01 16:23:39 dgp Exp $
  */
 
 #ifndef _TCL
@@ -58,12 +58,12 @@ extern "C" {
  */
 
 #define TCL_MAJOR_VERSION   8
-#define TCL_MINOR_VERSION   5
-#define TCL_RELEASE_LEVEL   TCL_FINAL_RELEASE
-#define TCL_RELEASE_SERIAL  2
+#define TCL_MINOR_VERSION   6
+#define TCL_RELEASE_LEVEL   TCL_ALPHA_RELEASE
+#define TCL_RELEASE_SERIAL  0
 
-#define TCL_VERSION	    "8.5"
-#define TCL_PATCH_LEVEL	    "8.5.2"
+#define TCL_VERSION	    "8.6"
+#define TCL_PATCH_LEVEL	    "8.6a0"
 
 /*
  * The following definitions set up the proper options for Windows compilers.
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index 07c2ef7..87b251f 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -14,7 +14,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclBasic.c,v 1.295 2008/03/14 19:53:10 dgp Exp $
+ * RCS: @(#) $Id: tclBasic.c,v 1.296 2008/04/01 16:23:40 dgp Exp $
  */
 
 #include "tclInt.h"
@@ -810,11 +810,6 @@ Tcl_CreateInterp(void)
 
     Tcl_PkgProvideEx(interp, "Tcl", TCL_PATCH_LEVEL, &tclStubs);
 
-#ifdef Tcl_InitStubs
-#undef Tcl_InitStubs
-#endif
-    Tcl_InitStubs(interp, TCL_VERSION, 1);
-
     if (TclTommath_Init(interp) != TCL_OK) {
 	Tcl_Panic(Tcl_GetString(Tcl_GetObjResult(interp)));
     }
diff --git a/generic/tclDecls.h b/generic/tclDecls.h
index 865dd6c..db398d7 100644
--- a/generic/tclDecls.h
+++ b/generic/tclDecls.h
@@ -8,7 +8,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclDecls.h,v 1.130 2007/12/13 15:23:16 dgp Exp $
+ * RCS: @(#) $Id: tclDecls.h,v 1.131 2008/04/01 16:23:40 dgp Exp $
  */
 
 #ifndef _TCLDECLS
@@ -4142,6 +4142,8 @@ typedef struct TclStubs {
     void (*tcl_AppendPrintfToObj) (Tcl_Obj * objPtr, CONST char * format, ...); /* 579 */
 } TclStubs;
 
+#if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS)
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -4150,6 +4152,8 @@ extern TclStubs *tclStubsPtr;
 }
 #endif
 
+#endif /* defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS) */
+
 #if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS)
 
 /*
diff --git a/generic/tclIntDecls.h b/generic/tclIntDecls.h
index 0ff03f9..983b39c 100644
--- a/generic/tclIntDecls.h
+++ b/generic/tclIntDecls.h
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclIntDecls.h,v 1.112 2008/01/23 17:31:42 dgp Exp $
+ * RCS: @(#) $Id: tclIntDecls.h,v 1.113 2008/04/01 16:23:41 dgp Exp $
  */
 
 #ifndef _TCLINTDECLS
@@ -1344,6 +1344,8 @@ typedef struct TclIntStubs {
     void (*tclBackgroundException) (Tcl_Interp * interp, int code); /* 236 */
 } TclIntStubs;
 
+#if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS)
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -1352,6 +1354,8 @@ extern TclIntStubs *tclIntStubsPtr;
 }
 #endif
 
+#endif /* defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS) */
+
 #if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS)
 
 /*
diff --git a/generic/tclIntPlatDecls.h b/generic/tclIntPlatDecls.h
index 38563b1..7b8ab8e 100644
--- a/generic/tclIntPlatDecls.h
+++ b/generic/tclIntPlatDecls.h
@@ -9,7 +9,7 @@
  * Copyright (c) 1998-1999 by Scriptics Corporation.
  * All rights reserved.
  *
- * RCS: @(#) $Id: tclIntPlatDecls.h,v 1.32 2007/12/13 15:23:18 dgp Exp $
+ * RCS: @(#) $Id: tclIntPlatDecls.h,v 1.33 2008/04/01 16:23:41 dgp Exp $
  */
 
 #ifndef _TCLINTPLATDECLS
@@ -446,6 +446,8 @@ typedef struct TclIntPlatStubs {
 #endif /* MACOSX */
 } TclIntPlatStubs;
 
+#if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS)
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -454,6 +456,8 @@ extern TclIntPlatStubs *tclIntPlatStubsPtr;
 }
 #endif
 
+#endif /* defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS) */
+
 #if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS)
 
 /*
diff --git a/generic/tclPlatDecls.h b/generic/tclPlatDecls.h
index c581274..1e695eb 100644
--- a/generic/tclPlatDecls.h
+++ b/generic/tclPlatDecls.h
@@ -6,7 +6,7 @@
  * Copyright (c) 1998-1999 by Scriptics Corporation.
  * All rights reserved.
  *
- * RCS: @(#) $Id: tclPlatDecls.h,v 1.27 2007/12/13 15:23:20 dgp Exp $
+ * RCS: @(#) $Id: tclPlatDecls.h,v 1.28 2008/04/01 16:23:41 dgp Exp $
  */
 
 #ifndef _TCLPLATDECLS
@@ -94,6 +94,8 @@ typedef struct TclPlatStubs {
 #endif /* MACOSX */
 } TclPlatStubs;
 
+#if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS)
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -102,6 +104,8 @@ extern TclPlatStubs *tclPlatStubsPtr;
 }
 #endif
 
+#endif /* defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS) */
+
 #if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS)
 
 /*
diff --git a/generic/tclTomMathDecls.h b/generic/tclTomMathDecls.h
index 785c61b..d12f199 100644
--- a/generic/tclTomMathDecls.h
+++ b/generic/tclTomMathDecls.h
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclTomMathDecls.h,v 1.2 2006/11/15 14:58:27 dgp Exp $
+ * RCS: @(#) $Id: tclTomMathDecls.h,v 1.3 2008/04/01 16:23:42 dgp Exp $
  */
 
 #ifndef _TCLTOMMATHDECLS
@@ -520,6 +520,8 @@ typedef struct TclTomMathStubs {
     int (*tclBN_s_mp_sub) (mp_int* a, mp_int* b, mp_int* c); /* 60 */
 } TclTomMathStubs;
 
+#if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS)
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -528,6 +530,8 @@ extern TclTomMathStubs *tclTomMathStubsPtr;
 }
 #endif
 
+#endif /* defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS) */
+
 #if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS)
 
 /*
diff --git a/library/init.tcl b/library/init.tcl
index ef823f1..5bdbff2 100644
--- a/library/init.tcl
+++ b/library/init.tcl
@@ -3,7 +3,7 @@
 # Default system startup file for Tcl-based applications.  Defines
 # "unknown" procedure and auto-load facilities.
 #
-# RCS: @(#) $Id: init.tcl,v 1.104 2008/03/28 17:31:44 dgp Exp $
+# RCS: @(#) $Id: init.tcl,v 1.105 2008/04/01 16:23:42 dgp Exp $
 #
 # Copyright (c) 1991-1993 The Regents of the University of California.
 # Copyright (c) 1994-1996 Sun Microsystems, Inc.
@@ -17,7 +17,7 @@
 if {[info commands package] == ""} {
     error "version mismatch: library\nscripts expect Tcl version 7.5b1 or later but the loaded version is\nonly [info patchlevel]"
 }
-package require -exact Tcl 8.5.2
+package require -exact Tcl 8.6a0
 
 # Compute the auto path to use in this interpreter.
 # The values on the path come from several locations:
diff --git a/macosx/Tcl-Common.xcconfig b/macosx/Tcl-Common.xcconfig
index 9f89d82..c26b991 100644
--- a/macosx/Tcl-Common.xcconfig
+++ b/macosx/Tcl-Common.xcconfig
@@ -9,7 +9,7 @@
 // See the file "license.terms" for information on usage and redistribution
 // of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 //
-// RCS: @(#) $Id: Tcl-Common.xcconfig,v 1.10 2008/03/12 22:17:57 das Exp $
+// RCS: @(#) $Id: Tcl-Common.xcconfig,v 1.11 2008/04/01 16:23:42 dgp Exp $
 //
 
 HEADER_SEARCH_PATHS = "$(DERIVED_FILE_DIR)/tcl" $(HEADER_SEARCH_PATHS)
@@ -40,4 +40,4 @@ TCL_CONFIGURE_ARGS = --enable-threads --enable-dtrace
 TCL_LIBRARY = $(LIBDIR)/tcl$(VERSION)
 TCL_PACKAGE_PATH = "$(LIBDIR)"
 TCL_DEFS = HAVE_TCL_CONFIG_H
-VERSION = 8.5
+VERSION = 8.6
diff --git a/macosx/Tcl.pbproj/default.pbxuser b/macosx/Tcl.pbproj/default.pbxuser
index 2472114..2ac716d 100644
--- a/macosx/Tcl.pbproj/default.pbxuser
+++ b/macosx/Tcl.pbproj/default.pbxuser
@@ -144,7 +144,7 @@
 	F98F02E608E7EF9A00D0320A = {
 		isa = PBXFileReference;
 		lastKnownFileType = "compiled.mach-o.executable";
-		path = tclsh8.5;
+		path = tclsh8.6;
 		refType = 3;
 		sourceTree = BUILT_PRODUCTS_DIR;
 	};
diff --git a/macosx/Tcl.pbproj/project.pbxproj b/macosx/Tcl.pbproj/project.pbxproj
index 8cd58dc..e284063 100644
--- a/macosx/Tcl.pbproj/project.pbxproj
+++ b/macosx/Tcl.pbproj/project.pbxproj
@@ -331,7 +331,7 @@
 		F53ACC5C031D9D11016F146B = {
 			isa = PBXFileReference;
 			lastKnownFileType = "compiled.mach-o.executable";
-			path = tclsh8.5;
+			path = tclsh8.6;
 			refType = 3;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
diff --git a/tools/genStubs.tcl b/tools/genStubs.tcl
index 5bc3984..eceea00 100644
--- a/tools/genStubs.tcl
+++ b/tools/genStubs.tcl
@@ -10,7 +10,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: genStubs.tcl,v 1.22 2007/12/13 15:28:40 dgp Exp $
+# RCS: @(#) $Id: genStubs.tcl,v 1.23 2008/04/01 16:23:42 dgp Exp $
 
 package require Tcl 8.4
 
@@ -972,6 +972,7 @@ proc genStubs::emitMacros {name textVar} {
 proc genStubs::emitHeader {name} {
     variable outDir
     variable hooks
+    variable libraryName
 
     set capName [string toupper [string index $name 0]]
     append capName [string range $name 1 end]
@@ -995,9 +996,12 @@ proc genStubs::emitHeader {name} {
 
     append text "} ${capName}Stubs;\n"
 
+    set upName [string toupper $libraryName]
+    append text "\n#if defined(USE_${upName}_STUBS) && !defined(USE_${upName}_STUB_PROCS)\n"
     append text "\n#ifdef __cplusplus\nextern \"C\" {\n#endif\n"
     append text "extern ${capName}Stubs *${name}StubsPtr;\n"
     append text "#ifdef __cplusplus\n}\n#endif\n"
+    append text "\n#endif /* defined(USE_${upName}_STUBS) && !defined(USE_${upName}_STUB_PROCS) */\n"
 
     emitMacros $name text
 
diff --git a/tools/tcl.wse.in b/tools/tcl.wse.in
index a732b25..e5914fc 100644
--- a/tools/tcl.wse.in
+++ b/tools/tcl.wse.in
@@ -1,7 +1,7 @@
 Document Type: WSE
 item: Global
   Version=6.01
-  Title=Tcl 8.5 for Windows Installation
+  Title=Tcl 8.6 for Windows Installation
   Flags=00010100
   Languages=65 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
   Japanese Font Name=MS Gothic
@@ -12,7 +12,7 @@ item: Global
   Log Pathname=%MAINDIR%\INSTALL.LOG
   Message Font=MS Sans Serif
   Font Size=8
-  Disk Label=tcl8.5.2
+  Disk Label=tcl8.6a0
   Disk Filename=setup
   Patch Flags=0000000000000001
   Patch Threshold=85
@@ -42,7 +42,7 @@ item: End Block
 end
 item: Set Variable
   Variable=VER
-  Value=8.5
+  Value=8.6
 end
 item: Set Variable
   Variable=PATCHLEVEL
diff --git a/unix/Makefile.in b/unix/Makefile.in
index de79f1c..cbc5594 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -4,7 +4,7 @@
 # "./configure", which is a configuration script generated by the "autoconf"
 # program (constructs like "@foo@" will get replaced in the actual Makefile.
 #
-# RCS: @(#) $Id: Makefile.in,v 1.229 2008/03/12 09:51:39 hobbs Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.230 2008/04/01 16:23:42 dgp Exp $
 
 VERSION 		= @TCL_VERSION@
 MAJOR_VERSION		= @TCL_MAJOR_VERSION@
@@ -291,7 +291,7 @@ GENERIC_OBJS = regcomp.o regexec.o regfree.o regerror.o tclAlloc.o \
 	tclResolve.o tclResult.o tclScan.o tclStringObj.o \
 	tclStrToD.o tclThread.o \
 	tclThreadAlloc.o tclThreadJoin.o tclThreadStorage.o tclStubInit.o \
-	tclStubLib.o tclTimer.o tclTrace.o tclUtf.o tclUtil.o tclVar.o \
+	tclTimer.o tclTrace.o tclUtf.o tclUtil.o tclVar.o \
 	tclTomMathInterface.o
 
 TOMMATH_OBJS = bncore.o bn_reverse.o bn_fast_s_mp_mul_digs.o \
@@ -408,7 +408,6 @@ GENERIC_SRCS = \
 	$(GENERIC_DIR)/tclResult.c \
 	$(GENERIC_DIR)/tclScan.c \
 	$(GENERIC_DIR)/tclStubInit.c \
-	$(GENERIC_DIR)/tclStubLib.c \
 	$(GENERIC_DIR)/tclStringObj.c \
 	$(GENERIC_DIR)/tclStrToD.c \
 	$(GENERIC_DIR)/tclTest.c \
@@ -751,7 +750,7 @@ install-libraries: libraries $(INSTALL_TZDATA) install-msgs
 		else true; \
 		fi; \
 	    done;
-	@for i in opt0.4 http1.0 encoding ../tcl8 ../tcl8/8.3 ../tcl8/8.4  ../tcl8/8.4/platform ../tcl8/8.5; \
+	@for i in opt0.4 http1.0 encoding ../tcl8 ../tcl8/8.3 ../tcl8/8.4  ../tcl8/8.4/platform ../tcl8/8.5 ../tcl8/8.6; \
 	    do \
 	    if [ ! -d "$(SCRIPT_INSTALL_DIR)"/$$i ] ; then \
 		echo "Making directory $(SCRIPT_INSTALL_DIR)/$$i"; \
diff --git a/unix/configure b/unix/configure
index 697cf0d..65fa543 100755
--- a/unix/configure
+++ b/unix/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for tcl 8.5.
+# Generated by GNU Autoconf 2.59 for tcl 8.6.
 #
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
@@ -267,8 +267,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='tcl'
 PACKAGE_TARNAME='tcl'
-PACKAGE_VERSION='8.5'
-PACKAGE_STRING='tcl 8.5'
+PACKAGE_VERSION='8.6'
+PACKAGE_STRING='tcl 8.6'
 PACKAGE_BUGREPORT=''
 
 # Factoring default headers for most tests.
@@ -777,7 +777,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures tcl 8.5 to adapt to many kinds of systems.
+\`configure' configures tcl 8.6 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -834,7 +834,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of tcl 8.5:";;
+     short | recursive ) echo "Configuration of tcl 8.6:";;
    esac
   cat <<\_ACEOF
 
@@ -978,7 +978,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-tcl configure 8.5
+tcl configure 8.6
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -992,7 +992,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by tcl $as_me 8.5, which was
+It was created by tcl $as_me 8.6, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1332,10 +1332,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-TCL_VERSION=8.5
+TCL_VERSION=8.6
 TCL_MAJOR_VERSION=8
-TCL_MINOR_VERSION=5
-TCL_PATCH_LEVEL=".2"
+TCL_MINOR_VERSION=6
+TCL_PATCH_LEVEL="a0"
 VERSION=${TCL_VERSION}
 
 #------------------------------------------------------------------------
@@ -19140,7 +19140,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by tcl $as_me 8.5, which was
+This file was extended by tcl $as_me 8.6, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -19198,7 +19198,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-tcl config.status 8.5
+tcl config.status 8.6
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/unix/configure.in b/unix/configure.in
index 320930a..f59e281 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -3,9 +3,9 @@ dnl	This file is an input file used by the GNU "autoconf" program to
 dnl	generate the file "configure", which is run during Tcl installation
 dnl	to configure the system for the local environment.
 #
-# RCS: @(#) $Id: configure.in,v 1.181 2008/03/30 04:26:20 kennykb Exp $
+# RCS: @(#) $Id: configure.in,v 1.182 2008/04/01 16:23:44 dgp Exp $
 
-AC_INIT([tcl],[8.5])
+AC_INIT([tcl],[8.6])
 AC_PREREQ(2.59)
 
 dnl This is only used when included from macosx/configure.ac
@@ -24,10 +24,10 @@ m4_ifdef([SC_USE_CONFIG_HEADERS], [
     #endif /* _TCLCONFIG */])
 ])
 
-TCL_VERSION=8.5
+TCL_VERSION=8.6
 TCL_MAJOR_VERSION=8
-TCL_MINOR_VERSION=5
-TCL_PATCH_LEVEL=".2"
+TCL_MINOR_VERSION=6
+TCL_PATCH_LEVEL="a0"
 VERSION=${TCL_VERSION}
 
 #------------------------------------------------------------------------
diff --git a/unix/tcl.spec b/unix/tcl.spec
index 1799203..39bc504 100644
--- a/unix/tcl.spec
+++ b/unix/tcl.spec
@@ -1,11 +1,11 @@
-# $Id: tcl.spec,v 1.37 2008/03/28 17:31:48 dgp Exp $
+# $Id: tcl.spec,v 1.38 2008/04/01 16:23:45 dgp Exp $
 # This file is the basis for a binary Tcl RPM for Linux.
 
 %{!?directory:%define directory /usr/local}
 
 Name:          tcl
 Summary:       Tcl scripting language development environment
-Version:       8.5.2
+Version:       8.6a0
 Release:       2
 License:       BSD
 Group:         Development/Languages
diff --git a/win/README b/win/README
index a4d6386..e978305 100644
--- a/win/README
+++ b/win/README
@@ -1,6 +1,6 @@
-Tcl 8.5 for Windows
+Tcl 8.6 for Windows
 
-RCS: @(#) $Id: README,v 1.37 2007/12/14 21:02:05 hobbs Exp $
+RCS: @(#) $Id: README,v 1.38 2008/04/01 16:23:45 dgp Exp $
 
 1. Introduction
 ---------------
@@ -21,7 +21,7 @@ when compiling Tcl extensions that will be dynamically loaded.
 
 In order to compile Tcl for Windows, you need the following:
 
-	Tcl 8.5 Source Distribution (plus any patches)
+	Tcl 8.6 Source Distribution (plus any patches)
 
 	and
 
diff --git a/win/configure b/win/configure
index afe600c..e10d319 100755
--- a/win/configure
+++ b/win/configure
@@ -1269,10 +1269,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 # /bin/sh. The bash shell seems to suffer from some strange failures.
 SHELL=/bin/sh
 
-TCL_VERSION=8.5
+TCL_VERSION=8.6
 TCL_MAJOR_VERSION=8
-TCL_MINOR_VERSION=5
-TCL_PATCH_LEVEL=".2"
+TCL_MINOR_VERSION=6
+TCL_PATCH_LEVEL="a0"
 VER=$TCL_MAJOR_VERSION$TCL_MINOR_VERSION
 
 TCL_DDE_VERSION=1.3
diff --git a/win/configure.in b/win/configure.in
index 750c1b9..8beb3af 100644
--- a/win/configure.in
+++ b/win/configure.in
@@ -3,7 +3,7 @@
 # generate the file "configure", which is run during Tcl installation
 # to configure the system for the local environment.
 #
-# RCS: @(#) $Id: configure.in,v 1.104 2008/03/28 17:31:48 dgp Exp $
+# RCS: @(#) $Id: configure.in,v 1.105 2008/04/01 16:23:45 dgp Exp $
 
 AC_INIT(../generic/tcl.h)
 AC_PREREQ(2.59)
@@ -13,10 +13,10 @@ AC_PREREQ(2.59)
 # /bin/sh. The bash shell seems to suffer from some strange failures.
 SHELL=/bin/sh
 
-TCL_VERSION=8.5
+TCL_VERSION=8.6
 TCL_MAJOR_VERSION=8
-TCL_MINOR_VERSION=5
-TCL_PATCH_LEVEL=".2"
+TCL_MINOR_VERSION=6
+TCL_PATCH_LEVEL="a0"
 VER=$TCL_MAJOR_VERSION$TCL_MINOR_VERSION
 
 TCL_DDE_VERSION=1.3
diff --git a/win/makefile.bc b/win/makefile.bc
index f750555..629768c 100644
--- a/win/makefile.bc
+++ b/win/makefile.bc
@@ -124,8 +124,8 @@ CFG_ENCODING	= \"cp1252\"
 
 NAMEPREFIX	= tcl
 STUBPREFIX	= $(NAMEPREFIX)stub
-DOTVERSION	= 8.5
-VERSION		= 85
+DOTVERSION	= 8.6
+VERSION		= 86
 
 DDEVERSION = 13
 DDEDOTVERSION = 1.3
diff --git a/win/makefile.vc b/win/makefile.vc
index 43cd63e..f969775 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -12,7 +12,7 @@
 # Copyright (c) 2001-2004 David Gravereaux.
 #
 #------------------------------------------------------------------------------
-# RCS: @(#) $Id: makefile.vc,v 1.175 2007/12/14 02:27:11 patthoyts Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.176 2008/04/01 16:23:45 dgp Exp $
 #------------------------------------------------------------------------------
 
 # Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR)
@@ -942,6 +942,8 @@ install-libraries: tclConfig install-msgs install-tzdata
 		$(MKDIR) "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.4\platform"
 	@if not exist "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.5$(NULL)" \
 		$(MKDIR) "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.5"
+	@if not exist "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.6$(NULL)" \
+		$(MKDIR) "$(SCRIPT_INSTALL_DIR)\..\tcl8\8.6"
 	@echo Installing header files
 	@$(CPY) "$(GENERICDIR)\tcl.h"             "$(INCLUDE_INSTALL_DIR)\"
 	@$(CPY) "$(GENERICDIR)\tclDecls.h"        "$(INCLUDE_INSTALL_DIR)\"
diff --git a/win/tcl.m4 b/win/tcl.m4
index 833680f..59b51c9 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -20,15 +20,15 @@
 AC_DEFUN([SC_PATH_TCLCONFIG], [
     AC_MSG_CHECKING([the location of tclConfig.sh])
 
-    if test -d ../../tcl8.5$1/win;  then
-	TCL_BIN_DIR_DEFAULT=../../tcl8.5$1/win
-    elif test -d ../../tcl8.5/win;  then
-	TCL_BIN_DIR_DEFAULT=../../tcl8.5/win
+    if test -d ../../tcl8.6$1/win;  then
+	TCL_BIN_DIR_DEFAULT=../../tcl8.6$1/win
+    elif test -d ../../tcl8.6/win;  then
+	TCL_BIN_DIR_DEFAULT=../../tcl8.6/win
     else
 	TCL_BIN_DIR_DEFAULT=../../tcl/win
     fi
     
-    AC_ARG_WITH(tcl, [  --with-tcl=DIR          use Tcl 8.5 binaries from DIR],
+    AC_ARG_WITH(tcl, [  --with-tcl=DIR          use Tcl 8.6 binaries from DIR],
 	    TCL_BIN_DIR=$withval, TCL_BIN_DIR=`cd $TCL_BIN_DIR_DEFAULT; pwd`)
     if test ! -d $TCL_BIN_DIR; then
 	AC_MSG_ERROR(Tcl directory $TCL_BIN_DIR does not exist)
@@ -60,15 +60,15 @@ AC_DEFUN([SC_PATH_TCLCONFIG], [
 AC_DEFUN([SC_PATH_TKCONFIG], [
     AC_MSG_CHECKING([the location of tkConfig.sh])
 
-    if test -d ../../tk8.5$1/win;  then
-	TK_BIN_DIR_DEFAULT=../../tk8.5$1/win
-    elif test -d ../../tk8.5/win;  then
-	TK_BIN_DIR_DEFAULT=../../tk8.5/win
+    if test -d ../../tk8.6$1/win;  then
+	TK_BIN_DIR_DEFAULT=../../tk8.6$1/win
+    elif test -d ../../tk8.6/win;  then
+	TK_BIN_DIR_DEFAULT=../../tk8.6/win
     else
 	TK_BIN_DIR_DEFAULT=../../tk/win
     fi
     
-    AC_ARG_WITH(tk, [  --with-tk=DIR          use Tk 8.5 binaries from DIR],
+    AC_ARG_WITH(tk, [  --with-tk=DIR          use Tk 8.6 binaries from DIR],
 	    TK_BIN_DIR=$withval, TK_BIN_DIR=`cd $TK_BIN_DIR_DEFAULT; pwd`)
     if test ! -d $TK_BIN_DIR; then
 	AC_MSG_ERROR(Tk directory $TK_BIN_DIR does not exist)
@@ -796,13 +796,13 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
 #------------------------------------------------------------------------
 
 AC_DEFUN([SC_WITH_TCL], [
-    if test -d ../../tcl8.5$1/win;  then
-	TCL_BIN_DEFAULT=../../tcl8.5$1/win
+    if test -d ../../tcl8.6$1/win;  then
+	TCL_BIN_DEFAULT=../../tcl8.6$1/win
     else
-	TCL_BIN_DEFAULT=../../tcl8.5/win
+	TCL_BIN_DEFAULT=../../tcl8.6/win
     fi
     
-    AC_ARG_WITH(tcl, [  --with-tcl=DIR          use Tcl 8.5 binaries from DIR],
+    AC_ARG_WITH(tcl, [  --with-tcl=DIR          use Tcl 8.6 binaries from DIR],
 	    TCL_BIN_DIR=$withval, TCL_BIN_DIR=`cd $TCL_BIN_DEFAULT; pwd`)
     if test ! -d $TCL_BIN_DIR; then
 	AC_MSG_ERROR(Tcl directory $TCL_BIN_DIR does not exist)