merge 8.6

5 files changed, 87 insertions, 19 deletions

diff --git a/ChangeLog b/ChangeLog
index 94cabc1..2c1ca70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
 A NOTE ON THE CHANGELOG:
 Starting in early 2011, Tk source code has been under the management of
-fossil, hosted at http://core.tcl.tk/tk/ .  Fossil presents a "Timeline"
+fossil, hosted at http://core.tcl-lang.org/tk/ .  Fossil presents a "Timeline"
 view of changes made that is superior in every way to a hand edited log file.
 Because of this, many Tk developers are now out of the habit of maintaining
 this log file.  You may still find useful things in it, but the Timeline is
diff --git a/README b/README
index 2ea8387..b688c1f 100644
--- a/README
+++ b/README
@@ -12,7 +12,7 @@ toolkit implemented with the Tcl scripting language.
 For details on features, incompatibilities, and potential problems with
 this release, see the Tcl/Tk 8.7 Web page at
 
-	http://www.tcl.tk/software/tcltk/8.7.html
+	http://www.tcl-lang.org/software/tcltk/8.7.html
 
 or refer to the "changes" file in this directory, which contains a
 historical record of all changes to Tk.
@@ -21,11 +21,11 @@ Tk is maintained, enhanced, and distributed freely by the Tcl community.
 Source code development and tracking of bug reports and feature requests
 takes place at:
 
-	http://core.tcl.tk/tk/
+	http://core.tcl-lang.org/tk/
 
 with the Tcl Developer Xchange at:
 
-	http://www.tcl.tk/
+	http://www.tcl-lang.org/
 
 Tk is a freely available open source package.  You can do virtually
 anything you like with it, such as modifying it, redistributing it,
diff --git a/changes b/changes
index fde933c..319cc6a 100644
--- a/changes
+++ b/changes
@@ -7496,6 +7496,80 @@ Tk Cocoa 2.0: More drawing internals refinements (culler,walzer)
 
 --- Released 8.6.8, December 22, 2017 --- http://core.tcl.tk/tk/ for details
 
+2017-12-31 (bug)[aa7679] crash using window after master destroyed (vogel)
+
+2017-12-31 (bug)[6525e1] encoding leak in tkMacOSXProcessFiles (werner)
+
+2018-01-07 (bug)[925262] New option -state for ttk::scale (vogel)
+
+2018-01-07 (bug)[fa8de7] Crash [ttk::checkbutton .x -variable {}] (werner)
+
+2018-01-16 (bug)[382712] Crash in [event generate . <KeyPress>] (werner)
+
+2018-01-19 (bug)[657c38] Crash in menu destroy with checkbutton entry (werner)
+
+2018-01-25 (bug)[de156e] Deny PRIMARY selection access in safe interps (nash)
+
+2018-01-28 (bug)[b68710] Fixes in [text] bindings (nash)
+
+2018-01-28 (bug)[e20d5c] Stop failures of textTag-18.1 (vogel)
+
+2018-02-04 (bug)[5d991b] Fortify var traces against deleted vars (vogel)
+
+2018-02-10 (bug)[1821174] Stop RenderBadPicture X error (werner)
+
+2018-02-11 (bug)[502e74] Stop X errors on untrusted connections (werner)
+
+2018-03-07 (bug)[71b131] Regression in Tk_DrawChars() (werner,cramer)
+
+2018-04-03 (bug)[59fccb] menu flaws when empty menubar clicked (vogel,mcdonald)
+
+2018-04-28 (bug)[7423f9] improved legacy support for [tk_setPalette] (bll)
+
+2018-04-30 (bug)[6d5042] enable [tk inactive] on Mac OSX (culler)
+
+2018-05-03 (bug)[75d38f] fix touchpad scroll of listbox on win notebook (vogel)
+
+2018-06-16 (bug)[de01e2] Crash in [$text replace] (vogel)
+
+2018-07-04 (bug)[6ca257] Fix [wm resizable] on Mac OSX (culler)
+
+2018-07-04 (bug)[135696] Crash in [wm transient] (culler)
+
+2018-07-04 (bug)[309b42] Improve ttk high-contrast-mode support (lemburg,vogel)
+
+2018-07-17 (bug)[1088825] fix frame-2.17,3.9,3.10 on Mac (vogel)
+
+2018-07-27 (bug)[fabed1] GIF photo support for "deferred clear code" (vogel)
+
+2018-08-08 (feature) Modern full-screen support on Mac OSX (walzer)
+
+2018-08-12 (bug)[1875c1] scrollbar on Mac OSX (walzer)
+
+2018-08-14 (bug)[1ba71a] KeyRelease events on Mac OSX(walzer)
+
+2018-09-02 (bug)[3441086] error message in layout-2 (vogel)
+
+2018-09-07 (bug)[05bd7f] vista theme for combobox (vogel)
+
+2018-09-08 (bug)[382712] crash in KeyPress event handling (vogel,werner)
+
+2018-09-08 (bug)[6fcaaa] insertion cursor visibility in ttk::entry (nemethi)
+
+2018-09-30 (bug)[822923] cascade menu indicator color (mcdonald)
+
+2018-10-06 (bug)[9658bc] borderwidth calculations on menu items (vogel)
+
+2018-10-17 (bug)[ca403f] treeview border drawing (vogel)
+
+2018-10-17 (bug)[4b555a] hang in [$text search -all] (vogel,danckaert)
+
+2018-10-30 (new platform) port to system changes in Mac OSX 10.14 (culler)
+
+2018-11-04 (bug)[6b22d4] [treeview] binding fix (ohagan)
+
+- Released 8.6.9, November 16, 2018 - http://core.tcl-lang.org/tk/ for details -
+
 Changes to 8.7a1 include all changes to the 8.6 line through 8.6.7,
 plus the following, which focuses on the high-level feature changes
 in this changeset (new minor version) rather than bug fixes:
