merge stable branch onto HEAD

27 files changed, 35 insertions, 35 deletions

diff --git a/unix/Makefile.in b/unix/Makefile.in
index bc105f4..66a2277 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -5,7 +5,7 @@
 # "autoconf" program (constructs like "@foo@" will get replaced in the
 # actual Makefile.
 #
-# RCS: @(#) $Id: Makefile.in,v 1.137 2007/09/11 17:46:41 dgp Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.138 2007/12/13 15:28:49 dgp Exp $
 
 # Current Tk version;  used in various names.
 
diff --git a/unix/README b/unix/README
index 0e71527..0018edd 100644
--- a/unix/README
+++ b/unix/README
@@ -20,7 +20,7 @@ SGI, as well as PCs running Linux, BSDI, and SCO UNIX.  To compile for
 a PC running Windows, see the README file in the directory ../win.  To
 compile for MacOSX, see the README file in the directory ../macosx.
 
-RCS: @(#) $Id: README,v 1.25 2007/12/07 20:47:56 dgp Exp $
+RCS: @(#) $Id: README,v 1.26 2007/12/13 15:28:49 dgp Exp $
 
 How To Compile And Install Tk:
 ------------------------------
diff --git a/unix/configure b/unix/configure
index de9b59e..bbe6c9e 100755
--- a/unix/configure
+++ b/unix/configure
@@ -1337,7 +1337,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 TK_VERSION=8.5
 TK_MAJOR_VERSION=8
 TK_MINOR_VERSION=5
-TK_PATCH_LEVEL="b3"
+TK_PATCH_LEVEL=".0"
 VERSION=${TK_VERSION}
 LOCALES="cs de el en en_gb eo es fr hu it nl pl pt ru sv"
 
@@ -9406,7 +9406,7 @@ ac_x_header_dirs='
 /usr/openwin/share/include'
 
 if test "$ac_x_includes" = no; then
-  # Guess where to find include files, by looking for Intrinsic.h.
+  # Guess where to find include files, by looking for Xlib.h.
   # First, try using that file with no special directory specified.
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -9414,7 +9414,7 @@ _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <X11/Intrinsic.h>
+#include <X11/Xlib.h>
 _ACEOF
 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -9441,7 +9441,7 @@ else
 sed 's/^/| /' conftest.$ac_ext >&5
 
   for ac_dir in $ac_x_header_dirs; do
-  if test -r "$ac_dir/X11/Intrinsic.h"; then
+  if test -r "$ac_dir/X11/Xlib.h"; then
     ac_x_includes=$ac_dir
     break
   fi
@@ -9455,18 +9455,18 @@ if test "$ac_x_libraries" = no; then
   # See if we find them without any special options.
   # Don't add to $LIBS permanently.
   ac_save_LIBS=$LIBS
-  LIBS="-lXt $LIBS"
+  LIBS="-lX11 $LIBS"
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <X11/Intrinsic.h>
+#include <X11/Xlib.h>
 int
 main ()
 {
-XtMalloc (0)
+XrmInitialize ()
   ;
   return 0;
 }
diff --git a/unix/configure.in b/unix/configure.in
index fd5baed..5d21b96 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -3,7 +3,7 @@ dnl	This file is an input file used by the GNU "autoconf" program to
 dnl	generate the file "configure", which is run during Tk installation
 dnl	to configure the system for the local environment.
 #
-# RCS: @(#) $Id: configure.in,v 1.146 2007/12/05 15:58:41 dkf Exp $
+# RCS: @(#) $Id: configure.in,v 1.147 2007/12/13 15:28:50 dgp Exp $
 
 AC_INIT([tk],[8.5])
 AC_PREREQ(2.59)
@@ -27,7 +27,7 @@ m4_ifdef([SC_USE_CONFIG_HEADERS], [
 TK_VERSION=8.5
 TK_MAJOR_VERSION=8
 TK_MINOR_VERSION=5
-TK_PATCH_LEVEL="b3"
+TK_PATCH_LEVEL=".0"
 VERSION=${TK_VERSION}
 LOCALES="cs da de el en en_gb eo es fr hu it nl pl pt ru sv"
 
diff --git a/unix/tk.spec b/unix/tk.spec
index a1adefd..65984e3 100644
--- a/unix/tk.spec
+++ b/unix/tk.spec
@@ -1,11 +1,11 @@
-# $Id: tk.spec,v 1.30 2007/11/19 18:39:33 dgp Exp $
+# $Id: tk.spec,v 1.31 2007/12/13 15:28:50 dgp Exp $
 # This file is the basis for a binary Tk Linux RPM.
 
 %{!?directory:%define directory /usr/local}
 
 Name:          tk
 Summary:       Tk graphical toolkit for the Tcl scripting language.
-Version:       8.5b3
+Version:       8.5.0
 Release:       2
 License:       BSD
 Group:         Development/Languages
diff --git a/unix/tkConfig.sh.in b/unix/tkConfig.sh.in
index 63f351a..7657e40 100644
--- a/unix/tkConfig.sh.in
+++ b/unix/tkConfig.sh.in
@@ -11,7 +11,7 @@
 #
 # The information in this file is specific to a single platform.
 #
-# RCS: @(#) $Id: tkConfig.sh.in,v 1.12 2007/09/11 05:23:47 das Exp $
+# RCS: @(#) $Id: tkConfig.sh.in,v 1.13 2007/12/13 15:28:50 dgp Exp $
 
 # Tk's version number.
 TK_VERSION='@TK_VERSION@'
diff --git a/unix/tkUnix.c b/unix/tkUnix.c
index 5399956..cd44149 100644
--- a/unix/tkUnix.c
+++ b/unix/tkUnix.c
@@ -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: tkUnix.c,v 1.14 2007/09/07 00:34:57 dgp Exp $
+ * RCS: @(#) $Id: tkUnix.c,v 1.15 2007/12/13 15:28:50 dgp Exp $
  */
 
 #include "tkInt.h"
diff --git a/unix/tkUnix3d.c b/unix/tkUnix3d.c
index 8710483..c872484 100644
--- a/unix/tkUnix3d.c
+++ b/unix/tkUnix3d.c
@@ -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: tkUnix3d.c,v 1.11 2007/09/07 00:34:57 dgp Exp $
+ * RCS: @(#) $Id: tkUnix3d.c,v 1.12 2007/12/13 15:28:50 dgp Exp $
  */
 
 #include "tkInt.h"
diff --git a/unix/tkUnixButton.c b/unix/tkUnixButton.c
index dcdba82..b8be6b3 100644
--- a/unix/tkUnixButton.c
+++ b/unix/tkUnixButton.c
@@ -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: tkUnixButton.c,v 1.24 2007/09/07 00:34:57 dgp Exp $
+ * RCS: @(#) $Id: tkUnixButton.c,v 1.25 2007/12/13 15:28:50 dgp Exp $
  */
 
 #include "tkInt.h"
diff --git a/unix/tkUnixColor.c b/unix/tkUnixColor.c
index 7e4c4d7..1c8c47e 100644
--- a/unix/tkUnixColor.c
+++ b/unix/tkUnixColor.c
@@ -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: tkUnixColor.c,v 1.5 2007/09/07 00:34:57 dgp Exp $
+ * RCS: @(#) $Id: tkUnixColor.c,v 1.6 2007/12/13 15:28:50 dgp Exp $
  */
 
 #include "tkInt.h"
diff --git a/unix/tkUnixConfig.c b/unix/tkUnixConfig.c
index 0ddc1f6..91a992a 100644
--- a/unix/tkUnixConfig.c
+++ b/unix/tkUnixConfig.c
@@ -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: tkUnixConfig.c,v 1.5 2007/09/07 00:34:57 dgp Exp $
+ * RCS: @(#) $Id: tkUnixConfig.c,v 1.6 2007/12/13 15:28:50 dgp Exp $
  */
 
 #include "tkInt.h"
diff --git a/unix/tkUnixCursor.c b/unix/tkUnixCursor.c
index 130d9d6..03bac45 100644
--- a/unix/tkUnixCursor.c
+++ b/unix/tkUnixCursor.c
@@ -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: tkUnixCursor.c,v 1.11 2007/09/07 00:34:57 dgp Exp $
+ * RCS: @(#) $Id: tkUnixCursor.c,v 1.12 2007/12/13 15:28:50 dgp Exp $
  */
 
 #include "tkInt.h"
diff --git a/unix/tkUnixDefault.h b/unix/tkUnixDefault.h
index 5fd7b63..2d16d4a 100644
--- a/unix/tkUnixDefault.h
+++ b/unix/tkUnixDefault.h
@@ -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: tkUnixDefault.h,v 1.25 2007/10/30 01:57:58 hobbs Exp $
+ * RCS: @(#) $Id: tkUnixDefault.h,v 1.26 2007/12/13 15:28:50 dgp Exp $
  */
 
 #ifndef _TKUNIXDEFAULT
diff --git a/unix/tkUnixDialog.c b/unix/tkUnixDialog.c
index 7914541..1299e90 100644
--- a/unix/tkUnixDialog.c
+++ b/unix/tkUnixDialog.c
@@ -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: tkUnixDialog.c,v 1.5 2007/09/07 00:34:58 dgp Exp $
+ * RCS: @(#) $Id: tkUnixDialog.c,v 1.6 2007/12/13 15:28:50 dgp Exp $
  *
  */
 
diff --git a/unix/tkUnixDraw.c b/unix/tkUnixDraw.c
index 0f3754c..25741cc 100644
--- a/unix/tkUnixDraw.c
+++ b/unix/tkUnixDraw.c
@@ -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: tkUnixDraw.c,v 1.10 2007/09/07 00:34:58 dgp Exp $
+ * RCS: @(#) $Id: tkUnixDraw.c,v 1.11 2007/12/13 15:28:50 dgp Exp $
  */
 
 #include "tkInt.h"
diff --git a/unix/tkUnixEmbed.c b/unix/tkUnixEmbed.c
index 4929d81..9b93cb6 100644
--- a/unix/tkUnixEmbed.c
+++ b/unix/tkUnixEmbed.c
@@ -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: tkUnixEmbed.c,v 1.11 2007/09/07 00:34:58 dgp Exp $
+ * RCS: @(#) $Id: tkUnixEmbed.c,v 1.12 2007/12/13 15:28:50 dgp Exp $
  */
 
 #include "tkUnixInt.h"
diff --git a/unix/tkUnixEvent.c b/unix/tkUnixEvent.c
index 7b45747..ab95290 100644
--- a/unix/tkUnixEvent.c
+++ b/unix/tkUnixEvent.c
@@ -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: tkUnixEvent.c,v 1.25 2007/09/07 00:34:58 dgp Exp $
+ * RCS: @(#) $Id: tkUnixEvent.c,v 1.26 2007/12/13 15:28:50 dgp Exp $
  */
 
 #include "tkUnixInt.h"
diff --git a/unix/tkUnixFocus.c b/unix/tkUnixFocus.c
index 2cfb282..b4cc4b5 100644
--- a/unix/tkUnixFocus.c
+++ b/unix/tkUnixFocus.c
@@ -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: tkUnixFocus.c,v 1.6 2007/09/07 00:34:58 dgp Exp $
+ * RCS: @(#) $Id: tkUnixFocus.c,v 1.7 2007/12/13 15:28:50 dgp Exp $
  */
 
 #include "tkUnixInt.h"
diff --git a/unix/tkUnixInit.c b/unix/tkUnixInit.c
index b7c12e4..50797f2 100644
--- a/unix/tkUnixInit.c
+++ b/unix/tkUnixInit.c
@@ -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: tkUnixInit.c,v 1.9 2007/09/07 00:34:58 dgp Exp $
+ * RCS: @(#) $Id: tkUnixInit.c,v 1.10 2007/12/13 15:28:50 dgp Exp $
  */
 
 #include "tkUnixInt.h"
diff --git a/unix/tkUnixMenu.c b/unix/tkUnixMenu.c
index 5239db5..0fcadb6 100644
--- a/unix/tkUnixMenu.c
+++ b/unix/tkUnixMenu.c
@@ -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: tkUnixMenu.c,v 1.18 2007/10/15 07:24:50 das Exp $
+ * RCS: @(#) $Id: tkUnixMenu.c,v 1.19 2007/12/13 15:28:50 dgp Exp $
  */
 
 #include "default.h"
diff --git a/unix/tkUnixMenubu.c b/unix/tkUnixMenubu.c
index 14112bc..08d796e 100644
--- a/unix/tkUnixMenubu.c
+++ b/unix/tkUnixMenubu.c
@@ -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: tkUnixMenubu.c,v 1.10 2007/09/07 00:34:58 dgp Exp $
+ * RCS: @(#) $Id: tkUnixMenubu.c,v 1.11 2007/12/13 15:28:50 dgp Exp $
  */
 
 #include "tkInt.h"
diff --git a/unix/tkUnixPort.h b/unix/tkUnixPort.h
index bdcfc13..4805a6f 100644
--- a/unix/tkUnixPort.h
+++ b/unix/tkUnixPort.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: tkUnixPort.h,v 1.13 2007/11/28 20:12:38 dgp Exp $
+ * RCS: @(#) $Id: tkUnixPort.h,v 1.14 2007/12/13 15:28:50 dgp Exp $
  */
 
 #ifndef _UNIXPORT
diff --git a/unix/tkUnixScale.c b/unix/tkUnixScale.c
index c12eee3..4c925b7 100644
--- a/unix/tkUnixScale.c
+++ b/unix/tkUnixScale.c
@@ -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: tkUnixScale.c,v 1.12 2007/09/07 00:34:58 dgp Exp $
+ * RCS: @(#) $Id: tkUnixScale.c,v 1.13 2007/12/13 15:28:51 dgp Exp $
  */
 
 #include "tkInt.h"
diff --git a/unix/tkUnixScrlbr.c b/unix/tkUnixScrlbr.c
index 63dbddb..beef224 100644
--- a/unix/tkUnixScrlbr.c
+++ b/unix/tkUnixScrlbr.c
@@ -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: tkUnixScrlbr.c,v 1.5 2007/09/07 00:34:58 dgp Exp $
+ * RCS: @(#) $Id: tkUnixScrlbr.c,v 1.6 2007/12/13 15:28:51 dgp Exp $
  */
 
 #include "tkInt.h"
diff --git a/unix/tkUnixSend.c b/unix/tkUnixSend.c
index fce1e75..b2083f3 100644
--- a/unix/tkUnixSend.c
+++ b/unix/tkUnixSend.c
@@ -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: tkUnixSend.c,v 1.19 2007/09/07 00:34:58 dgp Exp $
+ * RCS: @(#) $Id: tkUnixSend.c,v 1.20 2007/12/13 15:28:51 dgp Exp $
  */
 
 #include "tkUnixInt.h"
diff --git a/unix/tkUnixWm.c b/unix/tkUnixWm.c
index 6a8eaf6..d8082ff 100644
--- a/unix/tkUnixWm.c
+++ b/unix/tkUnixWm.c
@@ -12,7 +12,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkUnixWm.c,v 1.57 2007/10/15 20:52:48 hobbs Exp $
+ * RCS: @(#) $Id: tkUnixWm.c,v 1.58 2007/12/13 15:28:51 dgp Exp $
  */
 
 #include "tkUnixInt.h"
diff --git a/unix/tkUnixXId.c b/unix/tkUnixXId.c
index 7f3446b..af43b7f 100644
--- a/unix/tkUnixXId.c
+++ b/unix/tkUnixXId.c
@@ -16,7 +16,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tkUnixXId.c,v 1.9 2007/09/07 00:34:58 dgp Exp $
+ * RCS: @(#) $Id: tkUnixXId.c,v 1.10 2007/12/13 15:28:51 dgp Exp $
  */
 
 /*