@@ -7515,12 +7589,6 @@ in this changeset (new minor version) rather than bug fixes:
 
 2017-04-13 \u escaped content in msg files converted to true utf-8 (nijtmans)
 
-2017-08-24 (bug)[f1a3ca] Memleak in text operations (hume)
-
-2017-08-24 (bug)[ee40fd] Error reporting from failed console init (the)
-
-2017-08-24 (bug)[3295446] Keep console cursor visible when using history (goth)
-
 2017-08-28 (TIP 166) Extended color notation for alpha channel (bachmann)
 
 --- Released 8.7a1, September 8, 2017 --- http://core.tcl.tk/tk/ for details
diff --git a/unix/configure b/unix/configure
index cf5ce30..efd289f 100755
--- a/unix/configure
+++ b/unix/configure
@@ -7312,18 +7312,18 @@ ac_x_header_dirs='
 /usr/openwin/share/include'
 
 if test "$ac_x_includes" = no; then
-  # Guess where to find include files, by looking for Xlib.h.
+  # Guess where to find include files, by looking for Intrinsic.h.
   # First, try using that file with no special directory specified.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <X11/Xlib.h>
+#include <X11/Intrinsic.h>
 _ACEOF
 if ac_fn_c_try_cpp "$LINENO"; then :
   # We can compile using X headers with no special include directory.
 ac_x_includes=
 else
   for ac_dir in $ac_x_header_dirs; do
-  if test -r "$ac_dir/X11/Xlib.h"; then
+  if test -r "$ac_dir/X11/Intrinsic.h"; then
     ac_x_includes=$ac_dir
     break
   fi
@@ -7337,14 +7337,14 @@ 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="-lX11 $LIBS"
+  LIBS="-lXt $LIBS"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <X11/Xlib.h>
+#include <X11/Intrinsic.h>
 int
 main ()
 {
-XrmInitialize ()
+XtMalloc (0)
   ;
   return 0;
 }
diff --git a/unix/tkConfig.h.in b/unix/tkConfig.h.in
index edd7aa6..d598ca3 100644
--- a/unix/tkConfig.h.in
+++ b/unix/tkConfig.h.in
@@ -13,6 +13,9 @@
 /* Do we have access to Darwin CoreFoundation.framework? */
 #undef HAVE_COREFOUNDATION
 
+/* Is 'DIR64' in <sys/types.h>? */
+#undef HAVE_DIR64
+
 /* Compiler support for module scope symbols */
 #undef HAVE_HIDDEN
 
@@ -232,9 +235,6 @@
 /* Define to `unsigned' if <sys/types.h> does not define. */
 #undef size_t
 
-/* Do we want to use the strtod() in compat? */
-#undef strtod
-
 /* Define to `int' if <sys/types.h> doesn't define. */
 #undef uid_t