ADDED   .fossil-settings/crlf-glob
Index: .fossil-settings/crlf-glob
==================================================================
--- /dev/null
+++ .fossil-settings/crlf-glob
@@ -0,0 +1,2 @@
+win/*.bat
+win/*.vc

Index: .fossil-settings/crnl-glob
==================================================================
--- .fossil-settings/crnl-glob
+++ .fossil-settings/crnl-glob
@@ -1,6 +1,2 @@
-win/buildall.vc.bat
-win/makefile.bc
-win/makefile.vc
-win/mkd.bat
-win/rmd.bat
-win/rules.vc
+win/*.bat
+win/*.vc

Index: .fossil-settings/encoding-glob
==================================================================
--- .fossil-settings/encoding-glob
+++ .fossil-settings/encoding-glob
@@ -1,6 +1,3 @@
 win/buildall.vc.bat
-win/makefile.bc
 win/makefile.vc
-win/mkd.bat
-win/rmd.bat
 win/rules.vc

Index: .fossil-settings/ignore-glob
==================================================================
--- .fossil-settings/ignore-glob
+++ .fossil-settings/ignore-glob
@@ -4,10 +4,11 @@
 *.exe
 *.exp
 *.lib
 *.o
 *.obj
+*.pdb
 *.res
 *.sl
 *.so
 */Makefile
 */config.cache
@@ -16,6 +17,11 @@
 */tkConfig.sh
 */wish*
 */tktest*
 */versions.vc
 doc/man.macros
+win/Debug*
+win/Release*
+win/nmhlp-out.txt
+win/nmakehlp.out
 unix/tk.pc
+html/*

Index: .project
==================================================================
--- .project
+++ .project
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>tk8.6</name>
+	<name>tk8.7</name>
 	<comment></comment>
 	<projects>
 	</projects>
 	<buildSpec>
 	</buildSpec>

Index: ChangeLog.2002
==================================================================
--- ChangeLog.2002
+++ ChangeLog.2002
@@ -2236,11 +2236,11 @@
 
 	* unix/tkUnixWm.c (CreateWrapper): Removed redundat setting of
 	inputContext to null.
 
 	* win/Makefile.in: changed gdb and shell targets to properly build
-	all binaries before running (otherwise an error often occured).
+	all binaries before running (otherwise an error often occurred).
 
 2002-03-28  David Gravereaux <davygrvy@pobox.com>
 
 	* win/.cvsignore (new):
 	* win/lamp.bmp (new):

Index: ChangeLog.2004
==================================================================
--- ChangeLog.2004
+++ ChangeLog.2004
@@ -809,11 +809,11 @@
 	default canvas origin. [Bug 956681]
 
 2004-07-05  George Peter Staplin <GeorgePS@XMission.com>
 
 	* generic/tkEvent.c: TK_XIM_SPOT preprocessor usage was modified
-	slightly to fix a bug that occured when TK_XIM_SPOT was defined as 0.
+	slightly to fix a bug that occurred when TK_XIM_SPOT was defined as 0.
 	Thanks to Joe Mistachkin for reporting this bug.
 
 2004-07-05  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
 
 	TIP#158 IMPLEMENTATION

Index: README
==================================================================
--- README
+++ README
@@ -1,7 +1,7 @@
 README:  Tk
-    This is the Tk 8.6.6 source distribution.
+    This is the Tk 8.7a2 source distribution.
 	http://sourceforge.net/projects/tcl/files/Tcl/
     You can get any source release of Tk from the URL above.
 
 1. Introduction
 ---------------
@@ -8,13 +8,13 @@
 
 This directory contains the sources and documentation for Tk, an X11
 toolkit implemented with the Tcl scripting language.
 
 For details on features, incompatibilities, and potential problems with
-this release, see the Tcl/Tk 8.6 Web page at
+this release, see the Tcl/Tk 8.7 Web page at
 
-	http://www.tcl.tk/software/tcltk/8.6.html
+	http://www.tcl.tk/software/tcltk/8.7.html
 
 or refer to the "changes" file in this directory, which contains a
 historical record of all changes to Tk.
 
 Tk is maintained, enhanced, and distributed freely by the Tcl community.

Index: changes
==================================================================
--- changes
+++ changes
@@ -1313,11 +1313,11 @@
 
 2/19/94 (bug fix) Modified tkBind.c to save and restore the interpreter's
 result across the execution of binding scripts.  Otherwise if an event
 triggers in the middle of some other script (e.g. a destroy event during
 window creation, because there was an error in the creation command),
-the intepreter's result gets lost.
+the interpreter's result gets lost.
 
 2/19/94 (bug fix) Fixed bug in dealing with results of sent command
 that could cause them to get lost in some situations.
 
 2/21/94 (bug fix) Don't let user close a dialog window created by
@@ -5097,11 +5097,11 @@
 2001-08-28 (bug fix) fixed tk_chooseDirectory crash on Win95. (baker)
 
 2001-08-28 (bug fix) removed 2 second 'raise' delay seen by some Unix
 window managers. (hobbs, baker)
 
-2001-09-14 (bug fix) fixed memory leaks that occured if errors were
+2001-09-14 (bug fix) fixed memory leaks that occurred if errors were
 thrown while initializing the channel for an image. (darley)
 
 2001-09-20 (new feature) --enable-64bit support was added for HP 11 when
 using the native compiler.
 
@@ -7311,5 +7311,216 @@
 2016-07-17 (bug)[c84f66] Aqua: crash: overflow in geometry calc (culler,walzer)
 
 2016-07-21 (bug)[450bb0] Aqua: memory corruption from [tk busy] (porter)
 
 --- Released 8.6.6, July 27, 2016 --- http://core.tcl.tk/tk/ for details
+
+2016-08-23 (bug)[a2abc4] Wrong warp cursor position on 2nd display (vogel)
+
+2016-08-29 (bug)[fa3229] menu-38.1 (calvo,vogel)
+
+2016-08-29 (bug)[2cf3d6] button-5.24 (vogel)
+
+2016-09-04 (bug)[1534455,2945130] Key release events get _L vs _R right. (vogel)
+
+2016-09-10 (bug)[8c4216] listbox-4.1 (vogel)
+
+2016-09-10 (bug)[eb2681] listbox-13.1 (vogel)
+
+2016-09-21 (bug)[3126428] ttk::button react to image change (thoyts)
+
+2016-10-09 (bug)[1082213] wrapped text don't start lines with whitespace (vogel)
+
+2016-10-12 (bug)[3217462] tri-state button on non-native theme (vogel)
+
+2016-10-30 (bug)[3588460] Fix file dialog -typevariable (vogel)
+
+2016-11-01 (bug)[e36963] event generate .e <diaeresis> (matthias,vogel)
+
+2016-11-05 (bug)[6aea69] grid-23 (danckaert,vogel)
+
+2016-11-18 (bug)[f60c54] combobox-3 (panza,vogel)
+
+2017-01-03 (bug)[f32502] crash drawing many dashed objects (reithofer,werner)
+
+2017-01-05 (bug)[dac92f] text-2.[89] (vogel)
+
+2017-01-07 (bug)[3df559] OSX: Negative bbox width (vogel)
+
+2017-01-07 (bug)[28a453] OSX: text widget index OBOE (vogel)
+
+2017-01-07 (bug)[c12af7] OSX: text-21.1 (vogel)
+
+2017-01-08 (bug)[7a838c] X11 ring buffer overflow (werner)
+
+2017-01-11 (bug)[d4fb4e] imgPhoto-4.75 (nijtmans)
+
+2017-01-18 (bug)[fab5fe] OSX: repair textDisp failures (vogel)
+
+2017-01-23 (bug)[89a638] OSX: textDisp-15.8 (vogel)
+
+2017-01-25 (bug)[1403ea] Limits on text line size on Windows (spjuth)
+
+2017-02-05 (bug)[ae32eb] textDisp fails in text custom config (vogel)
+
+2017-02-05 (bug)[7d967c] crash after IME restart (lanam,nijtmans)
+
+2017-02-22 (bug)[c492c9] disabled combobox arrow appearance (danckaert)
+
+2017-03-06 (bug)[6b3644] Fix -alpha for 16-bit color PNG (LemonMan)
+
+2017-03-11 (bug)[775273] artifacts on Ubuntu 16.10+ (nemethi)
+
+2017-03-26 (TIP 464) Win multimedia keys support (fassel,vogel)
+
+2017-03-29 (bug)[28a3c3] test BTree memleaks plugged (anonymous)
+
+2017-04-06 (bug)[db8c54] Stop freed mem access in warp pointer callback (porter)
+
+2017-04-07 (bugs) Fix calculation of ttk::notebook tab widths (vogel)
+
+2017-04-07 (bug)[291296] notebook tab management (decoster)
+
+2017-04-08 (bug)[f0188a] Win reject invalid hex color codes (bachmann)
+
+2017-04-10 (bug)[3f323b] variable struct size on XCode 8.3.1 (auriocus)
+
+2017-04-20 (bug)[061bf9] OSX scrollbar draw position (reincke,walzer,joye)
+
+2017-05-01 (bug) restore -initialfile for OSX file dialogs (reincke,gollwitzer)
+
+2017-05-06 (bug) OSX file dialog type filters (walzer)
+
+2017-05-10 (bug)[a5ba1c] race condition on Win clipboard cleanup (donchenko)
+
+2017-05-18 (bug)[2433781] center image on button (cramer)
+
+2017-05-19 (bug)[434d29] type mismatch with recent Xft (nijtmans,werner)
+
+2017-06-02 (bug)[bc43fd] paneconfigure get pane heights right (vogel)
+
+2017-06-21 (bug)[adc028] menu avoid unreleasable global grab (nash)
+
+2017-06-30 (bug)[92e028,c5eb90] User switch forced theme reset (lanam)
+
+2017-06-30 (bug)[62c5b7] segfault in [text] replace (werner)
+
+2017-07-03 (bug)[8afc6c] OSX crash in save/open dialogs (simpson,walzer)
+
+2017-08-02 (bug)[b601ce] Resource exhaustion processing corrupt GIF (nash)
+
+2017-08-03 (bug)[9eab54] Fix -initialdir for OSX file dialogs (gollwitzer)
+
+2017-08-08 (bug)[28d0b8] Follow ICCCM advice on X selection protocol (donchenko)
+
+2017-08-08 (bug)[4966ca] Scidb race in notebook tab selection (cramer)
+
+--- Released 8.6.7, August 9, 2017 --- http://core.tcl.tk/tk/ for details
+
+2017-08-24 (bug)[f1a3ca] Memory leak in [text] B-tree (edhume3)
+
+2017-08-24 (bug)[ee40fd] Report [console] init errors (the)
+
+2017-08-24 (bug)[3295446] Improve history visibility in [console] (goth)
+
+2017-08-24 (bug) canvas closed polylines fully honor -joinstyle (vogel)
+
+2017-08-24 (bug)[cc42cc] out of mem crash in tests imgPhoto-18.* (vogel)
+
+2017-09-16 (bug)[3406785] fix coords rounding when drawing canvas items (vogel)
+
+2017-09-24 (bug)[8277e1] linux fontchooser sync with available fonts (vogel)
+
+2017-09-24 (bug)[5239fd] Segfault copying a photo image to itself (bachmann)
+
+2017-09-24 (bug)[514ff6] canvas rotated text overlap detection (vogel)
+
+2017-09-24 (bug)[1e0db2] canvas rchars artifacts (bruchie,vogel)
+
+2017-10-07 (bug)[d9fdfa] display of Long non-wrapped lines in text (cramer)
+
+2017-10-07 (bug)[dd9667] text anchor not set (vogel)
+
+2017-10-11 (bugs) memleaks and other changes for macOS 10.13 support (culler)
+
+2017-10-11 (bug)[111de2] macOS colorspace improvement (walzer,culler)
+
+2017-10-13 (bug) macOS scrolling issues (culler)
+
+2017-10-15 (bug) clipping regions in scrolling and drawing on macOS (culler)
+
+2017-10-15 (bug) macOS redraw artifacts (culler)
+
+2017-10-22 (bug)[bb6b40] ::tk::AmpMenuArgs and 'entryconf' (vogel)
+
+2017-10-22 (bug)[55b95f] Crash [scale] with a bignum value (vogel)
+
+2017-10-28 (bug)[ce62c8] text-37.1 fails (vogel)
+
+2017-11-03 (bug)[0ef1c5] OS X - tests menu-22.[345] hang (vogel)
+
+2017-11-04 (bug)[c8c52b] repair OBOE in menu.test on macOS (vogel)
+
+2017-11-11 (feature) Implement [wm_iconphoto] on macOS (walzer)
+
+2017-11-11 (bug) display of embedded toplevels (culler)
+
+2017-11-19 (bug)[73ba07] Correct property type for MULTIPLE conversion (dpb)
+
+2017-11-20 (bug) Memory leak in tkImgPhoto.c. (werner)
+
+2017-11-21 (bug) Defeat zombie toplevels (culler)
+
+2017-11-25 (bug) macOS resposive menu bar for command line apps (culler)
+
+2017-11-25 (bug)[1c659e] support png from mac screenshots (vogel)
+
+2017-11-25 (bug)[de4af1] macOS file selector "all types" setting (culler)
+
+2017-11-26 (bug) [wm withdraw] on Window and Dock menus (walzer)
+
+2017-11-27 (feature) Drop support for macOS 10.5 (culler)
+
+2017-11-30 (bug)[164c1b] Fixes [raise] on macOS (culler)
+
+2017-11-30 (bug)[13d63d] macOS support of menu -postcommand (culler)
+
+2017-12-05 (bug) enable custom icon display on macOS (walzer)
+
+2017-12-05 (bug)[1088805,0feb63] macOS bind failures (culler)
+
+2017-12-05 (bug)[3382424] Suppress noisy messages on macOS (culler)
+
+2017-12-08 (new)[TIP 477] nmake build system reform (nadkarni)
+
+2017-12-18 (bug)[b77626] Make [tk busy -cursor] silent no-op on macOS (vogel)
+
+--- Released 8.6.8, December 22, 2017 --- http://core.tcl.tk/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:
+
+2016-03-07 (feature)[841280] spinbox autoswap -to/-from to get ordering (vogel)
+
+2016-03-27 (feature)[38dc27] Support <Button-6> & <Button-7> (nijtmans)
+
+2016-08-29 (TIP 449) [text] undo/redo return character range (vogel)
+
+2016-11-02 (feature) Removed undocumented command [tk_getFileType] (vogel)
+        *** POTENTIAL INCOMPATIBILITY ***
+
+2017-02-05 (bug)[c0dbdd] Compatibility fonts shadowed system fonts (vogel)
+
+2017-03-21 (TIP 442) display text in a progressbar (zaumseil)
+
+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

Index: doc/3DBorder.3
==================================================================
--- doc/3DBorder.3
+++ doc/3DBorder.3
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1990-1993 The Regents of the University of California.
 '\" Copyright (c) 1994-1998 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_Alloc3DBorderFromObj 3 8.1 Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_Alloc3DBorderFromObj, Tk_Get3DBorder, Tk_Get3DBorderFromObj, Tk_Draw3DRectangle, Tk_Fill3DRectangle, Tk_Draw3DPolygon, Tk_Fill3DPolygon, Tk_3DVerticalBevel, Tk_3DHorizontalBevel, Tk_SetBackgroundFromBorder, Tk_NameOf3DBorder, Tk_3DBorderColor, Tk_3DBorderGC, Tk_Free3DBorderFromObj, Tk_Free3DBorder \- draw borders with three-dimensional appearance

Index: doc/BindTable.3
==================================================================
--- doc/BindTable.3
+++ doc/BindTable.3
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1994 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_CreateBindingTable 3 4.0 Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_CreateBindingTable, Tk_DeleteBindingTable, Tk_CreateBinding, Tk_DeleteBinding, Tk_GetBinding, Tk_GetAllBindings, Tk_DeleteAllBindings, Tk_BindEvent \- invoke scripts in response to X events

Index: doc/CanvPsY.3
==================================================================
--- doc/CanvPsY.3
+++ doc/CanvPsY.3
@@ -1,11 +1,11 @@
 '\"
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_CanvasPs 3 4.0 Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_CanvasPsY, Tk_CanvasPsBitmap, Tk_CanvasPsColor, Tk_CanvasPsFont, Tk_CanvasPsPath, Tk_CanvasPsStipple \- utility procedures for generating Postscript for canvases

Index: doc/CanvTkwin.3
==================================================================
--- doc/CanvTkwin.3
+++ doc/CanvTkwin.3
@@ -1,11 +1,11 @@
 '\"
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_CanvasTkwin 3 4.1 Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_CanvasTkwin, Tk_CanvasGetCoord, Tk_CanvasDrawableCoords, Tk_CanvasSetStippleOrigin, Tk_CanvasWindowCoords, Tk_CanvasEventuallyRedraw, Tk_CanvasTagsOption \- utility procedures for canvas type managers

Index: doc/CanvTxtInfo.3
==================================================================
--- doc/CanvTxtInfo.3
+++ doc/CanvTxtInfo.3
@@ -1,11 +1,11 @@
 '\"
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_CanvasTextInfo 3 4.0 Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_CanvasTextInfo \- additional information for managing text items in canvases

Index: doc/Clipboard.3
==================================================================
--- doc/Clipboard.3
+++ doc/Clipboard.3
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1994 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_ClipboardClear 3 4.0 Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_ClipboardClear, Tk_ClipboardAppend \- Manage the clipboard

Index: doc/ClrSelect.3
==================================================================
--- doc/ClrSelect.3
+++ doc/ClrSelect.3
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1992-1994 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_ClearSelection 3 4.0 Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_ClearSelection \- Deselect a selection

Index: doc/ConfigWind.3
==================================================================
--- doc/ConfigWind.3
+++ doc/ConfigWind.3
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1990-1993 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_ConfigureWindow 3 4.0 Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_ConfigureWindow, Tk_MoveWindow, Tk_ResizeWindow, Tk_MoveResizeWindow, Tk_SetWindowBorderWidth, Tk_ChangeWindowAttributes, Tk_SetWindowBackground, Tk_SetWindowBackgroundPixmap, Tk_SetWindowBorder, Tk_SetWindowBorderPixmap, Tk_SetWindowColormap, Tk_DefineCursor, Tk_UndefineCursor \- change window configuration or attributes

Index: doc/CoordToWin.3
==================================================================
--- doc/CoordToWin.3
+++ doc/CoordToWin.3
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1990-1993 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_CoordsToWindow 3 "" Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_CoordsToWindow \- Find window containing a point

Index: doc/CrtCmHdlr.3
==================================================================
--- doc/CrtCmHdlr.3
+++ doc/CrtCmHdlr.3
@@ -1,11 +1,11 @@
 '\"
 '\" Copyright (c) 2000 Ajuba Solutions.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_CreateClientMessageHandler 3 "8.4" Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_CreateClientMessageHandler, Tk_DeleteClientMessageHandler \- associate procedure callback with ClientMessage type X events

Index: doc/CrtConsoleChan.3
==================================================================
--- doc/CrtConsoleChan.3
+++ doc/CrtConsoleChan.3
@@ -1,11 +1,11 @@
 '\"
 '\" Copyright (c) 2007 ActiveState Software Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_InitConsoleChannels 3 8.5 Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_InitConsoleChannels \- Install the console channels as standard channels

Index: doc/CrtErrHdlr.3
==================================================================
--- doc/CrtErrHdlr.3
+++ doc/CrtErrHdlr.3
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1990 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_CreateErrorHandler 3 "" Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_CreateErrorHandler, Tk_DeleteErrorHandler \- handle X protocol errors

Index: doc/CrtGenHdlr.3
==================================================================
--- doc/CrtGenHdlr.3
+++ doc/CrtGenHdlr.3
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1992-1994 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_CreateGenericHandler 3 "" Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_CreateGenericHandler, Tk_DeleteGenericHandler \- associate procedure callback with all X events

Index: doc/CrtImgType.3
==================================================================
--- doc/CrtImgType.3
+++ doc/CrtImgType.3
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1994 The Regents of the University of California.
 '\" Copyright (c) 1994-1997 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_CreateImageType 3 8.5 Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_CreateImageType, Tk_GetImageMasterData, Tk_InitImageArgs \- define new kind of image

Index: doc/CrtItemType.3
==================================================================
--- doc/CrtItemType.3
+++ doc/CrtItemType.3
@@ -1,11 +1,11 @@
 '\"
 '\" Copyright (c) 1994-1995 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_CreateItemType 3 4.0 Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_CreateItemType, Tk_GetItemTypes \- define new kind of canvas item

Index: doc/CrtPhImgFmt.3
==================================================================
--- doc/CrtPhImgFmt.3
+++ doc/CrtPhImgFmt.3
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1994 The Australian National University
 '\" Copyright (c) 1994-1997 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 '\" Author: Paul Mackerras (paulus@cs.anu.edu.au),
 '\"	    Department of Computer Science,
 '\"	    Australian National University.
 '\"
 .TH Tk_CreatePhotoImageFormat 3 8.5 Tk "Tk Library Procedures"

Index: doc/DeleteImg.3
==================================================================
--- doc/DeleteImg.3
+++ doc/DeleteImg.3
@@ -1,11 +1,11 @@
 '\"
 '\" Copyright (c) 1995-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_DeleteImage 3 4.0 Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_DeleteImage \- Destroy an image.

Index: doc/DrawFocHlt.3
==================================================================
--- doc/DrawFocHlt.3
+++ doc/DrawFocHlt.3
@@ -1,11 +1,11 @@
 '\"
 '\" Copyright (c) 1995-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_DrawFocusHighlight 3 4.0 Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_DrawFocusHighlight \- draw the traversal highlight ring for a widget

Index: doc/EventHndlr.3
==================================================================
--- doc/EventHndlr.3
+++ doc/EventHndlr.3
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1990 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_CreateEventHandler 3 "" Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_CreateEventHandler, Tk_DeleteEventHandler \- associate procedure callback with an X event

Index: doc/FindPhoto.3
==================================================================
--- doc/FindPhoto.3
+++ doc/FindPhoto.3
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1994 The Australian National University
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 '\" Author: Paul Mackerras (paulus@cs.anu.edu.au),
 '\"	    Department of Computer Science,
 '\"	    Australian National University.
 '\"
 .TH Tk_FindPhoto 3 8.0 Tk "Tk Library Procedures"
@@ -97,12 +97,12 @@
 .PP
 \fBTk_FindPhoto\fR returns an opaque handle that is used to identify a
 particular photo image to the other procedures.  The parameter is the
 name of the image, that is, the name specified to the \fBimage create
 photo\fR command, or assigned by that command if no name was specified.
-If \fIimageName\fR does not exist or is not a photo image, 
-\fBTk_FindPhoto\fR returns NULL. 
+If \fIimageName\fR does not exist or is not a photo image,
+\fBTk_FindPhoto\fR returns NULL.
 .PP
 \fBTk_PhotoPutBlock\fR is used to supply blocks of image data to be
 displayed.  The call affects an area of the image of size
 \fIwidth\fR x \fIheight\fR pixels, with its top-left corner at
 coordinates (\fIx\fR,\fIy\fR).  All of \fIwidth\fR, \fIheight\fR,
@@ -128,18 +128,27 @@
 .CE
 The \fIpixelPtr\fR field points to the first pixel, that is, the
 top-left pixel in the block.
 The \fIwidth\fR and \fIheight\fR fields specify the dimensions of the
 block of pixels.  The \fIpixelSize\fR field specifies the address
-difference between two horizontally adjacent pixels.  Often it is 3
-or 4, but it can have any value.  The \fIpitch\fR field specifies the
+difference between two horizontally adjacent pixels.  It should be 4 for
+RGB and 2 for grayscale image data.  Other values are possible, if the
+offsets in the \fIoffset\fR array are adjusted accordingly (e.g. for
+red, green and blue data stored in different planes).  Using such a
+layout is strongly discouraged, though. Due to a bug, it might not work
+correctly if an alpha channel is provided. (see the \fBBUGS\fR section
+below). The \fIpitch\fR field specifies the
 address difference between two vertically adjacent pixels.  The
 \fIoffset\fR array contains the offsets from the address of a pixel
 to the addresses of the bytes containing the red, green, blue and alpha
-(transparency) components.  These are normally 0, 1, 2 and 3, but can
-have other values, e.g., for images that are stored as separate red,
-green and blue planes.
+(transparency) components.  If the offsets for red, green and blue are
+equal, the image is interpreted as grayscale. If they differ, RGB data
+is assumed. Normally the offsets will be 0, 1, 2, 3 for RGB data
+and 0, 0, 0, 1 for grayscale.  It is possible to provide image data
+without an alpha channel by setting the offset for alpha to a negative
+value and adjusting the \fIpixelSize\fR field accordingly. This use is
+discouraged, though (see the \fBBUGS\fR section below).
 .PP
 The \fIcompRule\fR parameter to \fBTk_PhotoPutBlock\fR specifies a
 compositing rule that says what to do with transparent pixels.  The
 value \fBTK_PHOTO_COMPOSITE_OVERLAY\fR says that the previous contents of
 the photo image should show through, and the value
@@ -182,20 +191,20 @@
 in the structure pointed to by the \fIblockPtr\fR parameter with values
 that describe the address and layout of the image data that the
 photo image has stored internally.  The values are valid
 until the image is destroyed or its size is changed.
 .PP
-It is possible to modify an image by writing directly to the data 
+It is possible to modify an image by writing directly to the data
 the \fIpixelPtr\fR field points to. The size of the image cannot be
 changed this way, though.
-Also, changes made by writing directly to \fIpixelPtr\fR will not be 
-immediately visible, but only after a call to 
-\fBTk_ImageChanged\fR or after an event that causes the interested 
+Also, changes made by writing directly to \fIpixelPtr\fR will not be
+immediately visible, but only after a call to
+\fBTk_ImageChanged\fR or after an event that causes the interested
 widgets to redraw themselves.
-For these reasons usually it is preferable to make changes to 
-a copy of the image data and write it back with 
-\fBTk_PhotoPutBlock\fR or \fBTk_PhotoPutZoomedBlock\fR. 
+For these reasons usually it is preferable to make changes to
+a copy of the image data and write it back with
+\fBTk_PhotoPutBlock\fR or \fBTk_PhotoPutZoomedBlock\fR.
 .PP
 \fBTk_PhotoGetImage\fR returns 1 for compatibility with the
 corresponding procedure in the old photo widget.
 .PP
 \fBTk_PhotoBlank\fR blanks the entire area of the
@@ -246,11 +255,29 @@
 \fIinterp\fR argument or return any result code.  If insufficient
 memory was available for an image, Tk would panic.  This behaviour is
 still supported if you compile your extension with the additional flag
 -DUSE_PANIC_ON_PHOTO_ALLOC_FAILURE.  Code linked using Stubs against
 older versions of Tk will continue to work.
+.SH BUGS
+The \fBTk_PhotoImageBlock\fR structure used to provide image data to
+\fBTk_PhotoPutBlock\fR promises great flexibility in the layout of the
+data (e.g. separate planes for the red, green, blue and alpha
+channels).  Unfortunately, the implementation fails to hold this
+promise.  The problem is that the \fIpixelSize\fR field is
+(incorrectly) used to determine whether the image has an alpha channel.
+Currently, if the offset for the alpha channel is greater or equal than
+\fIpixelSize\fR, \fBtk_PhotoPutblock\fR assumes no alpha data is
+present and makes the image fully opaque.  This means that for layouts
+where the channels are separate (or any other exotic layout where
+\fIpixelSize\fR has to be smaller than the alpha offset), the alpha
+channel will not be read correctly.  In order to be on the safe side
+if this issue will be corrected in a future release, it is strongly
+recommended you always provide alpha data - even if the image has no
+transparency - and only use the "standard" layout with a
+\fIpixelSize\fR of 2 for grayscale and 4 for RGB data with
+\fIoffset\fRs of 0, 0, 0, 1 or 0, 1, 2, 3 respectively.
 .SH CREDITS
 .PP
 The code for the photo image type was developed by Paul Mackerras,
 based on his earlier photo widget code.
 .SH KEYWORDS
 photo, image

Index: doc/FreeXId.3
==================================================================
--- doc/FreeXId.3
+++ doc/FreeXId.3
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1990 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_FreeXId 3 4.0 Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_FreeXId \- make X resource identifier available for reuse
@@ -23,26 +23,8 @@
 Identifier of X resource (window, font, pixmap, cursor, graphics
 context, or colormap) that is no longer in use.
 .BE
 .SH DESCRIPTION
 .PP
-The default allocator for resource identifiers provided by Xlib is very
-simple-minded and does not allow resource identifiers to be re-used.
-If a long-running application reaches the end of the resource id
-space, it will generate an X protocol error and crash.
-Tk replaces the default id allocator with its own allocator, which
-allows identifiers to be reused.
-In order for this to work, \fBTk_FreeXId\fR must be called to
-tell the allocator about resources that have been freed.
-Tk automatically calls \fBTk_FreeXId\fR whenever it frees a
-resource, so if you use procedures like \fBTk_GetFont\fR,
-\fBTk_GetGC\fR, and \fBTk_GetPixmap\fR then you need not call
-\fBTk_FreeXId\fR.
-However, if you allocate resources directly from Xlib, for example
-by calling \fBXCreatePixmap\fR, then you should call \fBTk_FreeXId\fR
-when you call the corresponding Xlib free procedure, such as
-\fBXFreePixmap\fR.
-If you do not call \fBTk_FreeXId\fR then the resource identifier will
-be lost, which could cause problems if the application runs long enough
-to lose all of the available identifiers.
+This function is deprecated, it doesn't do anything since 2008-08-19.
 .SH KEYWORDS
 resource identifier

Index: doc/GeomReq.3
==================================================================
--- doc/GeomReq.3
+++ doc/GeomReq.3
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1990-1994 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_GeometryRequest 3 "8.4" Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_GeometryRequest, Tk_SetMinimumRequestSize, Tk_SetInternalBorder, Tk_SetInternalBorderEx \- specify desired geometry or internal border for a window

Index: doc/GetAnchor.3
==================================================================
--- doc/GetAnchor.3
+++ doc/GetAnchor.3
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1990 The Regents of the University of California.
 '\" Copyright (c) 1994-1998 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_GetAnchorFromObj 3 8.1 Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_GetAnchorFromObj, Tk_GetAnchor, Tk_NameOfAnchor \- translate between strings and anchor positions

Index: doc/GetBitmap.3
==================================================================
--- doc/GetBitmap.3
+++ doc/GetBitmap.3
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1990 The Regents of the University of California.
 '\" Copyright (c) 1994-1998 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_AllocBitmapFromObj 3 8.1 Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_AllocBitmapFromObj, Tk_GetBitmap, Tk_GetBitmapFromObj, Tk_DefineBitmap, Tk_NameOfBitmap, Tk_SizeOfBitmap, Tk_FreeBitmapFromObj, Tk_FreeBitmap \- maintain database of single-plane pixmaps

Index: doc/GetCapStyl.3
==================================================================
--- doc/GetCapStyl.3
+++ doc/GetCapStyl.3
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1990 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_GetCapStyle 3 "" Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_GetCapStyle, Tk_NameOfCapStyle \- translate between strings and cap styles

Index: doc/GetClrmap.3
==================================================================
--- doc/GetClrmap.3
+++ doc/GetClrmap.3
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1994 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_GetColormap 3 4.0 Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_GetColormap, Tk_PreserveColormap, Tk_FreeColormap \- allocate and free colormaps

Index: doc/GetDash.3
==================================================================
--- doc/GetDash.3
+++ doc/GetDash.3
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1989-1993 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_GetDash 3 8.3 Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_GetDash \- convert from string to valid dash structure.

Index: doc/GetGC.3
==================================================================
--- doc/GetGC.3
+++ doc/GetGC.3
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1990 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_GetGC 3 "" Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_GetGC, Tk_FreeGC \- maintain database of read-only graphics contexts

Index: doc/GetHINSTANCE.3
==================================================================
--- doc/GetHINSTANCE.3
+++ doc/GetHINSTANCE.3
@@ -1,9 +1,9 @@
 '\"
 '\" Copyright (c) 1998-2000 by Scriptics Corporation.
 '\" All rights reserved.
-'\" 
+'\"
 .TH Tk_GetHISTANCE 3 "" Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_GetHINSTANCE \- retrieve the global application instance handle

Index: doc/GetHWND.3
==================================================================
--- doc/GetHWND.3
+++ doc/GetHWND.3
@@ -1,9 +1,9 @@
 '\"
 '\" Copyright (c) 1998-2000 by Scriptics Corporation.
 '\" All rights reserved.
-'\" 
+'\"
 .TH HWND 3 8.0 Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_GetHWND, Tk_AttachHWND \- manage interactions between the Windows handle and an X window

Index: doc/GetImage.3
==================================================================
--- doc/GetImage.3
+++ doc/GetImage.3
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1994 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_GetImage 3 4.0 Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_GetImage, Tk_RedrawImage, Tk_SizeOfImage, Tk_FreeImage \- use an image in a widget

Index: doc/GetJoinStl.3
==================================================================
--- doc/GetJoinStl.3
+++ doc/GetJoinStl.3
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1990 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_GetJoinStyle 3 "" Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_GetJoinStyle, Tk_NameOfJoinStyle \- translate between strings and join styles

Index: doc/GetJustify.3
==================================================================
--- doc/GetJustify.3
+++ doc/GetJustify.3
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1990-1994 The Regents of the University of California.
 '\" Copyright (c) 1994-1998 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_GetJustifyFromObj 3 8.1 Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_GetJustifyFromObj, Tk_GetJustify, Tk_NameOfJustify \- translate between strings and justification styles

Index: doc/GetOption.3
==================================================================
--- doc/GetOption.3
+++ doc/GetOption.3
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1990 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_GetOption 3 "" Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_GetOption \- retrieve an option from the option database

Index: doc/GetPixels.3
==================================================================
--- doc/GetPixels.3
+++ doc/GetPixels.3
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1990 The Regents of the University of California.
 '\" Copyright (c) 1994-1998 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_GetPixelsFromObj 3 8.1 Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_GetPixelsFromObj, Tk_GetPixels, Tk_GetMMFromObj, Tk_GetScreenMM \- translate between strings and screen units

Index: doc/GetPixmap.3
==================================================================
--- doc/GetPixmap.3
+++ doc/GetPixmap.3
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1990 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_GetPixmap 3 4.0 Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_GetPixmap, Tk_FreePixmap \- allocate and free pixmaps

Index: doc/GetRelief.3
==================================================================
--- doc/GetRelief.3
+++ doc/GetRelief.3
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1990 The Regents of the University of California.
 '\" Copyright (c) 1994-1998 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_GetReliefFromObj 3 8.1 Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_GetReliefFromObj, Tk_GetRelief, Tk_NameOfRelief \- translate between strings and relief values

Index: doc/GetRootCrd.3
==================================================================
--- doc/GetRootCrd.3
+++ doc/GetRootCrd.3
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1990 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_GetRootCoords 3 "" Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_GetRootCoords \- Compute root-window coordinates of window

Index: doc/GetScroll.3
==================================================================
--- doc/GetScroll.3
+++ doc/GetScroll.3
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1994 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_GetScrollInfo 3 8.0 Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_GetScrollInfoObj, Tk_GetScrollInfo \- parse arguments for scrolling commands

Index: doc/GetSelect.3
==================================================================
--- doc/GetSelect.3
+++ doc/GetSelect.3
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1990-1994 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_GetSelection 3 4.0 Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_GetSelection \- retrieve the contents of a selection

Index: doc/GetUid.3
==================================================================
--- doc/GetUid.3
+++ doc/GetUid.3
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1990 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_GetUid 3 "" Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_GetUid, Tk_Uid \- convert from string to unique identifier

Index: doc/GetVRoot.3
==================================================================
--- doc/GetVRoot.3
+++ doc/GetVRoot.3
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1990 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_GetVRootGeometry 3 4.0 Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_GetVRootGeometry \- Get location and size of virtual root for window

Index: doc/GetVisual.3
==================================================================
--- doc/GetVisual.3
+++ doc/GetVisual.3
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1994 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_GetVisual 3 4.0 Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_GetVisual \- translate from string to visual

Index: doc/Grab.3
==================================================================
--- doc/Grab.3
+++ doc/Grab.3
@@ -1,9 +1,9 @@
 '\"
 '\" Copyright (c) 1998-2000 by Scriptics Corporation.
 '\" All rights reserved.
-'\" 
+'\"
 .TH Tk_Grab 3 "" Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_Grab, Tk_Ungrab \- manipulate grab state in an application

Index: doc/HWNDToWindow.3
==================================================================
--- doc/HWNDToWindow.3
+++ doc/HWNDToWindow.3
@@ -1,9 +1,9 @@
 '\"
 '\" Copyright (c) 1998-2000 by Scriptics Corporation.
 '\" All rights reserved.
-'\" 
+'\"
 .TH Tk_HWNDToWindow 3 "" Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_HWNDToWindow \- Find Tk's window information for a Windows window

Index: doc/HandleEvent.3
==================================================================
--- doc/HandleEvent.3
+++ doc/HandleEvent.3
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1990-1992 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_HandleEvent 3 "" Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_HandleEvent \- invoke event handlers for window system events

Index: doc/IdToWindow.3
==================================================================
--- doc/IdToWindow.3
+++ doc/IdToWindow.3
@@ -1,11 +1,11 @@
 '\"
 '\" Copyright (c) 1995-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_IdToWindow 3 4.0 Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_IdToWindow \- Find Tk's window information for an X window

Index: doc/ImgChanged.3
==================================================================
--- doc/ImgChanged.3
+++ doc/ImgChanged.3
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1994 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_ImageChanged 3 4.0 Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_ImageChanged \- notify widgets that image needs to be redrawn

Index: doc/Inactive.3
==================================================================
--- doc/Inactive.3
+++ doc/Inactive.3
@@ -1,9 +1,9 @@
 '\"
 '\" Copyright (c) 1998-2000 by Scriptics Corporation.
 '\" All rights reserved.
-'\" 
+'\"
 .TH Tk_GetUserInactiveTime 3 8.5 Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_GetUserInactiveTime, Tk_ResetUserInactiveTime \- discover user inactivity time
@@ -12,11 +12,11 @@
 \fB#include <tk.h>\fR
 .sp
 long
 \fBTk_GetUserInactiveTime(\fIdisplay\fB)\fR
 .sp
-\fBTk_GetUserInactiveTime(\fIdisplay\fB)\fR
+\fBTk_ResetUserInactiveTime(\fIdisplay\fB)\fR
 .SH ARGUMENTS
 .AS Display *display
 .AP Display *display in
 The display on which the user inactivity timer is to be queried or
 reset.
@@ -24,11 +24,11 @@
 .SH DESCRIPTION
 .PP
 \fBTk_GetUserInactiveTime\fR returns the number of milliseconds that
 have passed since the last user interaction (usually via keyboard or
 mouse) with the respective display. On systems and displays that do not
-support querying the user inactiviy time, \fB\-1\fR is returned.
-\fBTk_GetUserInactiveTime\fR resets the user inactivity timer of the
+support querying the user inactivity time, \fB\-1\fR is returned.
+\fBTk_ResetUserInactiveTime\fR resets the user inactivity timer of the
 given display to zero.  On windowing systems that do not support
 multiple displays \fIdisplay\fR can be passed as \fBNULL\fR.
 .SH KEYWORDS
 idle, inactive

Index: doc/InternAtom.3
==================================================================
--- doc/InternAtom.3
+++ doc/InternAtom.3
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1990 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_InternAtom 3 "" Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_InternAtom, Tk_GetAtomName \- manage cache of X atoms

Index: doc/MainLoop.3
==================================================================
--- doc/MainLoop.3
+++ doc/MainLoop.3
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1990-1992 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_MainLoop 3 "" Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_MainLoop \- loop for events until all windows are deleted

Index: doc/MainWin.3
==================================================================
--- doc/MainWin.3
+++ doc/MainWin.3
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1990 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_MainWindow 3 7.0 Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_MainWindow, Tk_GetNumMainWindows \- functions for querying main window information

Index: doc/MaintGeom.3
==================================================================
--- doc/MaintGeom.3
+++ doc/MaintGeom.3
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1994 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_MaintainGeometry 3 4.0 Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_MaintainGeometry, Tk_UnmaintainGeometry \- maintain geometry of one window relative to another

Index: doc/ManageGeom.3
==================================================================
--- doc/ManageGeom.3
+++ doc/ManageGeom.3
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1990-1994 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_ManageGeometry 3 4.0 Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_ManageGeometry \- arrange to handle geometry requests for a window

Index: doc/MoveToplev.3
==================================================================
--- doc/MoveToplev.3
+++ doc/MoveToplev.3
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1990-1993 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_MoveToplevelWindow 3 "" Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_MoveToplevelWindow \- Adjust the position of a top-level window

Index: doc/Name.3
==================================================================
--- doc/Name.3
+++ doc/Name.3
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1990 The Regents of the University of California.
 '\" Copyright (c) 1994-1997 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_Name 3 "" Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_Name, Tk_PathName, Tk_NameToWindow \- convert between names and window tokens

Index: doc/NameOfImg.3
==================================================================
--- doc/NameOfImg.3
+++ doc/NameOfImg.3
@@ -1,11 +1,11 @@
 '\"
 '\" Copyright (c) 1995-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_NameOfImage 3 4.0 Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_NameOfImage \- Return name of image.

Index: doc/OwnSelect.3
==================================================================
--- doc/OwnSelect.3
+++ doc/OwnSelect.3
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1990-1994 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_OwnSelection 3 4.0 Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_OwnSelection \- make a window the owner of the primary selection

Index: doc/ParseArgv.3
==================================================================
--- doc/ParseArgv.3
+++ doc/ParseArgv.3
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1990-1992 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_ParseArgv 3 "" Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_ParseArgv \- process command-line options

Index: doc/QWinEvent.3
==================================================================
--- doc/QWinEvent.3
+++ doc/QWinEvent.3
@@ -1,11 +1,11 @@
 '\"
 '\" Copyright (c) 1995-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_QueueWindowEvent 3 7.5 Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_CollapseMotionEvents, Tk_QueueWindowEvent \- Add a window event to the Tcl event queue

Index: doc/Restack.3
==================================================================
--- doc/Restack.3
+++ doc/Restack.3
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1990 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_RestackWindow 3 "" Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_RestackWindow \- Change a window's position in the stacking order

Index: doc/RestrictEv.3
==================================================================
--- doc/RestrictEv.3
+++ doc/RestrictEv.3
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1990 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_RestrictEvents 3 "" Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_RestrictEvents \- filter and selectively delay X events

Index: doc/SetAppName.3
==================================================================
--- doc/SetAppName.3
+++ doc/SetAppName.3
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1994 The Regents of the University of California.
 '\" Copyright (c) 1994-1997 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_SetAppName 3 4.0 Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_SetAppName \- Set the name of an application for 'send' commands

Index: doc/SetCaret.3
==================================================================
--- doc/SetCaret.3
+++ doc/SetCaret.3
@@ -1,11 +1,11 @@
 '\"
 '\" Copyright (c) 2002 ActiveState Corporation.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_SetCaretPos 3 8.4 Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_SetCaretPos \- set the display caret location

Index: doc/SetClass.3
==================================================================
--- doc/SetClass.3
+++ doc/SetClass.3
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1990 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_SetClass 3 "" Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_SetClass, Tk_Class \- set or retrieve a window's class

Index: doc/SetClassProcs.3
==================================================================
--- doc/SetClassProcs.3
+++ doc/SetClassProcs.3
@@ -1,11 +1,11 @@
 '\"
 '\" Copyright (c) 2000 Ajuba Solutions.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_SetClassProcs 3 8.4 Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_SetClassProcs \- register widget specific procedures

Index: doc/SetGrid.3
==================================================================
--- doc/SetGrid.3
+++ doc/SetGrid.3
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1990-1994 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_SetGrid 3 4.0 Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_SetGrid, Tk_UnsetGrid \- control the grid for interactive resizing

Index: doc/SetOptions.3
==================================================================
--- doc/SetOptions.3
+++ doc/SetOptions.3
@@ -1,11 +1,11 @@
 '\"
 '\" Copyright (c) 1998 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_SetOptions 3 8.1 Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_CreateOptionTable, Tk_DeleteOptionTable, Tk_InitOptions, Tk_SetOptions, Tk_FreeSavedOptions, Tk_RestoreSavedOptions, Tk_GetOptionValue,  Tk_GetOptionInfo, Tk_FreeConfigOptions, Tk_Offset \- process configuration options
@@ -50,11 +50,11 @@
 options that are supported.  Used to build a Tk_OptionTable.  The information
 pointed to by this argument must exist for the lifetime of the Tk_OptionTable.
 .AP Tk_OptionTable optionTable in
 Token for an option table.  Must have been returned by a previous call
 to \fBTk_CreateOptionTable\fR.
-.AP char *recordPtr in/out
+.AP void *recordPtr in/out
 Points to structure in which values of configuration options are stored;
 fields of this record are modified by procedures such as \fBTk_SetOptions\fR
 and read by procedures such as \fBTk_GetOptionValue\fR.
 .AP Tk_Window tkwin in
 For options such as \fBTK_OPTION_COLOR\fR, this argument indicates

Index: doc/SetVisual.3
==================================================================
--- doc/SetVisual.3
+++ doc/SetVisual.3
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1992 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_SetWindowVisual 3 4.0 Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_SetWindowVisual \- change visual characteristics of window

Index: doc/StrictMotif.3
==================================================================
--- doc/StrictMotif.3
+++ doc/StrictMotif.3
@@ -1,11 +1,11 @@
 '\"
 '\" Copyright (c) 1995-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_StrictMotif 3 4.0 Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_StrictMotif \- Return value of tk_strictMotif variable

Index: doc/TkInitStubs.3
==================================================================
--- doc/TkInitStubs.3
+++ doc/TkInitStubs.3
@@ -1,11 +1,11 @@
 '\"
 '\" Copyright (c) 1999 Scriptics Corporation
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_InitStubs 3 8.4 Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_InitStubs \- initialize the Tk stubs mechanism

Index: doc/Tk_Init.3
==================================================================
--- doc/Tk_Init.3
+++ doc/Tk_Init.3
@@ -1,11 +1,11 @@
 '\"
 '\" Copyright (c) 1995-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Tk_Init 3 8.0 Tk "Tk Library Procedures"
 .so man.macros
 .BS
 .SH NAME
 Tk_Init, Tk_SafeInit \- add Tk to an interpreter and make a new Tk application.

Index: doc/bell.n
==================================================================
--- doc/bell.n
+++ doc/bell.n
@@ -3,11 +3,11 @@
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\" Copyright (c) 2000 Ajuba Solutions.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH bell n 8.4 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
 '\" Note:  do not modify the .SH NAME line immediately below!
 .SH NAME

Index: doc/bind.n
==================================================================
--- doc/bind.n
+++ doc/bind.n
@@ -3,11 +3,11 @@
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\" Copyright (c) 1998 by Scriptics Corporation.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH bind n 8.0 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
 '\" Note:  do not modify the .SH NAME line immediately below!
 .SH NAME
@@ -17,13 +17,14 @@
 .BE
 .SH "INTRODUCTION"
 .PP
 The \fBbind\fR command associates Tcl scripts with X events.
 If all three arguments are specified, \fBbind\fR will
-arrange for \fIscript\fR (a Tcl script) to be evaluated whenever
-the event(s) given by \fIsequence\fR occur in the window(s)
-identified by \fItag\fR.
+arrange for \fIscript\fR (a Tcl script called the
+.QW "binding script")
+to be evaluated whenever the event(s) given by \fIsequence\fR
+occur in the window(s) identified by \fItag\fR.
 If \fIscript\fR is prefixed with a
 .QW + ,
 then it is appended to
 any existing binding for \fIsequence\fR;  otherwise \fIscript\fR replaces
 any existing binding.
@@ -349,11 +350,11 @@
 .RE
 .SS "EVENT DETAILS"
 .PP
 The last part of a long event specification is \fIdetail\fR.  In the
 case of a \fBButtonPress\fR or \fBButtonRelease\fR event, it is the
-number of a button (1\-5).  If a button number is given, then only an
+number of a button (1\-9).  If a button number is given, then only an
 event on that particular button will match;  if no button number is
 given, then an event on any button will match.  Note:  giving a
 specific button number is different than specifying a button modifier;
 in the first case, it refers to a button being pressed or released,
 while in the second it refers to some other button that is already
@@ -385,11 +386,12 @@
 \fItype\fR field may be omitted;  it will default to \fBKeyPress\fR.
 For example, \fB<Control\-comma>\fR is equivalent to
 \fB<Control\-KeyPress\-comma>\fR.
 .SH "BINDING SCRIPTS AND SUBSTITUTIONS"
 .PP
-The \fIscript\fR argument to \fBbind\fR is a Tcl script,
+The \fIscript\fR argument to \fBbind\fR is a Tcl script, called the
+.QW "binding script",
 which will be executed whenever the given event sequence occurs.
 \fICommand\fR will be executed in the same interpreter that the
 \fBbind\fR command was executed in, and it will run at global
 level (only global variables will be accessible).
 If \fIscript\fR contains
@@ -604,16 +606,24 @@
 a particular window or to associate additional binding tags with
 the window.
 .PP
 The \fBcontinue\fR and \fBbreak\fR commands may be used inside a
 binding script to control the processing of matching scripts.
-If \fBcontinue\fR is invoked, then the current binding script
-is terminated but Tk will continue processing binding scripts
-associated with other \fItag\fR's.
+If \fBcontinue\fR is invoked within a binding script, then this
+binding script, including all other
+.QW +
+appended scripts, is terminated but Tk will continue processing
+binding scripts associated with other \fItag\fR's.
 If the \fBbreak\fR command is invoked within a binding script,
 then that script terminates and no other scripts will be invoked
 for the event.
+.PP
+Within a script called from the binding script, \fBreturn\fR
+\fB-code ok\fR may be used to continue processing (including
+.QW +
+appended scripts), or \fBreturn\fR \fB-code break\fR may be used to
+stop processing all other binding scripts.
 .PP
 If more than one binding matches a particular event and they
 have the same \fItag\fR, then the most specific binding
 is chosen and its script is evaluated.
 The following tests are applied, in order, to determine which of

Index: doc/bindtags.n
==================================================================
--- doc/bindtags.n
+++ doc/bindtags.n
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1990 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH bindtags n 4.0 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
 '\" Note:  do not modify the .SH NAME line immediately below!
 .SH NAME

Index: doc/bitmap.n
==================================================================
--- doc/bitmap.n
+++ doc/bitmap.n
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1994 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH bitmap n 4.0 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
 '\" Note:  do not modify the .SH NAME line immediately below!
 .SH NAME

Index: doc/busy.n
==================================================================
--- doc/busy.n
+++ doc/busy.n
@@ -26,13 +26,15 @@
 .TH busy n "" Tk "Tk Built-In Commands"
 .so man.macros
 .BS
 '\" Note:  do not modify the .SH NAME line immediately below!
 .SH NAME
-busy \- confine pointer and keyboard events to a window sub-tree
+busy \- Make Tk widgets busy, temporarily blocking user interactions
 .SH SYNOPSIS
 \fBtk busy\fR \fIwindow \fR?\fIoptions\fR?
+.sp
+\fBtk busy busywindow \fIwindow\fR
 .sp
 \fBtk busy hold\fR \fIwindow \fR?\fIoptions\fR?
 .sp
 \fBtk busy configure \fIwindow\fR ?\fIoption value\fR?...
 .sp
@@ -42,13 +44,14 @@
 .sp
 \fBtk busy status \fIwindow\fR
 .BE
 .SH DESCRIPTION
 .PP
-The \fBtk busy\fR command provides a simple means to block keyboard, button,
-and pointer events from Tk widgets, while overriding the widget's cursor with
-a configurable busy cursor.
+The \fBtk busy\fR command provides a simple means to block mouse pointer events
+from Tk widgets, while overriding the widget's cursor with a configurable busy
+cursor. Note this command does not prevent keyboard events from being sent to
+the widgets made busy.
 .SH INTRODUCTION
 .PP
 There are many times in applications where you want to temporarily restrict
 what actions the user can take. For example, an application could have a
 .QW Run
@@ -66,12 +69,12 @@
 etc.\0are ignored by the widget. You can set a special cursor (like a watch)
 that overrides the widget's normal cursor, providing feedback that the
 application (widget) is temporarily busy.
 .PP
 When a widget is made busy, the widget and all of its descendants will ignore
-events. It's easy to make an entire panel of widgets busy. You can simply make
-the toplevel widget (such as
+pointer events. It's easy to make an entire panel of widgets busy. You can
+simply make the toplevel widget (such as
 .QW . )
 busy. This is easier and far much more efficient than recursively traversing
 the widget hierarchy, disabling each widget and re-configuring its cursor.
 .PP
 Often, the \fBtk busy\fR command can be used instead of Tk's \fBgrab\fR
@@ -125,28 +128,15 @@
 .TP
 \fBtk busy \fIwindow\fR ?\fIoption value\fR?...
 .
 Shortcut for \fBtk busy hold\fR command.
 .TP
-\fBtk busy hold \fIwindow\fR ?\fIoption value\fR?...
-.
-Makes the specified \fIwindow\fR (and its descendants in the Tk window
-hierarchy) appear busy. \fIWindow\fR must be a valid path name of a Tk widget.
-A transparent window is put in front of the specified window. This transparent
-window is mapped the next time idle tasks are processed, and the specified
-window and its descendants will be blocked from user interactions. Normally
-\fBupdate\fR should be called immediately afterward to insure that the hold
-operation is in effect before the application starts its processing. The
-following configuration options are valid:
-.RS
-.TP
-\fB\-cursor \fIcursorName\fR
-.
-Specifies the cursor to be displayed when the widget is made busy.
-\fICursorName\fR can be in any form accepted by \fBTk_GetCursor\fR. The
-default cursor is \fBwait\fR on Windows and \fBwatch\fR on other platforms.
-.RE
+\fBtk busy busywindow \fIwindow\fR
+.
+Returns the pathname of the busy window (i.e. the transparent window
+shielding the window appearing busy) created by the \fBtk busy hold\fR
+command for \fIwindow\fR, or the empty string if \fIwindow\fR is not busy.
 .TP
 \fBtk busy cget \fIwindow\fR \fIoption\fR
 .
 Queries the \fBtk busy\fR command configuration options for \fIwindow\fR.
 \fIWindow\fR must be the path name of a widget previously made busy by the
@@ -177,24 +167,45 @@
 .CS
 option add *frame.busyCursor gumby
 option add *Frame.BusyCursor gumby
 .CE
 .RE
+.TP
+\fBtk busy current \fR?\fIpattern\fR?
+.
+Returns the pathnames of all widgets that are currently busy. If a
+\fIpattern\fR is given, only the path names of busy widgets matching
+\fIpattern\fR are returned.
 .TP
 \fBtk busy forget \fIwindow\fR ?\fIwindow\fR?...
 .
 Releases resources allocated by the \fBtk busy\fR command for \fIwindow\fR,
 including the transparent window. User events will again be received by
 \fIwindow\fR. Resources are also released when \fIwindow\fR is destroyed.
 \fIWindow\fR must be the name of a widget specified in the \fBhold\fR
 operation, otherwise an error is reported.
 .TP
-\fBtk busy current \fR?\fIpattern\fR?
+\fBtk busy hold \fIwindow\fR ?\fIoption value\fR?...
+.
+Makes the specified \fIwindow\fR (and its descendants in the Tk window
+hierarchy) appear busy. \fIWindow\fR must be a valid path name of a Tk widget.
+A transparent window is put in front of the specified window. This transparent
+window is mapped the next time idle tasks are processed, and the specified
+window and its descendants will be blocked from user interactions. Normally
+\fBupdate\fR should be called immediately afterward to insure that the hold
+operation is in effect before the application starts its processing. The
+command returns the pathname of the busy window that was created (i.e. the
+transparent window shielding the window appearing busy). The following
+configuration options are valid:
+.RS
+.TP
+\fB\-cursor \fIcursorName\fR
 .
-Returns the pathnames of all widgets that are currently busy. If a
-\fIpattern\fR is given, only the path names of busy widgets matching
-\fIpattern\fR are returned.
+Specifies the cursor to be displayed when the widget is made busy.
+\fICursorName\fR can be in any form accepted by \fBTk_GetCursor\fR. The
+default cursor is \fBwait\fR on Windows and \fBwatch\fR on other platforms.
+.RE
 .TP
 \fBtk busy status \fIwindow\fR
 .
 Returns the status of a widget \fIwindow\fR. If \fIwindow\fR presently can not
 receive user interactions, \fB1\fR is returned, otherwise \fB0\fR.
@@ -203,59 +214,52 @@
 .PP
 The event blocking feature is implemented by creating and mapping a
 transparent window that completely covers the widget. When the busy window is
 mapped, it invisibly shields the widget and its hierarchy from all events that
 may be sent. Like Tk widgets, busy windows have widget names in the Tk window
-hierarchy. This means that you can use the \fBbind\fR command, to handle
-events in the busy window.
+hierarchy. This means that you can use the \fBbind\fR command to handle
+events in the busy window:
 .PP
 .CS
 \fBtk busy\fR hold .frame.canvas
-bind .frame.canvas_Busy <Enter> { ... }
+bind [\fBtk busy\fR busywindow .frame.canvas] <Enter> { ... }
 .CE
 .PP
-Normally the busy window is a sibling of the widget. The name of the busy
-window is
-.QW \fIwidget\fB_Busy\fR
-where \fIwidget\fR is the name of the widget to be made busy. In the previous
-example, the pathname of the busy window is
-.QW \fB.frame.canvas_Busy\fR .
-The exception is when the widget is a toplevel widget (such as
-.QW . )
-where the busy window can't be made a sibling. The busy window is then a child
-of the widget named
-.QW \fIwidget\fB._Busy\fR
-where \fIwidget\fR is the name of the toplevel widget. In the following
-example, the pathname of the busy window is
-.QW \fB._Busy\fR .
-.PP
+or
 .CS
-\fBtk busy\fR hold .
-bind ._Busy <Enter> { ... }
+set busyWin [\fBtk busy\fR hold .frame.canvas]
+bind $busyWin <Enter> { ... }
 .CE
 .SS "ENTER/LEAVE EVENTS"
 .PP
 Mapping and unmapping busy windows generates Enter/Leave events for all
 widgets they cover. Please note this if you are tracking Enter/Leave events in
 widgets.
 .SS "KEYBOARD EVENTS"
 .PP
 When a widget is made busy, the widget is prevented from gaining the keyboard
-focus by the busy window. But if the widget already had focus, it still may
-received keyboard events. To prevent this, you must move focus to another
-window.
+focus by a user clicking on it by the busy window. But if the widget already had
+focus, it still may receive keyboard events. The widget can also still receive
+focus through keyboard traversal. To prevent this, you must move
+focus to another window and make sure the focus can not go back to the widgets
+made busy (e.g. but restricting focus to a cancel button).
 .PP
 .CS
+pack [frame .frame]
+pack [text .frame.text]
 \fBtk busy\fR hold .frame
-label .dummy
-focus .dummy
+pack [button .cancel -text "Cancel" -command exit]
+focus .cancel
+bind .cancel <Tab> {break}
+bind .cancel <Shift-Tab> {break}
 update
 .CE
 .PP
 The above example moves the focus from .frame immediately after invoking the
 \fBhold\fR so that no keyboard events will be sent to \fB.frame\fR or any of
-its descendants.
+its descendants. It also makes sure it's not possible to leave button
+\fB.cancel\fR using the keyboard.
 .SH PORTABILITY
 .PP
 Note that the \fBtk busy\fR command does not currently have any effect on OSX
 when Tk is built using Aqua support.
 .SH "SEE ALSO"

Index: doc/canvas.n
==================================================================
--- doc/canvas.n
+++ doc/canvas.n
@@ -545,10 +545,19 @@
 \fItagOrId\fR.
 If coordinates are specified, then they replace the current
 coordinates for the named item.
 If \fItagOrId\fR refers to multiple items, then
 the first one in the display list is used.
+.RS
+.PP
+Note that for rectangles, ovals and arcs the returned list of coordinates
+has a fixed order, namely the left, top, right and bottom coordinates,
+which may not be the order originally given. Also the coordinates are always
+returned in screen units with no units (that is, in pixels). So if the
+original coordinates were specified for instance in centimeters or inches,
+the returned values will nevertheless be in pixels.
+.RE
 .TP
 \fIpathName \fBcreate \fItype x y \fR?\fIx y ...\fR? ?\fIoption value ...\fR?
 .TP
 \fIpathName \fBcreate \fItype coordList \fR?\fIoption value ...\fR?
 .
@@ -646,10 +655,24 @@
 Note: the insertion cursor is only displayed in an item if
 that item currently has the keyboard focus (see the \fBfocus\fR widget
 command, above), but the cursor position may
 be set even when the item does not have the focus.
 This command returns an empty string.
+.TP
+\fIpathName \fBimage \fIimagename\fR ?\fIsubsample\fR? ?\fIzoom\fR?
+.
+Draw the canvas into the Tk photo image named \fIimagename\fR. If a \fB-scrollregion\fR
+has been defined then this will be the boundaries of the canvas region drawn and the
+final size of the photo image. Otherwise the widget width and height with an origin
+of 0,0 will be the size of the canvas region drawn and the final size of the photo
+image. Optionally an integer \fIsubsample\fR factor may be given and the photo image
+will be reduced in size. In addition to the \fIsubsample\fR an integer \fIzoom\fR
+factor can also be given and the photo image will be enlarged. The image background
+will be filled with the canvas background colour. The canvas widget does not need to
+be mapped for this widget command to work, but at least one of it's ancestors must be
+mapped.
+This command returns an empty string.
 .TP
 \fIpathName \fBimove \fItagOrId index x y\fR
 .VS 8.6
 This command causes the \fIindex\fR'th coordinate of each of the items
 indicated by \fItagOrId\fR to be relocated to the location (\fIx\fR,\fIy\fR).

Index: doc/chooseColor.n
==================================================================
--- doc/chooseColor.n
+++ doc/chooseColor.n
@@ -1,11 +1,11 @@
 '\"
 '\" Copyright (c) 1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH tk_chooseColor n 4.2 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
 '\" Note:  do not modify the .SH NAME line immediately below!
 .SH NAME

Index: doc/chooseDirectory.n
==================================================================
--- doc/chooseDirectory.n
+++ doc/chooseDirectory.n
@@ -15,10 +15,17 @@
 .PP
 The procedure \fBtk_chooseDirectory\fR pops up a dialog box for the
 user to select a directory. The following \fIoption\-value\fR pairs are
 possible as command line arguments:
 .TP
+\fB\-command\fR \fIstring\fR
+Specifies the prefix of a Tcl command to invoke when the user closes the
+dialog after having selected an item. This callback is not called if the
+user cancelled the dialog. The actual command consists of \fIstring\fR
+followed by a space and the value selected by the user in the dialog. This
+is only available on Mac OS X.
+.TP
 \fB\-initialdir\fR \fIdirname\fR
 Specifies that the directories in \fIdirectory\fR should be displayed
 when the dialog pops up. If this parameter is not specified,
 the initial directory defaults to the current working directory
 on non-Windows systems and on Windows systems prior to Vista.
@@ -25,10 +32,14 @@
 On Vista and later systems, the initial directory defaults to the last
 user-selected directory for the application. If the
 parameter specifies a relative path, the return value will convert the
 relative path to an absolute path.
 .TP
+\fB\-message\fR \fIstring\fR
+Specifies a message to include in the client area of the dialog.
+This is only available on Mac OS X.
+.TP
 \fB\-mustexist\fR \fIboolean\fR
 Specifies whether the user may specify non-existent directories.  If
 this parameter is true, then the user may only select directories that
 already exist.  The default value is \fIfalse\fR.
 .TP

Index: doc/console.n
==================================================================
--- doc/console.n
+++ doc/console.n
@@ -1,11 +1,11 @@
 '\"
 '\" Copyright (c) 2001 Donal K. Fellows
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH console n 8.4 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
 '\" Note:  do not modify the .SH NAME line immediately below!
 .SH NAME

Index: doc/cursors.n
==================================================================
--- doc/cursors.n
+++ doc/cursors.n
@@ -1,11 +1,11 @@
 '\"
 '\" Copyright (c) 1998-2000 by Scriptics Corporation.
 '\" All rights reserved.
-'\" 
+'\"
 '\" Copyright (c) 2006-2007 Daniel A. Steffen <das@users.sourceforge.net>
-'\" 
+'\"
 .TH cursors n 8.3 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
 '\" Note:  do not modify the .SH NAME line immediately below!
 .SH NAME

Index: doc/destroy.n
==================================================================
--- doc/destroy.n
+++ doc/destroy.n
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1990 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH destroy n "" Tk "Tk Built-In Commands"
 .so man.macros
 .BS
 '\" Note:  do not modify the .SH NAME line immediately below!
 .SH NAME

Index: doc/dialog.n
==================================================================
--- doc/dialog.n
+++ doc/dialog.n
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1992 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH tk_dialog n 4.1 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
 '\" Note:  do not modify the .SH NAME line immediately below!
 .SH NAME

Index: doc/entry.n
==================================================================
--- doc/entry.n
+++ doc/entry.n
@@ -3,11 +3,11 @@
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\" Copyright (c) 1998-2000 Scriptics Corporation.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH entry n 8.3 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
 '\" Note:  do not modify the .SH NAME line immediately below!
 .SH NAME
@@ -21,10 +21,11 @@
 \-exportselection	\-insertofftime	\-takefocus
 \-font	\-insertontime	\-textvariable
 \-foreground	\-insertwidth	\-xscrollcommand
 \-highlightbackground	\-justify
 \-highlightcolor	\-relief
+\-placeholder	\-placeholderforeground
 .SE
 .SH "WIDGET-SPECIFIC OPTIONS"
 .OP \-disabledbackground disabledBackground DisabledBackground
 Specifies the background color to use when the entry is disabled.  If
 this option is the empty string, the normal background color is used.

Index: doc/event.n
==================================================================
--- doc/event.n
+++ doc/event.n
@@ -336,11 +336,13 @@
 \fB<<Selection>>\fR
 This is sent to a text widget when the selection in the widget is
 changed.
 .TP
 \fB<<ThemeChanged>>\fR
-This is sent to a text widget when the ttk (Tile) theme changed.
+This is sent to all widgets when the ttk theme changed. The ttk
+widgets listen to this event and redisplay themselves when it fires.
+The legacy widgets ignore this event.
 .TP
 \fB<<TraverseIn>>\fR
 This is sent to a widget when the focus enters the widget because of a
 user-driven
 .QW "tab to widget"

Index: doc/focus.n
==================================================================
--- doc/focus.n
+++ doc/focus.n
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1990-1994 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH focus n 4.0 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
 '\" Note:  do not modify the .SH NAME line immediately below!
 .SH NAME

Index: doc/focusNext.n
==================================================================
--- doc/focusNext.n
+++ doc/focusNext.n
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1994 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH tk_focusNext n 4.0 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
 '\" Note:  do not modify the .SH NAME line immediately below!
 .SH NAME

Index: doc/fontchooser.n
==================================================================
--- doc/fontchooser.n
+++ doc/fontchooser.n
@@ -1,11 +1,11 @@
 '\"
 '\" Copyright (c) 2008 Daniel A. Steffen <das@users.sourceforge.net>
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH fontchooser n "" Tk "Tk Built-In Commands"
 .so man.macros
 .BS
 '\" Note:  do not modify the .SH NAME line immediately below!
 .SH NAME

Index: doc/frame.n
==================================================================
--- doc/frame.n
+++ doc/frame.n
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1990-1994 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH frame n 8.4 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
 '\" Note:  do not modify the .SH NAME line immediately below!
 .SH NAME

Index: doc/getOpenFile.n
==================================================================
--- doc/getOpenFile.n
+++ doc/getOpenFile.n
@@ -33,10 +33,17 @@
 whether the existing file should be overwritten or not.
 .PP
 The following \fIoption\-value\fR pairs are possible as command line
 arguments to these two commands:
 .TP
+\fB\-command\fR \fIstring\fR
+Specifies the prefix of a Tcl command to invoke when the user closes the
+dialog after having selected an item. This callback is not called if the
+user cancelled the dialog. The actual command consists of \fIstring\fR
+followed by a space and the value selected by the user in the dialog. This
+is only available on Mac OS X.
+.TP
 \fB\-confirmoverwrite\fR \fIboolean\fR
 Configures how the Save dialog reacts when the selected file already
 exists, and saving would overwrite it.  A true value requests a
 confirmation dialog be presented to the user.  A false value requests
 that the overwrite take place without confirmation.  Default value is true.

Index: doc/grab.n
==================================================================
--- doc/grab.n
+++ doc/grab.n
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1992 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH grab n "" Tk "Tk Built-In Commands"
 .so man.macros
 .BS
 '\" Note:  do not modify the .SH NAME line immediately below!
 .SH NAME

Index: doc/grid.n
==================================================================
--- doc/grid.n
+++ doc/grid.n
@@ -1,11 +1,11 @@
 '\"
 '\" Copyright (c) 1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH grid n 8.5 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
 '\" Note:  do not modify the .SH NAME line immediately below!
 .SH NAME
@@ -158,11 +158,12 @@
 \fB\-row \fIn\fR
 .
 Insert the slave so that it occupies the \fIn\fRth row in the grid.
 Row numbers start with 0.  If this option is not supplied, then the
 slave is arranged on the same row as the previous slave specified on this
-call to \fBgrid\fR, or the first unoccupied row if this is the first slave.
+call to \fBgrid\fR, or the next row after the highest occupied row
+if this is the first slave.
 .TP
 \fB\-rowspan \fIn\fR
 .
 Insert the slave so that it occupies \fIn\fR rows in the grid.
 The default is one row.  If the next \fBgrid\fR command contains
@@ -199,10 +200,18 @@
 master and unmaps their windows.
 The slaves will no longer be managed by the grid geometry manager.
 The configuration options for that window are forgotten, so that if the
 slave is managed once more by the grid geometry manager, the initial
 default settings are used.
+.RS
+.PP
+.VS TIP518
+If the last slave of the master becomes unmanaged, this will also send
+the virtual event \fB<<NoManagedChild>>\fR to the master; the master
+may choose to resize itself (or otherwise respond) to such a change.
+.VE TIP518
+.RE
 .TP
 \fBgrid info \fIslave\fR
 .
 Returns a list whose elements are the current configuration state of
 the slave given by \fIslave\fR in the same option-value form that
@@ -275,10 +284,18 @@
 The slaves will no longer be managed by the grid geometry manager.
 However, the configuration options for that window are remembered,
 so that if the
 slave is managed once more by the grid geometry manager, the previous
 values are retained.
+.RS
+.PP
+.VS TIP518
+If the last slave of the master becomes unmanaged, this will also send
+the virtual event \fB<<NoManagedChild>>\fR to the master; the master
+may choose to resize itself (or otherwise respond) to such a change.
+.VE TIP518
+.RE
 .TP
 \fBgrid size \fImaster\fR
 .
 Returns the size of the grid (in columns then rows) for \fImaster\fR.
 The size is determined either by the \fIslave\fR occupying the largest

Index: doc/image.n
==================================================================
--- doc/image.n
+++ doc/image.n
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1994 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH image n 4.0 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
 '\" Note:  do not modify the .SH NAME line immediately below!
 .SH NAME

Index: doc/keysyms.n
==================================================================
--- doc/keysyms.n
+++ doc/keysyms.n
@@ -13,11 +13,13 @@
 .PP
 Tk recognizes many keysyms when specifying key bindings (e.g.,
 .QW "\fBbind\fR \fB. <Key-\fR\fIkeysym\fR\fB>\fR" ).
 The following list enumerates the
 keysyms that will be recognized by Tk.  Note that not all keysyms will
-be valid on all platforms.  For example, on Unix systems, the presence
+be valid on all platforms, and some keysyms are also available on
+platforms that have a different native name for that key.
+For example, on Unix systems, the presence
 of a particular keysym is dependant on the configuration of the
 keyboard modifier map.  This list shows keysyms along with their
 decimal and hexadecimal values.
 .PP
 .CS
@@ -916,13 +918,20 @@
 Super_L                          65515     0xffeb
 Super_R                          65516     0xffec
 Hyper_L                          65517     0xffed
 Hyper_R                          65518     0xffee
 Delete                           65535     0xffff
+XF86AudioLowerVolume         269025041     0x1008FF11
+XF86AudioMute                269025042     0x1008FF12
+XF86AudioRaiseVolume         269025043     0x1008FF13
+XF86AudioPlay                269025044     0x1008FF14
+XF86AudioStop                269025045     0x1008FF15
+XF86AudioPrev                269025046     0x1008FF16
+XF86AudioNext                269025047     0x1008FF17
 .CE
 .SH "SEE ALSO"
 bind(n), event(n)
 .SH KEYWORDS
 bind, binding, event, keysym
 '\" Local Variables:
 '\" mode: nroff
 '\" End:

Index: doc/label.n
==================================================================
--- doc/label.n
+++ doc/label.n
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1990-1994 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH label n 4.0 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
 '\" Note:  do not modify the .SH NAME line immediately below!
 .SH NAME

Index: doc/lower.n
==================================================================
--- doc/lower.n
+++ doc/lower.n
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1990 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH lower n 3.3 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
 '\" Note:  do not modify the .SH NAME line immediately below!
 .SH NAME

Index: doc/menu.n
==================================================================
--- doc/menu.n
+++ doc/menu.n
@@ -17,11 +17,11 @@
 \fBtk_menuSetFocus\fR \fIpathName\fR
 .SO
 \-activebackground	\-borderwidth	\-foreground
 \-activeborderwidth	\-cursor	\-relief
 \-activeforeground	\-disabledforeground	\-takefocus
-\-background	\-font
+\-background	\-font	\-activerelief
 .SE
 .SH "WIDGET-SPECIFIC OPTIONS"
 .OP \-postcommand postCommand Command
 If this option is specified then it provides a Tcl command to execute
 each time the menu is posted.  The command is invoked by the \fBpost\fR
@@ -32,16 +32,16 @@
 .OP \-selectcolor selectColor Background
 For menu entries that are check buttons or radio buttons, this option
 specifies the color to display in the indicator when the check button
 or radio button is selected.
 .OP \-tearoff tearOff TearOff
-This option must have a proper boolean value, which specifies
-whether or not the menu should include a tear-off entry at the
-top.  If so, it will exist as entry 0 of the menu and the other
-entries will number starting at 1.  The default
-menu bindings arrange for the menu to be torn off when the tear-off
-entry is invoked.
+This option must have a proper boolean value (default is false),
+which specifies whether or not the menu should include a tear-off
+entry at the top.  If so, it will exist as entry 0 of the menu and
+the other entries will number starting at 1.  The default menu
+bindings arrange for the menu to be torn off when the tear-off entry
+is invoked.
 This option is ignored under Aqua/Mac OS X, where menus cannot
 be torn off.
 .OP \-tearoffcommand tearOffCommand TearOffCommand
 If this option has a non-empty value, then it specifies a Tcl command
 to invoke whenever the menu is torn off.  The actual command will
@@ -99,11 +99,11 @@
 If the  \fB\-accelerator\fR option is specified for an entry then a second
 textual field is displayed to the right of the label.  The accelerator
 typically describes a keystroke sequence that may be used in the
 application to cause the same result as invoking the menu entry.
 This is a display option, it does not actually set the corresponding
-binding (which can be achieved using the \fBbind\fR command). 
+binding (which can be achieved using the \fBbind\fR command).
 The third field is an \fIindicator\fR.  The indicator is present only for
 checkbutton or radiobutton entries.  It indicates whether the entry
 is selected or not, and is displayed to the left of the entry's
 string.
 .PP

Index: doc/menubar.n
==================================================================
--- doc/menubar.n
+++ doc/menubar.n
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1992 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH tk_menuBar n "" Tk "Tk Built-In Commands"
 .so man.macros
 .BS
 '\" Note:  do not modify the .SH NAME line immediately below!
 .SH NAME

Index: doc/menubutton.n
==================================================================
--- doc/menubutton.n
+++ doc/menubutton.n
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1990-1994 The Regents of the University of California.
 '\" Copyright (c) 1994-1997 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH menubutton n 4.0 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
 '\" Note:  do not modify the .SH NAME line immediately below!
 .SH NAME

Index: doc/message.n
==================================================================
--- doc/message.n
+++ doc/message.n
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1990-1994 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH message n 4.0 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
 '\" Note:  do not modify the .SH NAME line immediately below!
 .SH NAME

Index: doc/messageBox.n
==================================================================
--- doc/messageBox.n
+++ doc/messageBox.n
@@ -22,10 +22,16 @@
 popped up, \fBtk_messageBox\fR waits for the user to select one of the
 buttons. Then it returns the symbolic name of the selected button.
 .PP
 The following option-value pairs are supported:
 .TP
+\fB\-command\fR \fIstring\fR
+Specifies the prefix of a Tcl command to invoke when the user closes the
+dialog. The actual command consists of \fIstring\fR followed by a space
+and the name of the button clicked by the user to close the dialog. This
+is only available on Mac OS X.
+.TP
 \fB\-default\fR \fIname\fR
 .
 \fIName\fR gives the symbolic name of the default button for
 this message window (
 .QW ok ,

Index: doc/option.n
==================================================================
--- doc/option.n
+++ doc/option.n
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1990 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH option n "" Tk "Tk Built-In Commands"
 .so man.macros
 .BS
 '\" Note:  do not modify the .SH NAME line immediately below!
 .SH NAME

Index: doc/optionMenu.n
==================================================================
--- doc/optionMenu.n
+++ doc/optionMenu.n
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1990-1994 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH tk_optionMenu n 4.0 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
 '\" Note:  do not modify the .SH NAME line immediately below!
 .SH NAME

Index: doc/options.n
==================================================================
--- doc/options.n
+++ doc/options.n
@@ -56,10 +56,13 @@
 This option is typically only available in widgets displaying more
 than one element at a time (e.g. menus but not buttons).
 .OP \-activeforeground activeForeground Background
 Specifies foreground color to use when drawing active elements.
 See above for definition of active elements.
+.OP \-activerelief activeRelief Relief
+Specifies the 3-D effect desired for the active item of the widget.
+See the \fB-relief\fR option for details.
 .OP \-anchor anchor Anchor
 Specifies how the information in a widget (e.g. text or a bitmap)
 is to be displayed in the widget.
 Must be one of the values \fBn\fR, \fBne\fR, \fBe\fR, \fBse\fR,
 \fBs\fR, \fBsw\fR, \fBw\fR, \fBnw\fR, or \fBcenter\fR.
@@ -219,10 +222,18 @@
 manager can satisfy this request, the widget will end up with extra
 internal space above and/or below what it displays inside.
 Most widgets only use this option for padding text:  if they are
 displaying a bitmap or image, then they usually ignore padding
 options.
+.OP \-placeholder placeHolder PlaceHolder
+Specifies a help text string to display if no text is otherwise displayed,
+that is when the widget is empty. The placeholder text is displayed using
+the values of the \fB\-font\fR and \fB\-justify\fR options.
+.OP \-placeholderforeground placeholderForeground PlaceholderForeground
+Specifies the foreground color to use when the placeholder text is
+displayed. If this option is the empty string, the default color gray70
+is used.
 .OP \-relief relief Relief
 Specifies the 3-D effect desired for the widget.  Acceptable
 values are \fBraised\fR, \fBsunken\fR, \fBflat\fR, \fBridge\fR,
 \fBsolid\fR, and \fBgroove\fR.
 The value

Index: doc/pack-old.n
==================================================================
--- doc/pack-old.n
+++ doc/pack-old.n
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1990-1994 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH pack-old n 4.0 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
 '\" Note:  do not modify the .SH NAME line immediately below!
 .SH NAME

Index: doc/pack.n
==================================================================
--- doc/pack.n
+++ doc/pack.n
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1990-1994 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH pack n 4.0 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
 '\" Note:  do not modify the .SH NAME line immediately below!
 .SH NAME
@@ -127,10 +127,18 @@
 .TP
 \fBpack forget \fIslave \fR?\fIslave ...\fR?
 Removes each of the \fIslave\fRs from the packing order for its
 master and unmaps their windows.
 The slaves will no longer be managed by the packer.
+.RS
+.PP
+.VS TIP518
+If the last slave of the master becomes unmanaged, this will also send
+the virtual event \fB<<NoManagedChild>>\fR to the master; the master
+may choose to resize itself (or otherwise respond) to such a change.
+.VE TIP518
+.RE
 .TP
 \fBpack info \fIslave\fR
 Returns a list whose elements are the current configuration state of
 the slave given by \fIslave\fR in the same option-value form that
 might be specified to \fBpack configure\fR.

Index: doc/palette.n
==================================================================
--- doc/palette.n
+++ doc/palette.n
@@ -1,11 +1,11 @@
 '\"
 '\" Copyright (c) 1995-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH tk_setPalette n 4.0 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
 '\" Note:  do not modify the .SH NAME line immediately below!
 .SH NAME

Index: doc/panedwindow.n
==================================================================
--- doc/panedwindow.n
+++ doc/panedwindow.n
@@ -27,10 +27,21 @@
 drawn as squares.  May be any value accepted by \fBTk_GetPixels\fR.
 .OP \-height height Height
 Specifies a desired height for the overall panedwindow widget. May be any
 value accepted by \fBTk_GetPixels\fR. If an empty string, the widget will be
 made high enough to allow all contained widgets to have their natural height.
+.OP \-opaqueresize opaqueResize OpaqueResize
+Specifies whether panes should be resized as a sash is moved (true),
+or if resizing should be deferred until the sash is placed (false).
+In the latter case, a
+.QW ghost
+version of the sash is displayed during the resizing to show where the
+panes will be resized to when releasing the mouse button. This
+.QW ghost
+version of the sash is the proxy. It's rendering can be configured
+using the \fB-proxybackground\fR, \fB-proxyborderwidth\fR and
+\fB-proxyrelief\fR options.
 .OP \-proxybackground proxyBackground ProxyBackground
 Background color to use when drawing the proxy. If an empty string, the
 value of the \fB-background\fR option will be used.
 .OP \-proxyborderwidth proxyBorderWidth ProxyBorderWidth
 Specifies the borderwidth of the proxy. May be any value accepted by
@@ -37,13 +48,10 @@
 \fBTk_GetPixels\fR.
 .OP \-proxyrelief proxyRelief ProxyRelief
 Relief to use when drawing the proxy. May be any of the standard Tk
 relief values. If an empty string, the value of the \fB-sashrelief\fR
 option will be used.
-.OP \-opaqueresize opaqueResize OpaqueResize
-Specifies whether panes should be resized as a sash is moved (true),
-or if resizing should be deferred until the sash is placed (false).
 .OP \-sashcursor sashCursor SashCursor
 Mouse cursor to use when over a sash.  If null,
 \fBsb_h_double_arrow\fR will be used for horizontal panedwindows, and
 \fBsb_v_double_arrow\fR will be used for vertical panedwindows.
 .OP \-sashpad sashPad SashPad
@@ -130,60 +138,10 @@
 \fIx\fR and \fIy\fR, in window coordinates.  If the point is over a
 sash or a sash handle, the result is a two element list containing the
 index of the sash or handle, and a word indicating whether it is over
 a sash or a handle, such as {0 sash} or {2 handle}.  If the point is
 over any other part of the panedwindow, the result is an empty list.
-.TP
-\fIpathName \fBproxy \fR?\fIargs\fR?
-.
-This command is used to query and change the position of the sash
-proxy, used for rubberband-style pane resizing. It can take any of
-the following forms:
-.RS
-.TP
-\fIpathName \fBproxy coord\fR
-.
-Return a list containing the x and y coordinates of the most recent
-proxy location.
-.TP
-\fIpathName \fBproxy forget\fR
-.
-Remove the proxy from the display.
-.TP
-\fIpathName \fBproxy place \fIx y\fR
-.
-Place the proxy at the given \fIx\fR and \fIy\fR coordinates.
-.RE
-.TP
-\fIpathName \fBsash \fR?\fIargs\fR?
-This command is used to query and change the position of sashes in the
-panedwindow.  It can take any of the following forms:
-.RS
-.TP
-\fIpathName \fBsash coord \fIindex\fR
-.
-Return the current x and y coordinate pair for the sash given by
-\fIindex\fR.  \fIIndex\fR must be an integer between 0 and 1 less than
-the number of panes in the panedwindow.  The coordinates given are
-those of the top left corner of the region containing the sash.
-.TP
-\fIpathName \fBsash dragto \fIindex x y\fR
-.
-This command computes the difference between the given coordinates and the
-coordinates given to the last \fBsash mark\fR command for the given
-sash.  It then moves that sash the computed difference.  The return
-value is the empty string.
-.TP
-\fIpathName \fBsash mark \fIindex x y\fR
-.
-Records \fIx\fR and \fIy\fR for the sash given by \fIindex\fR; used in
-conjunction with later \fBsash dragto\fR commands to move the sash.
-.TP
-\fIpathName \fBsash place \fIindex x y\fR
-.
-Place the sash given by \fIindex\fR at the given coordinates.
-.RE
 .TP
 \fIpathName \fBpanecget \fIwindow option\fR
 .
 Query a management option for \fIwindow\fR.  \fIOption\fR may be any
 value allowed by the \fBpaneconfigure\fR subcommand.
@@ -308,10 +266,60 @@
 .RE
 .TP
 \fIpathName \fBpanes\fR
 .
 Returns an ordered list of the widgets managed by \fIpathName\fR.
+.TP
+\fIpathName \fBproxy \fR?\fIargs\fR?
+.
+This command is used to query and change the position of the sash
+proxy, used for rubberband-style pane resizing. It can take any of
+the following forms:
+.RS
+.TP
+\fIpathName \fBproxy coord\fR
+.
+Return a list containing the x and y coordinates of the most recent
+proxy location.
+.TP
+\fIpathName \fBproxy forget\fR
+.
+Remove the proxy from the display.
+.TP
+\fIpathName \fBproxy place \fIx y\fR
+.
+Place the proxy at the given \fIx\fR and \fIy\fR coordinates.
+.RE
+.TP
+\fIpathName \fBsash \fR?\fIargs\fR?
+This command is used to query and change the position of sashes in the
+panedwindow.  It can take any of the following forms:
+.RS
+.TP
+\fIpathName \fBsash coord \fIindex\fR
+.
+Return the current x and y coordinate pair for the sash given by
+\fIindex\fR.  \fIIndex\fR must be an integer between 0 and 1 less than
+the number of panes in the panedwindow.  The coordinates given are
+those of the top left corner of the region containing the sash.
+.TP
+\fIpathName \fBsash dragto \fIindex x y\fR
+.
+This command computes the difference between the given coordinates and the
+coordinates given to the last \fBsash mark\fR command for the given
+sash.  It then moves that sash the computed difference.  The return
+value is the empty string.
+.TP
+\fIpathName \fBsash mark \fIindex x y\fR
+.
+Records \fIx\fR and \fIy\fR for the sash given by \fIindex\fR; used in
+conjunction with later \fBsash dragto\fR commands to move the sash.
+.TP
+\fIpathName \fBsash place \fIindex x y\fR
+.
+Place the sash given by \fIindex\fR at the given coordinates.
+.RE
 .SH "RESIZING PANES"
 .PP
 A pane is resized by grabbing the sash (or sash handle if present) and
 dragging with the mouse.  This is accomplished via mouse motion
 bindings on the widget.  When a sash is moved, the sizes of the panes

Index: doc/photo.n
==================================================================
--- doc/photo.n
+++ doc/photo.n
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1994 The Australian National University
 '\" Copyright (c) 1994-1997 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 '\" Author: Paul Mackerras (paulus@cs.anu.edu.au),
 '\"	    Department of Computer Science,
 '\"	    Australian National University.
 '\"
 .TH photo n 4.0 Tk "Tk Built-In Commands"
@@ -22,56 +22,62 @@
 \fIimageName \fBblank\fR
 \fIimageName \fBcget \fIoption\fR
 \fIimageName \fBconfigure\fR ?\fIoption\fR? ?\fIvalue option value ...\fR?
 \fIimageName \fBcopy \fIsourceImage\fR ?\fIoption value(s) ...\fR?
 \fIimageName \fBdata\fR ?\fIoption value(s) ...\fR?
-\fIimageName \fBget \fIx y\fR
+\fIimageName \fBget \fIx y\fR ?\fIoption\fR?
 \fIimageName \fBput \fIdata\fR ?\fIoption value(s) ...\fR?
 \fIimageName \fBread \fIfilename\fR ?\fIoption value(s) ...\fR?
 \fIimageName \fBredither\fR
 \fIimageName \fBtransparency \fIsubcommand \fR?\fIarg arg ...\fR?
 \fIimageName \fBwrite \fIfilename\fR ?\fIoption value(s) ...\fR?
 .fi
 .BE
 .SH DESCRIPTION
 .PP
-A photo is an image whose pixels can display any color or be
-transparent.  A photo image is stored internally in full color (32
-bits per pixel), and is displayed using dithering if necessary.  Image
-data for a photo image can be obtained from a file or a string, or it
-can be supplied from
-C code through a procedural interface.  At present, only
+A photo is an image whose pixels can display any color with a varying
+degree of transparency (the alpha channel). A photo image is stored
+internally in full color (32 bits per pixel), and is displayed using
+dithering if necessary.  Image data for a photo image can be obtained
+from a file or a string, or it can be supplied from C code through a
+procedural interface.  At present, only
 .VS 8.6
 PNG,
 .VE 8.6
-GIF and PPM/PGM
-formats are supported, but an interface exists to allow additional
-image file formats to be added easily.  A photo image is transparent
-in regions where no image data has been supplied
-or where it has been set transparent by the \fBtransparency set\fR
-subcommand.
+GIF and PPM/PGM formats are supported, but an interface exists to
+allow additional image file formats to be added easily.  A photo image
+is (semi)transparent if the image data it was obtained from had
+transparency informaton. In regions where no image data has been
+supplied, it is fully transparent. Transparency may also be modified
+with the \fBtransparency set\fR subcommand.
 .SH "CREATING PHOTOS"
 .PP
 Like all images, photos are created using the \fBimage create\fR
 command.
 Photos support the following \fIoptions\fR:
 .TP
 \fB\-data \fIstring\fR
 .
-Specifies the contents of the image as a string.  The string should
-contain binary data or, for some formats, base64-encoded data (this is
+Specifies the contents of the image as a string.
+.VS 8.7
+The string should
+contain data in the default list-of-lists form,
+.VE 8.7
+binary data or, for some formats, base64-encoded data (this is
 currently guaranteed to be supported for PNG and GIF images). The
-format of the
-string must be one of those for which there is an image file format
-handler that will accept string data.  If both the \fB\-data\fR
-and \fB\-file\fR options are specified, the \fB\-file\fR option takes
-precedence.
+format of the string must be one of those for which there is an image
+file format handler that will accept string data.  If both the
+\fB\-data\fR and \fB\-file\fR options are specified, the \fB\-file\fR
+option takes precedence.
 .TP
-\fB\-format \fIformat-name\fR
+\fB\-format\fR {\fIformat-name\fR ?\fIoption value ...\fR?}
 .
 Specifies the name of the file format for the data specified with the
-\fB\-data\fR or \fB\-file\fR option.
+\fB\-data\fR or \fB\-file\fR option and optional arguments passed to
+the format handler. Note: the value of this option must be a Tcl list.
+This means that the braces may be omitted if the argument has only one
+word. Also, instead of braces, double quotes may be used for quoting.
 .TP
 \fB\-file \fIname\fR
 .
 \fIname\fR gives the name of a file that is to be read to supply data
 for the photo image.  The file format must be one of those for which
@@ -231,33 +237,43 @@
 \fIoverlay\fR.
 .RE
 .TP
 \fIimageName \fBdata\fR ?\fIoption value(s) ...\fR?
 .
-Returns image data in the form of a string. The following options
-may be specified:
+Returns image data in the form of a string.
+.VS 8.7
+The format of the string depends on the format handler. By default, a
+human readable format as a list of lists of pixel data is used, other
+formats can be chosen with the \fB-format\fR option.
+See \fBIMAGE FORMATS\fR below for details.
+.VE 8.7
+The following options may be specified:
 .RS
 .TP
 \fB\-background\fI color\fR
 .
 If the color is specified, the data will not contain any transparency
 information. In all transparent pixels the color will be replaced by
 the specified color.
 .TP
-\fB\-format\fI format-name\fR
-.
-Specifies the name of the image file format handler to be used.
-Specifically, this subcommand searches
-for the first handler whose name matches an initial substring of
-\fIformat-name\fR and which has the capability to write a string
-containing this image data.
-If this option is not given, this subcommand uses a format that
-consists of a list (one element per row) of lists (one element per
-pixel/column) of colors in
+\fB\-format\fR {\fIformat-name\fR ?\fIoption value ...\fR?}
+.
+Specifies the name of the image file format handler to use and,
+optionally, arguments to the format handler.  Specifically, this
+subcommand searches for the first handler whose name matches an
+initial substring of \fIformat-name\fR and which has the capability to
+write a string containing this image data.
+.VS 8.7
+If this option is not given, this subcommand uses the default format
+that consists of a list (one element per row) of lists (one element
+per pixel/column) of colors in
 .QW \fB#\fIrrggbb\fR
-format (where \fIrr\fR is a pair of hexadecimal digits for the red
-channel, \fIgg\fR for green, and \fIbb\fR for blue).
+format (see \fBIMAGE FORMATS\fR below).
+.VE 8.7
+Note: the value of this option must be a Tcl list.
+This means that the braces may be omitted if the argument has only one
+word. Also, instead of braces, double quotes may be used for quoting.
 .TP
 \fB\-from \fIx1 y1 x2 y2\fR
 .
 Specifies a rectangular region of \fIimageName\fR to be returned.
 If only \fIx1\fR and \fIy1\fR are specified, the region
@@ -270,47 +286,55 @@
 \fB\-grayscale\fR
 .
 If this options is specified, the data will not contain color
 information. All pixel data will be transformed into grayscale.
 .RE
+.VS 8.7
 .TP
-\fIimageName \fBget\fR \fIx y\fR
+\fIimageName \fBget\fR \fIx y\fR ?\fB-withalpha\fR?
 .
 Returns the color of the pixel at coordinates (\fIx\fR,\fIy\fR) in the
 image as a list of three integers between 0 and 255, representing the
-red, green and blue components respectively.
+red, green and blue components respectively. If the \fB-withalpha\fR
+option is specified, the returned list will have a fourth element
+representing the alpha value of the pixel as an integer between 0 and
+255.
+.VE 8.7
 .TP
 \fIimageName \fBput\fR \fIdata\fR ?\fIoption value(s) ...\fR?
 .
 Sets pixels in \fI imageName\fR to the data specified in \fIdata\fR.
-This command first searches the list of image file format handlers for
+.VS 8.7
+This command searches the list of image file format handlers for
 a handler that can interpret the data in \fIdata\fR, and then reads
 the image encoded within into \fIimageName\fR (the destination image).
-If \fIdata\fR does not match any known format, an attempt to interpret
-it as a (top-to-bottom) list of scan-lines is made, with each
-scan-line being a (left-to-right) list of pixel colors (see
-\fBTk_GetColor\fR for a description of valid colors.)  Every scan-line
-must be of the same length.  Note that when \fIdata\fR is a single
-color name, you are instructing Tk to fill a rectangular region with
-that color.  The following options may be specified:
+See \fBIMAGE FORMATS\fR below for details on formats for image data.
+.VE 8.7
+The following options may be specified:
 .RS
 .TP
-\fB\-format \fIformat-name\fR
+\fB\-format\fR {\fIformat-name\fR ?\fIoption value ..\fR?}
 .
-Specifies the format of the image data in \fIdata\fR.
+Specifies the format of the image data in \fIdata\fR and, optionally,
+arguments to be passed to the format handler.
 Specifically, only image file format handlers whose names begin with
 \fIformat-name\fR will be used while searching for an image data
 format handler to read the data.
+Note: the value of this option must be a Tcl list.
+This means that the braces may be omitted if the argument has only one
+word. Also, instead of braces, double quotes may be used for quoting.
 .TP
 \fB\-to \fIx1 y1\fR ?\fIx2 y2\fR?
 .
 Specifies the coordinates of the top-left corner (\fIx1\fR,\fIy1\fR)
 of the region of \fIimageName\fR into which the image data will be
 copied.  The default position is (0,0).  If \fIx2\fR,\fIy2\fR is given
 and \fIdata\fR is not large enough to cover the rectangle specified by
 this option, the image data extracted will be tiled so it covers the
-entire destination rectangle.  Note that if \fIdata\fR specifies a
+entire destination rectangle. If the region specified with this opion
+is smaller than the supplied \fIdata\fR, the exceeding data is silently
+discarded. Note that if \fIdata\fR specifies a
 single color value, then a region extending to the bottom-right corner
 represented by (\fIx2\fR,\fIy2\fR) will be filled with that color.
 .RE
 .TP
 \fIimageName \fBread\fR \fIfilename\fR ?\fIoption value(s) ...\fR?
@@ -321,16 +345,20 @@
 in \fIfilename\fR, and then reads the image in \fIfilename\fR into
 \fIimageName\fR (the destination image).  The following options may be
 specified:
 .RS
 .TP
-\fB\-format \fIformat-name\fR
+\fB\-format {\fIformat-name\fR ?\fIoption value ..\fR?}
 .
-Specifies the format of the image data in \fIfilename\fR.
+Specifies the format of the image data in \fIfilename\fR and,
+optionally, additional options to the format handler.
 Specifically, only image file format handlers whose names begin with
 \fIformat-name\fR will be used while searching for an image data
 format handler to read the data.
+Note: the value of this option must be a Tcl list.
+This means that the braces may be omitted if the argument has only one
+word. Also, instead of braces, double quotes may be used for quoting.
 .TP
 \fB\-from \fIx1 y1 x2 y2\fR
 .
 Specifies a rectangular sub-region of the image file data to be copied
 to the destination image.  If only \fIx1\fR and \fIy1\fR are
@@ -369,20 +397,30 @@
 \fIimageName \fBtransparency \fIsubcommand \fR?\fIarg arg ...\fR?
 .
 Allows examination and manipulation of the transparency information in
 the photo image.  Several subcommands are available:
 .RS
-.TP
-\fIimageName \fBtransparency get \fIx y\fR
-.
-Returns a boolean indicating if the pixel at (\fIx\fR,\fIy\fR) is
-transparent.
-.TP
-\fIimageName \fBtransparency set \fIx y boolean\fR
-.
-Makes the pixel at (\fIx\fR,\fIy\fR) transparent if \fIboolean\fR is
-true, and makes that pixel opaque otherwise.
+.VS 8.7
+.TP
+\fIimageName \fBtransparency get \fIx y\fR ?\fB-alpha\fR?
+.
+Returns true if the pixel at (\fIx\fR,\fIy\fR) is fully transparent,
+false otherwise.  If the option \fB-alpha\fR is passed, returns the
+alpha value of the pixel instead, as an integer in the range 0 to 255.
+.VE 8.7
+
+.VS 8.7
+.TP
+\fIimageName \fBtransparency set \fIx y\fR \fInewVal\fR ?\fB-alpha\fR?
+.
+Change the transparency of the pixel at (\fIx\fR,\fIy\fR) to
+\fInewVal.\fR If no additional option is passed, \fInewVal\fR is
+interpreted as a boolean and the pixel is made fully transparent if
+that value is true, fully opaque otherwise.  If the \fB-alpha\fR
+option is passed, \fInewVal\fR is interpreted as an integral alpha
+value for the pixel, which must be in the range 0 to 255.
+.VE 8.7
 .RE
 .TP
 \fIimageName \fBwrite \fIfilename\fR ?\fIoption value(s) ...\fR?
 .
 Writes image data from \fIimageName\fR to a file named \fIfilename\fR.
@@ -393,19 +431,23 @@
 .
 If the color is specified, the data will not contain any transparency
 information. In all transparent pixels the color will be replaced by
 the specified color.
 .TP
-\fB\-format\fI format-name\fR
+\fB\-format\fR {\fIformat-name\fR ?\fIoption value ...\fR?}
 .
 Specifies the name of the image file format handler to be used to
-write the data to the file.  Specifically, this subcommand searches
-for the first handler whose name matches an initial substring of
-\fIformat-name\fR and which has the capability to write an image
-file.  If this option is not given, the format is guessed from
-the file extension. If that cannot be determined, this subcommand
-uses the first handler that has the capability to write an image file.
+write the data to the file and, optionally, options to pass to the
+format handler.  Specifically, this subcommand searches for the first
+handler whose name matches an initial substring of \fIformat-name\fR
+and which has the capability to write an image file.  If this option
+is not given, the format is guessed from the file extension. If that
+cannot be determined, this subcommand uses the first handler that has
+the capability to write an image file.
+Note: the value of this option must be a Tcl list.
+This means that the braces may be omitted if the argument has only one
+word. Also, instead of braces, double quotes may be used for quoting.
 .TP
 \fB\-from \fIx1 y1 x2 y2\fR
 .
 Specifies a rectangular region of \fIimageName\fR to be written to the
 image file.  If only \fIx1\fR and \fIy1\fR are specified, the region
@@ -424,24 +466,28 @@
 The photo image code is structured to allow handlers for additional
 image file formats to be added easily.  The photo image code maintains
 a list of these handlers.  Handlers are added to the list by
 registering them with a call to \fBTk_CreatePhotoImageFormat\fR.  The
 standard Tk distribution comes with handlers for PPM/PGM, PNG and GIF
-formats, which are automatically registered on initialization.
+formats,
+.VS 8.7
+as well as the \fBdefault\fR handler to encode/decode image
+data in a human readable form.
+.VE 8.7
+These handlers are automatically registered on initialization.
 .PP
-When reading an image file or processing
-string data specified with the \fB\-data\fR configuration option, the
-photo image code invokes each handler in turn until one is
-found that claims to be able to read the data in the file or string.
-Usually this will find the correct handler, but if it does not, the
-user may give a format name with the \fB\-format\fR option to specify
-which handler to use.  In fact the photo image code will try those
-handlers whose names begin with the string specified for the
-\fB\-format\fR option (the comparison is case-insensitive).  For
-example, if the user specifies \fB\-format gif\fR, then a handler
-named GIF87 or GIF89 may be invoked, but a handler
-named JPEG may not (assuming that such handlers had been
+When reading an image file or processing string data specified with
+the \fB\-data\fR configuration option, the photo image code invokes
+each handler in turn until one is found that claims to be able to read
+the data in the file or string.  Usually this will find the correct
+handler, but if it does not, the user may give a format name with the
+\fB\-format\fR option to specify which handler to use.  In this case,
+the photo image code will try those handlers whose names begin with
+the string specified for the \fB\-format\fR option (the comparison is
+case-insensitive).  For example, if the user specifies \fB\-format
+gif\fR, then a handler named GIF87 or GIF89 may be invoked, but a
+handler named JPEG may not (assuming that such handlers had been
 registered).
 .PP
 When writing image data to a file, the processing of the
 \fB\-format\fR option is slightly different: the string value given
 for the \fB\-format\fR option must begin with the complete name of the
@@ -448,31 +494,113 @@
 requested handler, and may contain additional information following
 that, which the handler can use, for example, to specify which variant
 to use of the formats supported by the handler.
 Note that not all image handlers may support writing transparency data
 to a file, even where the target image format does.
+.VS 8.7
+.SS "THE DEFAULT IMAGE HANDLER"
+.PP
+The \fBdefault\fR image handler cannot be used to read or write data
+from/to a file. Its sole purpose is to encode and decode image data in
+string form in a clear text, human readable, form. The \fIimageName\fR
+\fBdata\fR subcommand uses this handler when no other format is
+specified. When reading image data from a string with \fIimageName\fR
+\fBput\fR or the \fB-data\fR option, the default handler is treated
+as the other handlers.
+.PP
+Image data in the \fBdefault\fR string format is a (top-to-bottom)
+list of scan-lines, with each scan-line being a (left-to-right) list
+of pixel data. Every scan-line has the same length. The color
+and, optionally, alpha value of each pixel is specified in any of
+the forms described in the \fBCOLOR FORMATS\fR section below.
+.VE 8.7
+
 .SS "FORMAT SUBOPTIONS"
 .PP
 .VS 8.6
-Some image formats support sub-options, which are specified at the time that
-the image is loaded using additional words in the \fB\-format\fR option. At
-the time of writing, the following are supported:
+Image formats may support sub-options, wich ahre specified using
+additional words in the value to the \fB\-format\fR option. These
+suboptions can affect how image data is read or written to file or
+string. The nature and values of these options is up to the format
+handler.
+The built-in handlers support these suboptions:
+.VS 8.7
+.TP
+\fBdefault \-colorformat\fI formatType\fR
+.
+The option is allowed when writing image data to a string with
+\fIimageName\fR \fBdata\fR. Specifies the format to use for the color
+string of each pixel. \fIformatType\fR may be one of: \fBrgb\fR to
+encode pixel data in the form \fB#\fIRRGGBB\fR, \fBrgba\fR to encode
+pixel data in the form \fB#\fIRRGGBBAA\fR or \fBlist\fR to encode
+pixel data as a list with four elements. See \fBCOLOR FORMATS\fR
+below for details. The default is \fBrgb\fR.
+.VE 8.7
 .TP
 \fBgif \-index\fI indexValue\fR
 .
-When parsing a multi-part GIF image, Tk normally only accesses the first
-image. By giving the \fB\-index\fR sub-option, the \fIindexValue\fR'th value
-may be used instead. The \fIindexValue\fR must be an integer from 0 up to the
-number of image parts in the GIF data.
+The option has effect when reading image data from a file. When
+parsing a multi-part GIF image, Tk normally only accesses the first
+image. By giving the \fB\-index\fR sub-option, the \fIindexValue\fR'th
+value may be used instead. The \fIindexValue\fR must be an integer
+from 0 up to the number of image parts in the GIF data.
 .TP
 \fBpng \-alpha\fI alphaValue\fR
 .
-An additional alpha filtering for the overall image, which allows the
-background on which the image is displayed to show through. This usually also
-has the effect of desaturating the image. The \fIalphaValue\fR must be between
-0.0 and 1.0.
+The option has effect when reading image data from a file. Specifies
+an additional alpha filtering for the overall image, which allows the
+background on which the image is displayed to show through.  This
+usually also has the effect of desaturating the image.  The
+\fIalphaValue\fR must be between 0.0 and 1.0.
 .VE 8.6
+.VS 8.7
+.SH "COLOR FORMATS"
+.PP
+The default image handler can represent/parse color and alpha values
+of a pixel in one of the formats listed below. If a color format does
+not contain transparency information, full opacity is assumed.  The
+available color formats are:
+.IP \(bu 3
+The empty string - interpreted as full transparency, the color value
+is undefined.
+.IP \(bu 3
+Any value accepted by \fBTk_GetColor\fR, optionally followed by an
+alpha suffix. The alpha suffix may be one of:
+.RS
+.TP
+\fB@\fR\fIA\fR
+.
+The alpha value \fIA\fR must be a fractional value in the range  0.0
+(fully transparent) to 1.0 (fully opaque).
+.TP
+\fB#\fR\fIX\fR
+.
+The alpha value \fIX\fR is a hexadecimal digit that specifies an integer
+alpha value in the range 0 (fully transparent) to 255 (fully opaque).
+This is expanded in range from 4 bits wide to 8 bits wide by
+multiplication by 0x11.
+.TP
+\fB#\fR\fIXX\fR
+.
+The alpha value \fIXX\fR is passed as two hexadecimal digits that
+specify an integer alpha value in the range 0 (fully transparent) to 255
+(fully opaque).
+.RE
+.IP \(bu 3
+A Tcl list with three or four integers in the range 0 to 255,
+specifying the values for the red, green, blue and (optionally)
+alpha channels respectively.
+.IP \(bu 3
+\fB#\fR\fIRGBA\fR format: a \fB#\fR followed by four hexadecimal digits,
+where each digit is the value for the red, green, blue and alpha
+channels respectively. Each digit will be expanded internally to
+8 bits by multiplication by 0x11.
+.IP \(bu 3
+\fB#\fR\fIRRGGBBAA\fR format: \fB#\fR followed by eight hexadecimal digits,
+where each pair of  subsequent digits represents the value for the red,
+green, blue and alpha channels respectively.
+.VE 8.7
 .SH "COLOR ALLOCATION"
 .PP
 When a photo image is displayed in a window, the photo image code
 allocates colors to use to display the image and dithers the image, if
 necessary, to display a reasonable approximation to the image using
@@ -532,12 +660,29 @@
 \fBimage create photo\fR iconDisabled \-file "icon.png" \e
         \-format "png \-alpha 0.5"
 button .b \-image icon \-disabledimage iconDisabled
 .CE
 .VE 8.6
+.PP
+.VS 8.7
+Create a green box with a simple shadow effect
+.PP
+.CS
+\fBimage create photo\fR foo
+
+# Make a simple graduated fill varying in alpha for the shadow
+for {set i 14} {$i > 0} {incr i -1} {
+   set i2 [expr {$i + 30}]
+   foo \fBput\fR [format black#%x [expr {15-$i}]] -to $i $i $i2 $i2
+}
+
+# Put a solid green rectangle on top
+foo \fBput\fR #F080 -to 0 0 30 30
+.VE 8.7
+.CE
 .SH "SEE ALSO"
 image(n)
 .SH KEYWORDS
 photo, image, color
 '\" Local Variables:
 '\" mode: nroff
 '\" End:

Index: doc/place.n
==================================================================
--- doc/place.n
+++ doc/place.n
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1992 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH place n "" Tk "Tk Built-In Commands"
 .so man.macros
 .BS
 '\" Note:  do not modify the .SH NAME line immediately below!
 .SH NAME

Index: doc/popup.n
==================================================================
--- doc/popup.n
+++ doc/popup.n
@@ -1,11 +1,11 @@
 '\"
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH tk_popup n 4.0 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
 '\" Note:  do not modify the .SH NAME line immediately below!
 .SH NAME

Index: doc/radiobutton.n
==================================================================
--- doc/radiobutton.n
+++ doc/radiobutton.n
@@ -39,20 +39,10 @@
 .OP \-indicatoron indicatorOn IndicatorOn
 Specifies whether or not the indicator should be drawn.  Must be a
 proper boolean value.  If false, the \fB\-relief\fR option is
 ignored and the widget's relief is always sunken if the widget is
 selected and raised otherwise.
-.OP \-selectcolor selectColor Background
-Specifies a background color to use when the button is selected.
-If \fB\-indicatoron\fR is true then the color applies to the indicator.
-Under Windows, this color is used as the background for the indicator
-regardless of the select state.
-If \fB\-indicatoron\fR is false, this color is used as the background
-for the entire widget, in place of \fB\-background\fR or \fB\-activeBackground\fR,
-whenever the widget is selected.
-If specified as an empty string then no special color is used for
-displaying when the widget is selected.
 .OP \-offrelief offRelief OffRelief
 Specifies the relief for the checkbutton when the indicator is not drawn and
 the checkbutton is off.  The default value is
 .QW raised .
 By setting this option to
@@ -69,10 +59,19 @@
 mouse cursor is over the widget.  This option can be used to make
 toolbar buttons, by configuring \fB\-relief flat \-overrelief
 raised\fR.  If the value of this option is the empty string, then no
 alternative relief is used when the mouse cursor is over the radiobutton.
 The empty string is the default value.
+.OP \-selectcolor selectColor Background
+Specifies a background color to use when the button is selected.
+If \fBindicatorOn\fR is true then the color is used as the background for
+the indicator regardless of the select state.
+If \fB\-indicatoron\fR is false, this color is used as the background
+for the entire widget, in place of \fB\-background\fR or \fB\-activeBackground\fR,
+whenever the widget is selected.
+If specified as an empty string then no special color is used for
+displaying when the widget is selected.
 .OP \-selectimage selectImage SelectImage
 Specifies an image to display (in place of the \fB\-image\fR option)
 when the radiobutton is selected.
 This option is ignored unless the \fB\-image\fR option has been
 specified.

Index: doc/raise.n
==================================================================
--- doc/raise.n
+++ doc/raise.n
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1990 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH raise n 3.3 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
 '\" Note:  do not modify the .SH NAME line immediately below!
 .SH NAME
@@ -29,10 +29,13 @@
 this could end up either raising or lowering \fIwindow\fR.
 .PP
 All \fBtoplevel\fR windows may be restacked with respect to each
 other, whatever their relative path names, but the window manager is
 not obligated to strictly honor requests to restack.
+.PP
+On macOS raising an iconified \fBtoplevel\fR window causes it to be
+deiconified.
 .SH EXAMPLE
 .PP
 Make a button appear to be in a sibling frame that was created after
 it. This is is often necessary when building GUIs in the style where
 you create your activity widgets first before laying them out on the

Index: doc/scale.n
==================================================================
--- doc/scale.n
+++ doc/scale.n
@@ -89,14 +89,14 @@
 value of the variable changes, the scale will update to reflect this
 value.
 Whenever the scale is manipulated interactively, the variable
 will be modified to reflect the scale's new value.
 .OP \-width width Width
-Specifies the desired narrow dimension of the trough in screen units
+Specifies the desired narrow dimension of the scale in screen units
 (i.e. any of the forms acceptable to \fBTk_GetPixels\fR).
-For vertical scales this is the trough's width;  for horizontal scales
-this is the trough's height.
+For vertical scales this is the scale's width;  for horizontal scales
+this is the scale's height.
 .BE
 .SH DESCRIPTION
 .PP
 The \fBscale\fR command creates a new window (given by the
 \fIpathName\fR argument) and makes it into a scale widget.

Index: doc/scrollbar.n
==================================================================
--- doc/scrollbar.n
+++ doc/scrollbar.n
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1990-1994 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH scrollbar n 4.1 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
 '\" Note:  do not modify the .SH NAME line immediately below!
 .SH NAME

Index: doc/selection.n
==================================================================
--- doc/selection.n
+++ doc/selection.n
@@ -138,10 +138,30 @@
 that it has lost the selection.
 If \fIcommand\fR is specified, it is a Tcl script to execute when
 some other window claims ownership of the selection away from
 \fIwindow\fR.  \fISelection\fR defaults to PRIMARY.
 .RE
+.SH WIDGET FACILITIES
+.PP
+The \fBtext\fR, \fBentry\fR, \fBttk::entry\fR, \fBlistbox\fR, \fBspinbox\fR and \fBttk::spinbox\fR widgets have the option \fB\-exportselection\fR.  If a widget has this option set to boolean \fBtrue\fR, then (in an unsafe interpreter) a selection made in the widget is automatically written to the \fBPRIMARY\fR selection.
+.PP
+A GUI event, for example \fB<<PasteSelection>>\fR, can copy the \fBPRIMARY\fR selection to certain widgets.  This copy is implemented by a widget binding to the event.  The binding script makes appropriate calls to the \fBselection\fR command.
+.PP
+.SH PORTABILITY ISSUES
+.PP
+On X11, the \fBPRIMARY\fR selection is a system-wide feature of the X server, allowing communication between different processes that are X11 clients.
+.PP
+On Windows, the \fBPRIMARY\fR selection is not provided by the system, but only by Tk, and so it is shared only between windows of a master interpreter and its unsafe slave interpreters.  It is not shared between interpreters in different processes or different threads.  Each master interpreter has a separate \fBPRIMARY\fR selection that is shared only with its unsafe slaves.
+.PP
+.SH SECURITY
+.PP
+A safe interpreter cannot read from the \fBPRIMARY\fR selection because its \fBselection\fR command is hidden.  For this reason the \fBPRIMARY\fR selection cannot be written to the Tk widgets of a safe interpreter.
+.PP
+A Tk widget can have its option \fB\-exportselection\fR set to boolean \fBtrue\fR, but in a safe interpreter this option has no effect: writing from the widget to the \fBPRIMARY\fR selection is disabled.
+.PP
+These are security features.  A safe interpreter may run untrusted code, and it is a security risk if this untrusted code can read or write the \fBPRIMARY\fR selection used by other interpreters.
+.PP
 .SH EXAMPLES
 .PP
 On X11 platforms, one of the standard selections available is the
 \fBSECONDARY\fR selection. Hardly anything uses it, but here is how to read
 it using Tk:

Index: doc/send.n
==================================================================
--- doc/send.n
+++ doc/send.n
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1990-1994 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH send n 4.0 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
 '\" Note:  do not modify the .SH NAME line immediately below!
 .SH NAME

Index: doc/spinbox.n
==================================================================
--- doc/spinbox.n
+++ doc/spinbox.n
@@ -2,11 +2,11 @@
 '\" Copyright (c) 2000 Jeffrey Hobbs.
 '\" Copyright (c) 2000 Ajuba Solutions.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH spinbox n 8.4 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
 '\" Note:  do not modify the .SH NAME line immediately below!
 .SH NAME
@@ -21,10 +21,11 @@
 \-exportselection	\-insertwidth	\-takefocus
 \-font	\-insertofftime	\-textvariable
 \-foreground	\-justify	\-xscrollcommand
 \-highlightbackground	\-relief
 \-highlightcolor	\-repeatdelay
+\-placeholder	\-placeholderforeground
 .SE
 .SH "WIDGET-SPECIFIC OPTIONS"
 .OP \-buttonbackground buttonBackground Background
 The background color to be used for the spin buttons.
 .OP \-buttoncursor buttonCursor Cursor
@@ -52,11 +53,12 @@
 as it will format a floating-point number.
 .OP \-from from From
 A floating-point value corresponding to the lowest value for a spinbox, to
 be used in conjunction with \fB\-to\fR and \fB\-increment\fR.  When all
 are specified correctly, the spinbox will use these values to control its
-contents.  This value must be less than the \fB\-to\fR option.
+contents. If this value is greater than the \fB\-to\fR option, then
+\fB\-from\fR and \fB\-to\fR values are automatically swapped.
 If \fB\-values\fR is specified, it supersedes this option.
 .OP "\-invalidcommand or \-invcmd" invalidCommand InvalidCommand
 Specifies a script to eval when \fB\-validatecommand\fR returns 0.  Setting
 it to an empty string disables this feature (the default).  The best use of
 this option is to set it to \fIbell\fR.  See \fBVALIDATION\fR below for
@@ -81,11 +83,12 @@
 \fB\-disabledforeground\fR and \fB\-disabledbackground\fR options.
 .OP \-to to To
 A floating-point value corresponding to the highest value for the spinbox,
 to be used in conjunction with \fB\-from\fR and \fB\-increment\fR.  When
 all are specified correctly, the spinbox will use these values to control
-its contents.  This value must be greater than the \fB\-from\fR option.
+its contents. If this value is less than the \fB\-from\fR option, then
+\fB\-from\fR and \fB\-to\fR values are automatically swapped.
 If \fB\-values\fR is specified, it supersedes this option.
 .OP \-validate validate Validate
 Specifies the mode in which validation should operate: \fBnone\fR,
 \fBfocus\fR, \fBfocusin\fR, \fBfocusout\fR, \fBkey\fR, or \fBall\fR.
 It defaults to \fBnone\fR.  When you want validation, you must explicitly
@@ -215,19 +218,23 @@
 in the \fB\-validatecommand\fR or \fB\-invalidcommand\fR (whichever one you
 were editing the spinbox widget from).  It is also recommended to not set an
 associated \fB\-textvariable\fR during validation, as that can cause the
 spinbox widget to become out of sync with the \fB\-textvariable\fR.
 .PP
-Also, the \fBvalidate\fR option will set itself to \fBnone\fR when the
-spinbox value gets changed because of adjustment of \fBfrom\fR or \fBto\fR
-and the \fBvalidateCommand\fR returns false. For instance
+Also, the \fB-validate\fR option will set itself to \fBnone\fR when the
+spinbox value gets changed because of adjustment of \fB-from\fR or \fB-to\fR
+and the \fB-validatecommand\fR returns false. For instance
 .CS
      \fIspinbox pathName \-from 1 \-to 10 \-validate all \-vcmd {return 0}\fR
 .CE
-will in fact set the \fBvalidate\fR option to \fBnone\fR because the default
-value for the spinbox gets changed (due to the \fBfrom\fR and \fBto\fR
+will in fact set the \fB-validate\fR option to \fBnone\fR because the default
+value for the spinbox gets changed (due to the \fB-from\fR and \fB-to\fR
 options) to a value not accepted by the validation script.
+.PP
+Moreover, forced validation is performed when invoking any spinbutton of
+the spinbox. If the validation script returns false in this situation,
+then the \fB-validate\fR option will be automatically set to \fBnone\fR.
 .SH "WIDGET COMMAND"
 .PP
 The \fBspinbox\fR command creates a new Tcl command whose
 name is \fIpathName\fR.  This command may be used to invoke various
 operations on the widget.  It has the following general form:

Index: doc/text.n
==================================================================
--- doc/text.n
+++ doc/text.n
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1992 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH text n 8.5 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
 '\" Note: do not modify the .SH NAME line immediately below!
 .SH NAME
@@ -535,11 +535,11 @@
 character of that display line.
 .TP
 \fB\-rmargincolor \fIcolor\fR
 .
 \fIColor\fR specifies the background color to use in regions that do not
-contain characters because they are indented by \fB\-rmargin1\fR. It may
+contain characters because they are indented by \fB\-rmargin\fR. It may
 have any of the forms accepted by \fBTk_GetColor\fR. If \fIcolor\fR has not
 been specified, or if it is specified as an empty string, then the color
 used is specified by the \fB-background\fR tag option (or, if this is also
 unspecified, by the \fB-background\fR widget option).
 .TP
@@ -607,13 +607,15 @@
 specified by the \fB\-foreground\fR tag option is used.
 .TP
 \fB\-wrap \fImode\fR
 .
 \fIMode\fR specifies how to handle lines that are wider than the text's
-window. It has the same legal values as the \fB\-wrap\fR option for the text
-widget: \fBnone\fR, \fBchar\fR, or \fBword\fR. If this tag option is
-specified, it overrides the \fB\-wrap\fR option for the text widget.
+window. This option only applies to a display line if it applies to the
+first non-elided character on that display line. It has the same legal
+values as the \fB\-wrap\fR option for the text widget: \fBnone\fR,
+\fBchar\fR, or \fBword\fR. If this tag option is specified, it
+overrides the \fB\-wrap\fR option for the text widget.
 .PP
 If a character has several tags associated with it, and if their display
 options conflict, then the options of the highest priority tag are used. If a
 particular display option has not been specified for a particular tag, or if
 it is specified as an empty string, then that option will never be used; the
@@ -1305,12 +1307,13 @@
 of the widget to \fIboolean\fR.
 .TP
 \fIpathName \fBedit redo\fR
 .
 When the \fB\-undo\fR option is true, reapplies the last undone edits provided
-no other edits were done since then. Generates an error when the redo stack is
-empty. Does nothing when the \fB\-undo\fR option is false.
+no other edits were done since then, and returns a list of indices indicating
+what ranges were changed by the redo operation. Generates an error when the
+redo stack is empty. Does nothing when the \fB\-undo\fR option is false.
 .TP
 \fIpathName \fBedit reset\fR
 .
 Clears the undo and redo stacks.
 .TP
@@ -1319,13 +1322,14 @@
 Inserts a separator (boundary) on the undo stack. Does nothing when the
 \fB\-undo\fR option is false.
 .TP
 \fIpathName \fBedit undo\fR
 .
-Undoes the last edit action when the \fB\-undo\fR option is true. An edit
-action is defined as all the insert and delete commands that are recorded on
-the undo stack in between two separators. Generates an error when the undo
+Undoes the last edit action when the \fB\-undo\fR option is true, and returns a
+list of indices indicating what ranges were changed by the undo operation. An
+edit action is defined as all the insert and delete commands that are recorded
+on the undo stack in between two separators. Generates an error when the undo
 stack is empty. Does nothing when the \fB\-undo\fR option is false.
 .RE
 .TP
 \fIpathName \fBget\fR ?\fB\-displaychars\fR? ?\fB\-\-\fR? \fIindex1\fR ?\fIindex2 ...\fR?
 .
@@ -2151,15 +2155,15 @@
 insertion cursor without moving the insertion cursor.
 .IP [29]
 Meta-backspace and Meta-Delete delete the word to the left of the insertion
 cursor.
 .IP [30]
+Control-t reverses the order of the two characters to the right of the
+insertion cursor.
+.IP [31]
 Control-x deletes whatever is selected in the text widget after copying it to
 the clipboard.
-.IP [31]
-Control-t reverses the order of the two characters to the right of the
-insertion cursor.
 .IP [32]
 Control-z undoes the last edit action if the \fB\-undo\fR option is true.
 Does nothing otherwise.
 .IP [33]
 Control-Z (or Control-y on Windows) reapplies the last undone edit action if

Index: doc/tk.n
==================================================================
--- doc/tk.n
+++ doc/tk.n
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1992 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH tk n 8.4 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
 '\" Note:  do not modify the .SH NAME line immediately below!
 .SH NAME

Index: doc/tk4.0.ps
==================================================================
--- doc/tk4.0.ps
+++ doc/tk4.0.ps
@@ -14,11 +14,11 @@
 % This file fixes the problem with NeWS printers dithering color output.
 % Any questions should be sent to mickey@magickingdom.eng.sun.com
 %
 % Known Problems:
 %	Due to bugs in Transcript, the 'PS-Adobe-' is omitted from line 1
-/FMversion (3.0) def 
+/FMversion (3.0) def
 % Set up Color vs. Black-and-White
 
 /FMPrintInColor { % once-thru loop gimmick
     % See if we're a NeWSprint printer
      /currentcanvas where {
@@ -36,38 +36,38 @@
     systemdict /currentcolortransfer known and
 exit } loop def
 
 % Uncomment the following line to force b&w on color printer
 %   /FMPrintInColor false def
-/FrameDict 195 dict def 
+/FrameDict 195 dict def
 systemdict /errordict known not {/errordict 10 dict def
 		errordict /rangecheck {stop} put} if
 % The readline in 23.0 doesn't recognize cr's as nl's on AppleTalk
-FrameDict /tmprangecheck errordict /rangecheck get put 
-errordict /rangecheck {FrameDict /bug true put} put 
-FrameDict /bug false put 
-mark 
+FrameDict /tmprangecheck errordict /rangecheck get put
+errordict /rangecheck {FrameDict /bug true put} put
+FrameDict /bug false put
+mark
 % Some PS machines read past the CR, so keep the following 3 lines together!
 currentfile 5 string readline
 00
 0000000000
-cleartomark 
-errordict /rangecheck FrameDict /tmprangecheck get put 
-FrameDict /bug get { 
+cleartomark
+errordict /rangecheck FrameDict /tmprangecheck get put
+FrameDict /bug get {
 	/readline {
 		/gstring exch def
 		/gfile exch def
 		/gindex 0 def
 		{
-			gfile read pop 
-			dup 10 eq {exit} if 
-			dup 13 eq {exit} if 
-			gstring exch gindex exch put 
-			/gindex gindex 1 add def 
+			gfile read pop
+			dup 10 eq {exit} if
+			dup 13 eq {exit} if
+			gstring exch gindex exch put
+			/gindex gindex 1 add def
 		} loop
-		pop 
-		gstring 0 gindex getinterval true 
+		pop
+		gstring 0 gindex getinterval true
 		} def
 	} if
 /FMVERSION {
 	FMversion ne {
 		/Times-Roman findfont 18 scalefont setfont
@@ -74,16 +74,16 @@
 		100 100 moveto
 		(FrameMaker version does not match postscript_prolog!)
 		dup =
 		show showpage
 		} if
-	} def 
+	} def
 /FMLOCAL {
 	FrameDict begin
-	0 def 
-	end 
-	} def 
+	0 def
+	end
+	} def
 	/gstring FMLOCAL
 	/gfile FMLOCAL
 	/gindex FMLOCAL
 	/orgxfer FMLOCAL
 	/orgproc FMLOCAL
@@ -92,12 +92,12 @@
 	/yscale FMLOCAL
 	/xscale FMLOCAL
 	/manualfeed FMLOCAL
 	/paperheight FMLOCAL
 	/paperwidth FMLOCAL
-/FMDOCUMENT { 
-	array /FMfonts exch def 
+/FMDOCUMENT {
+	array /FMfonts exch def
 	/#copies exch def
 	FrameDict begin
 	0 ne dup {setmanualfeed} if
 	/manualfeed exch def
 	/paperheight exch def
@@ -105,109 +105,109 @@
 	/yscale exch def
 	/xscale exch def
 	currenttransfer cvlit /orgxfer exch def
 	currentscreen cvlit /orgproc exch def
 	/organgle exch def /orgfreq exch def
-	setpapername 
-	manualfeed {true} {papersize} ifelse 
-	{manualpapersize} {false} ifelse 
+	setpapername
+	manualfeed {true} {papersize} ifelse
+	{manualpapersize} {false} ifelse
 	{desperatepapersize} if
-	end 
-	} def 
+	end
+	} def
 	/pagesave FMLOCAL
 	/orgmatrix FMLOCAL
 	/landscape FMLOCAL
-/FMBEGINPAGE { 
-	FrameDict begin 
+/FMBEGINPAGE {
+	FrameDict begin
 	/pagesave save def
 	3.86 setmiterlimit
 	/landscape exch 0 ne def
-	landscape { 
-		90 rotate 0 exch neg translate pop 
+	landscape {
+		90 rotate 0 exch neg translate pop
 		}
 		{pop pop}
 		ifelse
 	xscale yscale scale
 	/orgmatrix matrix def
-	gsave 
-	} def 
+	gsave
+	} def
 /FMENDPAGE {
-	grestore 
+	grestore
 	pagesave restore
-	end 
+	end
 	showpage
-	} def 
-/FMFONTDEFINE { 
+	} def
+/FMFONTDEFINE {
 	FrameDict begin
-	findfont 
-	ReEncode 
-	1 index exch 
-	definefont 
-	FMfonts 3 1 roll 
+	findfont
+	ReEncode
+	1 index exch
+	definefont
+	FMfonts 3 1 roll
 	put
-	end 
-	} def 
+	end
+	} def
 /FMFILLS {
 	FrameDict begin
 	array /fillvals exch def
-	end 
-	} def 
+	end
+	} def
 /FMFILL {
 	FrameDict begin
 	 fillvals 3 1 roll put
-	end 
-	} def 
-/FMNORMALIZEGRAPHICS { 
+	end
+	} def
+/FMNORMALIZEGRAPHICS {
 	newpath
 	0.0 0.0 moveto
 	1 setlinewidth
 	0 setlinecap
 	0 0 0 sethsbcolor
-	0 setgray 
+	0 setgray
 	} bind def
 	/fx FMLOCAL
 	/fy FMLOCAL
 	/fh FMLOCAL
 	/fw FMLOCAL
 	/llx FMLOCAL
 	/lly FMLOCAL
 	/urx FMLOCAL
 	/ury FMLOCAL
-/FMBEGINEPSF { 
-	end 
-	/FMEPSF save def 
-	/showpage {} def 
-	FMNORMALIZEGRAPHICS 
-	[/fy /fx /fh /fw /ury /urx /lly /llx] {exch def} forall 
-	fx fy translate 
+/FMBEGINEPSF {
+	end
+	/FMEPSF save def
+	/showpage {} def
+	FMNORMALIZEGRAPHICS
+	[/fy /fx /fh /fw /ury /urx /lly /llx] {exch def} forall
+	fx fy translate
 	rotate
-	fw urx llx sub div fh ury lly sub div scale 
-	llx neg lly neg translate 
+	fw urx llx sub div fh ury lly sub div scale
+	llx neg lly neg translate
 	} bind def
 /FMENDEPSF {
 	FMEPSF restore
-	FrameDict begin 
+	FrameDict begin
 	} bind def
-FrameDict begin 
+FrameDict begin
 /setmanualfeed {
 %%BeginFeature *ManualFeed True
 	 statusdict /manualfeed true put
 %%EndFeature
 	} def
 /max {2 copy lt {exch} if pop} bind def
 /min {2 copy gt {exch} if pop} bind def
 /inch {72 mul} def
-/pagedimen { 
-	paperheight sub abs 16 lt exch 
+/pagedimen {
+	paperheight sub abs 16 lt exch
 	paperwidth sub abs 16 lt and
 	{/papername exch def} {pop} ifelse
 	} def
 	/papersizedict FMLOCAL
-/setpapername { 
-	/papersizedict 14 dict def 
+/setpapername {
+	/papersizedict 14 dict def
 	papersizedict begin
-	/papername /unknown def 
+	/papername /unknown def
 		/Letter 8.5 inch 11.0 inch pagedimen
 		/LetterSmall 7.68 inch 10.16 inch pagedimen
 		/Tabloid 11.0 inch 17.0 inch pagedimen
 		/Ledger 17.0 inch 11.0 inch pagedimen
 		/Legal 8.5 inch 14.0 inch pagedimen
@@ -235,13 +235,13 @@
 		/B4 {b4tray b4} def
 		/B5 {b5tray b5} def
 		/unknown {unknown} def
 	papersizedict dup papername known {papername} {/unknown} ifelse get
 	end
-	/FMdicttop countdictstack 1 add def 
-	statusdict begin stopped end 
-	countdictstack -1 FMdicttop {pop end} for 
+	/FMdicttop countdictstack 1 add def
+	statusdict begin stopped end
+	countdictstack -1 FMdicttop {pop end} for
 	} def
 /manualpapersize {
 	papersizedict begin
 		/Letter {letter} def
 		/LetterSmall {lettersmall} def
@@ -256,18 +256,18 @@
 		/B4 {b4} def
 		/B5 {b5} def
 		/unknown {unknown} def
 	papersizedict dup papername known {papername} {/unknown} ifelse get
 	end
-	stopped 
+	stopped
 	} def
 /desperatepapersize {
 	statusdict /setpageparams known
 		{
-		paperwidth paperheight 0 1 
+		paperwidth paperheight 0 1
 		statusdict begin
-		{setpageparams} stopped pop 
+		{setpageparams} stopped pop
 		end
 		} if
 	} def
 /savematrix {
 	orgmatrix currentmatrix pop
@@ -312,22 +312,22 @@
 /Acircumflex /Ecircumflex /Aacute /Edieresis /Egrave /Iacute
 /Icircumflex /Idieresis /Igrave /Oacute /Ocircumflex /.notdef /Ograve
 /Uacute /Ucircumflex /Ugrave /dotlessi /circumflex /tilde /macron
 /breve /dotaccent /ring /cedilla /hungarumlaut /ogonek /caron
 ] def
-/ReEncode { 
-	dup 
-	length 
-	dict begin 
-	{
-	1 index /FID ne 
-		{def} 
-		{pop pop} ifelse 
-	} forall 
-	0 eq {/Encoding DiacriticEncoding def} if 
-	currentdict 
-	end 
+/ReEncode {
+	dup
+	length
+	dict begin
+	{
+	1 index /FID ne
+		{def}
+		{pop pop} ifelse
+	} forall
+	0 eq {/Encoding DiacriticEncoding def} if
+	currentdict
+	end
 	} bind def
 /graymode true def
 	/bwidth FMLOCAL
 	/bpside FMLOCAL
 	/bstring FMLOCAL
@@ -340,11 +340,11 @@
 /setpattern {
 	 /bwidth  exch def
 	 /bpside  exch def
 	 /bstring exch def
 	 /onbits 0 def  /offbits 0 def
-	 freq sangle landscape {90 add} if 
+	 freq sangle landscape {90 add} if
 		{/y exch def
 		 /x exch def
 		 /xindex x 1 add 2 div bpside mul cvi def
 		 /yindex y 1 add 2 div bpside mul cvi def
 		 bstring yindex bwidth mul xindex 8 idiv add get
@@ -368,65 +368,65 @@
 	} bind def
 	/HUE FMLOCAL
 	/SAT FMLOCAL
 	/BRIGHT FMLOCAL
 	/Colors FMLOCAL
-FMPrintInColor 
-	
+FMPrintInColor
+
 	{
 	/HUE 0 def
 	/SAT 0 def
 	/BRIGHT 0 def
 	% array of arrays Hue and Sat values for the separations [HUE BRIGHT]
-	/Colors   
+	/Colors
 	[[0    0  ]    % black
 	 [0    0  ]    % white
 	 [0.00 1.0]    % red
 	 [0.37 1.0]    % green
 	 [0.60 1.0]    % blue
 	 [0.50 1.0]    % cyan
 	 [0.83 1.0]    % magenta
 	 [0.16 1.0]    % comment / yellow
 	 ] def
-      
-	/BEGINBITMAPCOLOR { 
+
+	/BEGINBITMAPCOLOR {
 		BITMAPCOLOR} def
-	/BEGINBITMAPCOLORc { 
+	/BEGINBITMAPCOLORc {
 		BITMAPCOLORc} def
-	/BEGINBITMAPTRUECOLOR { 
+	/BEGINBITMAPTRUECOLOR {
 		BITMAPTRUECOLOR } def
-	/BEGINBITMAPTRUECOLORc { 
+	/BEGINBITMAPTRUECOLORc {
 		BITMAPTRUECOLORc } def
-	/K { 
+	/K {
 		Colors exch get dup
-		0 get /HUE exch store 
+		0 get /HUE exch store
 		1 get /BRIGHT exch store
 		  HUE 0 eq BRIGHT 0 eq and
 			{1.0 SAT sub setgray}
-			{HUE SAT BRIGHT sethsbcolor} 
+			{HUE SAT BRIGHT sethsbcolor}
 		  ifelse
 		} def
-	/FMsetgray { 
-		/SAT exch 1.0 exch sub store 
+	/FMsetgray {
+		/SAT exch 1.0 exch sub store
 		  HUE 0 eq BRIGHT 0 eq and
 			{1.0 SAT sub setgray}
-			{HUE SAT BRIGHT sethsbcolor} 
+			{HUE SAT BRIGHT sethsbcolor}
 		  ifelse
 		} bind def
 	}
-	
+
 	{
-	/BEGINBITMAPCOLOR { 
+	/BEGINBITMAPCOLOR {
 		BITMAPGRAY} def
-	/BEGINBITMAPCOLORc { 
+	/BEGINBITMAPCOLORc {
 		BITMAPGRAYc} def
-	/BEGINBITMAPTRUECOLOR { 
+	/BEGINBITMAPTRUECOLOR {
 		BITMAPTRUEGRAY } def
-	/BEGINBITMAPTRUECOLORc { 
+	/BEGINBITMAPTRUECOLORc {
 		BITMAPTRUEGRAYc } def
 	/FMsetgray {setgray} bind def
-	/K { 
+	/K {
 		pop
 		} def
 	}
 ifelse
 /normalize {
@@ -433,66 +433,66 @@
 	transform round exch round exch itransform
 	} bind def
 /dnormalize {
 	dtransform round exch round exch idtransform
 	} bind def
-/lnormalize { 
+/lnormalize {
 	0 dtransform exch cvi 2 idiv 2 mul 1 add exch idtransform pop
 	} bind def
-/H { 
+/H {
 	lnormalize setlinewidth
 	} bind def
 /Z {
 	setlinecap
 	} bind def
 	/fillvals FMLOCAL
-/X { 
+/X {
 	fillvals exch get
 	dup type /stringtype eq
-	{8 1 setpattern} 
+	{8 1 setpattern}
 	{grayness}
 	ifelse
 	} bind def
-/V { 
+/V {
 	gsave eofill grestore
 	} bind def
-/N { 
+/N {
 	stroke
 	} bind def
 /M {newpath moveto} bind def
 /E {lineto} bind def
 /D {curveto} bind def
 /O {closepath} bind def
 	/n FMLOCAL
-/L { 
+/L {
  	/n exch def
 	newpath
 	normalize
-	moveto 
+	moveto
 	2 1 n {pop normalize lineto} for
 	} bind def
-/Y { 
-	L 
+/Y {
+	L
 	closepath
 	} bind def
 	/x1 FMLOCAL
 	/x2 FMLOCAL
 	/y1 FMLOCAL
 	/y2 FMLOCAL
 	/rad FMLOCAL
-/R { 
+/R {
 	/y2 exch def
 	/x2 exch def
 	/y1 exch def
 	/x1 exch def
 	x1 y1
 	x2 y1
 	x2 y2
 	x1 y2
-	4 Y 
+	4 Y
 	} bind def
-/RR { 
+/RR {
 	/rad exch def
 	normalize
 	/y2 exch def
 	/x2 exch def
 	normalize
@@ -505,91 +505,91 @@
 	x2 y1 x1 y1 rad arcto
 	x1 y1 x1 y2 rad arcto
 	closepath
 	16 {pop} repeat
 	} bind def
-/C { 
+/C {
 	grestore
 	gsave
-	R 
+	R
 	clip
 	} bind def
 	/FMpointsize FMLOCAL
-/F { 
+/F {
 	FMfonts exch get
 	FMpointsize scalefont
 	setfont
 	} bind def
-/Q { 
+/Q {
 	/FMpointsize exch def
-	F 
+	F
 	} bind def
-/T { 
+/T {
 	moveto show
 	} bind def
-/RF { 
+/RF {
 	rotate
 	0 ne {-1 1 scale} if
 	} bind def
-/TF { 
+/TF {
 	gsave
-	moveto 
+	moveto
 	RF
 	show
 	grestore
 	} bind def
-/P { 
+/P {
 	moveto
 	0 32 3 2 roll widthshow
 	} bind def
-/PF { 
+/PF {
 	gsave
-	moveto 
+	moveto
 	RF
 	0 32 3 2 roll widthshow
 	grestore
 	} bind def
-/S { 
+/S {
 	moveto
 	0 exch ashow
 	} bind def
-/SF { 
+/SF {
 	gsave
 	moveto
 	RF
 	0 exch ashow
 	grestore
 	} bind def
-/B { 
+/B {
 	moveto
 	0 32 4 2 roll 0 exch awidthshow
 	} bind def
-/BF { 
+/BF {
 	gsave
 	moveto
 	RF
 	0 32 4 2 roll 0 exch awidthshow
 	grestore
 	} bind def
-/G { 
+/G {
 	gsave
 	newpath
-	normalize translate 0.0 0.0 moveto 
-	dnormalize scale 
-	0.0 0.0 1.0 5 3 roll arc 
+	normalize translate 0.0 0.0 moveto
+	dnormalize scale
+	0.0 0.0 1.0 5 3 roll arc
 	closepath fill
 	grestore
 	} bind def
-/A { 
+/A {
 	gsave
 	savematrix
 	newpath
-	2 index 2 div add exch 3 index 2 div sub exch 
-	normalize 2 index 2 div sub exch 3 index 2 div add exch 
-	translate 
-	scale 
-	0.0 0.0 1.0 5 3 roll arc 
+	2 index 2 div add exch 3 index 2 div sub exch
+	normalize 2 index 2 div sub exch 3 index 2 div add exch
+	translate
+	scale
+	0.0 0.0 1.0 5 3 roll arc
 	restorematrix
 	stroke
 	grestore
 	} bind def
 	/x FMLOCAL
@@ -601,41 +601,41 @@
 	/ww FMLOCAL
 	/hh FMLOCAL
 	/FMsaveobject FMLOCAL
 	/FMoptop FMLOCAL
 	/FMdicttop FMLOCAL
-/BEGINPRINTCODE { 
-	/FMdicttop countdictstack 1 add def 
-	/FMoptop count 4 sub def 
+/BEGINPRINTCODE {
+	/FMdicttop countdictstack 1 add def
+	/FMoptop count 4 sub def
 	/FMsaveobject save def
-	userdict begin 
-	/showpage {} def 
-	FMNORMALIZEGRAPHICS 
+	userdict begin
+	/showpage {} def
+	FMNORMALIZEGRAPHICS
 	3 index neg 3 index neg translate
 	} bind def
 /ENDPRINTCODE {
-	count -1 FMoptop {pop pop} for 
-	countdictstack -1 FMdicttop {pop end} for 
-	FMsaveobject restore 
+	count -1 FMoptop {pop pop} for
+	countdictstack -1 FMdicttop {pop end} for
+	FMsaveobject restore
 	} bind def
-/gn { 
-	0 
-	{	46 mul 
-		cf read pop 
-		32 sub 
-		dup 46 lt {exit} if 
-		46 sub add 
+/gn {
+	0
+	{	46 mul
+		cf read pop
+		32 sub
+		dup 46 lt {exit} if
+		46 sub add
 		} loop
-	add 
+	add
 	} bind def
 	/str FMLOCAL
-/cfs { 
-	/str sl string def 
-	0 1 sl 1 sub {str exch val put} for 
-	str def 
+/cfs {
+	/str sl string def
+	0 1 sl 1 sub {str exch val put} for
+	str def
 	} bind def
-/ic [ 
+/ic [
 	0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0223
 	0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0223
 	0
 	{0 hx} {1 hx} {2 hx} {3 hx} {4 hx} {5 hx} {6 hx} {7 hx} {8 hx} {9 hx}
 	{10 hx} {11 hx} {12 hx} {13 hx} {14 hx} {15 hx} {16 hx} {17 hx} {18 hx}
@@ -653,112 +653,112 @@
 	/im FMLOCAL
 	/bs FMLOCAL
 	/cs FMLOCAL
 	/len FMLOCAL
 	/pos FMLOCAL
-/ms { 
-	/sl exch def 
-	/val 255 def 
-	/ws cfs 
-	/im cfs 
-	/val 0 def 
-	/bs cfs 
-	/cs cfs 
-	} bind def
-400 ms 
-/ip { 
-	is 
-	0 
-	cf cs readline pop 
-	{	ic exch get exec 
-		add 
-		} forall 
-	pop 
-	
-	} bind def
-/wh { 
-	/len exch def 
-	/pos exch def 
+/ms {
+	/sl exch def
+	/val 255 def
+	/ws cfs
+	/im cfs
+	/val 0 def
+	/bs cfs
+	/cs cfs
+	} bind def
+400 ms
+/ip {
+	is
+	0
+	cf cs readline pop
+	{	ic exch get exec
+		add
+		} forall
+	pop
+
+	} bind def
+/wh {
+	/len exch def
+	/pos exch def
 	ws 0 len getinterval im pos len getinterval copy pop
-	pos len 
+	pos len
 	} bind def
-/bl { 
-	/len exch def 
-	/pos exch def 
+/bl {
+	/len exch def
+	/pos exch def
 	bs 0 len getinterval im pos len getinterval copy pop
-	pos len 
+	pos len
 	} bind def
 /s1 1 string def
-/fl { 
-	/len exch def 
-	/pos exch def 
+/fl {
+	/len exch def
+	/pos exch def
 	/val cf s1 readhexstring pop 0 get def
 	pos 1 pos len add 1 sub {im exch val put} for
-	pos len 
+	pos len
 	} bind def
-/hx { 
-	3 copy getinterval 
-	cf exch readhexstring pop pop 
+/hx {
+	3 copy getinterval
+	cf exch readhexstring pop pop
 	} bind def
 	/h FMLOCAL
 	/w FMLOCAL
 	/d FMLOCAL
 	/lb FMLOCAL
 	/bitmapsave FMLOCAL
 	/is FMLOCAL
 	/cf FMLOCAL
-/wbytes { 
-	dup 
-	8 eq {pop} {1 eq {7 add 8 idiv} {3 add 4 idiv} ifelse} ifelse
-	} bind def
-/BEGINBITMAPBWc { 
-	1 {} COMMONBITMAPc
-	} bind def
-/BEGINBITMAPGRAYc { 
-	8 {} COMMONBITMAPc
-	} bind def
-/BEGINBITMAP2BITc { 
-	2 {} COMMONBITMAPc
-	} bind def
-/COMMONBITMAPc { 
-	/r exch def
-	/d exch def
-	gsave
-	translate rotate scale /h exch def /w exch def
-	/lb w d wbytes def 
-	sl lb lt {lb ms} if 
-	/bitmapsave save def 
-	r                    
-	/is im 0 lb getinterval def 
-	ws 0 lb getinterval is copy pop 
-	/cf currentfile def 
-	w h d [w 0 0 h neg 0 h] 
-	{ip} image 
-	bitmapsave restore 
-	grestore
-	} bind def
-/BEGINBITMAPBW { 
-	1 {} COMMONBITMAP
-	} bind def
-/BEGINBITMAPGRAY { 
-	8 {} COMMONBITMAP
-	} bind def
-/BEGINBITMAP2BIT { 
-	2 {} COMMONBITMAP
-	} bind def
-/COMMONBITMAP { 
-	/r exch def
-	/d exch def
-	gsave
-	translate rotate scale /h exch def /w exch def
-	/bitmapsave save def 
-	r                    
-	/is w d wbytes string def
-	/cf currentfile def 
-	w h d [w 0 0 h neg 0 h] 
-	{cf is readhexstring pop} image
-	bitmapsave restore 
+/wbytes {
+	dup
+	8 eq {pop} {1 eq {7 add 8 idiv} {3 add 4 idiv} ifelse} ifelse
+	} bind def
+/BEGINBITMAPBWc {
+	1 {} COMMONBITMAPc
+	} bind def
+/BEGINBITMAPGRAYc {
+	8 {} COMMONBITMAPc
+	} bind def
+/BEGINBITMAP2BITc {
+	2 {} COMMONBITMAPc
+	} bind def
+/COMMONBITMAPc {
+	/r exch def
+	/d exch def
+	gsave
+	translate rotate scale /h exch def /w exch def
+	/lb w d wbytes def
+	sl lb lt {lb ms} if
+	/bitmapsave save def
+	r
+	/is im 0 lb getinterval def
+	ws 0 lb getinterval is copy pop
+	/cf currentfile def
+	w h d [w 0 0 h neg 0 h]
+	{ip} image
+	bitmapsave restore
+	grestore
+	} bind def
+/BEGINBITMAPBW {
+	1 {} COMMONBITMAP
+	} bind def
+/BEGINBITMAPGRAY {
+	8 {} COMMONBITMAP
+	} bind def
+/BEGINBITMAP2BIT {
+	2 {} COMMONBITMAP
+	} bind def
+/COMMONBITMAP {
+	/r exch def
+	/d exch def
+	gsave
+	translate rotate scale /h exch def /w exch def
+	/bitmapsave save def
+	r
+	/is w d wbytes string def
+	/cf currentfile def
+	w h d [w 0 0 h neg 0 h]
+	{cf is readhexstring pop} image
+	bitmapsave restore
 	grestore
 	} bind def
 	/proc1 FMLOCAL
 	/proc2 FMLOCAL
 	/newproc FMLOCAL
@@ -811,131 +811,131 @@
 	{} setblackgeneration
 	} bind def
 	/tran FMLOCAL
 /fakecolorsetup {
 	/tran 256 string def
-	0 1 255 {/indx exch def 
+	0 1 255 {/indx exch def
 		tran indx
 		red indx get 77 mul
 		green indx get 151 mul
 		blue indx get 28 mul
 		add add 256 idiv put} for
 	currenttransfer
 	{255 mul cvi tran exch get 255.0 div}
 	exch Fmcc settransfer
 } bind def
-/BITMAPCOLOR { 
-	/d 8 def
-	gsave
-	translate rotate scale /h exch def /w exch def
-	/bitmapsave save def 
-	colorsetup
-	/is w d wbytes string def
-	/cf currentfile def 
-	w h d [w 0 0 h neg 0 h] 
-	{cf is readhexstring pop} {is} {is} true 3 colorimage 
-	bitmapsave restore 
-	grestore
-	} bind def
-/BITMAPCOLORc { 
-	/d 8 def
-	gsave
-	translate rotate scale /h exch def /w exch def
-	/lb w d wbytes def 
-	sl lb lt {lb ms} if 
-	/bitmapsave save def 
-	colorsetup
-	/is im 0 lb getinterval def 
-	ws 0 lb getinterval is copy pop 
-	/cf currentfile def 
-	w h d [w 0 0 h neg 0 h] 
-	{ip} {is} {is} true 3 colorimage
-	bitmapsave restore 
-	grestore
-	} bind def
-/BITMAPTRUECOLORc { 
-        gsave
-        translate rotate scale /h exch def /w exch def
-        /bitmapsave save def 
-        
-        /is w string def
-        
-        ws 0 w getinterval is copy pop 
-        /cf currentfile def 
-        w h 8 [w 0 0 h neg 0 h] 
-        {ip} {gip} {bip} true 3 colorimage
-        bitmapsave restore 
-        grestore
-        } bind def
-/BITMAPTRUECOLOR { 
-        gsave
-        translate rotate scale /h exch def /w exch def
-        /bitmapsave save def 
+/BITMAPCOLOR {
+	/d 8 def
+	gsave
+	translate rotate scale /h exch def /w exch def
+	/bitmapsave save def
+	colorsetup
+	/is w d wbytes string def
+	/cf currentfile def
+	w h d [w 0 0 h neg 0 h]
+	{cf is readhexstring pop} {is} {is} true 3 colorimage
+	bitmapsave restore
+	grestore
+	} bind def
+/BITMAPCOLORc {
+	/d 8 def
+	gsave
+	translate rotate scale /h exch def /w exch def
+	/lb w d wbytes def
+	sl lb lt {lb ms} if
+	/bitmapsave save def
+	colorsetup
+	/is im 0 lb getinterval def
+	ws 0 lb getinterval is copy pop
+	/cf currentfile def
+	w h d [w 0 0 h neg 0 h]
+	{ip} {is} {is} true 3 colorimage
+	bitmapsave restore
+	grestore
+	} bind def
+/BITMAPTRUECOLORc {
+        gsave
+        translate rotate scale /h exch def /w exch def
+        /bitmapsave save def
+
+        /is w string def
+
+        ws 0 w getinterval is copy pop
+        /cf currentfile def
+        w h 8 [w 0 0 h neg 0 h]
+        {ip} {gip} {bip} true 3 colorimage
+        bitmapsave restore
+        grestore
+        } bind def
+/BITMAPTRUECOLOR {
+        gsave
+        translate rotate scale /h exch def /w exch def
+        /bitmapsave save def
         /is w string def
         /gis w string def
         /bis w string def
-        /cf currentfile def 
-        w h 8 [w 0 0 h neg 0 h] 
-        { cf is readhexstring pop } 
-        { cf gis readhexstring pop } 
-        { cf bis readhexstring pop } 
-        true 3 colorimage 
-        bitmapsave restore 
+        /cf currentfile def
+        w h 8 [w 0 0 h neg 0 h]
+        { cf is readhexstring pop }
+        { cf gis readhexstring pop }
+        { cf bis readhexstring pop }
+        true 3 colorimage
+        bitmapsave restore
         grestore
         } bind def
-/BITMAPTRUEGRAYc { 
+/BITMAPTRUEGRAYc {
         gsave
         translate rotate scale /h exch def /w exch def
-        /bitmapsave save def 
-        
+        /bitmapsave save def
+
         /is w string def
-        
-        ws 0 w getinterval is copy pop 
-        /cf currentfile def 
-        w h 8 [w 0 0 h neg 0 h] 
+
+        ws 0 w getinterval is copy pop
+        /cf currentfile def
+        w h 8 [w 0 0 h neg 0 h]
         {ip gip bip w gray} image
-        bitmapsave restore 
+        bitmapsave restore
         grestore
         } bind def
 /ww FMLOCAL
 /r FMLOCAL
 /g FMLOCAL
 /b FMLOCAL
 /i FMLOCAL
-/gray { 
+/gray {
         /ww exch def
         /b exch def
         /g exch def
         /r exch def
         0 1 ww 1 sub { /i exch def r i get .299 mul g i get .587 mul
 			b i get .114 mul add add r i 3 -1 roll floor cvi put } for
         r
         } bind def
-/BITMAPTRUEGRAY { 
+/BITMAPTRUEGRAY {
         gsave
         translate rotate scale /h exch def /w exch def
-        /bitmapsave save def 
+        /bitmapsave save def
         /is w string def
         /gis w string def
         /bis w string def
-        /cf currentfile def 
-        w h 8 [w 0 0 h neg 0 h] 
-        { cf is readhexstring pop 
-          cf gis readhexstring pop 
+        /cf currentfile def
+        w h 8 [w 0 0 h neg 0 h]
+        { cf is readhexstring pop
+          cf gis readhexstring pop
           cf bis readhexstring pop w gray}  image
-        bitmapsave restore 
+        bitmapsave restore
         grestore
         } bind def
-/BITMAPGRAY { 
+/BITMAPGRAY {
 	8 {fakecolorsetup} COMMONBITMAP
 	} bind def
-/BITMAPGRAYc { 
+/BITMAPGRAYc {
 	8 {fakecolorsetup} COMMONBITMAPc
 	} bind def
 /ENDBITMAP {
 	} bind def
-end 
+end
 	/ALDsave FMLOCAL
 	/ALDmatrix matrix def ALDmatrix currentmatrix pop
 /StartALD {
 	/ALDsave save def
 	 savematrix

Index: doc/tk_mac.n
==================================================================
--- doc/tk_mac.n
+++ doc/tk_mac.n
@@ -2,11 +2,11 @@
 '\" Copyright (c) 2011 Kevin Walzer.
 '\" Copyright (c) 2011 Donal K. Fellows.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH tk::mac n 8.6 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
 '\" Note:  do not modify the .SH NAME line immediately below!
 .SH NAME

Index: doc/tkvars.n
==================================================================
--- doc/tkvars.n
+++ doc/tkvars.n
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1990-1994 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH tkvars n 4.1 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
 '\" Note:  do not modify the .SH NAME line immediately below!
 .SH NAME

Index: doc/tkwait.n
==================================================================
--- doc/tkwait.n
+++ doc/tkwait.n
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1992 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH tkwait n "" Tk "Tk Built-In Commands"
 .so man.macros
 .BS
 '\" Note:  do not modify the .SH NAME line immediately below!
 .SH NAME

Index: doc/toplevel.n
==================================================================
--- doc/toplevel.n
+++ doc/toplevel.n
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1990-1994 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH toplevel n 8.4 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
 '\" Note:  do not modify the .SH NAME line immediately below!
 .SH NAME

Index: doc/ttk_Theme.3
==================================================================
--- doc/ttk_Theme.3
+++ doc/ttk_Theme.3
@@ -1,11 +1,11 @@
 '\"
 '\" Copyright (c) 2003 Joe English
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH Ttk_CreateTheme 3 8.5 Tk "Tk Themed Widget"
 .so man.macros
 .BS
 .SH NAME
 Ttk_CreateTheme, Ttk_GetTheme, Ttk_GetDefaultTheme, Ttk_GetCurrentTheme \- create and use Tk themes.

Index: doc/ttk_button.n
==================================================================
--- doc/ttk_button.n
+++ doc/ttk_button.n
@@ -15,11 +15,11 @@
 .SH DESCRIPTION
 A \fBttk::button\fR widget displays a textual label and/or image,
 and evaluates a command when pressed.
 .SO ttk_widget
 \-class	\-compound	\-cursor
-\-image	\-state	\-style
+\-image	\-justify	\-state	\-style
 \-takefocus	\-text	\-textvariable
 \-underline	\-width
 .SE
 .SH "WIDGET-SPECIFIC OPTIONS"
 .OP \-command command Command
@@ -37,23 +37,15 @@
 .RS
 .PP
 Depending on the theme, the default button may be displayed
 with an extra highlight ring, or with a different border color.
 .RE
-.OP \-width width Width
-If greater than zero, specifies how much space, in character widths,
-to allocate for the text label.
-If less than zero, specifies a minimum width.
-If zero or unspecified, the natural width of the text label is used.
-Note that some themes may specify a non-zero \fB\-width\fR
-in the style.
 .\" Not documented -- may go away
 .\" .OP \-padding padding Padding
 .\" .OP \-foreground foreground Foreground
 .\" .OP \-font font Font
 .\" .OP \-anchor anchor Anchor
-.\" .OP \-padding padding Padding
 .\" .OP \-relief relief Relief
 .SH "WIDGET COMMAND"
 .PP
 In addition to the standard
 \fBcget\fR, \fBconfigure\fR, \fBidentify\fR, \fBinstate\fR, and \fBstate\fR
@@ -63,19 +55,55 @@
 Invokes the command associated with the button.
 .SH "STANDARD STYLES"
 .PP
 \fBTtk::button\fR widgets support the \fBToolbutton\fR style in all standard
 themes, which is useful for creating widgets for toolbars.
-.SH "COMPATIBILITY OPTIONS"
-.OP \-state state State
-May be set to \fBnormal\fR or \fBdisabled\fR to control the
-\fBdisabled\fR state bit. This is a
-.QW write-only
-option: setting it changes the widget state, but the \fBstate\fR
-widget command does not affect the state option.
+.SH "STYLING OPTIONS"
+.PP
+The class name for a \fBttk::button\fP is \fBTButton\fP.
+.PP
+Dynamic states: \fBactive\fP, \fBdisabled\fP, \fBpressed\fP, \fBreadonly\fP.
+.PP
+\fBTButton\fP styling options configurable with \fBttk::style\fP
+are:
+.PP
+\fB\-anchor\fP \fIanchor\fP
+.br
+\fB\-background\fP \fIcolor\fP
+.br
+\fB\-bordercolor\fP \fIcolor\fP
+.br
+\fB\-darkcolor\fP \fIcolor\fP
+.br
+\fB\-foreground\fP \fIcolor\fP
+.br
+\fB\-font\fP \fIfont\fP
+.br
+\fB\-highlightcolor\fP \fIcolor\fP
+.br
+\fB\-highlightthickness\fP \fIamount\fP
+.br
+\fB\-lightcolor\fP \fIcolor\fP
+.br
+\fB\-padding\fP \fIpadding\fP
+.br
+\fB\-relief\fP \fIrelief\fP
+.br
+\fB\-shiftrelief\fP \fIamount\fP
+.RS
+\fB\-shiftrelief\fP specifies how far the button contents are
+shifted down and right in the \fIpressed\fP state.
+This action provides additional skeumorphic feedback.
+.RE
+\fB\-width\fP \fIamount\fP
+.PP
+Some options are only available for specific themes.
+.PP
+See the \fBttk::style\fP manual page for information on how to configure
+ttk styles.
 .SH "SEE ALSO"
 ttk::widget(n), button(n)
 .SH "KEYWORDS"
 widget, button, default, command
 '\" Local Variables:
 '\" mode: nroff
 '\" End:

Index: doc/ttk_checkbutton.n
==================================================================
--- doc/ttk_checkbutton.n
+++ doc/ttk_checkbutton.n
@@ -66,10 +66,38 @@
 selection.)
 .SH "STANDARD STYLES"
 .PP
 \fBTtk::checkbutton\fR widgets support the \fBToolbutton\fR style in all
 standard themes, which is useful for creating widgets for toolbars.
+.SH "STYLING OPTIONS"
+.PP
+The class name for a \fBttk::checkbutton\fP is \fBTCheckbutton\fP.
+.PP
+Dynamic states: \fBactive\fP, \fBalternate\fP, \fBdisabled\fP,
+\fBpressed\fP, \fBselected\fP, \fBreadonly\fP.
+.PP
+\fBTCheckbutton\fP styling options configurable with \fBttk::style\fP
+are:
+.PP
+\fB\-background\fP \fIcolor\fP
+.br
+\fB\-foreground\fP \fIcolor\fP
+.br
+\fB\-indicatorbackground\fP \fIcolor\fP
+.br
+\fB\-indicatorcolor\fP \fIcolor\fP
+.br
+\fB\-indicatormargin\fP \fIpadding\fP
+.br
+\fB\-indicatorrelief\fP \fIrelief\fP
+.br
+\fB\-padding\fP \fIpadding\fP
+.PP
+Some options are only available for specific themes.
+.PP
+See the \fBttk::style\fP manual page for information on how to configure
+ttk styles.
 .SH "SEE ALSO"
 ttk::widget(n), ttk::radiobutton(n), checkbutton(n)
 .SH "KEYWORDS"
 widget, button, toggle, check, option
 '\" Local Variables:

Index: doc/ttk_combobox.n
==================================================================
--- doc/ttk_combobox.n
+++ doc/ttk_combobox.n
@@ -17,11 +17,11 @@
 A \fBttk::combobox\fR combines a text field with a pop-down list of values;
 the user may select the value of the text field from among the
 values in the list.
 .SO ttk_widget
 \-class	\-cursor	\-takefocus
-\-style
+\-style	\-placeholder
 .SE
 .\" ALSO: Other entry widget options
 .SH "WIDGET-SPECIFIC OPTIONS"
 .OP \-exportselection exportSelection ExportSelection
 Boolean value.
@@ -108,12 +108,89 @@
 .PP
 The combobox widget generates a \fB<<ComboboxSelected>>\fR virtual event
 when the user selects an element from the list of values.
 If the selection action unposts the listbox,
 this event is delivered after the listbox is unposted.
+.SH "STYLING OPTIONS"
+.PP
+The class name for a \fBttk::combobox\fP is \fBTCombobox\fP.
+The \fBttk::combobox\fP uses the \fBentry\fP and
+\fBlistbox\fP widgets internally.
+The listbox frame has a class name of \fBComboboxPopdownFrame\fP.
+.PP
+Dynamic states: \fBdisabled\fP, \fBfocus\fP, \fBpressed\fP, \fBreadonly\fP.
+.PP
+\fBTCombobox\fP styling options configurable with \fBttk::style\fP
+are:
+.PP
+\fB\-arrowcolor\fP \fIcolor\fP
+.br
+\fB\-background\fP \fIcolor\fP
+.br
+\fB\-bordercolor\fP \fIcolor\fP
+.br
+\fB\-darkcolor\fP \fIcolor\fP
+.br
+\fB\-focusfill\fP \fIcolor\fP
+.br
+\fB\-foreground\fP \fIcolor\fP
+.br
+\fB\-fieldbackground\fP \fIcolor\fP
+.RS
+Can only be changed when using non-native and non-graphical themes.
+.RE
+\fB\-insertwidth\fP \fIamount\fP
+.br
+\fB\-lightcolor\fP \fIcolor\fP
+.br
+\fB\-padding\fP \fIpadding\fP
+.br
+\fB\-postoffset\fP \fIpadding\fP
+.br
+\fB\-selectbackground\fP \fIcolor\fP
+.RS
+Text entry select background.
+.RE
+\fB\-selectforeground\fP \fIcolor\fP
+.RS
+Text entry select foreground.
+.RE
+.PP
+The \fBttk::combobox\fP popdown listbox cannot be configured using
+\fBttk::style\fP nor via the widget \fBconfigure\fP command.  The listbox
+can be configured using the option database.
+.PP
+option add *TCombobox*Listbox.background \fIcolor\fP
+.br
+option add *TCombobox*Listbox.font \fIfont\fP
+.br
+option add *TCombobox*Listbox.foreground \fIcolor\fP
+.br
+option add *TCombobox*Listbox.selectBackground \fIcolor\fP
+.br
+option add *TCombobox*Listbox.selectForeground \fIcolor\fP
+.PP
+To configure a specific listbox (subject to future change):
+.CS
+set popdown [ttk::combobox::PopdownWindow .mycombobox]
+$popdown.f.l configure \-font \fIfont\fP
+.CE
+.PP
+\fBComboboxPopdownFrame\fP
+styling options configurable with \fBttk::style\fP
+are:
+.PP
+\fB\-borderwidth\fP \fIamount\fP
+.br
+\fB\-relief\fP \fIrelief\fP
+.PP
+Some options are only available for specific themes.
+.PP
+See the \fBttk::style\fP manual page for information on how to configure
+ttk styles.
 .SH "SEE ALSO"
 ttk::widget(n), ttk::entry(n)
 .SH KEYWORDS
 choice, entry, list box, text box, widget
 '\" Local Variables:
 '\" mode: nroff
 '\" End:

Index: doc/ttk_entry.n
==================================================================
--- doc/ttk_entry.n
+++ doc/ttk_entry.n
@@ -21,23 +21,23 @@
 The value of the string may be linked to a Tcl variable
 with the \fB\-textvariable\fR option.
 Entry widgets support horizontal scrolling with the
 standard \fB\-xscrollcommand\fR option and \fBxview\fR widget command.
 .SO ttk_widget
-\-class	\-cursor	\-style
-\-takefocus	\-xscrollcommand
+\-class	\-cursor
+\-font	\-foreground
+\-style
+\-takefocus	\-xscrollcommand	\-placeholder
 .SE
 .SH "WIDGET-SPECIFIC OPTIONS"
 .OP \-exportselection exportSelection ExportSelection
 A boolean value specifying whether or not
 a selection in the widget should be linked to the X selection.
 If the selection is exported, then selecting in the widget deselects
 the current X selection, selecting outside the widget deselects any
 widget selection, and the widget will respond to selection retrieval
 requests when it has a selection.
-.\" MAYBE: .OP \-font font Font
-.\" MAYBE: .OP \-foreground foreground Foreground
 .\" MAYBE: .OP \-insertbackground insertBackground Foreground
 .\" MAYBE: .OP \-insertwidth insertWidth InsertWidth
 .OP \-invalidcommand invalidCommand InvalidCommand
 A script template to evaluate whenever the \fB\-validatecommand\fR returns 0.
 See \fBVALIDATION\fR below for more information.
@@ -459,12 +459,53 @@
 in the \fBdisabled\fR state,
 and a different background is used in the \fBreadonly\fR state.
 .PP
 The entry widget sets the \fBinvalid\fR state if revalidation fails,
 and clears it whenever validation succeeds.
+.SH "STYLING OPTIONS"
+.PP
+The class name for a \fBttk::entry\fP is \fBTEntry\fP.
+.PP
+Dynamic states: \fBdisabled\fP, \fBfocus\fP, \fBreadonly\fP.
+.PP
+\fBTEntry\fP styling options configurable with \fBttk::style\fP
+are:
+.PP
+\fB\-background\fP \fIcolor\fP
+.RS
+When using the aqua theme (Mac OS X), changes the \fB\-fieldbackground\fP.
+.RE
+\fB\-bordercolor\fP \fIcolor\fP
+.br
+\fB\-darkcolor\fP \fIcolor\fP
+.br
+\fB\-fieldbackground\fP \fIcolor\fP
+.RS
+Does not work with the aqua theme (Mac OS X).
+.br
+Some themes use a graphical background and their field background colors cannot be changed.
+.RE
+\fB\-foreground\fP \fIcolor\fP
+.br
+\fB\-insertwidth\fP \fIamount\fP
+.br
+\fB\-lightcolor\fP \fIcolor\fP
+.br
+\fB\-padding\fP \fIpadding\fP
+.br
+\fB\-relief\fP \fIrelief\fP
+.br
+\fB\-selectbackground\fP \fIcolor\fP
+.br
+\fB\-selectborderwidth\fP \fIamount\fP
+.br
+\fB\-selectforeground\fP \fIcolor\fP
+.PP
+See the \fBttk::style\fP manual page for information on how to configure
+ttk styles.
 .SH "SEE ALSO"
 ttk::widget(n), entry(n)
 .SH KEYWORDS
 entry, widget, text field
 '\" Local Variables:
 '\" mode: nroff
 '\" End:

Index: doc/ttk_frame.n
==================================================================
--- doc/ttk_frame.n
+++ doc/ttk_frame.n
@@ -15,23 +15,21 @@
 .SH DESCRIPTION
 .PP
 A \fBttk::frame\fR widget is a container, used to group other widgets
 together.
 .SO ttk_widget
-\-class	\-cursor	\-takefocus
-\-style
+\-class	\-cursor	\-padding	\-style
+\-takefocus
 .SE
 .SH "WIDGET-SPECIFIC OPTIONS"
 .OP \-borderwidth borderWidth BorderWidth
 The desired width of the widget border.  Defaults to 0.
 .OP \-relief relief Relief
 One of the standard Tk border styles:
 \fBflat\fR, \fBgroove\fR, \fBraised\fR, \fBridge\fR,
 \fBsolid\fR, or \fBsunken\fR.
 Defaults to \fBflat\fR.
-.OP \-padding padding Padding
-Additional padding to include inside the border.
 .OP \-width width Width
 If specified, the widget's requested width in pixels.
 .OP \-height height Height
 If specified, the widget's requested height in pixels.
 .SH "WIDGET COMMAND"
@@ -45,12 +43,25 @@
 are used to manage the children of the \fBframe\fR,
 by the GM's requested size will normally take precedence
 over the \fBframe\fR widget's \fB\-width\fR and \fB\-height\fR options.
 \fBpack propagate\fR and \fBgrid propagate\fR can be used
 to change this.
+.SH "STYLING OPTIONS"
+.PP
+The class name for a \fBttk::frame\fP is \fBTFrame\fP.
+.PP
+\fBTFrame\fP styling options configurable with \fBttk::style\fP
+are:
+.PP
+\fB\-background\fP \fIcolor\fP
+.PP
+Some options are only available for specific themes.
+.PP
+See the \fBttk::style\fP manual page for information on how to configure
+ttk styles.
 .SH "SEE ALSO"
 ttk::widget(n), ttk::labelframe(n), frame(n)
 .SH "KEYWORDS"
 widget, frame, container
 '\" Local Variables:
 '\" mode: nroff
 '\" End:

Index: doc/ttk_image.n
==================================================================
--- doc/ttk_image.n
+++ doc/ttk_image.n
@@ -27,19 +27,35 @@
 Valid \fIoptions\fR are:
 .TP
 \fB\-border\fR \fIpadding\fR
 \fIpadding\fR is a list of up to four integers, specifying
 the left, top, right, and bottom borders, respectively.
+If fewer than four elements are specified,
+\fIbottom\fR defaults to \fItop\fR,
+\fIright\fR defaults to \fIleft\fR, and
+\fItop\fR defaults to \fIleft\fR.
+In other words, a list of three numbers specify the left, vertical, and right border;
+a list of two numbers specify the horizontal and the vertical border;
+a single number specifies the same border all the way around the element.
 See \fBIMAGE STRETCHING\fR, below.
 .TP
 \fB\-height \fIheight\fR
 Specifies a minimum height for the element.
 If less than zero, the base image's height is used as a default.
 .TP
 \fB\-padding\fR \fIpadding\fR
-Specifies the element's interior padding.  Defaults to
-\fB\-border\fR if not specified.
+Specifies the element's interior padding.
+The padding is a list of up to four length specifications
+\fIleft top right bottom\fR.
+If fewer than four elements are specified,
+\fIbottom\fR defaults to \fItop\fR,
+\fIright\fR defaults to \fIleft\fR, and
+\fItop\fR defaults to \fIleft\fR.
+In other words, a list of three numbers specify the left, vertical, and right padding;
+a list of two numbers specify the horizontal and the vertical padding;
+a single number specifies the same padding all the way around the widget.
+Defaults to \fB\-border\fR if not specified.
 .TP
 \fB\-sticky\fR \fIspec\fR
 Specifies how the image is placed within the final parcel.
 \fIspec\fR contains zero or more characters
 .QW n ,

Index: doc/ttk_label.n
==================================================================
--- doc/ttk_label.n
+++ doc/ttk_label.n
@@ -16,63 +16,50 @@
 .PP
 A \fBttk::label\fR widget displays a textual label and/or image.
 The label may be linked to a Tcl variable
 to automatically change the displayed text.
 .SO ttk_widget
-\-class	\-compound	\-cursor
-\-image	\-style	\-takefocus
+\-anchor	\-class	\-compound	\-cursor
+\-font	\-foreground
+\-image	\-justify	\-padding	\-state	\-style	\-takefocus
 \-text	\-textvariable	\-underline
-\-width
+\-width	\-wraplength
 .SE
 .SH "WIDGET-SPECIFIC OPTIONS"
-.OP \-anchor anchor Anchor
-Specifies how the information in the widget is positioned
-relative to the inner margins.  Legal values are
-\fBn\fR, \fBne\fR, \fBe\fR, \fBse\fR,
-\fBs\fR, \fBsw\fR, \fBw\fR, \fBnw\fR, and \fBcenter\fR.
-See also \fB\-justify\fR.
 .OP \-background frameColor FrameColor
 The widget's background color.
 If unspecified, the theme default is used.
-.OP \-font font Font
-Font to use for label text.
-.OP \-foreground textColor TextColor
-The widget's foreground color.
-If unspecified, the theme default is used.
-.OP \-justify justify Justify
-If there are multiple lines of text, specifies how
-the lines are laid out relative to one another.
-One of \fBleft\fR, \fBcenter\fR, or \fBright\fR.
-See also \fB\-anchor\fR.
-.OP \-padding padding Padding
-Specifies the amount of extra space to allocate for the widget.
-The padding is a list of up to four length specifications
-\fIleft top right bottom\fR.
-If fewer than four elements are specified,
-\fIbottom\fR defaults to \fItop\fR,
-\fIright\fR defaults to \fIleft\fR, and
-\fItop\fR defaults to \fIleft\fR.
 .OP \-relief relief Relief
 .\" Rewrite this:
 Specifies the 3-D effect desired for the widget border.
 Valid values are
 \fBflat\fR, \fBgroove\fR, \fBraised\fR, \fBridge\fR, \fBsolid\fR,
 and \fBsunken\fR.
-.OP \-text text Text
-Specifies a text string to be displayed inside the widget
-(unless overridden by \fB\-textvariable\fR).
-.OP \-wraplength wrapLength WrapLength
-Specifies the maximum line length (in pixels).
-If this option is less than or equal to zero,
-then automatic wrapping is not performed; otherwise
-the text is split into lines such that no line is longer
-than the specified value.
 .SH "WIDGET COMMAND"
 .PP
 Supports the standard widget commands
 \fBconfigure\fR, \fBcget\fR, \fBidentify\fR, \fBinstate\fR, and \fBstate\fR;
 see \fIttk::widget(n)\fR.
+.SH "STYLING OPTIONS"
+.PP
+The class name for a \fBttk::label\fP is \fBTLabel\fP.
+.PP
+Dynamic states: \fBdisabled\fP, \fBreadonly\fP.
+.PP
+\fBTLabel\fP styling options configurable with \fBttk::style\fP
+are:
+.PP
+\fB\-background\fP \fIcolor\fP
+.br
+\fB\-foreground\fP \fIcolor\fP
+.br
+\fB\-font\fP \fIfont\fP
+.PP
+Some options are only available for specific themes.
+.PP
+See the \fBttk::style\fP manual page for information on how to configure
+ttk styles.
 .SH "SEE ALSO"
 ttk::widget(n), label(n)
 '\" Local Variables:
 '\" mode: nroff
 '\" End:

Index: doc/ttk_labelframe.n
==================================================================
--- doc/ttk_labelframe.n
+++ doc/ttk_labelframe.n
@@ -16,12 +16,12 @@
 .PP
 A \fBttk::labelframe\fR widget is a container used to group other widgets
 together.  It has an optional label, which may be a plain text string or
 another widget.
 .SO ttk_widget
-\-class	\-cursor	\-takefocus
-\-style
+\-class	\-cursor	\-padding	\-style
+\-takefocus
 .SE
 .SH "WIDGET-SPECIFIC OPTIONS"
 .\" XXX: Currently included, but may go away:
 .\" XXX: .OP -borderwidth borderWidth BorderWidth
 .\" XXX: The desired width of the widget border.  Default is theme-dependent.
@@ -46,12 +46,10 @@
 If set, specifies the integer index (0-based) of a character to
 underline in the text string.
 The underlined character is used for mnemonic activation.
 Mnemonic activation for a \fBttk::labelframe\fR
 sets the keyboard focus to the first child of the \fBttk::labelframe\fR widget.
-.OP \-padding padding Padding
-Additional padding to include inside the border.
 .OP \-labelwidget labelWidget LabelWidget
 The name of a widget to use for the label.
 If set, overrides the \fB\-text\fR option.
 The \fB\-labelwidget\fR must be a child of the \fBlabelframe\fR widget
 or one of the \fBlabelframe\fR's ancestors, and must belong to the
@@ -65,12 +63,52 @@
 .SH "WIDGET COMMAND"
 .PP
 Supports the standard widget commands
 \fBconfigure\fR, \fBcget\fR, \fBidentify\fR, \fBinstate\fR, and \fBstate\fR;
 see \fIttk::widget(n)\fR.
+.SH "STYLING OPTIONS"
+.PP
+The class name for a \fBttk::labelframe\fP is \fBTLabelframe\fP.
+The text label
+has a class of \fBTLabelframe.Label\fP.
+.PP
+Dynamic states: \fBdisabled\fP, \fBreadonly\fP.
+.PP
+\fBTLabelframe\fP styling options configurable with \fBttk::style\fP
+are:
+.PP
+\fB\-background\fP \fIcolor\fP
+.br
+\fB\-bordercolor\fP \fIcolor\fP
+.br
+\fB\-borderwidth\fP \fIamount\fP
+.br
+\fB\-darkcolor\fP \fIcolor\fP
+.br
+\fB\-labelmargins\fP \fIamount\fP
+.br
+\fB\-labeloutside\fP \fIboolean\fP
+.br
+\fB\-lightcolor\fP \fIcolor\fP
+.br
+\fB\-relief\fP \fIrelief\fP
+.PP
+\fBTLabelframe.Label\fP styling options configurable with \fBttk::style\fP
+are:
+.PP
+\fB\-background\fP \fIcolor\fP
+.br
+\fB\-font\fP \fIfont\fP
+.br
+\fB\-foreground\fP \fIcolor\fP
+.PP
+Some options are only available for specific themes.
+.PP
+See the \fBttk::style\fP manual page for information on how to configure
+ttk styles.
 .SH "SEE ALSO"
 ttk::widget(n), ttk::frame(n), labelframe(n)
 .SH "KEYWORDS"
 widget, frame, container, label, groupbox
 '\" Local Variables:
 '\" mode: nroff
 '\" End:

Index: doc/ttk_menubutton.n
==================================================================
--- doc/ttk_menubutton.n
+++ doc/ttk_menubutton.n
@@ -43,10 +43,37 @@
 methods.  No other widget methods are used.
 .SH "STANDARD STYLES"
 .PP
 \fBTtk::menubutton\fR widgets support the \fBToolbutton\fR style in all
 standard themes, which is useful for creating widgets for toolbars.
+.SH "STYLING OPTIONS"
+.PP
+The class name for a \fBttk::menubutton\fP is \fBTMenubutton\fP.
+.PP
+Dynamic states: \fBactive\fP, \fBdisabled\fP, \fBreadonly\fP.
+.PP
+\fBTMenubutton\fP styling options configurable with \fBttk::style\fP
+are:
+.PP
+\fB\-arrowsize\fP \fIamount\fP
+.br
+\fB\-background\fP \fIcolor\fP
+.br
+\fB\-foreground\fP \fIcolor\fP
+.br
+\fB\-font\fP \fIfont\fP
+.br
+\fB\-padding\fP \fIpadding\fP
+.br
+\fB\-relief\fP \fIrelief\fP
+.br
+\fB\-width\fP \fIamount\fP
+.PP
+Some options are only available for specific themes.
+.PP
+See the \fBttk::style\fP manual page for information on how to configure
+ttk styles.
 .SH "SEE ALSO"
 ttk::widget(n), menu(n), menubutton(n)
 .SH "KEYWORDS"
 widget, button, menu
 '\" Local Variables:

Index: doc/ttk_notebook.n
==================================================================
--- doc/ttk_notebook.n
+++ doc/ttk_notebook.n
@@ -39,10 +39,13 @@
 \fIleft top right bottom\fR.
 If fewer than four elements are specified,
 \fIbottom\fR defaults to \fItop\fR,
 \fIright\fR defaults to \fIleft\fR, and
 \fItop\fR defaults to \fIleft\fR.
+In other words, a list of three numbers specify the left, vertical, and right padding;
+a list of two numbers specify the horizontal and the vertical padding;
+a single number specifies the same padding all the way around the widget.
 .OP \-width width Width
 If present and greater than zero,
 specifies the desired width of the pane area
 (not including internal padding).
 Otherwise, the maximum width of all panes is used.
@@ -169,11 +172,12 @@
 returns the value of that \fIoption\fR.
 Otherwise, sets the \fI\-option\fRs to the corresponding \fIvalue\fRs.
 See \fBTAB OPTIONS\fR for the available options.
 .TP
 \fIpathname \fBtabs\fR
-Returns the list of windows managed by the notebook.
+Returns the list of windows managed by the notebook, in the index order of
+their associated tabs.
 .SH "KEYBOARD TRAVERSAL"
 To enable keyboard traversal for a toplevel window
 containing a notebook widget \fI$nb\fR, call:
 .CS
 ttk::notebook::enableTraversal $nb
@@ -202,12 +206,62 @@
 \&.nb add [frame .nb.f1] \-text "First tab"
 \&.nb add [frame .nb.f2] \-text "Second tab"
 \&.nb select .nb.f2
 ttk::notebook::enableTraversal .nb
 .CE
+.SH "STYLING OPTIONS"
+.PP
+The class name for a \fBttk::notebook\fP is \fBTNotebook\fP.  The tab has
+a class name of \fBTNotebook.Tab\fP
+.PP
+Dynamic states: \fBactive\fP, \fBdisabled\fP, \fBselected\fP.
+.PP
+\fBTNotebook\fP styling options configurable with \fBttk::style\fP
+are:
+.PP
+\fB\-background\fP \fIcolor\fP
+.br
+\fB\-bordercolor\fP \fIcolor\fP
+.br
+\fB\-darkcolor\fP \fIcolor\fP
+.br
+\fB\-foreground\fP \fIcolor\fP
+.br
+\fB\-lightcolor\fP \fIcolor\fP
+.br
+\fB\-padding\fP \fIpadding\fP
+.br
+\fB\-tabmargins\fP \fIpadding\fP
+.br
+\fB\-tabposition\fP \fIside\fP
+.br
+.PP
+\fBTNotebook.Tab\fP styling options configurable with \fBttk::style\fP
+are:
+.PP
+\fB\-background\fP \fIcolor\fP
+.br
+\fB\-bordercolor\fP \fIcolor\fP
+.br
+\fB\-expand\fP \fIpadding\fP
+.RS
+Defines how much the tab grows in size.  Usually used with the
+\fBselected\fP dynamic state.  \fB\-tabmargins\fP should be
+set appropriately so that there is room for the tab growth.
+.RE
+\fB\-font\fP \fIfont\fP
+.br
+\fB\-foreground\fP \fIcolor\fP
+.br
+\fB\-padding\fP \fIpadding\fP
+.PP
+Some options are only available for specific themes.
+.PP
+See the \fBttk::style\fP manual page for information on how to configure
+ttk styles.
 .SH "SEE ALSO"
 ttk::widget(n), grid(n)
 .SH "KEYWORDS"
 pane, tab
 '\" Local Variables:
 '\" mode: nroff
 '\" End:

Index: doc/ttk_panedwindow.n
==================================================================
--- doc/ttk_panedwindow.n
+++ doc/ttk_panedwindow.n
@@ -89,11 +89,12 @@
 option values.
 If one \fI\-option\fR is specified, returns the value of that \fIoption\fR.
 Otherwise, sets the \fI\-option\fRs to the corresponding \fIvalue\fRs.
 .TP
 \fIpathname \fBpanes\fR
-Returns the list of all windows managed by the widget.
+Returns the list of all windows managed by the widget, in the index order of
+their associated panes.
 .TP
 \fIpathname \fBsashpos \fIindex\fR ?\fInewpos\fR?
 If \fInewpos\fR is specified, sets the position
 of sash number \fIindex\fR.
 May adjust the positions of adjacent sashes
@@ -103,16 +104,59 @@
 .\" Full story: "total size" is either the -height (resp -width),
 .\" or the actual window height (resp actual window width),
 .\" depending on which changed most recently.
 Returns the new position of sash number \fIindex\fR.
 .\" Full story: new position may be different than the requested position.
+.PP
+The panedwindow widget also supports the following generic \fBttk::widget\fR
+widget subcommands (see \fIttk::widget(n)\fR for details):
+.DS
+.ta 5.5c 11c
+\fBcget\fR	\fBconfigure\fR
+\fBinstate\fR	\fBstate\fR
+.DE
 .SH "VIRTUAL EVENTS"
 .PP
 The panedwindow widget generates an \fB<<EnteredChild>>\fR virtual event on
 LeaveNotify/NotifyInferior events, because Tk does not execute binding scripts
 for <Leave> events when the pointer crosses from a parent to a child. The
 panedwindow widget needs to know when that happens.
+.SH "STYLING OPTIONS"
+.PP
+The class name for a \fBttk::panedwindow\fP is \fBTPanedwindow\fP.  The
+sash has a class name of \fBSash\fP.
+.PP
+\fBTPanedwindow\fP styling options configurable with \fBttk::style\fP
+are:
+.PP
+\fB\-background\fP \fIcolor\fP
+.PP
+\fBSash\fP styling options configurable with \fBttk::style\fP
+are:
+.PP
+\fB\-background\fP \fIcolor\fP
+.br
+\fB\-bordercolor\fP \fIcolor\fP
+.br
+\fB\-gripcount\fP \fIcount\fP
+.br
+\fB\-handlepad\fP \fIamount\fP
+.br
+\fB\-handlesize\fP \fIamount\fP
+.br
+\fB\-lightcolor\fP \fIcolor\fP
+.br
+\fB\-sashpad\fP \fIamount\fP
+.br
+\fB\-sashrelief\fP \fIrelief\fP
+.br
+\fB\-sashthickness\fP \fIamount\fP
+.PP
+Some options are only available for specific themes.
+.PP
+See the \fBttk::style\fP manual page for information on how to configure
+ttk styles.
 .SH "SEE ALSO"
 ttk::widget(n), ttk::notebook(n), panedwindow(n)
 '\" Local Variables:
 '\" mode: nroff
 '\" End:

Index: doc/ttk_progressbar.n
==================================================================
--- doc/ttk_progressbar.n
+++ doc/ttk_progressbar.n
@@ -17,26 +17,41 @@
 A \fBttk::progressbar\fR widget shows the status of a long-running
 operation.  They can operate in two modes: \fIdeterminate\fR mode shows the
 amount completed relative to the total amount of work to be done, and
 \fIindeterminate\fR mode provides an animated display to let the user know
 that something is happening.
+.PP
+If the value of \fB-orient\fR is \fBhorizontal\fR a text string can be
+displayed inside the progressbar. This string can be configured using
+the \fB-anchor\fR, \fB-font\fR, \fB-foreground\fR, \fB-justify\fR,
+\fB-text\fR and \fB-wraplength\fR options. If the value of \fB-orient\fR
+is \fBvertical\fR then these options are ignored.
 .SO ttk_widget
-\-class	\-cursor	\-takefocus
-\-style
+\-anchor	\-class	\-cursor
+\-font	\-foreground	\-justify	\-style
+\-takefocus	\-text	\-wraplength
 .SE
 .SH "WIDGET-SPECIFIC OPTIONS"
-.OP \-orient orient Orient
-One of \fBhorizontal\fR or \fBvertical\fR.
-Specifies the orientation of the progress bar.
 .OP \-length length Length
 Specifies the length of the long axis of the progress bar
-(width if horizontal, height if vertical).
-.OP \-mode mode Mode
-One of \fBdeterminate\fR or \fBindeterminate\fR.
+(width if horizontal, height if vertical). The value may have any of the forms
+acceptable to \fBTk_GetPixels\fR.
 .OP \-maximum maximum Maximum
 A floating point number specifying the maximum \fB\-value\fR.
 Defaults to 100.
+.OP \-mode mode Mode
+One of \fBdeterminate\fR or \fBindeterminate\fR.
+.OP \-orient orient Orient
+One of \fBhorizontal\fR or \fBvertical\fR.
+Specifies the orientation of the progress bar.
+.OP \-phase phase Phase
+Read-only option.
+The widget periodically increments the value of this option
+whenever the \fB\-value\fR is greater than 0 and,
+in \fIdeterminate\fR mode, less than \fB\-maximum\fR.
+This option may be used by the current theme
+to provide additional animation effects.
 .OP \-value value Value
 The current value of the progress bar.
 In \fIdeterminate\fR mode, this represents the amount of work completed.
 In \fIindeterminate\fR mode, it is interpreted modulo \fB\-maximum\fR;
 that is, the progress bar completes one
@@ -45,17 +60,10 @@
 .OP \-variable variable Variable
 The name of a global Tcl variable which is linked to the \fB\-value\fR.
 If specified, the \fB\-value\fR of the progress bar is
 automatically set to the value of the variable whenever
 the latter is modified.
-.OP \-phase phase Phase
-Read-only option.
-The widget periodically increments the value of this option
-whenever the \fB\-value\fR is greater than 0 and,
-in \fIdeterminate\fR mode, less than \fB\-maximum\fR.
-This option may be used by the current theme
-to provide additional animation effects.
 .SH "WIDGET COMMAND"
 .PP
 .TP
 \fIpathName \fBcget \fIoption\fR
 Returns the current value of the specified \fIoption\fR; see \fIttk::widget(n)\fR.
@@ -84,10 +92,39 @@
 \fIamount\fR defaults to 1.0 if omitted.
 .TP
 \fIpathName \fBstop\fR
 Stop autoincrement mode:
 cancels any recurring timer event initiated by \fIpathName \fBstart\fR.
+.SH "STYLING OPTIONS"
+.PP
+The class name for a \fBttk::progressbar\fP is \fBTProgressbar\fP.
+.PP
+\fBTProgressbar\fP styling options configurable with \fBttk::style\fP
+are:
+.PP
+\fB\-background\fP \fIcolor\fP
+.br
+\fB\-bordercolor\fP \fIcolor\fP
+.br
+\fB\-darkcolor\fP \fIcolor\fP
+.br
+\fB\-lightcolor\fP \fIcolor\fP
+.br
+\fB\-maxphase\fP
+.RS
+For the aqua theme.
+.RE
+\fB\-period\fP
+.RS
+For the aqua theme.
+.RE
+\fB\-troughcolor\fP \fIcolor\fP
+.PP
+Some options are only available for specific themes.
+.PP
+See the \fBttk::style\fP manual page for information on how to configure
+ttk styles.
 .SH "SEE ALSO"
 ttk::widget(n)
 '\" Local Variables:
 '\" mode: nroff
 '\" End:

Index: doc/ttk_radiobutton.n
==================================================================
--- doc/ttk_radiobutton.n
+++ doc/ttk_radiobutton.n
@@ -63,10 +63,38 @@
 selection.)
 .SH "STANDARD STYLES"
 .PP
 \fBTtk::radiobutton\fR widgets support the \fBToolbutton\fR style in all
 standard themes, which is useful for creating widgets for toolbars.
+.SH "STYLING OPTIONS"
+.PP
+The class name for a \fBttk::radiobutton\fP is \fBTRadiobutton\fP.
+.PP
+Dynamic states: \fBactive\fP, \fBalternate\fP, \fBdisabled\fP,
+\fBpressed\fP, \fBreadonly\fP, \fBselected\fP.
+.PP
+\fBTRadiobutton\fP styling options configurable with \fBttk::style\fP
+are:
+.PP
+\fB\-background\fP \fIcolor\fP
+.br
+\fB\-foreground\fP \fIcolor\fP
+.br
+\fB\-indicatorbackground\fP \fIcolor\fP
+.br
+\fB\-indicatorcolor\fP \fIcolor\fP
+.br
+\fB\-indicatormargin\fP \fIpadding\fP
+.br
+\fB\-indicatorrelief\fP \fIrelief\fP
+.br
+\fB\-padding\fP \fIpadding\fP
+.PP
+Some options are only available for specific themes.
+.PP
+See the \fBttk::style\fP manual page for information on how to configure
+ttk styles.
 .SH "SEE ALSO"
 ttk::widget(n), ttk::checkbutton(n), radiobutton(n)
 .SH "KEYWORDS"
 widget, button, option
 '\" Local Variables:

Index: doc/ttk_scale.n
==================================================================
--- doc/ttk_scale.n
+++ doc/ttk_scale.n
@@ -89,10 +89,39 @@
 \fIpathName \fBcoords \fR?\fIvalue\fR?
 .
 Get the coordinates corresponding to \fIvalue\fR, or the coordinates
 corresponding to the current value of the \fB\-value\fR option if \fIvalue\fR
 is omitted.
+.SH "STYLING OPTIONS"
+.PP
+The class name for a \fBttk::scale\fP is \fBTProgressbar\fP.
+.PP
+Dynamic states: \fBactive\fP.
+.PP
+\fBTProgressbar\fP styling options configurable with \fBttk::style\fP
+are:
+.PP
+\fB\-background\fP \fIcolor\fP
+.br
+\fB\-borderwidth\fP \fIamount\fP
+.br
+\fB\-darkcolor\fP \fIcolor\fP
+.br
+\fB\-groovewidth\fP \fIamount\fP
+.br
+\fB\-lightcolor\fP \fIcolor\fP
+.br
+\fB\-sliderwidth\fP \fIamount\fP
+.br
+\fB\-troughcolor\fP \fIcolor\fP
+.br
+\fB\-troughrelief\fP \fIrelief\fP
+.PP
+Some options are only available for specific themes.
+.PP
+See the \fBttk::style\fP manual page for information on how to configure
+ttk styles.
 .SH "SEE ALSO"
 ttk::widget(n), scale(n)
 .SH KEYWORDS
 scale, slider, trough, widget
 .\" Local Variables:

Index: doc/ttk_scrollbar.n
==================================================================
--- doc/ttk_scrollbar.n
+++ doc/ttk_scrollbar.n
@@ -152,10 +152,37 @@
 grid $f.vsb \-row 0 \-column 1 \-sticky nsew
 grid $f.hsb \-row 1 \-column 0 \-sticky nsew
 grid columnconfigure $f 0 \-weight 1
 grid rowconfigure $f 0 \-weight 1
 .CE
+.SH "STYLING OPTIONS"
+.PP
+The class name for a \fBttk::scrollbar\fP is \fBTScrollbar\fP.
+.PP
+Dynamic states: \fBactive\fP, \fBdisabled\fP.
+.PP
+\fBTScrollbar\fP styling options configurable with \fBttk::style\fP
+are:
+.PP
+\fB\-arrowcolor\fP \fIcolor\fP
+.br
+\fB\-background\fP \fIcolor\fP
+.br
+\fB\-bordercolor\fP \fIcolor\fP
+.br
+\fB\-darkcolor\fP \fIcolor\fP
+.br
+\fB\-foreground\fP \fIcolor\fP
+.br
+\fB\-lightcolor\fP \fIcolor\fP
+.br
+\fB\-troughcolor\fP \fIcolor\fP
+.PP
+Some options are only available for specific themes.
+.PP
+See the \fBttk::style\fP manual page for information on how to configure
+ttk styles.
 .SH "SEE ALSO"
 ttk::widget(n), scrollbar(n)
 .SH KEYWORDS
 scrollbar, widget
 '\" Local Variables:

Index: doc/ttk_separator.n
==================================================================
--- doc/ttk_separator.n
+++ doc/ttk_separator.n
@@ -15,11 +15,11 @@
 .SH DESCRIPTION
 .PP
 A \fBttk::separator\fR widget displays a horizontal or vertical separator
 bar.
 .SO ttk_widget
-\-class	\-cursor	\-state
+\-class	\-cursor
 \-style	\-takefocus
 .SE
 .SH "WIDGET-SPECIFIC OPTIONS"
 .OP \-orient orient Orient
 One of \fBhorizontal\fR or \fBvertical\fR.
@@ -27,12 +27,26 @@
 .SH "WIDGET COMMAND"
 .PP
 Separator widgets support the standard
 \fBcget\fR, \fBconfigure\fR, \fBidentify\fR, \fBinstate\fR, and \fBstate\fR
 methods.  No other widget methods are used.
+.PP
+.SH "STYLING OPTIONS"
+.PP
+The class name for a \fBttk::separator\fP is \fBTSeparator\fP.
+.PP
+\fBTSeparator\fP styling options configurable with \fBttk::style\fP
+are:
+.PP
+\fB\-background\fP \fIcolor\fP
+.PP
+Some options are only available for specific themes.
+.PP
+See the \fBttk::style\fP manual page for information on how to configure
+ttk styles.
 .SH "SEE ALSO"
 ttk::widget(n)
 .SH "KEYWORDS"
 widget, separator
 '\" Local Variables:
 '\" mode: nroff
 '\" End:

Index: doc/ttk_sizegrip.n
==================================================================
--- doc/ttk_sizegrip.n
+++ doc/ttk_sizegrip.n
@@ -1,11 +1,11 @@
 '\"
 '\" Copyright (c) 2006 Joe English
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH ttk::sizegrip n 8.5 Tk "Tk Themed Widget"
 .so man.macros
 .BS
 .SH NAME
 ttk::sizegrip \- Bottom-right corner resize widget
@@ -16,11 +16,11 @@
 .PP
 A \fBttk::sizegrip\fR widget (also known as a \fIgrow box\fR)
 allows the user to resize the containing toplevel window
 by pressing and dragging the grip.
 .SO ttk_widget
-\-class	\-cursor	\-state
+\-class	\-cursor
 \-style	\-takefocus
 .SE
 .SH "WIDGET COMMAND"
 .PP
 Sizegrip widgets support the standard
@@ -58,12 +58,25 @@
 the sizegrip widget will not resize the window.
 .PP
 \fBttk::sizegrip\fR widgets only support
 .QW southeast
 resizing.
+.SH "STYLING OPTIONS"
+.PP
+The class name for a \fBttk::sizegrip\fP is \fBTSizegrip\fP.
+.PP
+\fBTSizegrip\fP styling options configurable with \fBttk::style\fP
+are:
+.PP
+\fB\-background\fP \fIcolor\fP
+.PP
+Some options are only available for specific themes.
+.PP
+See the \fBttk::style\fP manual page for information on how to configure
+ttk styles.
 .SH "SEE ALSO"
 ttk::widget(n)
 .SH "KEYWORDS"
 widget, sizegrip, grow box
 '\" Local Variables:
 '\" mode: nroff
 '\" End:

Index: doc/ttk_spinbox.n
==================================================================
--- doc/ttk_spinbox.n
+++ doc/ttk_spinbox.n
@@ -19,44 +19,44 @@
 to select among a set of values. The widget implements all the features
 of the \fBttk::entry\fR widget including support of the
 \fB\-textvariable\fR option to link the value displayed by the widget
 to a Tcl variable.
 .SO ttk_widget
-\-class	\-cursor	\-style
-\-takefocus	\-xscrollcommand
+\-class	\-cursor	\-state	\-style
+\-takefocus	\-xscrollcommand	\-placeholder
 .SE
 .SO ttk_entry
 \-validate	\-validatecommand
 .SE
 .SH "WIDGET-SPECIFIC OPTIONS"
+.OP \-command command Command
+Specifies a Tcl command to be invoked whenever a spinbutton is invoked.
+.OP \-format format Format
+Specifies an alternate format to use when setting the string value
+when using the \fB\-from\fR and \fB\-to\fR range.
+This must be a format specifier of the form \fB%<pad>.<pad>f\fR,
+as it will format a floating-point number.
 .OP \-from from From
 A floating\-point value specifying the lowest value for the spinbox. This is
 used in conjunction with \fB\-to\fR and \fB\-increment\fR to set a numerical
 range.
-.OP \-to to To
-A floating\-point value specifying the highest permissible value for the
-widget. See also \fB\-from\fR and \fB\-increment\fR.
-range.
 .OP \-increment increment Increment
 A floating\-point value specifying the change in value to be applied each
 time one of the widget spin buttons is pressed. The up button applies a
 positive increment, the down button applies a negative increment.
+.OP \-to to To
+A floating\-point value specifying the highest permissible value for the
+widget. See also \fB\-from\fR and \fB\-increment\fR.
+range.
 .OP \-values values Values
 This must be a Tcl list of values. If this option is set then this will
 override any range set using the \fB\-from\fR, \fB\-to\fR and
 \fB\-increment\fR options. The widget will instead use the values
 specified beginning with the first value.
 .OP \-wrap wrap Wrap
 Must be a proper boolean value.  If on, the spinbox will wrap around the
 values of data in the widget.
-.OP \-format format Format
-Specifies an alternate format to use when setting the string value
-when using the \fB\-from\fR and \fB\-to\fR range.
-This must be a format specifier of the form \fB%<pad>.<pad>f\fR,
-as it will format a floating-point number.
-.OP \-command command Command
-Specifies a Tcl command to be invoked whenever a spinbutton is invoked.
 .SH "INDICES"
 .PP
 See the \fBttk::entry\fR manual for information about indexing characters.
 .SH "VALIDATION"
 .PP
@@ -65,12 +65,10 @@
 .SH "WIDGET COMMAND"
 .PP
 The following subcommands are possible for spinbox widgets in addition to
 the commands described for the \fBttk::entry\fR widget:
 .TP
-\fIpathName \fBcurrent \fIindex\fR
-.TP
 \fIpathName \fBget\fR
 Returns the spinbox's current value.
 .TP
 \fIpathName \fBset \fIvalue\fR
 Set the spinbox string to \fIvalue\fR. If a \fB\-format\fR option has
@@ -80,12 +78,51 @@
 .SH "VIRTUAL EVENTS"
 .PP
 The spinbox widget generates a \fB<<Increment>>\fR virtual event when
 the user presses <Up>, and a \fB<<Decrement>>\fR virtual event when the
 user presses <Down>.
+.SH "STYLING OPTIONS"
+.PP
+The class name for a \fBttk::spinbox\fP is \fBTSpinbox\fP.
+.PP
+Dynamic states: \fBactive\fP, \fBdisabled\fP, \fBfocus\fP, \fBreadonly\fP.
+.PP
+\fBTSpinbox\fP styling options configurable with \fBttk::style\fP
+are:
+.PP
+\fB\-arrowcolor\fP \fIcolor\fP
+.br
+\fB\-arrowsize\fP \fIamount\fP
+.br
+\fB\-background\fP \fIcolor\fP
+.RS
+When using the aqua theme (Mac OS X), changes the \fB\-fieldbackground\fP.
+.RE
+\fB\-bordercolor\fP \fIcolor\fP
+.br
+\fB\-darkcolor\fP \fIcolor\fP
+.br
+\fB\-fieldbackground\fP \fIcolor\fP
+.RS
+Does not work with the aqua theme (Mac OS X).
+.RE
+\fB\-foreground\fP \fIcolor\fP
+.br
+\fB\-lightcolor\fP \fIcolor\fP
+.br
+\fB\-padding\fP \fIpadding\fP
+.br
+\fB\-selectbackground\fP \fIcolor\fP
+.br
+\fB\-selectforeground\fP \fIcolor\fP
+.PP
+Some options are only available for specific themes.
+.PP
+See the \fBttk::style\fP manual page for information on how to configure
+ttk styles.
 .SH "SEE ALSO"
 ttk::widget(n), ttk::entry(n), spinbox(n)
 .SH KEYWORDS
 entry, spinbox, widget, text field
 '\" Local Variables:
 '\" mode: nroff
 '\" End:

Index: doc/ttk_treeview.n
==================================================================
--- doc/ttk_treeview.n
+++ doc/ttk_treeview.n
@@ -43,10 +43,11 @@
 standard \fB\-\fR[\fBxy\fR]\fBscrollcommand\fR options
 and [\fBxy\fR]\fBview\fR widget commands.
 .SO ttk_widget
 \-class	\-cursor	\-takefocus
 \-style	\-xscrollcommand	\-yscrollcommand
+\-padding
 .SE
 .SH "WIDGET-SPECIFIC OPTIONS"
 .OP \-columns columns Columns
 A list of column identifiers,
 specifying the number of columns and their names.
@@ -61,14 +62,10 @@
 all columns are shown in the order given.
 .OP \-height height Height
 Specifies the number of rows which should be visible.
 Note:
 the requested width is determined from the sum of the column widths.
-.OP \-padding padding Padding
-Specifies the internal padding for the widget.
-The padding is a list of up to four length specifications;
-see \fBTtk_GetPaddingFromObj()\fR for details.
 .OP \-selectmode selectMode SelectMode
 Controls how the built-in class bindings manage the selection.
 One of \fBextended\fR, \fBbrowse\fR, or \fBnone\fR.
 .RS
 .PP
@@ -475,10 +472,76 @@
 The \fBfocus\fR and \fBselection\fR widget commands can be used
 to determine the affected item or items.
 '\" Not yet:
 '\" In Tk 8.5, the affected item is also passed as the \fB\-detail\fR field
 '\" of the virtual event.
+.SH "STYLING OPTIONS"
+.PP
+The class name for a \fBttk::treeview\fP is \fBTreeview\fP.
+The treeview header class name is \fBHeading\fP.
+The treeview item class name is \fBItem\fP.
+The treeview cell class name is \fBCell\fP.
+.PP
+Dynamic states: \fBdisabled\fP, \fBselected\fP.
+.PP
+\fBTreeview\fP styling options configurable with \fBttk::style\fP
+are:
+.PP
+\fB\-background\fP \fIcolor\fP
+.br
+\fB\-fieldbackground\fP \fIcolor\fP
+.br
+\fB\-font\fP \fIfont\fP
+.br
+\fB\-foreground\fP \fIcolor\fP
+.br
+\fB\-rowheight\fP \fIamount\fP
+.RS
+The \fB\-rowheight\fP value is not corrected by the \fBtk scaling\fP
+value or by the configured font size and must always be set.  Also make
+sure that the \fB\-rowheight\fP is large enough to contain any images.
+.PP
+To adjust the \fB\-rowheight\fP for the Treeview style, use the following code
+after \fBtk scaling\fP has been applied.
+Note that even if you do not support or change \fBtk scaling\fP
+in your program, your users may have it set in their .wishrc.
+.RE
+.PP
+.CS
+ttk::style configure Treeview \\
+     \-rowheight [expr {[font metrics \fIfont\fP \-linespace] + 2}]
+.CE
+.PP
+\fBHeading\fP styling options configurable with \fBttk::style\fP
+are:
+.PP
+\fB\-background\fP \fIcolor\fP
+.br
+\fB\-font\fP \fIfont\fP
+.br
+\fB\-relief\fP \fIrelief\fP
+.PP
+\fBItem\fP styling options configurable with \fBttk::style\fP
+are:
+.PP
+\fB\-foreground\fP \fIcolor\fP
+.br
+\fB\-indicatormargins\fP \fIpadding\fP
+.br
+\fB\-indicatorsize\fP \fIamount\fP
+.br
+\fB\-padding\fP \fIpadding\fP
+.PP
+\fBCell\fP styling options configurable with \fBttk::style\fP
+are:
+.PP
+\fB\-padding\fP \fIpadding\fP
+.PP
+Some options are only available for specific themes.
+.PP
+See the \fBttk::style\fP manual page for information on how to configure
+ttk styles.
 .SH "SEE ALSO"
 ttk::widget(n), listbox(n), image(n), bind(n)
 '\" Local Variables:
 '\" mode: nroff
 '\" End:

Index: doc/ttk_vsapi.n
==================================================================
--- doc/ttk_vsapi.n
+++ doc/ttk_vsapi.n
@@ -32,10 +32,17 @@
 \fB\-padding \fIpadding\fR
 .
 Specify the element's interior padding.
 \fIpadding\fR is a list of up to four integers specifying
 the left, top, right and bottom padding quantities respectively.
+If fewer than four elements are specified,
+\fIbottom\fR defaults to \fItop\fR,
+\fIright\fR defaults to \fIleft\fR, and
+\fItop\fR defaults to \fIleft\fR.
+In other words, a list of three numbers specify the left, vertical, and right padding;
+a list of two numbers specify the horizontal and the vertical padding;
+a single number specifies the same padding all the way around the widget.
 This option may not be mixed with any other options.
 .TP
 \fB\-margins \fIpadding\fR
 .
 Specifies the elements exterior padding.
@@ -59,11 +66,11 @@
 The \fIstateMap\fR parameter is a list of ttk states and the
 corresponding Visual Styles API state value.
 This permits the element appearance to respond to changes in the
 widget state such as becoming active or being pressed. The list should
 be as described for the \fBttk::style map\fR command but note that the
-last pair in the list should be the default state and is typically and
+last pair in the list should be the default state and is typically an
 empty list and 1. Unfortunately all the Visual Styles parts have
 different state values and these must be looked up either in the
 Microsoft documentation or more likely in the header files. The
 original header to use was \fItmschema.h\fR, but in more recent
 versions of the Windows Development Kit this is \fIvssym32.h\fR.

Index: doc/ttk_widget.n
==================================================================
--- doc/ttk_widget.n
+++ doc/ttk_widget.n
@@ -69,28 +69,16 @@
 A command prefix, used to communicate with vertical scrollbars.
 See the description of \fB\-xscrollcommand\fR above for details.
 .SH "LABEL OPTIONS"
 The following options are supported by labels, buttons,
 and other button-like widgets:
-.OP \-text text Text
-Specifies a text string to be displayed inside the widget
-(unless overridden by \fB\-textvariable\fR).
-.OP \-textvariable textVariable Variable
-Specifies the name of a global variable whose value will be used
-in place of the \fB\-text\fR resource.
-.OP \-underline underline Underline
-If set, specifies the integer index (0-based) of a character to underline
-in the text string.
-The underlined character is used for mnemonic activation.
-.OP \-image image Image
-Specifies an image to display.
-This is a list of 1 or more elements.
-The first element is the default image name.
-The rest of the list is a sequence of \fIstatespec / value\fR pairs
-as per \fBstyle map\fR, specifying different images to use when
-the widget is in a particular state or combination of states.
-All images in the list should have the same size.
+.OP \-anchor anchor Anchor
+Specifies how the information in the widget is positioned
+relative to the inner margins.  Legal values are
+\fBn\fR, \fBne\fR, \fBe\fR, \fBse\fR,
+\fBs\fR, \fBsw\fR, \fBw\fR, \fBnw\fR, and \fBcenter\fR.
+See also \fB\-justify\fR (for widgets supporting this option).
 .OP \-compound compound Compound
 Specifies how to display the image relative to the text,
 in the case both \fB\-text\fR and \fB\-image\fR are present.
 Valid values are:
 .RS
@@ -106,16 +94,74 @@
 .IP right
 Display image above, below, left of, or right of the text, respectively.
 .IP none
 The default; display the image if present, otherwise the text.
 .RE
+.OP \-font font Font
+Font to use for the text displayed by the widget.
+.OP \-foreground textColor TextColor
+The widget's foreground color.
+If unspecified, the theme default is used.
+.OP \-image image Image
+Specifies an image to display.
+This is a list of 1 or more elements.
+The first element is the default image name.
+The rest of the list is a sequence of \fIstatespec / value\fR pairs
+as per \fBstyle map\fR, specifying different images to use when
+the widget is in a particular state or combination of states.
+All images in the list should have the same size.
+.OP \-justify justify Justify
+If there are multiple lines of text, specifies how
+the lines are laid out relative to one another.
+One of \fBleft\fR, \fBcenter\fR, or \fBright\fR.
+See also \fB\-anchor\fR (for widgets supporting this option).
+.OP \-padding padding Padding
+Specifies the internal padding for the widget.
+The padding is a list of up to four length specifications
+\fIleft top right bottom\fR.
+If fewer than four elements are specified,
+\fIbottom\fR defaults to \fItop\fR,
+\fIright\fR defaults to \fIleft\fR, and
+\fItop\fR defaults to \fIleft\fR.
+In other words, a list of three numbers specify the left, vertical, and right padding;
+a list of two numbers specify the horizontal and the vertical padding;
+a single number specifies the same padding all the way around the widget.
+.OP \-text text Text
+Specifies a text string to be displayed inside the widget
+(unless overridden by \fB\-textvariable\fR for the widgets supporting this option).
+.OP \-textvariable textVariable Variable
+Specifies the name of a global variable whose value will be used
+in place of the \fB\-text\fR resource.
+.OP \-underline underline Underline
+If set, specifies the integer index (0-based) of a character to underline
+in the text string.
+The underlined character is used for mnemonic activation.
 .OP \-width width Width
 If greater than zero, specifies how much space, in character widths,
 to allocate for the text label.
 If less than zero, specifies a minimum width.
 If zero or unspecified, the natural width of the text label is used.
+Note that some themes may specify a non-zero \fB\-width\fR
+in the style.
+.OP \-wraplength wrapLength WrapLength
+Specifies the maximum line length. The value may have any of the forms
+acceptable to \fBTk_GetPixels\fR. If this option is less than or equal
+to zero, then automatic wrapping is not performed; otherwise
+the text is split into lines such that no line is longer
+than the specified value.
+.SH "ENTRY OPTIONS"
+The following option is supported by entry, spinbox and combobox:
+.OP \-placeholder placeHolder PlaceHolder
+Specifies a help text string to display if no text is otherwise displayed,
+that is when the widget is empty. The placeholder text is displayed using
+the values of the \fB\-font\fR and \fB\-justify\fR options. The foreground
+color of the placeholder text can be changed using the
+\fB\-placeholderforeground\fR style option.
 .SH "COMPATIBILITY OPTIONS"
+This option is only available for themed widgets that have
+.QW corresponding
+traditional Tk widgets.
 .OP \-state state State
 May be set to \fBnormal\fR or \fBdisabled\fR
 to control the \fBdisabled\fR state bit.
 This is a write-only option:
 setting it changes the widget state,

Index: doc/winfo.n
==================================================================
--- doc/winfo.n
+++ doc/winfo.n
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1990-1994 The Regents of the University of California.
 '\" Copyright (c) 1994-1997 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH winfo n 4.3 Tk "Tk Built-In Commands"
 .so man.macros
 .BS
 '\" Note:  do not modify the .SH NAME line immediately below!
 .SH NAME

Index: doc/wish.1
==================================================================
--- doc/wish.1
+++ doc/wish.1
@@ -2,11 +2,11 @@
 '\" Copyright (c) 1991-1994 The Regents of the University of California.
 '\" Copyright (c) 1994-1996 Sun Microsystems, Inc.
 '\"
 '\" See the file "license.terms" for information on usage and redistribution
 '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-'\" 
+'\"
 .TH wish 1 8.0 Tk "Tk Applications"
 .so man.macros
 .BS
 '\" Note:  do not modify the .SH NAME line immediately below!
 .SH NAME
@@ -75,11 +75,11 @@
 If there exists a file
 .QW \fB.wishrc\fR
 in the home directory of the user, \fBwish\fR evaluates the file as a
 Tcl script just before reading the first command from standard input.
 .PP
-If arguments to \fBwish\fR do specify a \fIfileName\fR, then 
+If arguments to \fBwish\fR do specify a \fIfileName\fR, then
 \fIfileName\fR is treated as the name of a script file.
 \fBWish\fR will evaluate the script in \fIfileName\fR (which
 presumably creates a user interface), then it will respond to events
 until all windows have been deleted.
 Commands will not be read from standard input.

Index: doc/wm.n
==================================================================
--- doc/wm.n
+++ doc/wm.n
@@ -486,11 +486,17 @@
 On X, the images are arranged into the _NET_WM_ICON X property, which
 most modern window managers support.  A \fBwm iconbitmap\fR may exist
 simultaneously.  It is recommended to use not more than 2 icons, placing
 the larger icon first.
 .PP
-On Macintosh, this currently does nothing.
+On Macintosh, the first image called is loaded into an OSX-native icon
+format, and becomes the application icon in dialogs, the Dock, and
+other contexts. At the
+script level the command will accept only the first image passed in the
+parameters as support for multiple sizes/resolutions on macOS is outside Tk's
+scope. Developers should use the largest icon they can support
+(preferably 512 pixels) to ensure smooth rendering on the Mac.
 .RE
 .TP
 \fBwm iconposition \fIwindow\fR ?\fIx y\fR?
 .
 If \fIx\fR and \fIy\fR are specified, they are passed to the window

Index: generic/ks_names.h
==================================================================
--- generic/ks_names.h
+++ generic/ks_names.h
@@ -1,7 +1,17 @@
 /*
- * This file is generated from $(INCLUDESRC)/keysymdef.h.  Do not edit.
+ * This file should be maintained in sync with xlib/X11/keysymdefs.h
+ *
+ * Note that this should be done manually only, because in some cases
+ * keysymdefs.h defines the same integer for multiple keysyms, e.g.:
+ *
+ *    #define XK_Greek_LAMDA                         0x7cb
+ *    #define XK_Greek_LAMBDA                        0x7cb
+ *
+ *    #define XK_Cyrillic_DZHE                       0x6bf
+ *    #define XK_Serbian_DZE                         0x6bf  (deprecated)
+ *
  */
 { "BackSpace", 0xFF08 },
 { "Tab", 0xFF09 },
 { "Linefeed", 0xFF0A },
 { "Clear", 0xFF0B },
@@ -918,5 +928,12 @@
 { "hebrew_kuf", 0xcf7 },
 { "hebrew_resh", 0xcf8 },
 { "hebrew_shin", 0xcf9 },
 { "hebrew_taf", 0xcfa },
 { "Hebrew_switch", 0xFF7E },
+{ "XF86AudioLowerVolume", 0x1008FF11 },
+{ "XF86AudioMute", 0x1008FF12 },
+{ "XF86AudioRaiseVolume", 0x1008FF13 },
+{ "XF86AudioPlay", 0x1008FF14 },
+{ "XF86AudioStop", 0x1008FF15 },
+{ "XF86AudioPrev", 0x1008FF16 },
+{ "XF86AudioNext", 0x1008FF17 },

Index: generic/tk.decls
==================================================================
--- generic/tk.decls
+++ generic/tk.decls
@@ -103,11 +103,11 @@
 declare 18 {
     int Tk_CanvasTagsParseProc(ClientData clientData, Tcl_Interp *interp,
 	    Tk_Window tkwin, const char *value, char *widgRec, int offset)
 }
 declare 19 {
-    CONST86 char *Tk_CanvasTagsPrintProc(ClientData clientData, Tk_Window tkwin,
+    const char *Tk_CanvasTagsPrintProc(ClientData clientData, Tk_Window tkwin,
 	    char *widgRec, int offset, Tcl_FreeProc **freeProcPtr)
 }
 declare 20 {
     Tk_Window	Tk_CanvasTkwin(Tk_Canvas canvas)
 }
@@ -144,11 +144,11 @@
 	    char *widgRec, const char *argvName, int flags)
 }
 declare 29 {
     int Tk_ConfigureWidget(Tcl_Interp *interp,
 	    Tk_Window tkwin, const Tk_ConfigSpec *specs,
-	    int argc, CONST84 char **argv, char *widgRec,
+	    int argc, const char **argv, char *widgRec,
 	    int flags)
 }
 declare 30 {
     void Tk_ConfigureWindow(Tk_Window tkwin,
 	    unsigned int valueMask, XWindowChanges *valuePtr)
@@ -243,11 +243,11 @@
 }
 declare 54 {
     void Tk_DestroyWindow(Tk_Window tkwin)
 }
 declare 55 {
-    CONST84_RETURN char *Tk_DisplayName(Tk_Window tkwin)
+    const char *Tk_DisplayName(Tk_Window tkwin)
 }
 declare 56 {
     int Tk_DistanceToTextLayout(Tk_TextLayout layout, int x, int y)
 }
 declare 57 {
@@ -324,11 +324,11 @@
     void Tk_FreePixmap(Display *display, Pixmap pixmap)
 }
 declare 76 {
     void Tk_FreeTextLayout(Tk_TextLayout textLayout)
 }
-declare 77 {
+declare 77 {deprecated {function does nothing, call can be removed}} {
     void Tk_FreeXId(Display *display, XID xid)
 }
 declare 78 {
     GC Tk_GCForColor(XColor *colorPtr, Drawable drawable)
 }
@@ -346,14 +346,14 @@
 declare 82 {
     int Tk_GetAnchor(Tcl_Interp *interp,
 	    const char *str, Tk_Anchor *anchorPtr)
 }
 declare 83 {
-    CONST84_RETURN char *Tk_GetAtomName(Tk_Window tkwin, Atom atom)
+    const char *Tk_GetAtomName(Tk_Window tkwin, Atom atom)
 }
 declare 84 {
-    CONST84_RETURN char *Tk_GetBinding(Tcl_Interp *interp,
+    const char *Tk_GetBinding(Tcl_Interp *interp,
 	    Tk_BindingTable bindingTable, ClientData object,
 	    const char *eventStr)
 }
 declare 85 {
     Pixmap Tk_GetBitmap(Tcl_Interp *interp, Tk_Window tkwin, const char *str)
@@ -402,11 +402,11 @@
     Tk_Image Tk_GetImage(Tcl_Interp *interp, Tk_Window tkwin, const char *name,
 	    Tk_ImageChangedProc *changeProc, ClientData clientData)
 }
 declare 98 {
     ClientData Tk_GetImageMasterData(Tcl_Interp *interp,
-	    const char *name, CONST86 Tk_ImageType **typePtrPtr)
+	    const char *name, const Tk_ImageType **typePtrPtr)
 }
 declare 99 {
     Tk_ItemType *Tk_GetItemTypes(void)
 }
 declare 100 {
@@ -437,11 +437,11 @@
 declare 107 {
     void Tk_GetRootCoords(Tk_Window tkwin, int *xPtr, int *yPtr)
 }
 declare 108 {
     int Tk_GetScrollInfo(Tcl_Interp *interp,
-	    int argc, CONST84 char **argv, double *dblPtr, int *intPtr)
+	    int argc, const char **argv, double *dblPtr, int *intPtr)
 }
 declare 109 {
     int Tk_GetScreenMM(Tcl_Interp *interp,
 	    Tk_Window tkwin, const char *str, double *doublePtr)
 }
@@ -516,41 +516,41 @@
 }
 declare 129 {
     void Tk_MoveToplevelWindow(Tk_Window tkwin, int x, int y)
 }
 declare 130 {
-    CONST84_RETURN char *Tk_NameOf3DBorder(Tk_3DBorder border)
+    const char *Tk_NameOf3DBorder(Tk_3DBorder border)
 }
 declare 131 {
-    CONST84_RETURN char *Tk_NameOfAnchor(Tk_Anchor anchor)
+    const char *Tk_NameOfAnchor(Tk_Anchor anchor)
 }
 declare 132 {
-    CONST84_RETURN char *Tk_NameOfBitmap(Display *display, Pixmap bitmap)
+    const char *Tk_NameOfBitmap(Display *display, Pixmap bitmap)
 }
 declare 133 {
-    CONST84_RETURN char *Tk_NameOfCapStyle(int cap)
+    const char *Tk_NameOfCapStyle(int cap)
 }
 declare 134 {
-    CONST84_RETURN char *Tk_NameOfColor(XColor *colorPtr)
+    const char *Tk_NameOfColor(XColor *colorPtr)
 }
 declare 135 {
-    CONST84_RETURN char *Tk_NameOfCursor(Display *display, Tk_Cursor cursor)
+    const char *Tk_NameOfCursor(Display *display, Tk_Cursor cursor)
 }
 declare 136 {
-    CONST84_RETURN char *Tk_NameOfFont(Tk_Font font)
+    const char *Tk_NameOfFont(Tk_Font font)
 }
 declare 137 {
-    CONST84_RETURN char *Tk_NameOfImage(Tk_ImageMaster imageMaster)
+    const char *Tk_NameOfImage(Tk_ImageMaster imageMaster)
 }
 declare 138 {
-    CONST84_RETURN char *Tk_NameOfJoinStyle(int join)
+    const char *Tk_NameOfJoinStyle(int join)
 }
 declare 139 {
-    CONST84_RETURN char *Tk_NameOfJustify(Tk_Justify justify)
+    const char *Tk_NameOfJustify(Tk_Justify justify)
 }
 declare 140 {
-    CONST84_RETURN char *Tk_NameOfRelief(int relief)
+    const char *Tk_NameOfRelief(int relief)
 }
 declare 141 {
     Tk_Window Tk_NameToWindow(Tcl_Interp *interp,
 	    const char *pathName, Tk_Window tkwin)
 }
@@ -559,19 +559,19 @@
 	    Atom selection, Tk_LostSelProc *proc,
 	    ClientData clientData)
 }
 declare 143 {
     int Tk_ParseArgv(Tcl_Interp *interp,
-	    Tk_Window tkwin, int *argcPtr, CONST84 char **argv,
+	    Tk_Window tkwin, int *argcPtr, const char **argv,
 	    const Tk_ArgvInfo *argTable, int flags)
 }
-declare 144 {
+declare 144 {deprecated {function signature changed}} {
     void Tk_PhotoPutBlock_NoComposite(Tk_PhotoHandle handle,
 	    Tk_PhotoImageBlock *blockPtr, int x, int y,
 	    int width, int height)
 }
-declare 145 {
+declare 145 {deprecated {function signature changed}} {
     void Tk_PhotoPutZoomedBlock_NoComposite(Tk_PhotoHandle handle,
 	    Tk_PhotoImageBlock *blockPtr, int x, int y,
 	    int width, int height, int zoomX, int zoomY,
 	    int subsampleX, int subsampleY)
 }
@@ -579,17 +579,17 @@
     int Tk_PhotoGetImage(Tk_PhotoHandle handle, Tk_PhotoImageBlock *blockPtr)
 }
 declare 147 {
     void Tk_PhotoBlank(Tk_PhotoHandle handle)
 }
-declare 148 {
+declare 148 {deprecated {function signature changed}} {
     void Tk_PhotoExpand_Panic(Tk_PhotoHandle handle, int width, int height )
 }
 declare 149 {
     void Tk_PhotoGetSize(Tk_PhotoHandle handle, int *widthPtr, int *heightPtr)
 }
-declare 150 {
+declare 150 {deprecated {function signature changed}} {
     void Tk_PhotoSetSize_Panic(Tk_PhotoHandle handle, int width, int height)
 }
 declare 151 {
     int Tk_PointToChar(Tk_TextLayout layout, int x, int y)
 }
@@ -742,11 +742,11 @@
 }
 declare 194 {
     void  Tk_FreeColorFromObj(Tk_Window tkwin, Tcl_Obj *objPtr)
 }
 declare 195 {
-    void  Tk_FreeConfigOptions(char *recordPtr, Tk_OptionTable optionToken,
+    void  Tk_FreeConfigOptions(void *recordPtr, Tk_OptionTable optionToken,
 	    Tk_Window tkwin)
 }
 declare 196 {
     void  Tk_FreeSavedOptions(Tk_SavedOptions *savePtr)
 }
@@ -772,15 +772,15 @@
 declare 203 {
     Tk_Cursor Tk_GetCursorFromObj(Tk_Window tkwin, Tcl_Obj *objPtr)
 }
 declare 204 {
     Tcl_Obj *Tk_GetOptionInfo(Tcl_Interp *interp,
-	    char *recordPtr, Tk_OptionTable optionTable,
+	    void *recordPtr, Tk_OptionTable optionTable,
 	    Tcl_Obj *namePtr, Tk_Window tkwin)
 }
 declare 205 {
-    Tcl_Obj *Tk_GetOptionValue(Tcl_Interp *interp, char *recordPtr,
+    Tcl_Obj *Tk_GetOptionValue(Tcl_Interp *interp, void *recordPtr,
 	    Tk_OptionTable optionTable, Tcl_Obj *namePtr, Tk_Window tkwin)
 }
 declare 206 {
     int	 Tk_GetJustifyFromObj(Tcl_Interp *interp,
 	    Tcl_Obj *objPtr, Tk_Justify *justifyPtr)
@@ -800,11 +800,11 @@
 declare 210 {
     int	 Tk_GetScrollInfoObj(Tcl_Interp *interp,
 	    int objc, Tcl_Obj *const objv[], double *dblPtr, int *intPtr)
 }
 declare 211 {
-    int	 Tk_InitOptions(Tcl_Interp *interp, char *recordPtr,
+    int	 Tk_InitOptions(Tcl_Interp *interp, void *recordPtr,
 	    Tk_OptionTable optionToken, Tk_Window tkwin)
 }
 declare 212 {
     void  Tk_MainEx(int argc, char **argv, Tcl_AppInitProc *appInitProc,
 	    Tcl_Interp *interp)
@@ -811,11 +811,11 @@
 }
 declare 213 {
     void  Tk_RestoreSavedOptions(Tk_SavedOptions *savePtr)
 }
 declare 214 {
-    int	 Tk_SetOptions(Tcl_Interp *interp, char *recordPtr,
+    int	 Tk_SetOptions(Tcl_Interp *interp, void *recordPtr,
 	    Tk_OptionTable optionTable, int objc,
 	    Tcl_Obj *const objv[], Tk_Window tkwin,
 	    Tk_SavedOptions *savePtr, int *maskPtr)
 }
 declare 215 {
@@ -941,16 +941,16 @@
 # New in 8.4a5
 #
 declare 245 {
     void Tk_SetCaretPos(Tk_Window tkwin, int x, int y, int height)
 }
-declare 246 {
+declare 246 {deprecated {function signature changed}} {
     void Tk_PhotoPutBlock_Panic(Tk_PhotoHandle handle,
 	    Tk_PhotoImageBlock *blockPtr, int x, int y,
 	    int width, int height, int compRule)
 }
-declare 247 {
+declare 247 {deprecated {function signature changed}} {
     void Tk_PhotoPutZoomedBlock_Panic(Tk_PhotoHandle handle,
 	    Tk_PhotoImageBlock *blockPtr, int x, int y,
 	    int width, int height, int zoomX, int zoomY,
 	    int subsampleX, int subsampleY, int compRule)
 }
@@ -999,26 +999,26 @@
     Tk_StyledElement Tk_GetStyledElement(Tk_Style style, int elementId,
 	Tk_OptionTable optionTable)
 }
 declare 261 {
     void Tk_GetElementSize(Tk_Style style, Tk_StyledElement element,
-	    char *recordPtr, Tk_Window tkwin, int width, int height,
+	    void *recordPtr, Tk_Window tkwin, int width, int height,
 	    int inner, int *widthPtr, int *heightPtr)
 }
 declare 262 {
     void Tk_GetElementBox(Tk_Style style, Tk_StyledElement element,
-	    char *recordPtr, Tk_Window tkwin, int x, int y, int width,
+	    void *recordPtr, Tk_Window tkwin, int x, int y, int width,
 	    int height, int inner, int *xPtr, int *yPtr, int *widthPtr,
 	    int *heightPtr)
 }
 declare 263 {
     int Tk_GetElementBorderWidth(Tk_Style style, Tk_StyledElement element,
-	    char *recordPtr, Tk_Window tkwin)
+	    void *recordPtr, Tk_Window tkwin)
 }
 declare 264 {
     void Tk_DrawElement(Tk_Style style, Tk_StyledElement element,
-	    char *recordPtr, Tk_Window tkwin, Drawable d, int x, int y,
+	    void *recordPtr, Tk_Window tkwin, Drawable d, int x, int y,
 	    int width, int height, int state)
 }
 
 # TIP#116
 declare 265 {
@@ -1146,9 +1146,17 @@
 
 export {
     const char *Tk_PkgInitStubsCheck(Tcl_Interp *interp, const char *version,
 	    int exact)
 }
+export {
+    void Tk_MainEx(int argc, char **argv, Tcl_AppInitProc *appInitProc,
+	    Tcl_Interp *interp)
+}
+export {
+    void Tk_MainExW(int argc, wchar_t **argv,
+	    Tcl_AppInitProc *appInitProc, Tcl_Interp *interp);
+}
 
 # Local Variables:
 # mode: tcl
 # End:

Index: generic/tk.h
==================================================================
--- generic/tk.h
+++ generic/tk.h
@@ -15,21 +15,14 @@
 
 #ifndef _TK
 #define _TK
 
 #include <tcl.h>
-#if (TCL_MAJOR_VERSION != 8) || (TCL_MINOR_VERSION < 6)
-#	error Tk 8.6 must be compiled with tcl.h from Tcl 8.6 or better
+#if (TCL_MAJOR_VERSION < 8) || (TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION < 6)
+#	error Tk 8.7 must be compiled with tcl.h from Tcl 8.6 or better
 #endif
 
-#ifndef CONST84
-#   define CONST84 const
-#   define CONST84_RETURN const
-#endif
-#ifndef CONST86
-#   define CONST86 CONST84
-#endif
 #ifndef EXTERN
 #   define EXTERN extern TCL_STORAGE_CLASS
 #endif
 
 /*
@@ -57,12 +50,12 @@
 /*
  * When version numbers change here, you must also go into the following files
  * and update the version numbers:
  *
  * library/tk.tcl	(1 LOC patch)
- * unix/configure.in	(2 LOC Major, 2 LOC minor, 1 LOC patch)
- * win/configure.in	(as above)
+ * unix/configure.ac	(2 LOC Major, 2 LOC minor, 1 LOC patch)
+ * win/configure.ac	(as above)
  * README		(sections 0 and 1)
  * macosx/Tk-Common.xcconfig (not patchlevel) 1 LOC
  * win/README		(not patchlevel)
  * unix/README		(not patchlevel)
  * unix/tk.spec		(1 LOC patch)
@@ -71,16 +64,16 @@
  * You may also need to update some of these files when the numbers change for
  * the version of Tcl that this release of Tk is compiled against.
  */
 
 #define TK_MAJOR_VERSION	8
-#define TK_MINOR_VERSION	6
-#define TK_RELEASE_LEVEL	TCL_FINAL_RELEASE
-#define TK_RELEASE_SERIAL	6
+#define TK_MINOR_VERSION	7
+#define TK_RELEASE_LEVEL	TCL_ALPHA_RELEASE
+#define TK_RELEASE_SERIAL	2
 
-#define TK_VERSION		"8.6"
-#define TK_PATCH_LEVEL		"8.6.6"
+#define TK_VERSION		"8.7"
+#define TK_PATCH_LEVEL		"8.7a2"
 
 /*
  * A special definition used to allow this header file to be included from
  * windows or mac resource files so that they can obtain version information.
  * RC_INVOKED is defined by default by the windows RC tool and manually set
@@ -103,10 +96,14 @@
 #endif
 
 #ifdef BUILD_tk
 #undef TCL_STORAGE_CLASS
 #define TCL_STORAGE_CLASS	DLLEXPORT
+#else
+# ifndef TCL_STORAGE_CLASS
+#   define TCL_STORAGE_CLASS DLLIMPORT
+# endif
 #endif
 
 /*
  *----------------------------------------------------------------------
  *
@@ -188,24 +185,29 @@
     const char *dbName;		/* Name for option in option database. */
     const char *dbClass;	/* Class for option in database. */
     const char *defValue;	/* Default value for option if not specified
 				 * in command line, the option database, or
 				 * the system. */
-    int objOffset;		/* Where in record to store a Tcl_Obj * that
+#if TCL_MAJOR_VERSION > 8
+    size_t objOffset;		/* Where in record to store a Tcl_Obj * that
 				 * holds the value of this option, specified
 				 * as an offset in bytes from the start of the
 				 * record. Use the Tk_Offset macro to generate
 				 * values for this. -1 means don't store the
 				 * Tcl_Obj in the record. */
-    int internalOffset;		/* Where in record to store the internal
+    size_t internalOffset;		/* Where in record to store the internal
 				 * representation of the value of this option,
 				 * such as an int or XColor *. This field is
 				 * specified as an offset in bytes from the
 				 * start of the record. Use the Tk_Offset
 				 * macro to generate values for it. -1 means
 				 * don't store the internal representation in
 				 * the record. */
+#else
+    int objOffset;
+    int internalOffset;
+#endif
     int flags;			/* Any combination of the values defined
 				 * below. */
     const void *clientData;	/* An alternate place to put option-specific
 				 * data. Used for the monochrome default value
 				 * for colors, etc. */
@@ -288,11 +290,11 @@
 				 * a Tcl object; may be NULL if the value was
 				 * not saved as an object. */
     double internalForm;	/* The old value of the option, in some
 				 * internal representation such as an int or
 				 * (XColor *). Valid only if the field
-				 * optionPtr->specPtr->objOffset is < 0. The
+				 * optionPtr->specPtr->objOffset is -1. The
 				 * space must be large enough to accommodate a
 				 * double, a long, or a pointer; right now it
 				 * looks like a double (i.e., 8 bytes) is big
 				 * enough. Also, using a double guarantees
 				 * that the field is properly aligned for
@@ -304,15 +306,19 @@
 #else
 #   define TK_NUM_SAVED_OPTIONS 20
 #endif
 
 typedef struct Tk_SavedOptions {
-    char *recordPtr;		/* The data structure in which to restore
+    void *recordPtr;		/* The data structure in which to restore
 				 * configuration options. */
     Tk_Window tkwin;		/* Window associated with recordPtr; needed to
 				 * restore certain options. */
-    int numItems;		/* The number of valid items in items field. */
+#if TCL_MAJOR_VERSION > 8
+    size_t numItems;		/* The number of valid items in items field. */
+#else
+    int numItems;
+#endif
     Tk_SavedOption items[TK_NUM_SAVED_OPTIONS];
 				/* Items used to hold old values. */
     struct Tk_SavedOptions *nextPtr;
 				/* Points to next structure in list; needed if
 				 * too many options changed to hold all the
@@ -333,12 +339,12 @@
  */
 
 #ifndef __NO_OLD_CONFIG
 
 typedef int (Tk_OptionParseProc) (ClientData clientData, Tcl_Interp *interp,
-	Tk_Window tkwin, CONST84 char *value, char *widgRec, int offset);
-typedef CONST86 char *(Tk_OptionPrintProc) (ClientData clientData,
+	Tk_Window tkwin, const char *value, char *widgRec, int offset);
+typedef const char *(Tk_OptionPrintProc) (ClientData clientData,
 	Tk_Window tkwin, char *widgRec, int offset, Tcl_FreeProc **freeProcPtr);
 
 typedef struct Tk_CustomOption {
     Tk_OptionParseProc *parseProc;
 				/* Procedure to call to parse an option and
@@ -360,23 +366,27 @@
 
 typedef struct Tk_ConfigSpec {
     int type;			/* Type of option, such as TK_CONFIG_COLOR;
 				 * see definitions below. Last option in table
 				 * must have type TK_CONFIG_END. */
-    CONST86 char *argvName;	/* Switch used to specify option in argv. NULL
+    const char *argvName;	/* Switch used to specify option in argv. NULL
 				 * means this spec is part of a group. */
     Tk_Uid dbName;		/* Name for option in option database. */
     Tk_Uid dbClass;		/* Class for option in database. */
     Tk_Uid defValue;		/* Default value for option if not specified
 				 * in command line or database. */
-    int offset;			/* Where in widget record to store value; use
+#if TCL_MAJOR_VERSION > 8
+    size_t offset;			/* Where in widget record to store value; use
 				 * Tk_Offset macro to generate values for
 				 * this. */
+#else
+    int offset;
+#endif
     int specFlags;		/* Any combination of the values defined
 				 * below; other bits are used internally by
 				 * tkConfig.c. */
-    CONST86 Tk_CustomOption *customPtr;
+    const Tk_CustomOption *customPtr;
 				/* If type is TK_CONFIG_CUSTOM then this is a
 				 * pointer to info about how to parse and
 				 * print the option. Otherwise it is
 				 * irrelevant. */
 } Tk_ConfigSpec;
@@ -412,27 +422,29 @@
 
 #define TK_CONFIG_NULL_OK		(1 << 0)
 #define TK_CONFIG_COLOR_ONLY		(1 << 1)
 #define TK_CONFIG_MONO_ONLY		(1 << 2)
 #define TK_CONFIG_DONT_SET_DEFAULT	(1 << 3)
-#define TK_CONFIG_OPTION_SPECIFIED      (1 << 4)
+#ifndef TK_NO_DEPRECATED
+#  define TK_CONFIG_OPTION_SPECIFIED      (1 << 4)
+#endif /* !TK_NO_DEPRECATED */
 #define TK_CONFIG_USER_BIT		0x100
 #endif /* __NO_OLD_CONFIG */
 
 /*
  * Structure used to specify how to handle argv options.
  */
 
 typedef struct {
-    CONST86 char *key;		/* The key string that flags the option in the
+    const char *key;		/* The key string that flags the option in the
 				 * argv array. */
     int type;			/* Indicates option type; see below. */
     char *src;			/* Value to be used in setting dst; usage
 				 * depends on type. */
     char *dst;			/* Address of value to be modified; usage
 				 * depends on type. */
-    CONST86 char *help;		/* Documentation message describing this
+    const char *help;		/* Documentation message describing this
 				 * option. */
 } Tk_ArgvInfo;
 
 /*
  * Legal values for the type field of a Tk_ArgvInfo: see the user
@@ -674,11 +686,11 @@
     unsigned long serial;	/* # of last request processed by server. */
     Bool send_event;		/* True if this came from a SendEvent
 				 * request. */
     Display *display;		/* Display the event was read from. */
     Window event;		/* Window on which event was requested. */
-    Window root;		/* Root window that the event occured on. */
+    Window root;		/* Root window that the event occurred on. */
     Window subwindow;		/* Child window. */
     Time time;			/* Milliseconds. */
     int x, y;			/* Pointer x, y coordinates in event
 				 * window. */
     int x_root, y_root;		/* Coordinates relative to root. */
@@ -744,13 +756,14 @@
     (((Tk_FakeWin *) (tkwin))->flags & TK_TOP_HIERARCHY)
 #define Tk_IsManageable(tkwin) \
     (((Tk_FakeWin *) (tkwin))->flags & TK_WM_MANAGEABLE)
 #define Tk_ReqWidth(tkwin)	(((Tk_FakeWin *) (tkwin))->reqWidth)
 #define Tk_ReqHeight(tkwin)	(((Tk_FakeWin *) (tkwin))->reqHeight)
-/* Tk_InternalBorderWidth is deprecated */
+#ifndef TK_NO_DEPRECATED
 #define Tk_InternalBorderWidth(tkwin) \
     (((Tk_FakeWin *) (tkwin))->internalBorderLeft)
+#endif /* !TK_NO_DEPRECATED */
 #define Tk_InternalBorderLeft(tkwin) \
     (((Tk_FakeWin *) (tkwin))->internalBorderLeft)
 #define Tk_InternalBorderRight(tkwin) \
     (((Tk_FakeWin *) (tkwin))->internalBorderRight)
 #define Tk_InternalBorderTop(tkwin) \
@@ -812,10 +825,13 @@
     int internalBorderTop;
     int internalBorderBottom;
     int minReqWidth;
     int minReqHeight;
     char *dummy20;		/* geometryMaster */
+#ifdef TK_USE_INPUT_METHODS
+    int dummy21;
+#endif /* TK_USE_INPUT_METHODS */
 } Tk_FakeWin;
 
 /*
  * Flag values for TkWindow (and Tk_FakeWin) structures are:
  *
@@ -913,11 +929,11 @@
     TK_STATE_NULL = -1, TK_STATE_ACTIVE, TK_STATE_DISABLED,
     TK_STATE_NORMAL, TK_STATE_HIDDEN
 } Tk_State;
 
 typedef struct Tk_SmoothMethod {
-    CONST86 char *name;
+    const char *name;
     int (*coordProc) (Tk_Canvas canvas, double *pointPtr, int numPoints,
 	    int numSteps, XPoint xPoints[], double dblPoints[]);
     void (*postscriptProc) (Tcl_Interp *interp, Tk_Canvas canvas,
 	    double *coordPtr, int numPoints, int numSteps);
 } Tk_SmoothMethod;
@@ -1041,18 +1057,22 @@
 		    int first, int last);
 
 #ifndef __NO_OLD_CONFIG
 
 typedef struct Tk_ItemType {
-    CONST86 char *name;		/* The name of this type of item, such as
+    const char *name;		/* The name of this type of item, such as
 				 * "line". */
-    int itemSize;		/* Total amount of space needed for item's
+#if TCL_MAJOR_VERSION > 8
+    size_t itemSize;		/* Total amount of space needed for item's
 				 * record. */
+#else
+    int itemSize;
+#endif
     Tk_ItemCreateProc *createProc;
 				/* Procedure to create a new item of this
 				 * type. */
-    CONST86 Tk_ConfigSpec *configSpecs; /* Pointer to array of configuration specs for
+    const Tk_ConfigSpec *configSpecs; /* Pointer to array of configuration specs for
 				 * this type. Used for returning configuration
 				 * info. */
     Tk_ItemConfigureProc *configProc;
 				/* Procedure to call to change configuration
 				 * options. */
@@ -1169,11 +1189,11 @@
     int xoffset;		/* x offset */
     int yoffset;		/* y offset */
 } Tk_TSOffset;
 
 /*
- * Bit fields in Tk_Offset->flags:
+ * Bit fields in Tk_TSOffset->flags:
  */
 
 #define TK_OFFSET_INDEX		1
 #define TK_OFFSET_RELATIVE	2
 #define TK_OFFSET_LEFT		4
@@ -1218,12 +1238,12 @@
 #ifdef USE_OLD_IMAGE
 typedef int (Tk_ImageCreateProc) (Tcl_Interp *interp, char *name, int argc,
 	char **argv, Tk_ImageType *typePtr, Tk_ImageMaster master,
 	ClientData *masterDataPtr);
 #else
-typedef int (Tk_ImageCreateProc) (Tcl_Interp *interp, CONST86 char *name, int objc,
-	Tcl_Obj *const objv[], CONST86 Tk_ImageType *typePtr, Tk_ImageMaster master,
+typedef int (Tk_ImageCreateProc) (Tcl_Interp *interp, const char *name, int objc,
+	Tcl_Obj *const objv[], const Tk_ImageType *typePtr, Tk_ImageMaster master,
 	ClientData *masterDataPtr);
 #endif /* USE_OLD_IMAGE */
 typedef ClientData (Tk_ImageGetProc) (Tk_Window tkwin, ClientData masterData);
 typedef void (Tk_ImageDisplayProc) (ClientData instanceData, Display *display,
 	Drawable drawable, int imageX, int imageY, int width, int height,
@@ -1243,11 +1263,11 @@
  * that respond to various events. Each image manager is represented by one of
  * these structures.
  */
 
 struct Tk_ImageType {
-    CONST86 char *name;		/* Name of image type. */
+    const char *name;		/* Name of image type. */
     Tk_ImageCreateProc *createProc;
 				/* Procedure to call to create a new image of
 				 * this type. */
     Tk_ImageGetProc *getProc;	/* Procedure to call the first time
 				 * Tk_GetImage is called in a new way (new
@@ -1355,11 +1375,11 @@
  * images (e.g., PPM, GIF, JPEG, etc.). It provides information to allow image
  * files of that format to be recognized and read into a photo image.
  */
 
 struct Tk_PhotoImageFormat {
-    CONST86 char *name;		/* Name of image file format */
+    const char *name;		/* Name of image file format */
     Tk_ImageFileMatchProc *fileMatchProc;
 				/* Procedure to call to determine whether an
 				 * image file matches this format. */
     Tk_ImageStringMatchProc *stringMatchProc;
 				/* Procedure to call to determine whether the
@@ -1526,11 +1546,11 @@
 typedef int (Tk_ErrorProc) (ClientData clientData, XErrorEvent *errEventPtr);
 typedef void (Tk_EventProc) (ClientData clientData, XEvent *eventPtr);
 typedef int (Tk_GenericProc) (ClientData clientData, XEvent *eventPtr);
 typedef int (Tk_ClientMessageProc) (Tk_Window tkwin, XEvent *eventPtr);
 typedef int (Tk_GetSelProc) (ClientData clientData, Tcl_Interp *interp,
-	CONST86 char *portion);
+	const char *portion);
 typedef void (Tk_LostSelProc) (ClientData clientData);
 typedef Tk_RestrictAction (Tk_RestrictProc) (ClientData clientData,
 	XEvent *eventPtr);
 typedef int (Tk_SelectionProc) (ClientData clientData, int offset,
 	char *buffer, int maxBytes);
@@ -1554,16 +1574,17 @@
 
 /*
  *----------------------------------------------------------------------
  *
  * Allow users to say that they don't want to alter their source to add extra
- * arguments to Tk_PhotoPutBlock() et al; DO NOT DEFINE THIS WHEN BUILDING TK.
+ * arguments to Tk_PhotoPutBlock() et al.
  *
  * This goes after the inclusion of the stubbed-decls so that the declarations
  * of what is actually there can be correct.
  */
 
+#if !defined(TK_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
 #ifdef USE_COMPOSITELESS_PHOTO_PUT_BLOCK
 #   ifdef Tk_PhotoPutBlock
 #	undef Tk_PhotoPutBlock
 #   endif
 #   define Tk_PhotoPutBlock		Tk_PhotoPutBlock_NoComposite
@@ -1592,10 +1613,11 @@
 #   ifdef Tk_PhotoSetSize
 #	undef Tk_PhotoSetSize
 #   endif
 #   define Tk_PhotoSetSize		Tk_PhotoSetSize_Panic
 #endif /* USE_PANIC_ON_PHOTO_ALLOC_FAILURE */
+#endif /* !TK_NO_DEPRECATED */
 
 #undef TCL_STORAGE_CLASS
 #define TCL_STORAGE_CLASS DLLIMPORT
 
 #endif /* RC_INVOKED */

Index: generic/tk3d.h
==================================================================
--- generic/tk3d.h
+++ generic/tk3d.h
@@ -26,20 +26,20 @@
 				 * the border. */
     int depth;			/* Number of bits per pixel of drawables where
 				 * the border will be used. */
     Colormap colormap;		/* Colormap out of which pixels are
 				 * allocated. */
-    int resourceRefCount;	/* Number of active uses of this color (each
+    TkSizeT resourceRefCount;	/* Number of active uses of this color (each
 				 * active use corresponds to a call to
 				 * Tk_Alloc3DBorderFromObj or Tk_Get3DBorder).
 				 * If this count is 0, then this structure is
 				 * no longer valid and it isn't present in
 				 * borderTable: it is being kept around only
 				 * because there are objects referring to it.
 				 * The structure is freed when objRefCount and
 				 * resourceRefCount are both 0. */
-    int objRefCount;		/* The number of Tcl objects that reference
+    TkSizeT objRefCount;		/* The number of Tcl objects that reference
 				 * this structure. */
     XColor *bgColorPtr;		/* Background color (intensity between
 				 * lightColorPtr and darkColorPtr). */
     XColor *darkColorPtr;	/* Color for darker areas (must free when
 				 * deleting structure). NULL means shadows

Index: generic/tkAtom.c
==================================================================
--- generic/tkAtom.c
+++ generic/tkAtom.c
@@ -154,11 +154,11 @@
 	if (mustFree) {
 	    XFree(mustFree);
 	}
 	name = Tcl_GetHashKey(&dispPtr->nameTable, hPtr);
 	hPtr = Tcl_CreateHashEntry(&dispPtr->atomTable, INT2PTR(atom), &isNew);
-	Tcl_SetHashValue(hPtr, name);
+	Tcl_SetHashValue(hPtr, (char *)name);
     }
     return Tcl_GetHashValue(hPtr);
 }
 
 /*
@@ -200,11 +200,11 @@
 	name = atomNameArray[atom - 1];
 	hPtr = Tcl_CreateHashEntry(&dispPtr->nameTable, name, &isNew);
 	Tcl_SetHashValue(hPtr, INT2PTR(atom));
 	name = Tcl_GetHashKey(&dispPtr->nameTable, hPtr);
 	hPtr = Tcl_CreateHashEntry(&dispPtr->atomTable, INT2PTR(atom), &isNew);
-	Tcl_SetHashValue(hPtr, name);
+	Tcl_SetHashValue(hPtr, (char *)name);
     }
 }
 
 /*
  * Local Variables:

Index: generic/tkBind.c
==================================================================
--- generic/tkBind.c
+++ generic/tkBind.c
@@ -685,29 +685,29 @@
 
 	    Tcl_InitHashTable(&keySymTable, TCL_STRING_KEYS);
 	    Tcl_InitHashTable(&nameTable, TCL_ONE_WORD_KEYS);
 	    for (kPtr = keyArray; kPtr->name != NULL; kPtr++) {
 		hPtr = Tcl_CreateHashEntry(&keySymTable, kPtr->name, &newEntry);
-		Tcl_SetHashValue(hPtr, kPtr->value);
-		hPtr = Tcl_CreateHashEntry(&nameTable, (char *) kPtr->value,
+		Tcl_SetHashValue(hPtr, INT2PTR(kPtr->value));
+		hPtr = Tcl_CreateHashEntry(&nameTable, INT2PTR(kPtr->value),
 			&newEntry);
 		if (newEntry) {
-		    Tcl_SetHashValue(hPtr, kPtr->name);
+		    Tcl_SetHashValue(hPtr, (char *) kPtr->name);
 		}
 	    }
 #endif /* REDO_KEYSYM_LOOKUP */
 
 	    Tcl_InitHashTable(&modTable, TCL_STRING_KEYS);
 	    for (modPtr = modArray; modPtr->name != NULL; modPtr++) {
 		hPtr = Tcl_CreateHashEntry(&modTable, modPtr->name, &newEntry);
-		Tcl_SetHashValue(hPtr, modPtr);
+		Tcl_SetHashValue(hPtr, (ModInfo *) modPtr);
 	    }
 
 	    Tcl_InitHashTable(&eventTable, TCL_STRING_KEYS);
 	    for (eiPtr = eventArray; eiPtr->name != NULL; eiPtr++) {
 		hPtr = Tcl_CreateHashEntry(&eventTable, eiPtr->name, &newEntry);
-		Tcl_SetHashValue(hPtr, eiPtr);
+		Tcl_SetHashValue(hPtr, (EventInfo *) eiPtr);
 	    }
 	    initialized = 1;
 	}
 	Tcl_MutexUnlock(&bindMutex);
     }
@@ -1257,10 +1257,20 @@
     if ((eventPtr->type == FocusIn) || (eventPtr->type == FocusOut)) {
 	if (eventPtr->xfocus.detail == NotifyInferior) {
 	    return;
 	}
     }
+
+    /*
+     * Ignore event types which are not in flagArray and all zeroes there.
+     * Most notably, NoExpose events can fill the ring buffer and disturb
+     * (thus masking out) event sequences of interest.
+     */
+
+    if ((eventPtr->type >= TK_LASTEVENT) || !flagArray[eventPtr->type]) {
+	return;
+    }
 
     dispPtr = ((TkWindow *) tkwin)->dispPtr;
     bindInfoPtr = winPtr->mainPtr->bindInfo;
 
     /*
@@ -1726,13 +1736,14 @@
 		    goto nextSequence;
 		}
 	    }
 	    if (psPtr->flags & PAT_NEARBY) {
 		XEvent *firstPtr = &bindPtr->eventRing[bindPtr->curEvent];
-		int timeDiff;
+		long timeDiff;
 
-		timeDiff = (Time) firstPtr->xkey.time - eventPtr->xkey.time;
+		timeDiff = ((long)firstPtr->xkey.time -
+			    (long)eventPtr->xkey.time);
 		if ((firstPtr->xkey.x_root
 			    < (eventPtr->xkey.x_root - NEARBY_PIXELS))
 			|| (firstPtr->xkey.x_root
 			    > (eventPtr->xkey.x_root + NEARBY_PIXELS))
 			|| (firstPtr->xkey.y_root
@@ -1909,11 +1920,12 @@
     unsigned int scriptCount,	/* The number of script-based binding patterns
 				 * matched so far for this event. */
     Tcl_DString *dsPtr)		/* Dynamic string in which to append new
 				 * command. */
 {
-    int spaceNeeded, cvtFlags;	/* Used to substitute string as proper Tcl
+    size_t spaceNeeded;
+    int cvtFlags;	/* Used to substitute string as proper Tcl
 				 * list element. */
     int number, flags, length;
 #define NUM_SIZE 40
     const char *string;
     Tcl_DString buf;
@@ -2491,11 +2503,11 @@
  *
  *	Add a new definition for a virtual event. If the virtual event is
  *	already defined, the new definition augments those that already exist.
  *
  * Results:
- *	The return value is TCL_ERROR if an error occured while creating the
+ *	The return value is TCL_ERROR if an error occurred while creating the
  *	virtual binding. In this case, an error message will be left in the
  *	interp's result. If all went well then the return value is TCL_OK.
  *
  * Side effects:
  *	The virtual event may cause future calls to Tk_BindEvent to behave
@@ -2866,11 +2878,11 @@
  *	    event.xany.window is filled with the target window.
  *	    event.xany.display is filled with the target window's display.
  *	Any other fields in eventPtr which are not specified by the pattern
  *	string or the optional arguments, are set to 0.
  *
- *	The event may be handled sychronously or asynchronously, depending on
+ *	The event may be handled synchronously or asynchronously, depending on
  *	the value specified by the optional "-when" option. The default
  *	setting is synchronous.
  *
  *---------------------------------------------------------------------------
  */
@@ -3321,13 +3333,13 @@
 	case EVENT_TIME:
 	    if (Tcl_GetIntFromObj(interp, valuePtr, &number) != TCL_OK) {
 		return TCL_ERROR;
 	    }
 	    if (flags & KEY_BUTTON_MOTION_CROSSING) {
-		event.general.xkey.time = (Time) number;
+		event.general.xkey.time = number;
 	    } else if (flags & PROP) {
-		event.general.xproperty.time = (Time) number;
+		event.general.xproperty.time = number;
 	    } else {
 		goto badopt;
 	    }
 	    break;
 	case EVENT_WIDTH:
@@ -3453,17 +3465,28 @@
      * We only allow warping if the window is mapped.
      */
 
     if ((warp != 0) && Tk_IsMapped(tkwin)) {
 	TkDisplay *dispPtr = TkGetDisplay(event.general.xmotion.display);
+
+	Tk_Window warpWindow = Tk_IdToWindow(dispPtr->display,
+		event.general.xmotion.window);
 
 	if (!(dispPtr->flags & TK_DISPLAY_IN_WARP)) {
 	    Tcl_DoWhenIdle(DoWarp, dispPtr);
 	    dispPtr->flags |= TK_DISPLAY_IN_WARP;
 	}
-	dispPtr->warpWindow = Tk_IdToWindow(dispPtr->display,
-		event.general.xmotion.window);
+
+	if (warpWindow != dispPtr->warpWindow) {
+	    if (warpWindow) {
+		Tcl_Preserve(warpWindow);
+	    }
+	    if (dispPtr->warpWindow) {
+		Tcl_Release(dispPtr->warpWindow);
+	    }
+	    dispPtr->warpWindow = warpWindow;
+	}
 	dispPtr->warpMainwin = mainWin;
 	dispPtr->warpX = event.general.xmotion.x;
 	dispPtr->warpY = event.general.xmotion.y;
     }
 
@@ -3547,10 +3570,15 @@
             (Tk_IsMapped(dispPtr->warpWindow)
             && (Tk_WindowId(dispPtr->warpWindow) != None))) {
         TkpWarpPointer(dispPtr);
         XForceScreenSaver(dispPtr->display, ScreenSaverReset);
     }
+
+    if (dispPtr->warpWindow) {
+	Tcl_Release(dispPtr->warpWindow);
+	dispPtr->warpWindow = None;
+    }
     dispPtr->flags &= ~TK_DISPLAY_IN_WARP;
 }
 
 /*
  *-------------------------------------------------------------------------
@@ -3947,11 +3975,11 @@
 	    p++;
 	}
 	p = GetField(p, field, FIELD_SIZE);
     }
     if (*field != '\0') {
-	if ((*field >= '1') && (*field <= '5') && (field[1] == '\0')) {
+	if ((*field >= '1') && (*field <= '9') && (field[1] == '\0')) {
 	    if (eventFlags == 0) {
 		patPtr->eventType = ButtonPress;
 		eventMask = ButtonPressMask;
 	    } else if (eventFlags & KEY) {
 		goto getKeysym;
@@ -4286,13 +4314,40 @@
    TkWindow *winPtr = (TkWindow *) Tk_MainWindow(interp);
    BindingTable *bindPtr = winPtr->mainPtr->bindingTable;
 
    return &(bindPtr->eventRing[bindPtr->curEvent]);
 }
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * TkpCancelWarp --
+ *
+ *	This function cancels an outstanding pointer warp and
+ *	is called during tear down of the display.
+ *
+ * Results:
+ *	None.
+ *
+ * Side effects:
+ *	None.
+ *
+ *----------------------------------------------------------------------
+ */
+
+void
+TkpCancelWarp(
+    TkDisplay *dispPtr)
+{
+    if (dispPtr->flags & TK_DISPLAY_IN_WARP) {
+	Tcl_CancelIdleCall(DoWarp, dispPtr);
+	dispPtr->flags &= ~TK_DISPLAY_IN_WARP;
+    }
+}
 
 /*
  * Local Variables:
  * mode: c
  * c-basic-offset: 4
  * fill-column: 78
  * End:
  */

Index: generic/tkBusy.c
==================================================================
--- generic/tkBusy.c
+++ generic/tkBusy.c
@@ -15,20 +15,18 @@
 #include "tkInt.h"
 #include "tkBusy.h"
 #include "default.h"
 
 /*
- * Things about the busy system that may be configured. Note that currently on
- * OSX/Aqua, that's nothing at all.
+ * Things about the busy system that may be configured. Note that on some
+ * platforms this may or may not have an effect.
  */
 
 static const Tk_OptionSpec busyOptionSpecs[] = {
-#ifndef MAC_OSX_TK
     {TK_OPTION_CURSOR, "-cursor", "cursor", "Cursor",
 	DEF_BUSY_CURSOR, -1, Tk_Offset(Busy, cursor),
 	TK_OPTION_NULL_OK, 0, 0},
-#endif
     {TK_OPTION_END, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0}
 };
 
 /*
  * Forward declarations of functions defined in this file.
@@ -571,11 +569,11 @@
     busyPtr->x = Tk_X(tkRef);
     busyPtr->y = Tk_Y(tkRef);
     busyPtr->cursor = None;
     Tk_SetClass(tkBusy, "Busy");
     busyPtr->optionTable = Tk_CreateOptionTable(interp, busyOptionSpecs);
-    if (Tk_InitOptions(interp, (char *) busyPtr, busyPtr->optionTable,
+    if (Tk_InitOptions(interp, busyPtr, busyPtr->optionTable,
 	    tkBusy) != TCL_OK) {
 	Tk_DestroyWindow(tkBusy);
 	return NULL;
     }
     SetWindowInstanceData(tkBusy, busyPtr);
@@ -638,11 +636,11 @@
     int objc,
     Tcl_Obj *const objv[])
 {
     Tk_Cursor oldCursor = busyPtr->cursor;
 
-    if (Tk_SetOptions(interp, (char *) busyPtr, busyPtr->optionTable, objc,
+    if (Tk_SetOptions(interp, busyPtr, busyPtr->optionTable, objc,
 	    objv, busyPtr->tkBusy, NULL, NULL) != TCL_OK) {
 	return TCL_ERROR;
     }
     if (busyPtr->cursor != oldCursor) {
 	if (busyPtr->cursor == None) {
@@ -761,10 +759,13 @@
     if (Tk_IsMapped(busyPtr->tkRef)) {
 	TkpShowBusyWindow(busyPtr);
     } else {
 	TkpHideBusyWindow(busyPtr);
     }
+    if (result == TCL_OK) {
+        Tcl_SetObjResult(interp, Tcl_NewStringObj(Tk_PathName(busyPtr->tkBusy), -1));
+    }
     return result;
 }
 
 /*
  *----------------------------------------------------------------------
@@ -794,15 +795,16 @@
     Tcl_HashTable *busyTablePtr = &((TkWindow *) tkwin)->mainPtr->busyTable;
     Busy *busyPtr;
     Tcl_Obj *objPtr;
     int index, result = TCL_OK;
     static const char *const optionStrings[] = {
-	"cget", "configure", "current", "forget", "hold", "status", NULL
+	"busywindow", "cget", "configure", "current", "forget", "hold",
+        "status", NULL
     };
     enum options {
-	BUSY_CGET, BUSY_CONFIGURE, BUSY_CURRENT, BUSY_FORGET, BUSY_HOLD,
-	BUSY_STATUS
+	BUSY_BUSYWINDOW, BUSY_CGET, BUSY_CONFIGURE, BUSY_CURRENT, BUSY_FORGET,
+	BUSY_HOLD, BUSY_STATUS
     };
 
     if (objc < 2) {
 	Tcl_WrongNumArgs(interp, 1, objv, "options ?arg arg ...?");
 	return TCL_ERROR;
@@ -823,10 +825,23 @@
     if (Tcl_GetIndexFromObjStruct(interp, objv[1], optionStrings,
 	    sizeof(char *), "option", 0, &index) != TCL_OK) {
 	return TCL_ERROR;
     }
     switch ((enum options) index) {
+    case BUSY_BUSYWINDOW:
+	if (objc != 3) {
+	    Tcl_WrongNumArgs(interp, 2, objv, "window");
+	    return TCL_ERROR;
+	}
+	busyPtr = GetBusy(interp, busyTablePtr, objv[2]);
+	if (busyPtr == NULL) {
+	    Tcl_ResetResult(interp);
+            return TCL_OK;
+	}
+        Tcl_SetObjResult(interp, Tcl_NewStringObj(Tk_PathName(busyPtr->tkBusy), -1));
+        return TCL_OK;
+
     case BUSY_CGET:
 	if (objc != 4) {
 	    Tcl_WrongNumArgs(interp, 2, objv, "window option");
 	    return TCL_ERROR;
 	}
@@ -833,11 +848,11 @@
 	busyPtr = GetBusy(interp, busyTablePtr, objv[2]);
 	if (busyPtr == NULL) {
 	    return TCL_ERROR;
 	}
 	Tcl_Preserve(busyPtr);
-	objPtr = Tk_GetOptionValue(interp, (char *) busyPtr,
+	objPtr = Tk_GetOptionValue(interp, busyPtr,
 		busyPtr->optionTable, objv[3], busyPtr->tkBusy);
 	if (objPtr == NULL) {
 	    result = TCL_ERROR;
 	} else {
 	    Tcl_SetObjResult(interp, objPtr);
@@ -854,11 +869,11 @@
 	if (busyPtr == NULL) {
 	    return TCL_ERROR;
 	}
 	Tcl_Preserve(busyPtr);
 	if (objc <= 4) {
-	    objPtr = Tk_GetOptionInfo(interp, (char *) busyPtr,
+	    objPtr = Tk_GetOptionInfo(interp, busyPtr,
 		    busyPtr->optionTable, (objc == 4) ? objv[3] : NULL,
 		    busyPtr->tkBusy);
 	    if (objPtr == NULL) {
 		result = TCL_ERROR;
 	    } else {

Index: generic/tkButton.c
==================================================================
--- generic/tkButton.c
+++ generic/tkButton.c
@@ -747,11 +747,11 @@
 
     Tk_CreateEventHandler(butPtr->tkwin,
 	    ExposureMask|StructureNotifyMask|FocusChangeMask,
 	    ButtonEventProc, butPtr);
 
-    if (Tk_InitOptions(interp, (char *) butPtr, optionTable, tkwin)
+    if (Tk_InitOptions(interp, butPtr, optionTable, tkwin)
 	    != TCL_OK) {
 	Tk_DestroyWindow(butPtr->tkwin);
 	return TCL_ERROR;
     }
     if (ConfigureButton(interp, butPtr, objc - 2, objv + 2) != TCL_OK) {
@@ -808,21 +808,21 @@
     case COMMAND_CGET:
 	if (objc != 3) {
 	    Tcl_WrongNumArgs(interp, 1, objv, "cget option");
 	    goto error;
 	}
-	objPtr = Tk_GetOptionValue(interp, (char *) butPtr,
+	objPtr = Tk_GetOptionValue(interp, butPtr,
 		butPtr->optionTable, objv[2], butPtr->tkwin);
 	if (objPtr == NULL) {
 	    goto error;
 	}
 	Tcl_SetObjResult(interp, objPtr);
 	break;
 
     case COMMAND_CONFIGURE:
 	if (objc <= 3) {
-	    objPtr = Tk_GetOptionInfo(interp, (char *) butPtr,
+	    objPtr = Tk_GetOptionInfo(interp, butPtr,
 		    butPtr->optionTable, (objc == 3) ? objv[2] : NULL,
 		    butPtr->tkwin);
 	    if (objPtr == NULL) {
 		goto error;
 	    }
@@ -1066,11 +1066,11 @@
 	if (!error) {
 	    /*
 	     * First pass: set options to new values.
 	     */
 
-	    if (Tk_SetOptions(interp, (char *) butPtr,
+	    if (Tk_SetOptions(interp, butPtr,
 		    butPtr->optionTable, objc, objv,
 		    butPtr->tkwin, &savedOptions, NULL) != TCL_OK) {
 		continue;
 	    }
 	} else {
@@ -1607,10 +1607,23 @@
     int flags)			/* Information about what happened. */
 {
     register TkButton *butPtr = clientData;
     const char *value;
     Tcl_Obj *valuePtr;
+
+    /*
+     * See ticket [5d991b82].
+     */
+
+    if (butPtr->selVarNamePtr == NULL) {
+	if (!(flags & TCL_INTERP_DESTROYED)) {
+	    Tcl_UntraceVar2(interp, name1, name2,
+		    TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
+		    ButtonVarProc, clientData);
+	}
+	return NULL;
+    }
 
     /*
      * If the variable is being unset, then just re-establish the trace unless
      * the whole interpreter is going away.
      */
@@ -1690,20 +1703,33 @@
 	/* ARGSUSED */
 static char *
 ButtonTextVarProc(
     ClientData clientData,	/* Information about button. */
     Tcl_Interp *interp,		/* Interpreter containing variable. */
-    const char *name1,		/* Not used. */
-    const char *name2,		/* Not used. */
+    const char *name1,		/* Name of variable. */
+    const char *name2,		/* Second part of variable name. */
     int flags)			/* Information about what happened. */
 {
     TkButton *butPtr = clientData;
     Tcl_Obj *valuePtr;
 
     if (butPtr->flags & BUTTON_DELETED) {
 	return NULL;
     }
+
+    /*
+     * See ticket [5d991b82].
+     */
+
+    if (butPtr->textVarNamePtr == NULL) {
+	if (!(flags & TCL_INTERP_DESTROYED)) {
+	    Tcl_UntraceVar2(interp, name1, name2,
+		    TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
+		    ButtonTextVarProc, clientData);
+	}
+ 	return NULL;
+     }
 
     /*
      * If the variable is unset, then immediately recreate it unless the whole
      * interpreter is going away.
      */

Index: generic/tkCanvPs.c
==================================================================
--- generic/tkCanvPs.c
+++ generic/tkCanvPs.c
@@ -489,11 +489,11 @@
 	 */
 
 	Tcl_AppendObjToObj(psObj, preambleObj);
 
 	if (psInfo.chan != NULL) {
-	    if (Tcl_WriteObj(psInfo.chan, psObj) == -1) {
+	    if (Tcl_WriteObj(psInfo.chan, psObj) == TCL_IO_FAILURE) {
 	    channelWriteFailed:
 		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 			"problem writing postscript data to channel: %s",
 			Tcl_PosixError(interp)));
 		result = TCL_ERROR;
@@ -543,11 +543,11 @@
 		psInfo.x2, Tk_PostscriptY((double)psInfo.y2,
 			(Tk_PostscriptInfo)psInfoPtr),
 		psInfo.x, Tk_PostscriptY((double)psInfo.y2,
 			(Tk_PostscriptInfo)psInfoPtr));
 	if (psInfo.chan != NULL) {
-	    if (Tcl_WriteObj(psInfo.chan, psObj) == -1) {
+	    if (Tcl_WriteObj(psInfo.chan, psObj) == TCL_IO_FAILURE) {
 		goto channelWriteFailed;
 	    }
 	    Tcl_DecrRefCount(psObj);
 	    psObj = Tcl_NewObj();
 	}
@@ -585,11 +585,11 @@
 	Tcl_AppendToObj(psObj, "gsave\n", -1);
 	Tcl_AppendObjToObj(psObj, Tcl_GetObjResult(interp));
 	Tcl_AppendToObj(psObj, "grestore\n", -1);
 
 	if (psInfo.chan != NULL) {
-	    if (Tcl_WriteObj(psInfo.chan, psObj) == -1) {
+	    if (Tcl_WriteObj(psInfo.chan, psObj) == TCL_IO_FAILURE) {
 		goto channelWriteFailed;
 	    }
 	    Tcl_DecrRefCount(psObj);
 	    psObj = Tcl_NewObj();
 	}
@@ -606,11 +606,11 @@
 		"%%Trailer\n"
 		"end\n"
 		"%%EOF\n", -1);
 
 	if (psInfo.chan != NULL) {
-	    if (Tcl_WriteObj(psInfo.chan, psObj) == -1) {
+	    if (Tcl_WriteObj(psInfo.chan, psObj) == TCL_IO_FAILURE) {
 		goto channelWriteFailed;
 	    }
 	}
     }
 
@@ -823,11 +823,11 @@
     Tcl_DStringInit(&ds);
     points = Tk_PostscriptFontName(tkfont, &ds);
     fontname = Tcl_DStringValue(&ds);
     Tcl_AppendPrintfToObj(GetPostscriptBuffer(interp),
 	    "/%s findfont %d scalefont%s setfont\n",
-	    fontname, TkFontGetPoints(psInfoPtr->tkwin, points),
+	    fontname, (int)(TkFontGetPoints(psInfoPtr->tkwin, points) + 0.5),
 	    strncasecmp(fontname, "Symbol", 7) ? " ISOEncode" : "");
     Tcl_CreateHashEntry(&psInfoPtr->fontTable, Tcl_DStringValue(&ds), &i);
     Tcl_DStringFree(&ds);
 
     return TCL_OK;

Index: generic/tkCanvText.c
==================================================================
--- generic/tkCanvText.c
+++ generic/tkCanvText.c
@@ -1004,16 +1004,17 @@
     int index,			/* Character index before which string is to
 				 * be inserted. */
     Tcl_Obj *obj)		/* New characters to be inserted. */
 {
     TextItem *textPtr = (TextItem *) itemPtr;
-    int byteIndex, byteCount, charsAdded;
+    int byteIndex, charsAdded;
+    size_t byteCount;
     char *newStr, *text;
     const char *string;
     Tk_CanvasTextInfo *textInfoPtr = textPtr->textInfoPtr;
 
-    string = Tcl_GetStringFromObj(obj, &byteCount);
+    string = TkGetStringFromObj(obj, &byteCount);
 
     text = textPtr->text;
 
     if (index < 0) {
 	index = 0;
@@ -1341,15 +1342,15 @@
 				 * itemPtr's text. */
     int *indexPtr)		/* Where to store converted character
 				 * index. */
 {
     TextItem *textPtr = (TextItem *) itemPtr;
-    int length;
+    size_t length;
     int c;
     TkCanvas *canvasPtr = (TkCanvas *) canvas;
     Tk_CanvasTextInfo *textInfoPtr = textPtr->textInfoPtr;
-    const char *string = Tcl_GetStringFromObj(obj, &length);
+    const char *string = TkGetStringFromObj(obj, &length);
 
     c = string[0];
 
     if ((c == 'e') && (strncmp(string, "end", (unsigned) length) == 0)) {
 	*indexPtr = textPtr->numChars;

Index: generic/tkCanvUtil.c
==================================================================
--- generic/tkCanvUtil.c
+++ generic/tkCanvUtil.c
@@ -1134,11 +1134,13 @@
 	}
     }
     if (mask && (dash->number != 0)) {
 	gcValues->line_style = LineOnOffDash;
 	gcValues->dash_offset = outline->offset;
-	if (dash->number > 0) {
+	if ((unsigned int)ABS(dash->number) > sizeof(char *)) {
+	    gcValues->dashes = dash->pattern.pt[0];
+	} else if (dash->number != 0) {
 	    gcValues->dashes = dash->pattern.array[0];
 	} else {
 	    gcValues->dashes = (char) (4 * width + 0.5);
 	}
 	mask |= GCLineStyle|GCDashList|GCDashOffset;
@@ -1338,11 +1340,13 @@
     }
 
     if ((dash->number > 2) || (dash->number < -1) || (dash->number==2 &&
 	    (dash->pattern.array[0] != dash->pattern.array[1])) ||
 	    ((dash->number == -1) && (dash->pattern.array[0] != ','))) {
-    if (dash->number > 0) {
+	if ((unsigned int)ABS(dash->number) > sizeof(char *)) {
+	    dashList = dash->pattern.pt[0];
+	} else if (dash->number != 0) {
 	    dashList = dash->pattern.array[0];
 	} else {
 	    dashList = (char) (4 * width + 0.5);
 	}
 	XSetDashes(Canvas(canvas)->display, outline->gc, outline->offset,

Index: generic/tkCanvas.c
==================================================================
--- generic/tkCanvas.c
+++ generic/tkCanvas.c
@@ -13,13 +13,13 @@
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
 
 /* #define USE_OLD_TAG_SEARCH 1 */
 
-#include "default.h"
 #include "tkInt.h"
 #include "tkCanvas.h"
+#include "default.h"
 #ifdef TK_NO_DOUBLE_BUFFERING
 #ifdef MAC_OSX_TK
 #include "tkMacOSXInt.h"
 #endif
 #endif /* TK_NO_DOUBLE_BUFFERING */
@@ -266,10 +266,11 @@
 static void		CanvasWorldChanged(ClientData instanceData);
 static int		ConfigureCanvas(Tcl_Interp *interp,
 			    TkCanvas *canvasPtr, int argc,
 			    Tcl_Obj *const *argv, int flags);
 static void		DestroyCanvas(char *memPtr);
+static int              DrawCanvas(Tcl_Interp *interp, ClientData clientData, Tk_PhotoHandle photohandle, int subsample, int zoom);
 static void		DisplayCanvas(ClientData clientData);
 static void		DoItem(Tcl_Obj *accumObj,
 			    Tk_Item *itemPtr, Tk_Uid tag);
 static void		EventuallyRedrawItem(TkCanvas *canvasPtr,
 			    Tk_Item *itemPtr);
@@ -803,10 +804,11 @@
     static const char *const optionStrings[] = {
 	"addtag",	"bbox",		"bind",		"canvasx",
 	"canvasy",	"cget",		"configure",	"coords",
 	"create",	"dchars",	"delete",	"dtag",
 	"find",		"focus",	"gettags",	"icursor",
+        "image",
 	"imove",	"index",	"insert",	"itemcget",
 	"itemconfigure",
 	"lower",	"move",		"moveto",	"postscript",
 	"raise",	"rchars",	"scale",	"scan",
 	"select",	"type",		"xview",	"yview",
@@ -815,10 +817,11 @@
     enum options {
 	CANV_ADDTAG,	CANV_BBOX,	CANV_BIND,	CANV_CANVASX,
 	CANV_CANVASY,	CANV_CGET,	CANV_CONFIGURE,	CANV_COORDS,
 	CANV_CREATE,	CANV_DCHARS,	CANV_DELETE,	CANV_DTAG,
 	CANV_FIND,	CANV_FOCUS,	CANV_GETTAGS,	CANV_ICURSOR,
+        CANV_IMAGE,
 	CANV_IMOVE,	CANV_INDEX,	CANV_INSERT,	CANV_ITEMCGET,
 	CANV_ITEMCONFIGURE,
 	CANV_LOWER,	CANV_MOVE,	CANV_MOVETO,	CANV_POSTSCRIPT,
 	CANV_RAISE,	CANV_RCHARS,	CANV_SCALE,	CANV_SCAN,
 	CANV_SELECT,	CANV_TYPE,	CANV_XVIEW,	CANV_YVIEW
@@ -1184,12 +1187,12 @@
 
 	tmpObj = Tcl_NewListObj(2, objv+4);
 
 	FOR_EVERY_CANVAS_ITEM_MATCHING(objv[2], &searchPtr, goto doneImove) {
 	    int index;
-	    int x1,x2,y1,y2;
-	    int dontRedraw1,dontRedraw2;
+	    int x1, x2, y1, y2;
+	    int dontRedraw1, dontRedraw2;
 
 	    /*
 	     * The TK_MOVABLE_POINTS flag should only be set for types that
 	     * support the same semantics of index, dChars and insert methods
 	     * as lines and canvases.
@@ -1215,15 +1218,15 @@
 	    x1 = itemPtr->x1; y1 = itemPtr->y1;
 	    x2 = itemPtr->x2; y2 = itemPtr->y2;
 
 	    itemPtr->redraw_flags &= ~TK_ITEM_DONT_REDRAW;
 	    ItemDelChars(canvasPtr, itemPtr, index, index);
-	    dontRedraw1=itemPtr->redraw_flags & TK_ITEM_DONT_REDRAW;
+	    dontRedraw1 = itemPtr->redraw_flags & TK_ITEM_DONT_REDRAW;
 
 	    itemPtr->redraw_flags &= ~TK_ITEM_DONT_REDRAW;
 	    ItemInsert(canvasPtr, itemPtr, index, tmpObj);
-	    dontRedraw2=itemPtr->redraw_flags & TK_ITEM_DONT_REDRAW;
+	    dontRedraw2 = itemPtr->redraw_flags & TK_ITEM_DONT_REDRAW;
 
 	    if (!(dontRedraw1 && dontRedraw2)) {
 		Tk_CanvasEventuallyRedraw((Tk_Canvas) canvasPtr,
 			x1, y1, x2, y2);
 		EventuallyRedrawItem(canvasPtr, itemPtr);
@@ -1247,12 +1250,11 @@
 	if (objc < 3) {
 	    Tcl_WrongNumArgs(interp, 2, objv, "type coords ?arg ...?");
 	    result = TCL_ERROR;
 	    goto done;
 	}
-	arg = Tcl_GetString(objv[2]);
-	length = objv[2]->length;
+	arg = TkGetStringFromObj(objv[2], &length);
 	c = arg[0];
 
 	/*
 	 * Lock because the list of types is a global resource that could be
 	 * updated by another thread. That's fairly unlikely, but not
@@ -1332,11 +1334,11 @@
 	Tcl_SetObjResult(interp, Tcl_NewIntObj(itemPtr->id));
 	break;
     }
     case CANV_DCHARS: {
 	int first, last;
-	int x1,x2,y1,y2;
+	int x1, x2, y1, y2;
 
 	if ((objc != 4) && (objc != 5)) {
 	    Tcl_WrongNumArgs(interp, 2, objv, "tagOrId first ?last?");
 	    result = TCL_ERROR;
 	    goto done;
@@ -1360,11 +1362,11 @@
 	    }
 
 	    /*
 	     * Redraw both item's old and new areas: it's possible that a
 	     * delete could result in a new area larger than the old area.
-	     * Except if the insertProc sets the TK_ITEM_DONT_REDRAW flag,
+	     * Except if the dCharsProc sets the TK_ITEM_DONT_REDRAW flag,
 	     * nothing more needs to be done.
 	     */
 
 	    x1 = itemPtr->x1; y1 = itemPtr->y1;
 	    x2 = itemPtr->x2; y2 = itemPtr->y2;
@@ -1570,11 +1572,11 @@
 	Tcl_SetObjResult(interp, Tcl_NewIntObj(index));
 	break;
     }
     case CANV_INSERT: {
 	int beforeThis;
-	int x1,x2,y1,y2;
+	int x1, x2, y1, y2;
 
 	if (objc != 5) {
 	    Tcl_WrongNumArgs(interp, 2, objv, "tagOrId beforeThis string");
 	    result = TCL_ERROR;
 	    goto done;
@@ -1798,11 +1800,12 @@
 	RELINK_ITEMS(objv[2], prevPtr);
 	break;
     }
     case CANV_RCHARS: {
 	int first, last;
-	int x1,x2,y1,y2;
+	int x1, x2, y1, y2;
+	int dontRedraw1, dontRedraw2;
 
 	if (objc != 6) {
 	    Tcl_WrongNumArgs(interp, 2, objv, "tagOrId first last string");
 	    result = TCL_ERROR;
 	    goto done;
@@ -1829,16 +1832,20 @@
 	     * TK_ITEM_DONT_REDRAW flag, nothing more needs to be done.
 	     */
 
 	    x1 = itemPtr->x1; y1 = itemPtr->y1;
 	    x2 = itemPtr->x2; y2 = itemPtr->y2;
-	    itemPtr->redraw_flags &= ~TK_ITEM_DONT_REDRAW;
 
+            itemPtr->redraw_flags &= ~TK_ITEM_DONT_REDRAW;
 	    ItemDelChars(canvasPtr, itemPtr, first, last);
+	    dontRedraw1 = itemPtr->redraw_flags & TK_ITEM_DONT_REDRAW;
+
+            itemPtr->redraw_flags &= ~TK_ITEM_DONT_REDRAW;
 	    ItemInsert(canvasPtr, itemPtr, first, objv[5]);
+	    dontRedraw2 = itemPtr->redraw_flags & TK_ITEM_DONT_REDRAW;
 
-	    if (!(itemPtr->redraw_flags & TK_ITEM_DONT_REDRAW)) {
+            if (!(dontRedraw1 && dontRedraw2)) {
 		Tk_CanvasEventuallyRedraw((Tk_Canvas) canvasPtr,
 			x1, y1, x2, y2);
 		EventuallyRedrawItem(canvasPtr, itemPtr);
 	    }
 	    itemPtr->redraw_flags &= ~TK_ITEM_DONT_REDRAW;
@@ -2124,10 +2131,50 @@
 	    break;
 	}
 	CanvasSetOrigin(canvasPtr, canvasPtr->xOrigin, newY);
 	break;
     }
+    case CANV_IMAGE: {
+        Tk_PhotoHandle photohandle;
+        int subsample = 1, zoom = 1;
+
+        if (objc < 3 || objc > 5) {
+            Tcl_WrongNumArgs(interp, 2, objv, "imagename ?subsample? ?zoom?");
+            result = TCL_ERROR;
+            goto done;
+        }
+
+        if ((photohandle = Tk_FindPhoto(interp, Tcl_GetString(objv[2]) )) == 0) {
+            result = TCL_ERROR;
+            goto done;
+        }
+
+        /*
+         * If we are given a subsample or a zoom then grab them.
+         */
+
+        if (objc >= 4 && Tcl_GetIntFromObj(interp, objv[3], &subsample) != TCL_OK) {
+            result = TCL_ERROR;
+            goto done;
+        }
+        if (objc >= 5 && Tcl_GetIntFromObj(interp, objv[4], &zoom) != TCL_OK) {
+            result = TCL_ERROR;
+            goto done;
+        }
+
+        /*
+         * Set the image size to zero, which allows the DrawCanvas() function
+         * to expand the image automatically when it copies the pixmap into it.
+         */
+
+        if (Tk_PhotoSetSize(interp, photohandle, 0, 0) != TCL_OK) {
+            result = TCL_ERROR;
+            goto done;
+        }
+
+        result = DrawCanvas(interp, clientData, photohandle, subsample, zoom);
+    }
     }
 
   done:
 #ifndef USE_OLD_TAG_SEARCH
     TagSearchDestroy(searchPtr);
@@ -2409,10 +2456,504 @@
 	    canvasPtr->xOrigin, canvasPtr->yOrigin,
 	    canvasPtr->xOrigin + Tk_Width(canvasPtr->tkwin),
 	    canvasPtr->yOrigin + Tk_Height(canvasPtr->tkwin));
 }
 
+/*
+ *----------------------------------------------------------------------
+ *
+ * DecomposeMaskToShiftAndBits --
+ *
+ *      Given a 32 bit pixel mask, we find the position of the lowest bit and the
+ *      width of the mask bits.
+ *
+ * Results:
+ *	None.
+ *
+ * Side effects:
+*       None.
+ *
+ *----------------------------------------------------------------------
+ */
+static void
+DecomposeMaskToShiftAndBits(
+    unsigned long mask,     /* The pixel mask to examine */
+    int *shift,             /* Where to put the shift count (position of lowest bit) */
+    int *bits)              /* Where to put the bit count (width of the pixel mask) */
+{
+    int i;
+
+    *shift = 0;
+    *bits = 0;
+
+    /*
+     * Find the lowest '1' bit in the mask.
+     */
+
+    for (i = 0; i < 32; ++i) {
+        if (mask & 1 << i)
+            break;
+    }
+    if (i < 32) {
+        *shift = i;
+
+        /*
+        * Now find the next '0' bit and the width of the mask.
+        */
+
+        for ( ; i < 32; ++i) {
+            if ((mask & 1 << i) == 0)
+                break;
+            else
+                ++*bits;
+        }
+
+        /*
+        * Limit to the top 8 bits if the mask was wider than 8.
+        */
+
+        if (*bits > 8) {
+            *shift += *bits - 8;
+            *bits = 8;
+        }
+    }
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * DrawCanvas --
+ *
+ *      This function draws the contents of a canvas into the given Photo image.
+ *      This function is called from the widget "image" subcommand.
+ *      The canvas does not need to be mapped (one of it's ancestors must be)
+ *      in order for this function to work.
+ *
+ * Results:
+ *	None.
+ *
+ * Side effects:
+ *      Canvas contents from within the -scrollregion or widget size are rendered
+ *      into the Photo. Any errors are left in the result.
+ *
+ *----------------------------------------------------------------------
+ */
+
+#define OVERDRAW_PIXELS 32        /* How much larger we make the pixmap
+                                   * that the canvas objects are drawn into */
+
+/* From stackoverflow.com/questions/2100331/c-macro-definition-to-determine-big-endian-or-little-endian-machine */
+#define IS_BIG_ENDIAN (*(unsigned short *)"\0\xff" < 0x100)
+
+#define BYTE_SWAP16(n) ((((unsigned short)n)>>8) | (((unsigned short)n)<<8))
+#define BYTE_SWAP32(n) (((n>>24)&0x000000FF) | ((n<<8)&0x00FF0000) | ((n>>8)&0x0000FF00) | ((n<<24)&0xFF000000))
+
+static int
+DrawCanvas(
+    Tcl_Interp *interp,           /* As passed to the widget command, and we will leave errors here */
+    ClientData clientData,
+    Tk_PhotoHandle photohandle,   /* The photo we are rendering into */
+    int subsample,                /* If either subsample or zoom are not 1 then we call Tk_PhotoPutZoomedBlock() */
+    int zoom)
+{
+    TkCanvas * canvasPtr = clientData;
+    Tk_Window tkwin;
+    Display *displayPtr;
+    Tk_PhotoImageBlock blockPtr = {0};
+    Window wid;
+    Tk_Item * itemPtr;
+    Pixmap pixmap = 0;
+    XImage *ximagePtr = NULL;
+    Visual *visualPtr;
+    GC xgc = 0;
+    XGCValues xgcValues;
+    int canvasX1, canvasY1, canvasX2, canvasY2, cWidth, cHeight,
+        pixmapX1, pixmapY1, pixmapX2, pixmapY2, pmWidth, pmHeight,
+        bitsPerPixel, bytesPerPixel, x, y, result = TCL_OK,
+        rshift, gshift, bshift, rbits, gbits, bbits;
+
+#ifdef DEBUG_DRAWCANVAS
+    char buffer[128];
+#endif
+
+    if ((tkwin = canvasPtr->tkwin) == NULL) {
+        Tcl_AppendResult(interp, "canvas tkwin is NULL!", NULL);
+        result = TCL_ERROR;
+        goto done;
+    }
+
+    /*
+     * If this canvas is unmapped, then we won't have a window id, so we will
+     * try the ancestors of the canvas until we find a window that has a
+     * valid window id. The Tk_GetPixmap() call requires a valid window id.
+     */
+
+    do {
+
+        if ((displayPtr = Tk_Display(tkwin)) == NULL) {
+            Tcl_AppendResult(interp, "canvas (or parent) display is NULL!", NULL);
+            result = TCL_ERROR;
+            goto done;
+        }
+
+        if ((wid = Tk_WindowId(tkwin)) != 0) {
+            continue;
+        }
+
+        if ((tkwin = Tk_Parent(tkwin)) == NULL) {
+            Tcl_AppendResult(interp, "canvas has no parent with a valid window id! Is the toplevel window mapped?", NULL);
+            result = TCL_ERROR;
+            goto done;
+        }
+
+    } while (wid == 0);
+
+    bitsPerPixel = Tk_Depth(tkwin);
+    visualPtr = Tk_Visual(tkwin);
+
+    if (subsample == 0) {
+        Tcl_AppendResult(interp, "subsample cannot be zero", NULL);
+        result = TCL_ERROR;
+        goto done;
+    }
+
+    /*
+    * Scan through the item list, registering the bounding box for all items
+    * that didn't do that for the final coordinates yet. This can be
+    * determined by the FORCE_REDRAW flag.
+    */
+
+    for (itemPtr = canvasPtr -> firstItemPtr; itemPtr != NULL;
+            itemPtr = itemPtr -> nextPtr) {
+        if (itemPtr -> redraw_flags & FORCE_REDRAW) {
+            itemPtr -> redraw_flags &= ~FORCE_REDRAW;
+            EventuallyRedrawItem(canvasPtr, itemPtr);
+            itemPtr -> redraw_flags &= ~FORCE_REDRAW;
+        }
+    }
+
+    /*
+     * The DisplayCanvas() function works out the region that needs redrawing,
+     * but we don't do this. We grab the whole scrollregion or canvas window
+     * area. If we have a defined -scrollregion we use that as the drawing
+     * region, otherwise use the canvas window height and width with an origin
+     * of 0,0.
+     */
+    if (canvasPtr->scrollX1 != 0 || canvasPtr->scrollY1 != 0 ||
+            canvasPtr->scrollX2 != 0 || canvasPtr->scrollY2 != 0) {
+
+        canvasX1 = canvasPtr->scrollX1;
+        canvasY1 = canvasPtr->scrollY1;
+        canvasX2 = canvasPtr->scrollX2;
+        canvasY2 = canvasPtr->scrollY2;
+        cWidth = canvasX2 - canvasX1 + 1;
+        cHeight = canvasY2 - canvasY1 + 1;
+
+    } else {
+
+        cWidth = Tk_Width(tkwin);
+        cHeight = Tk_Height(tkwin);
+        canvasX1 = 0;
+        canvasY1 = 0;
+        canvasX2 = canvasX1 + cWidth - 1;
+        canvasY2 = canvasY1 + cHeight - 1;
+    }
+
+    /*
+     * Allocate a pixmap to draw into. We add OVERDRAW_PIXELS in the same way
+     * that DisplayCanvas() does to avoid problems on some systems when objects
+     * are being drawn too close to the edge.
+     */
+
+    pixmapX1 = canvasX1 - OVERDRAW_PIXELS;
+    pixmapY1 = canvasY1 - OVERDRAW_PIXELS;
+    pixmapX2 = canvasX2 + OVERDRAW_PIXELS;
+    pixmapY2 = canvasY2 + OVERDRAW_PIXELS;
+    pmWidth = pixmapX2 - pixmapX1 + 1;
+    pmHeight = pixmapY2 - pixmapY1 + 1;
+    if ((pixmap = Tk_GetPixmap(displayPtr, Tk_WindowId(tkwin), pmWidth, pmHeight,
+            bitsPerPixel)) == 0) {
+        Tcl_AppendResult(interp, "failed to create drawing Pixmap", NULL);
+        result = TCL_ERROR;
+        goto done;
+    }
+
+    /*
+     * Before we can draw the canvas objects into the pixmap it's background
+     * should be filled with canvas background colour.
+     */
+
+    xgcValues.function = GXcopy;
+    xgcValues.foreground = Tk_3DBorderColor(canvasPtr->bgBorder)->pixel;
+    xgc = XCreateGC(displayPtr, pixmap, GCFunction|GCForeground, &xgcValues);
+    XFillRectangle(displayPtr,pixmap,xgc,0,0,pmWidth,pmHeight);
+
+    /*
+     * Draw all the cavas items into the pixmap
+     */
+
+    canvasPtr->drawableXOrigin = pixmapX1;
+    canvasPtr->drawableYOrigin = pixmapY1;
+    for (itemPtr = canvasPtr->firstItemPtr; itemPtr != NULL;
+            itemPtr = itemPtr->nextPtr) {
+        if ((itemPtr->x1 >= pixmapX2) || (itemPtr->y1 >= pixmapY2) ||
+                (itemPtr->x2 < pixmapX1) || (itemPtr->y2 < pixmapY1)) {
+            if (!AlwaysRedraw(itemPtr)) {
+                continue;
+            }
+        }
+        if (itemPtr->state == TK_STATE_HIDDEN ||
+                (itemPtr->state == TK_STATE_NULL && canvasPtr->canvas_state
+                == TK_STATE_HIDDEN)) {
+            continue;
+        }
+        ItemDisplay(canvasPtr, itemPtr, pixmap, pixmapX1, pixmapY1, pmWidth,
+                pmHeight);
+    }
+
+    /*
+     * Copy the Pixmap into an ZPixmap format XImage so we can copy it across
+     * to the photo image. This seems to be the only way to get Pixmap image
+     * data out of an image. Note we have to account for the OVERDRAW_PIXELS
+     * border width.
+     */
+
+    if ((ximagePtr = XGetImage(displayPtr, pixmap, -pixmapX1, -pixmapY1, cWidth,
+            cHeight, AllPlanes, ZPixmap)) == NULL) {
+        Tcl_AppendResult(interp, "failed to copy Pixmap to XImage", NULL);
+        result = TCL_ERROR;
+        goto done;
+    }
+
+#ifdef DEBUG_DRAWCANVAS
+    Tcl_AppendResult(interp, "ximagePtr {", NULL);
+    sprintf(buffer,"%d",ximagePtr->width);   Tcl_AppendResult(interp, " width ", buffer, NULL);
+    sprintf(buffer,"%d",ximagePtr->height);  Tcl_AppendResult(interp, " height ", buffer, NULL);
+    sprintf(buffer,"%d",ximagePtr->xoffset); Tcl_AppendResult(interp, " xoffset ", buffer, NULL);
+    sprintf(buffer,"%d",ximagePtr->format);  Tcl_AppendResult(interp, " format ", buffer, NULL);
+                                             Tcl_AppendResult(interp, " ximagePtr->data", NULL);
+    if (ximagePtr->data != NULL) {
+	int ix, iy;
+
+        Tcl_AppendResult(interp, " {", NULL);
+	for (iy = 0; iy < ximagePtr->height; ++ iy) {
+	    Tcl_AppendResult(interp, " {", NULL);
+	    for (ix = 0; ix < ximagePtr->bytes_per_line; ++ ix) {
+	        if (ix > 0) {
+                    if (ix % 4 == 0)
+                        Tcl_AppendResult(interp, "-", NULL);
+                    else
+                        Tcl_AppendResult(interp, " ", NULL);
+                }
+	        sprintf(buffer,"%2.2x",ximagePtr->data[ximagePtr->bytes_per_line * iy + ix]&0xFF);
+	        Tcl_AppendResult(interp, buffer, NULL);
+	    }
+	    Tcl_AppendResult(interp, " }", NULL);
+	}
+	Tcl_AppendResult(interp, " }", NULL);
+    } else
+	sprintf(buffer," NULL");
+    sprintf(buffer,"%d",ximagePtr->byte_order);       Tcl_AppendResult(interp, " byte_order ", buffer, NULL);
+    sprintf(buffer,"%d",ximagePtr->bitmap_unit);      Tcl_AppendResult(interp, " bitmap_unit ", buffer, NULL);
+    sprintf(buffer,"%d",ximagePtr->bitmap_bit_order); Tcl_AppendResult(interp, " bitmap_bit_order ", buffer, NULL);
+    sprintf(buffer,"%d",ximagePtr->bitmap_pad);       Tcl_AppendResult(interp, " bitmap_pad ", buffer, NULL);
+    sprintf(buffer,"%d",ximagePtr->depth);            Tcl_AppendResult(interp, " depth ", buffer, NULL);
+    sprintf(buffer,"%d",ximagePtr->bytes_per_line);   Tcl_AppendResult(interp, " bytes_per_line ", buffer, NULL);
+    sprintf(buffer,"%d",ximagePtr->bits_per_pixel);   Tcl_AppendResult(interp, " bits_per_pixel ", buffer, NULL);
+    sprintf(buffer,"0x%8.8lx",ximagePtr->red_mask);   Tcl_AppendResult(interp, " red_mask ", buffer, NULL);
+    sprintf(buffer,"0x%8.8lx",ximagePtr->green_mask); Tcl_AppendResult(interp, " green_mask ", buffer, NULL);
+    sprintf(buffer,"0x%8.8lx",ximagePtr->blue_mask);  Tcl_AppendResult(interp, " blue_mask ", buffer, NULL);
+    Tcl_AppendResult(interp, " }", NULL);
+
+    Tcl_AppendResult(interp, "\nvisualPtr {", NULL);
+    sprintf(buffer,"0x%8.8lx",visualPtr->red_mask);   Tcl_AppendResult(interp, " red_mask ", buffer, NULL);
+    sprintf(buffer,"0x%8.8lx",visualPtr->green_mask); Tcl_AppendResult(interp, " green_mask ", buffer, NULL);
+    sprintf(buffer,"0x%8.8lx",visualPtr->blue_mask);  Tcl_AppendResult(interp, " blue_mask ", buffer, NULL);
+    Tcl_AppendResult(interp, " }", NULL);
+
+#endif
+
+    /*
+     * Fill in the PhotoImageBlock structure abd allocate a block of memory
+     * for the converted image data. Note we allocate an alpha channel even
+     * though we don't use one, because this layout helps Tk_PhotoPutBlock()
+     * use memcpy() instead of the slow pixel or line copy.
+     */
+
+    blockPtr.width = cWidth;
+    blockPtr.height = cHeight;
+    blockPtr.pixelSize = 4;
+    blockPtr.pitch = blockPtr.pixelSize * blockPtr.width;
+    blockPtr.offset[0] = 0;
+    blockPtr.offset[1] = 1;
+    blockPtr.offset[2] = 2;
+    blockPtr.offset[3] = 3;
+    blockPtr.pixelPtr = ckalloc(blockPtr.pixelSize * blockPtr.height * blockPtr.width);
+
+    /*
+     * Now convert the image data pixel by pixel from XImage to 32bit RGBA
+     * format suitable for Tk_PhotoPutBlock().
+     */
+
+    DecomposeMaskToShiftAndBits(visualPtr->red_mask,&rshift,&rbits);
+    DecomposeMaskToShiftAndBits(visualPtr->green_mask,&gshift,&gbits);
+    DecomposeMaskToShiftAndBits(visualPtr->blue_mask,&bshift,&bbits);
+
+#ifdef DEBUG_DRAWCANVAS
+    sprintf(buffer,"%d",rshift); Tcl_AppendResult(interp, "\nbits { rshift ", buffer, NULL);
+    sprintf(buffer,"%d",gshift); Tcl_AppendResult(interp, " gshift ", buffer, NULL);
+    sprintf(buffer,"%d",bshift); Tcl_AppendResult(interp, " bshift ", buffer, NULL);
+    sprintf(buffer,"%d",rbits);  Tcl_AppendResult(interp, " rbits ", buffer, NULL);
+    sprintf(buffer,"%d",gbits);  Tcl_AppendResult(interp, " gbits ", buffer, NULL);
+    sprintf(buffer,"%d",bbits);  Tcl_AppendResult(interp, " bbits ", buffer, " }", NULL);
+    Tcl_AppendResult(interp, "\nConverted_image {", NULL);
+#endif
+
+    /* Ok, had to use ximagePtr->bits_per_pixel here and in the switch (...)
+     * below to get this to work on Windows. X11 correctly sets the bitmap
+     *_pad and bitmap_unit fields to 32, but on Windows they are 0 and 8
+     * respectively!
+     */
+
+    bytesPerPixel = ximagePtr->bits_per_pixel/8;
+    for (y = 0; y < blockPtr.height; ++y) {
+
+#ifdef DEBUG_DRAWCANVAS
+        Tcl_AppendResult(interp, " {", NULL);
+#endif
+
+        for(x = 0; x < blockPtr.width; ++x) {
+            unsigned long pixel = 0;
+
+            switch (ximagePtr->bits_per_pixel) {
+
+                /*
+                 * Get an 8 bit pixel from the XImage.
+                 */
+
+                case 8 :
+                    pixel = *((unsigned char *)(ximagePtr->data + bytesPerPixel * x
+                            + ximagePtr->bytes_per_line * y));
+                    break;
+
+                /*
+                 * Get a 16 bit pixel from the XImage, and correct the
+                 * byte order as necessary.
+                 */
+
+                case 16 :
+                    pixel = *((unsigned short *)(ximagePtr->data + bytesPerPixel * x
+                            + ximagePtr->bytes_per_line * y));
+                    if ((IS_BIG_ENDIAN && ximagePtr->byte_order == LSBFirst)
+                            || (!IS_BIG_ENDIAN && ximagePtr->byte_order == MSBFirst))
+                        pixel = BYTE_SWAP16(pixel);
+                    break;
+
+                /*
+                 * Grab a 32 bit pixel from the XImage, and correct the
+                 * byte order as necessary.
+                 */
+
+                case 32 :
+                    pixel = *((unsigned long *)(ximagePtr->data + bytesPerPixel * x
+                            + ximagePtr->bytes_per_line * y));
+                    if ((IS_BIG_ENDIAN && ximagePtr->byte_order == LSBFirst)
+                            || (!IS_BIG_ENDIAN && ximagePtr->byte_order == MSBFirst))
+                        pixel = BYTE_SWAP32(pixel);
+                    break;
+            }
+
+            /*
+             * We have a pixel with the correct byte order, so pull out the
+             * colours and place them in the photo block. Perhaps we could
+             * just not bother with the alpha byte because we are using
+             * TK_PHOTO_COMPOSITE_SET later?
+             * ***Windows: We have to swap the red and blue values. The
+             * XImage storage is B - G - R - A which becomes a 32bit ARGB
+             * quad. However the visual mask is a 32bit ABGR quad. And
+             * Tk_PhotoPutBlock() wants R-G-B-A which is a 32bit ABGR quad.
+             * If the visual mask was correct there would be no need to
+             * swap anything here.
+             */
+
+#ifdef _WIN32
+#define   R_OFFSET 2
+#define   B_OFFSET 0
+#else
+#define   R_OFFSET 0
+#define   B_OFFSET 2
+#endif
+            blockPtr.pixelPtr[blockPtr.pitch * y + blockPtr.pixelSize * x + R_OFFSET] =
+                    (unsigned char)((pixel & visualPtr->red_mask) >> rshift);
+            blockPtr.pixelPtr[blockPtr.pitch * y + blockPtr.pixelSize * x +1] =
+                    (unsigned char)((pixel & visualPtr->green_mask) >> gshift);
+            blockPtr.pixelPtr[blockPtr.pitch * y + blockPtr.pixelSize * x + B_OFFSET] =
+                    (unsigned char)((pixel & visualPtr->blue_mask) >> bshift);
+            blockPtr.pixelPtr[blockPtr.pitch * y + blockPtr.pixelSize * x +3] = 0xFF;
+
+#ifdef DEBUG_DRAWCANVAS
+            {
+		int ix;
+                if (x > 0)
+                    Tcl_AppendResult(interp, "-", NULL);
+	        for (ix = 0; ix < 4; ++ix) {
+                    if (ix > 0)
+                        Tcl_AppendResult(interp, " ", NULL);
+		    sprintf(buffer,"%2.2x",blockPtr.pixelPtr[blockPtr.pitch * y
+                            + blockPtr.pixelSize * x + ix]&0xFF);
+                    Tcl_AppendResult(interp, buffer, NULL);
+                }
+            }
+#endif
+
+        }
+
+#ifdef DEBUG_DRAWCANVAS
+        Tcl_AppendResult(interp, " }", NULL);
+#endif
+
+    }
+
+#ifdef DEBUG_DRAWCANVAS
+    Tcl_AppendResult(interp, " }", NULL);
+#endif
+
+    /*
+     * Now put the copied pixmap into the photo.
+     * If either zoom or subsample are not 1, we use the zoom function.
+     */
+
+    if (subsample != 1 || zoom != 1) {
+        if ((result = Tk_PhotoPutZoomedBlock(interp, photohandle, &blockPtr,
+                0, 0, cWidth * zoom / subsample, cHeight * zoom / subsample,
+                zoom, zoom, subsample, subsample, TK_PHOTO_COMPOSITE_SET))
+                != TCL_OK) {
+            goto done;
+        }
+    } else {
+        if ((result = Tk_PhotoPutBlock(interp, photohandle, &blockPtr, 0, 0,
+            cWidth, cHeight, TK_PHOTO_COMPOSITE_SET)) != TCL_OK) {
+            goto done;
+        }
+    }
+
+    /*
+     * Clean up anything we have allocated and exit.
+     */
+
+done:
+    if (blockPtr.pixelPtr)
+        ckfree(blockPtr.pixelPtr);
+    if (pixmap)
+        Tk_FreePixmap(Tk_Display(tkwin), pixmap);
+    if (ximagePtr)
+        XDestroyImage(ximagePtr);
+    if (xgc)
+        XFreeGC(displayPtr,xgc);
+    return result;
+}
+
 /*
  *----------------------------------------------------------------------
  *
  * DisplayCanvas --
  *

Index: generic/tkClipboard.c
==================================================================
--- generic/tkClipboard.c
+++ generic/tkClipboard.c
@@ -447,14 +447,15 @@
 	const char *string;
 	static const char *const appendOptionStrings[] = {
 	    "-displayof", "-format", "-type", NULL
 	};
 	enum appendOptions { APPEND_DISPLAYOF, APPEND_FORMAT, APPEND_TYPE };
-	int subIndex, length;
+	int subIndex;
+	size_t length;
 
 	for (i = 2; i < objc - 1; i++) {
-	    string = Tcl_GetStringFromObj(objv[i], &length);
+	    string = TkGetStringFromObj(objv[i], &length);
 	    if (string[0] != '-') {
 		break;
 	    }
 
 	    /*

Index: generic/tkCmds.c
==================================================================
--- generic/tkCmds.c
+++ generic/tkCmds.c
@@ -99,10 +99,11 @@
 	"-displayof", "-nice", NULL
     };
     enum options { TK_BELL_DISPLAYOF, TK_BELL_NICE };
     Tk_Window tkwin = clientData;
     int i, index, nice = 0;
+    Tk_ErrorHandler handler;
 
     if (objc > 4) {
     wrongArgs:
 	Tcl_WrongNumArgs(interp, 1, objv, "?-displayof window? ?-nice?");
 	return TCL_ERROR;
@@ -126,15 +127,17 @@
 	case TK_BELL_NICE:
 	    nice = 1;
 	    break;
 	}
     }
+    handler = Tk_CreateErrorHandler(Tk_Display(tkwin), -1, -1, -1, NULL, NULL);
     XBell(Tk_Display(tkwin), 0);
     if (!nice) {
 	XForceScreenSaver(Tk_Display(tkwin), ScreenSaverReset);
     }
     XFlush(Tk_Display(tkwin));
+    Tk_DeleteErrorHandler(handler);
     return TCL_OK;
 }
 
 /*
  *----------------------------------------------------------------------
@@ -2066,18 +2069,18 @@
 				 * option to "-displayof" argument, or
 				 * unmodified if "-displayof" argument was not
 				 * present. */
 {
     const char *string;
-    int length;
+    size_t length;
 
     if (objc < 1) {
 	return 0;
     }
-    string = Tcl_GetStringFromObj(objv[0], &length);
+    string = TkGetStringFromObj(objv[0], &length);
     if ((length >= 2) &&
-	    (strncmp(string, "-displayof", (unsigned) length) == 0)) {
+	    (strncmp(string, "-displayof", length) == 0)) {
         if (objc < 2) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		    "value for \"-displayof\" missing", -1));
 	    Tcl_SetErrorCode(interp, "TK", "NO_VALUE", "DISPLAYOF", NULL);
 	    return -1;

Index: generic/tkColor.c
==================================================================
--- generic/tkColor.c
+++ generic/tkColor.c
@@ -478,12 +478,11 @@
 
     if (tkColPtr->magic != COLOR_MAGIC) {
 	Tcl_Panic("Tk_FreeColor called with bogus color");
     }
 
-    tkColPtr->resourceRefCount--;
-    if (tkColPtr->resourceRefCount > 0) {
+    if (tkColPtr->resourceRefCount-- > 1) {
 	return;
     }
 
     /*
      * This color is no longer being actively used, so free the color
@@ -585,12 +584,11 @@
     Tcl_Obj *objPtr)		/* The object we are releasing. */
 {
     TkColor *tkColPtr = objPtr->internalRep.twoPtrValue.ptr1;
 
     if (tkColPtr != NULL) {
-	tkColPtr->objRefCount--;
-	if ((tkColPtr->objRefCount == 0)
+	if ((tkColPtr->objRefCount-- <= 1)
 		&& (tkColPtr->resourceRefCount == 0)) {
 	    ckfree(tkColPtr);
 	}
 	objPtr->internalRep.twoPtrValue.ptr1 = NULL;
     }
@@ -818,13 +816,13 @@
 	}
 	for ( ; (tkColPtr != NULL); tkColPtr = tkColPtr->nextPtr) {
 	    Tcl_Obj *objPtr = Tcl_NewObj();
 
 	    Tcl_ListObjAppendElement(NULL, objPtr,
-		    Tcl_NewIntObj(tkColPtr->resourceRefCount));
+		    Tcl_NewWideIntObj(tkColPtr->resourceRefCount));
 	    Tcl_ListObjAppendElement(NULL, objPtr,
-		    Tcl_NewIntObj(tkColPtr->objRefCount));
+		    Tcl_NewWideIntObj(tkColPtr->objRefCount));
 	    Tcl_ListObjAppendElement(NULL, resultPtr, objPtr);
 	}
     }
     return resultPtr;
 }

Index: generic/tkColor.h
==================================================================
--- generic/tkColor.h
+++ generic/tkColor.h
@@ -36,21 +36,21 @@
     Screen *screen;		/* Screen where this color is valid. Used to
 				 * delete it, and to find its display. */
     Colormap colormap;		/* Colormap from which this entry was
 				 * allocated. */
     Visual *visual;		/* Visual associated with colormap. */
-    int resourceRefCount;	/* Number of active uses of this color (each
+    TkSizeT resourceRefCount;	/* Number of active uses of this color (each
 				 * active use corresponds to a call to
 				 * Tk_AllocColorFromObj or Tk_GetColor). If
 				 * this count is 0, then this TkColor
 				 * structure is no longer valid and it isn't
 				 * present in a hash table: it is being kept
 				 * around only because there are objects
 				 * referring to it. The structure is freed
 				 * when resourceRefCount and objRefCount are
 				 * both 0. */
-    int objRefCount;		/* The number of Tcl objects that reference
+    TkSizeT objRefCount;		/* The number of Tcl objects that reference
 				 * this structure. */
     int type;			/* TK_COLOR_BY_NAME or TK_COLOR_BY_VALUE. */
     Tcl_HashEntry *hashPtr;	/* Pointer to hash table entry for this
 				 * structure. (for use in deleting entry). */
     struct TkColor *nextPtr;	/* Points to the next TkColor structure with

Index: generic/tkConfig.c
==================================================================
--- generic/tkConfig.c
+++ generic/tkConfig.c
@@ -89,11 +89,11 @@
  * One of the following exists for each Tk_OptionSpec array that has been
  * passed to Tk_CreateOptionTable.
  */
 
 typedef struct OptionTable {
-    int refCount;		/* Counts the number of uses of this table
+    size_t refCount;		/* Counts the number of uses of this table
 				 * (the number of times Tk_CreateOptionTable
 				 * has returned it). This can be greater than
 				 * 1 if it is shared along several option
 				 * table chains, or if the same table is used
 				 * for multiple purposes. */
@@ -101,11 +101,11 @@
 				 * used to delete the entry. */
     struct OptionTable *nextPtr;/* If templatePtr was part of a chain of
 				 * templates, this points to the table
 				 * corresponding to the next template in the
 				 * chain. */
-    int numOptions;		/* The number of items in the options array
+    size_t numOptions;		/* The number of items in the options array
 				 * below. */
     Option options[1];		/* Information about the individual options in
 				 * the table. This must be the last field in
 				 * the structure: the actual size of the array
 				 * will be numOptions, not 1. */
@@ -113,18 +113,18 @@
 
 /*
  * Forward declarations for functions defined later in this file:
  */
 
-static int		DoObjConfig(Tcl_Interp *interp, char *recordPtr,
+static int		DoObjConfig(Tcl_Interp *interp, void *recordPtr,
 			    Option *optionPtr, Tcl_Obj *valuePtr,
 			    Tk_Window tkwin, Tk_SavedOption *savePtr);
 static void		FreeResources(Option *optionPtr, Tcl_Obj *objPtr,
-			    char *internalPtr, Tk_Window tkwin);
-static Tcl_Obj *	GetConfigList(char *recordPtr,
+			    void *internalPtr, Tk_Window tkwin);
+static Tcl_Obj *	GetConfigList(void *recordPtr,
 			    Option *optionPtr, Tk_Window tkwin);
-static Tcl_Obj *	GetObjectForOption(char *recordPtr,
+static Tcl_Obj *	GetObjectForOption(void *recordPtr,
 			    Option *optionPtr, Tk_Window tkwin);
 static Option *		GetOption(const char *name, OptionTable *tablePtr);
 static Option *		GetOptionFromObj(Tcl_Interp *interp,
 			    Tcl_Obj *objPtr, OptionTable *tablePtr);
 static int		ObjectIsEmpty(Tcl_Obj *objPtr);
@@ -175,11 +175,11 @@
     Tcl_HashEntry *hashEntryPtr;
     int newEntry;
     OptionTable *tablePtr;
     const Tk_OptionSpec *specPtr, *specPtr2;
     Option *optionPtr;
-    int numOptions, i;
+    size_t numOptions, i;
     ThreadSpecificData *tsdPtr =
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     /*
      * We use an TSD in the thread to keep a hash table of
@@ -277,11 +277,11 @@
 
 		optionPtr->extra.custom = specPtr->clientData;
 	    }
 	}
 	if (((specPtr->type == TK_OPTION_STRING)
-		&& (specPtr->internalOffset >= 0))
+		&& (specPtr->internalOffset != TCL_AUTO_LENGTH))
 		|| (specPtr->type == TK_OPTION_COLOR)
 		|| (specPtr->type == TK_OPTION_FONT)
 		|| (specPtr->type == TK_OPTION_BITMAP)
 		|| (specPtr->type == TK_OPTION_BORDER)
 		|| (specPtr->type == TK_OPTION_CURSOR)
@@ -328,14 +328,13 @@
 Tk_DeleteOptionTable(
     Tk_OptionTable optionTable)	/* The option table to delete. */
 {
     OptionTable *tablePtr = (OptionTable *) optionTable;
     Option *optionPtr;
-    int count;
+    size_t count;
 
-    tablePtr->refCount--;
-    if (tablePtr->refCount > 0) {
+    if (tablePtr->refCount-- > 1) {
 	return;
     }
 
     if (tablePtr->nextPtr != NULL) {
 	Tk_DeleteOptionTable((Tk_OptionTable) tablePtr->nextPtr);
@@ -380,11 +379,11 @@
 
 int
 Tk_InitOptions(
     Tcl_Interp *interp,		/* Interpreter for error reporting. NULL means
 				 * don't leave an error message. */
-    char *recordPtr,		/* Pointer to the record to configure. Note:
+    void *recordPtr,		/* Pointer to the record to configure. Note:
 				 * the caller should have properly initialized
 				 * the record with NULL pointers for each
 				 * option value. */
     Tk_OptionTable optionTable,	/* The token which matches the config specs
 				 * for the widget in question. */
@@ -551,11 +550,11 @@
 static int
 DoObjConfig(
     Tcl_Interp *interp,		/* Interpreter for error reporting. If NULL,
 				 * then no message is left if an error
 				 * occurs. */
-    char *recordPtr,		/* The record to modify to hold the new option
+    void *recordPtr,		/* The record to modify to hold the new option
 				 * value. */
     Option *optionPtr,		/* Pointer to information about the option. */
     Tcl_Obj *valuePtr,		/* New value for option. */
     Tk_Window tkwin,		/* Window in which option will be used (needed
 				 * to allocate resources for some options).
@@ -567,14 +566,14 @@
 				 * be stored here, and it becomes the property
 				 * of the caller (the caller must eventually
 				 * free the old value). */
 {
     Tcl_Obj **slotPtrPtr, *oldPtr;
-    char *internalPtr;		/* Points to location in record where internal
+    void *internalPtr;		/* Points to location in record where internal
 				 * representation of value should be stored,
 				 * or NULL. */
-    char *oldInternalPtr;	/* Points to location in which to save old
+    void *oldInternalPtr;	/* Points to location in which to save old
 				 * internal representation of value. */
     Tk_SavedOption internal;	/* Used to save the old internal
 				 * representation of the value if
 				 * savedOptionPtr is NULL. */
     const Tk_OptionSpec *specPtr;
@@ -583,12 +582,12 @@
     /*
      * Save the old object form for the value, if there is one.
      */
 
     specPtr = optionPtr->specPtr;
-    if (specPtr->objOffset >= 0) {
-	slotPtrPtr = (Tcl_Obj **) (recordPtr + specPtr->objOffset);
+    if (specPtr->objOffset != TCL_AUTO_LENGTH) {
+	slotPtrPtr = (Tcl_Obj **) ((char *)recordPtr + specPtr->objOffset);
 	oldPtr = *slotPtrPtr;
     } else {
 	slotPtrPtr = NULL;
 	oldPtr = NULL;
     }
@@ -596,12 +595,12 @@
     /*
      * Apply the new value in a type-specific way. Also remember the old
      * object and internal forms, if they exist.
      */
 
-    if (specPtr->internalOffset >= 0) {
-	internalPtr = recordPtr + specPtr->internalOffset;
+    if (specPtr->internalOffset != TCL_AUTO_LENGTH) {
+	internalPtr = (char *)recordPtr + specPtr->internalOffset;
     } else {
 	internalPtr = NULL;
     }
     if (savedOptionPtr != NULL) {
 	savedOptionPtr->optionPtr = optionPtr;
@@ -655,18 +654,18 @@
 	break;
     }
     case TK_OPTION_STRING: {
 	char *newStr;
 	const char *value;
-	int length;
+	size_t length;
 
 	if (nullOK && ObjectIsEmpty(valuePtr)) {
 	    valuePtr = NULL;
 	}
 	if (internalPtr != NULL) {
 	    if (valuePtr != NULL) {
-		value = Tcl_GetStringFromObj(valuePtr, &length);
+		value = TkGetStringFromObj(valuePtr, &length);
 		newStr = ckalloc(length + 1);
 		strcpy(newStr, value);
 	    } else {
 		newStr = NULL;
 	    }
@@ -935,20 +934,17 @@
 
 static int
 ObjectIsEmpty(
     Tcl_Obj *objPtr)		/* Object to test. May be NULL. */
 {
-    int length;
-
     if (objPtr == NULL) {
 	return 1;
     }
-    if (objPtr->bytes != NULL) {
-	return (objPtr->length == 0);
+    if (objPtr->bytes == NULL) {
+	Tcl_GetString(objPtr);
     }
-    (void)Tcl_GetStringFromObj(objPtr, &length);
-    return (length == 0);
+    return (objPtr->length == 0);
 }
 
 /*
  *----------------------------------------------------------------------
  *
@@ -976,11 +972,11 @@
     OptionTable *tablePtr)	/* Table in which to look up name. */
 {
     Option *bestPtr, *optionPtr;
     OptionTable *tablePtr2;
     const char *p1, *p2;
-    int count;
+    size_t count;
 
     /*
      * Search through all of the option tables in the chain to find the best
      * match. Some tricky aspects:
      *
@@ -1224,11 +1220,11 @@
 
 int
 Tk_SetOptions(
     Tcl_Interp *interp,		/* Interpreter for error reporting. If NULL,
 				 * then no error message is returned.*/
-    char *recordPtr,	    	/* The record to configure. */
+    void *recordPtr,	    	/* The record to configure. */
     Tk_OptionTable optionTable,	/* Describes valid options. */
     int objc,			/* The number of elements in objv. */
     Tcl_Obj *const objv[],	/* Contains one or more name-value pairs. */
     Tk_Window tkwin,		/* Window associated with the thing being
 				 * configured; needed for some options (such
@@ -1342,16 +1338,16 @@
 void
 Tk_RestoreSavedOptions(
     Tk_SavedOptions *savePtr)	/* Holds saved option information; must have
 				 * been passed to Tk_SetOptions. */
 {
-    int i;
+    size_t i;
     Option *optionPtr;
     Tcl_Obj *newPtr;		/* New object value of option, which we
 				 * replace with old value and free. Taken from
 				 * record. */
-    char *internalPtr;		/* Points to internal value of option in
+    void *internalPtr;		/* Points to internal value of option in
 				 * record. */
     const Tk_OptionSpec *specPtr;
 
     /*
      * Be sure to restore the options in the opposite order they were set.
@@ -1362,26 +1358,26 @@
     if (savePtr->nextPtr != NULL) {
 	Tk_RestoreSavedOptions(savePtr->nextPtr);
 	ckfree(savePtr->nextPtr);
 	savePtr->nextPtr = NULL;
     }
-    for (i = savePtr->numItems - 1; i >= 0; i--) {
+    for (i = savePtr->numItems - 1; i != (size_t)-1; i--) {
 	optionPtr = savePtr->items[i].optionPtr;
 	specPtr = optionPtr->specPtr;
 
 	/*
 	 * First free the new value of the option, which is currently in the
 	 * record.
 	 */
 
-	if (specPtr->objOffset >= 0) {
-	    newPtr = *((Tcl_Obj **) (savePtr->recordPtr + specPtr->objOffset));
+	if (specPtr->objOffset != TCL_AUTO_LENGTH) {
+	    newPtr = *((Tcl_Obj **) ((char *)savePtr->recordPtr + specPtr->objOffset));
 	} else {
 	    newPtr = NULL;
 	}
-	if (specPtr->internalOffset >= 0) {
-	    internalPtr = savePtr->recordPtr + specPtr->internalOffset;
+	if (specPtr->internalOffset != TCL_AUTO_LENGTH) {
+	    internalPtr = (char *)savePtr->recordPtr + specPtr->internalOffset;
 	} else {
 	    internalPtr = NULL;
 	}
 	if (optionPtr->flags & OPTION_NEEDS_FREEING) {
 	    FreeResources(optionPtr, newPtr, internalPtr, savePtr->tkwin);
@@ -1392,15 +1388,15 @@
 
 	/*
 	 * Now restore the old value of the option.
 	 */
 
-	if (specPtr->objOffset >= 0) {
-	    *((Tcl_Obj **) (savePtr->recordPtr + specPtr->objOffset))
+	if (specPtr->objOffset != TCL_AUTO_LENGTH) {
+	    *((Tcl_Obj **) ((char *)savePtr->recordPtr + specPtr->objOffset))
 		    = savePtr->items[i].valuePtr;
 	}
-	if (specPtr->internalOffset >= 0) {
+	if (specPtr->internalOffset != TCL_AUTO_LENGTH) {
 	    register char *ptr = (char *) &savePtr->items[i].internalForm;
 
 	    CLANG_ASSERT(internalPtr);
 	    switch (specPtr->type) {
 	    case TK_OPTION_BOOLEAN:
@@ -1489,11 +1485,11 @@
 void
 Tk_FreeSavedOptions(
     Tk_SavedOptions *savePtr)	/* Contains options saved in a previous call
 				 * to Tk_SetOptions. */
 {
-    int count;
+    size_t count;
     Tk_SavedOption *savedOptionPtr;
 
     if (savePtr->nextPtr != NULL) {
 	Tk_FreeSavedOptions(savePtr->nextPtr);
 	ckfree(savePtr->nextPtr);
@@ -1529,21 +1525,21 @@
  */
 
 	/* ARGSUSED */
 void
 Tk_FreeConfigOptions(
-    char *recordPtr,		/* Record whose fields contain current values
+    void *recordPtr,		/* Record whose fields contain current values
 				 * for options. */
     Tk_OptionTable optionTable,	/* Describes legal options. */
     Tk_Window tkwin)		/* Window associated with recordPtr; needed
 				 * for freeing some options. */
 {
     OptionTable *tablePtr;
     Option *optionPtr;
-    int count;
+    size_t count;
     Tcl_Obj **oldPtrPtr, *oldPtr;
-    char *oldInternalPtr;
+    void *oldInternalPtr;
     const Tk_OptionSpec *specPtr;
 
     for (tablePtr = (OptionTable *) optionTable; tablePtr != NULL;
 	    tablePtr = tablePtr->nextPtr) {
 	for (optionPtr = tablePtr->options, count = tablePtr->numOptions;
@@ -1550,19 +1546,19 @@
 		count > 0; optionPtr++, count--) {
 	    specPtr = optionPtr->specPtr;
 	    if (specPtr->type == TK_OPTION_SYNONYM) {
 		continue;
 	    }
-	    if (specPtr->objOffset >= 0) {
-		oldPtrPtr = (Tcl_Obj **) (recordPtr + specPtr->objOffset);
+	    if (specPtr->objOffset != TCL_AUTO_LENGTH) {
+		oldPtrPtr = (Tcl_Obj **) ((char *)recordPtr + specPtr->objOffset);
 		oldPtr = *oldPtrPtr;
 		*oldPtrPtr = NULL;
 	    } else {
 		oldPtr = NULL;
 	    }
-	    if (specPtr->internalOffset >= 0) {
-		oldInternalPtr = recordPtr + specPtr->internalOffset;
+	    if (specPtr->internalOffset != TCL_AUTO_LENGTH) {
+		oldInternalPtr = (char *)recordPtr + specPtr->internalOffset;
 	    } else {
 		oldInternalPtr = NULL;
 	    }
 	    if (optionPtr->flags & OPTION_NEEDS_FREEING) {
 		FreeResources(optionPtr, oldPtr, oldInternalPtr, tkwin);
@@ -1595,14 +1591,14 @@
 static void
 FreeResources(
     Option *optionPtr,		/* Description of the configuration option. */
     Tcl_Obj *objPtr,		/* The current value of the option, specified
 				 * as an object. */
-    char *internalPtr,		/* A pointer to an internal representation for
+    void *internalPtr,		/* A pointer to an internal representation for
 				 * the option's value, such as an int or
 				 * (XColor *). Only valid if
-				 * optionPtr->specPtr->internalOffset >= 0. */
+				 * optionPtr->specPtr->internalOffset != -1. */
     Tk_Window tkwin)		/* The window in which this option is used. */
 {
     int internalFormExists;
 
     /*
@@ -1609,11 +1605,11 @@
      * If there exists an internal form for the value, use it to free
      * resources (also zero out the internal form). If there is no internal
      * form, then use the object form.
      */
 
-    internalFormExists = optionPtr->specPtr->internalOffset >= 0;
+    internalFormExists = optionPtr->specPtr->internalOffset != TCL_AUTO_LENGTH;
     switch (optionPtr->specPtr->type) {
     case TK_OPTION_STRING:
 	if (internalFormExists) {
 	    if (*((char **) internalPtr) != NULL) {
 		ckfree(*((char **) internalPtr));
@@ -1641,12 +1637,10 @@
 	break;
     case TK_OPTION_STYLE:
 	if (internalFormExists) {
 	    Tk_FreeStyle(*((Tk_Style *) internalPtr));
 	    *((Tk_Style *) internalPtr) = NULL;
-	} else if (objPtr != NULL) {
-	    Tk_FreeStyleFromObj(objPtr);
 	}
 	break;
     case TK_OPTION_BITMAP:
 	if (internalFormExists) {
 	    if (*((Pixmap *) internalPtr) != None) {
@@ -1717,11 +1711,11 @@
 
 Tcl_Obj *
 Tk_GetOptionInfo(
     Tcl_Interp *interp,		/* Interpreter for error reporting. If NULL,
 				 * then no error message is created. */
-    char *recordPtr,		/* Record whose fields contain current values
+    void *recordPtr,		/* Record whose fields contain current values
 				 * for options. */
     Tk_OptionTable optionTable,	/* Describes all the legal options. */
     Tcl_Obj *namePtr,		/* If non-NULL, the string value selects a
 				 * single option whose info is to be returned.
 				 * Otherwise info is returned for all options
@@ -1731,11 +1725,11 @@
 				 * options. */
 {
     Tcl_Obj *resultPtr;
     OptionTable *tablePtr = (OptionTable *) optionTable;
     Option *optionPtr;
-    int count;
+    size_t count;
 
     /*
      * If information is only wanted for a single configuration spec, then
      * handle that one spec specially.
      */
@@ -1785,11 +1779,11 @@
  *--------------------------------------------------------------
  */
 
 static Tcl_Obj *
 GetConfigList(
-    char *recordPtr,		/* Pointer to record holding current values of
+    void *recordPtr,		/* Pointer to record holding current values of
 				 * configuration options. */
     Option *optionPtr,		/* Pointer to information describing a
 				 * particular option. */
     Tk_Window tkwin)		/* Window corresponding to recordPtr. */
 {
@@ -1828,12 +1822,12 @@
 	} else {
 	    elementPtr = Tcl_NewObj();
 	}
 	Tcl_ListObjAppendElement(NULL, listPtr, elementPtr);
 
-	if (optionPtr->specPtr->objOffset >= 0) {
-	    elementPtr = *((Tcl_Obj **) (recordPtr
+	if (optionPtr->specPtr->objOffset != TCL_AUTO_LENGTH) {
+	    elementPtr = *((Tcl_Obj **) ((char *)recordPtr
 		    + optionPtr->specPtr->objOffset));
 	    if (elementPtr == NULL) {
 		elementPtr = Tcl_NewObj();
 	    }
 	} else {
@@ -1863,22 +1857,22 @@
  *----------------------------------------------------------------------
  */
 
 static Tcl_Obj *
 GetObjectForOption(
-    char *recordPtr,		/* Pointer to record holding current values of
+    void *recordPtr,		/* Pointer to record holding current values of
 				 * configuration options. */
     Option *optionPtr,		/* Pointer to information describing an option
 				 * whose internal value is stored in
 				 * *recordPtr. */
     Tk_Window tkwin)		/* Window corresponding to recordPtr. */
 {
     Tcl_Obj *objPtr;
-    char *internalPtr;		/* Points to internal value of option in
+    void *internalPtr;		/* Points to internal value of option in
 				 * record. */
 
-    internalPtr = recordPtr + optionPtr->specPtr->internalOffset;
+    internalPtr = (char *)recordPtr + optionPtr->specPtr->internalOffset;
     objPtr = NULL;
     switch (optionPtr->specPtr->type) {
     case TK_OPTION_BOOLEAN:
 	objPtr = Tcl_NewIntObj(*((int *) internalPtr));
 	break;
@@ -2005,11 +1999,11 @@
 Tcl_Obj *
 Tk_GetOptionValue(
     Tcl_Interp *interp,		/* Interpreter for error reporting. If NULL
 				 * then no messages are provided for
 				 * errors. */
-    char *recordPtr,		/* Record whose fields contain current values
+    void *recordPtr,		/* Record whose fields contain current values
 				 * for options. */
     Tk_OptionTable optionTable,	/* Describes legal options. */
     Tcl_Obj *namePtr,		/* Gives the command-line name for the option
 				 * whose value is to be returned. */
     Tk_Window tkwin)		/* Window corresponding to recordPtr. */
@@ -2023,12 +2017,12 @@
 	return NULL;
     }
     if (optionPtr->specPtr->type == TK_OPTION_SYNONYM) {
 	optionPtr = optionPtr->extra.synonymPtr;
     }
-    if (optionPtr->specPtr->objOffset >= 0) {
-	resultPtr = *((Tcl_Obj **) (recordPtr+optionPtr->specPtr->objOffset));
+    if (optionPtr->specPtr->objOffset != TCL_AUTO_LENGTH) {
+	resultPtr = *((Tcl_Obj **) ((char *)recordPtr+optionPtr->specPtr->objOffset));
 	if (resultPtr == NULL) {
 	    /*
 	     * This option has a null value and is represented by a null
 	     * object pointer. We can't return the null pointer, since that
 	     * would indicate an error. Instead, return a new empty object.
@@ -2094,13 +2088,13 @@
 	    hashEntryPtr != NULL;
 	    hashEntryPtr = Tcl_NextHashEntry(&search)) {
 	if (tablePtr == (OptionTable *) Tcl_GetHashValue(hashEntryPtr)) {
 	    for ( ; tablePtr != NULL; tablePtr = tablePtr->nextPtr) {
 		Tcl_ListObjAppendElement(NULL, objPtr,
-			Tcl_NewIntObj(tablePtr->refCount));
+			Tcl_NewWideIntObj(tablePtr->refCount));
 		Tcl_ListObjAppendElement(NULL, objPtr,
-			Tcl_NewIntObj(tablePtr->numOptions));
+			Tcl_NewWideIntObj(tablePtr->numOptions));
 		Tcl_ListObjAppendElement(NULL, objPtr, Tcl_NewStringObj(
 			tablePtr->options[0].specPtr->optionName, -1));
 	    }
 	    break;
 	}

Index: generic/tkConsole.c
==================================================================
--- generic/tkConsole.c
+++ generic/tkConsole.c
@@ -22,11 +22,11 @@
  */
 
 typedef struct ConsoleInfo {
     Tcl_Interp *consoleInterp;	/* Interpreter displaying the console. */
     Tcl_Interp *interp;		/* Interpreter controlled by console. */
-    int refCount;
+    size_t refCount;
 } ConsoleInfo;
 
 /*
  * Each console channel holds an instance of the ChannelData struct as
  * its instance data.  It contains ConsoleInfo, so the channel can work
@@ -221,11 +221,11 @@
 
     /*
      * Ensure that we are getting a compatible version of Tcl.
      */
 
-    if (Tcl_InitStubs(interp, "8.6", 0) == NULL) {
+    if (Tcl_InitStubs(interp, "8.6-", 0) == NULL) {
         return;
     }
 
     consoleInitPtr = Tcl_GetThreadData(&consoleInitKey, (int) sizeof(int));
     if (*consoleInitPtr) {
@@ -316,11 +316,11 @@
  *----------------------------------------------------------------------
  *
  * Tk_CreateConsoleWindow --
  *
  *	Initialize the console. This code actually creates a new application
- *	and associated interpreter. This effectivly hides the implementation
+ *	and associated interpreter. This effectively hides the implementation
  *	from the main application.
  *
  * Results:
  *	None.
  *
@@ -342,13 +342,17 @@
     int haveConsoleChannel = 1;
 
     /* Init an interp with Tcl and Tk */
     Tcl_Interp *consoleInterp = Tcl_CreateInterp();
     if (Tcl_Init(consoleInterp) != TCL_OK) {
+	Tcl_Obj *result_obj = Tcl_GetObjResult(consoleInterp);
+	Tcl_SetObjResult(interp, result_obj);
 	goto error;
     }
     if (Tk_Init(consoleInterp) != TCL_OK) {
+	Tcl_Obj *result_obj = Tcl_GetObjResult(consoleInterp);
+	Tcl_SetObjResult(interp, result_obj);
 	goto error;
     }
 
     /*
      * Fetch the instance data from whatever std channel is a
@@ -450,11 +454,11 @@
 	Tcl_DeleteCommandFromToken(interp, token);
 	mainWindow = Tk_MainWindow(interp);
 	if (mainWindow) {
 	    Tk_DeleteEventHandler(mainWindow, StructureNotifyMask,
 		    ConsoleEventProc, info);
-	    if (--info->refCount <= 0) {
+	    if (info->refCount-- <= 1) {
 		ckfree(info);
 	    }
 	}
 	goto error;
     }
@@ -590,11 +594,11 @@
 {
     ChannelData *data = instanceData;
     ConsoleInfo *info = data->info;
 
     if (info) {
-	if (--info->refCount <= 0) {
+	if (info->refCount-- <= 1) {
 	    /*
 	     * Assuming the Tcl_Interp * fields must already be NULL.
 	     */
 
 	    ckfree(info);
@@ -879,11 +883,11 @@
 
     if (info->consoleInterp == interp) {
 	Tcl_DeleteThreadExitHandler(DeleteConsoleInterp, info->consoleInterp);
 	info->consoleInterp = NULL;
     }
-    if (--info->refCount <= 0) {
+    if (info->refCount-- <= 1) {
 	ckfree(info);
     }
 }
 
 /*
@@ -910,11 +914,11 @@
     ConsoleInfo *info = clientData;
 
     if (info->consoleInterp) {
 	Tcl_DeleteInterp(info->consoleInterp);
     }
-    if (--info->refCount <= 0) {
+    if (info->refCount-- <= 1) {
 	ckfree(info);
     }
 }
 
 /*
@@ -947,11 +951,11 @@
 
 	if (consoleInterp && !Tcl_InterpDeleted(consoleInterp)) {
 	    Tcl_EvalEx(consoleInterp, "tk::ConsoleExit", -1, TCL_EVAL_GLOBAL);
 	}
 
-	if (--info->refCount <= 0) {
+	if (info->refCount-- <= 1) {
 	    ckfree(info);
 	}
     }
 }
 

Index: generic/tkCursor.c
==================================================================
--- generic/tkCursor.c
+++ generic/tkCursor.c
@@ -461,12 +461,11 @@
 FreeCursor(
     TkCursor *cursorPtr)	/* Cursor to be released. */
 {
     TkCursor *prevPtr;
 
-    cursorPtr->resourceRefCount--;
-    if (cursorPtr->resourceRefCount > 0) {
+    if (cursorPtr->resourceRefCount-- > 1) {
 	return;
     }
 
     Tcl_DeleteHashEntry(cursorPtr->idHashPtr);
     prevPtr = Tcl_GetHashValue(cursorPtr->hashPtr);
@@ -588,12 +587,11 @@
     Tcl_Obj *objPtr)		/* The object we are releasing. */
 {
     TkCursor *cursorPtr = objPtr->internalRep.twoPtrValue.ptr1;
 
     if (cursorPtr != NULL) {
-	cursorPtr->objRefCount--;
-	if ((cursorPtr->objRefCount == 0)
+	if ((cursorPtr->objRefCount-- <= 1)
 		&& (cursorPtr->resourceRefCount == 0)) {
 	    ckfree(cursorPtr);
 	}
 	objPtr->internalRep.twoPtrValue.ptr1 = NULL;
     }
@@ -862,13 +860,13 @@
 	    Tcl_Panic("TkDebugCursor found empty hash table entry");
 	}
 	for ( ; (cursorPtr != NULL); cursorPtr = cursorPtr->nextPtr) {
 	    objPtr = Tcl_NewObj();
 	    Tcl_ListObjAppendElement(NULL, objPtr,
-		    Tcl_NewIntObj(cursorPtr->resourceRefCount));
+		    Tcl_NewWideIntObj(cursorPtr->resourceRefCount));
 	    Tcl_ListObjAppendElement(NULL, objPtr,
-		    Tcl_NewIntObj(cursorPtr->objRefCount));
+		    Tcl_NewWideIntObj(cursorPtr->objRefCount));
 	    Tcl_ListObjAppendElement(NULL, resultPtr, objPtr);
 	}
     }
     return resultPtr;
 }

Index: generic/tkDecls.h
==================================================================
--- generic/tkDecls.h
+++ generic/tkDecls.h
@@ -15,10 +15,18 @@
 #ifdef BUILD_tk
 #undef TCL_STORAGE_CLASS
 #define TCL_STORAGE_CLASS DLLEXPORT
 #endif
 
+#if !defined(BUILD_tk)
+# define TK_DEPRECATED(msg) EXTERN TCL_DEPRECATED_API(msg)
+#elif defined(TK_NO_DEPRECATED)
+# define TK_DEPRECATED(msg) MODULE_SCOPE
+#else
+# define TK_DEPRECATED(msg) EXTERN
+#endif
+
 /*
  * WARNING: This file is automatically generated by the tools/genStubs.tcl
  * script.  Any modifications to the function declarations below should be made
  * in the generic/tk.decls script.
  */
@@ -93,11 +101,11 @@
 /* 18 */
 EXTERN int		Tk_CanvasTagsParseProc(ClientData clientData,
 				Tcl_Interp *interp, Tk_Window tkwin,
 				const char *value, char *widgRec, int offset);
 /* 19 */
-EXTERN CONST86 char *	Tk_CanvasTagsPrintProc(ClientData clientData,
+EXTERN const char *	Tk_CanvasTagsPrintProc(ClientData clientData,
 				Tk_Window tkwin, char *widgRec, int offset,
 				Tcl_FreeProc **freeProcPtr);
 /* 20 */
 EXTERN Tk_Window	Tk_CanvasTkwin(Tk_Canvas canvas);
 /* 21 */
@@ -131,11 +139,11 @@
 				char *widgRec, const char *argvName,
 				int flags);
 /* 29 */
 EXTERN int		Tk_ConfigureWidget(Tcl_Interp *interp,
 				Tk_Window tkwin, const Tk_ConfigSpec *specs,
-				int argc, CONST84 char **argv, char *widgRec,
+				int argc, const char **argv, char *widgRec,
 				int flags);
 /* 30 */
 EXTERN void		Tk_ConfigureWindow(Tk_Window tkwin,
 				unsigned int valueMask,
 				XWindowChanges *valuePtr);
@@ -213,11 +221,11 @@
 EXTERN void		Tk_DeleteSelHandler(Tk_Window tkwin, Atom selection,
 				Atom target);
 /* 54 */
 EXTERN void		Tk_DestroyWindow(Tk_Window tkwin);
 /* 55 */
-EXTERN CONST84_RETURN char * Tk_DisplayName(Tk_Window tkwin);
+EXTERN const char *	Tk_DisplayName(Tk_Window tkwin);
 /* 56 */
 EXTERN int		Tk_DistanceToTextLayout(Tk_TextLayout layout, int x,
 				int y);
 /* 57 */
 EXTERN void		Tk_Draw3DPolygon(Tk_Window tkwin, Drawable drawable,
@@ -279,11 +287,12 @@
 /* 75 */
 EXTERN void		Tk_FreePixmap(Display *display, Pixmap pixmap);
 /* 76 */
 EXTERN void		Tk_FreeTextLayout(Tk_TextLayout textLayout);
 /* 77 */
-EXTERN void		Tk_FreeXId(Display *display, XID xid);
+TK_DEPRECATED("function does nothing, call can be removed")
+void			Tk_FreeXId(Display *display, XID xid);
 /* 78 */
 EXTERN GC		Tk_GCForColor(XColor *colorPtr, Drawable drawable);
 /* 79 */
 EXTERN void		Tk_GeometryRequest(Tk_Window tkwin, int reqWidth,
 				int reqHeight);
@@ -296,13 +305,13 @@
 				ClientData object);
 /* 82 */
 EXTERN int		Tk_GetAnchor(Tcl_Interp *interp, const char *str,
 				Tk_Anchor *anchorPtr);
 /* 83 */
-EXTERN CONST84_RETURN char * Tk_GetAtomName(Tk_Window tkwin, Atom atom);
+EXTERN const char *	Tk_GetAtomName(Tk_Window tkwin, Atom atom);
 /* 84 */
-EXTERN CONST84_RETURN char * Tk_GetBinding(Tcl_Interp *interp,
+EXTERN const char *	Tk_GetBinding(Tcl_Interp *interp,
 				Tk_BindingTable bindingTable,
 				ClientData object, const char *eventStr);
 /* 85 */
 EXTERN Pixmap		Tk_GetBitmap(Tcl_Interp *interp, Tk_Window tkwin,
 				const char *str);
@@ -346,11 +355,11 @@
 				Tk_ImageChangedProc *changeProc,
 				ClientData clientData);
 /* 98 */
 EXTERN ClientData	Tk_GetImageMasterData(Tcl_Interp *interp,
 				const char *name,
-				CONST86 Tk_ImageType **typePtrPtr);
+				const Tk_ImageType **typePtrPtr);
 /* 99 */
 EXTERN Tk_ItemType *	Tk_GetItemTypes(void);
 /* 100 */
 EXTERN int		Tk_GetJoinStyle(Tcl_Interp *interp, const char *str,
 				int *joinPtr);
@@ -374,11 +383,11 @@
 /* 107 */
 EXTERN void		Tk_GetRootCoords(Tk_Window tkwin, int *xPtr,
 				int *yPtr);
 /* 108 */
 EXTERN int		Tk_GetScrollInfo(Tcl_Interp *interp, int argc,
-				CONST84 char **argv, double *dblPtr,
+				const char **argv, double *dblPtr,
 				int *intPtr);
 /* 109 */
 EXTERN int		Tk_GetScreenMM(Tcl_Interp *interp, Tk_Window tkwin,
 				const char *str, double *doublePtr);
 /* 110 */
@@ -436,48 +445,49 @@
 /* 128 */
 EXTERN void		Tk_MoveWindow(Tk_Window tkwin, int x, int y);
 /* 129 */
 EXTERN void		Tk_MoveToplevelWindow(Tk_Window tkwin, int x, int y);
 /* 130 */
-EXTERN CONST84_RETURN char * Tk_NameOf3DBorder(Tk_3DBorder border);
+EXTERN const char *	Tk_NameOf3DBorder(Tk_3DBorder border);
 /* 131 */
-EXTERN CONST84_RETURN char * Tk_NameOfAnchor(Tk_Anchor anchor);
+EXTERN const char *	Tk_NameOfAnchor(Tk_Anchor anchor);
 /* 132 */
-EXTERN CONST84_RETURN char * Tk_NameOfBitmap(Display *display, Pixmap bitmap);
+EXTERN const char *	Tk_NameOfBitmap(Display *display, Pixmap bitmap);
 /* 133 */
-EXTERN CONST84_RETURN char * Tk_NameOfCapStyle(int cap);
+EXTERN const char *	Tk_NameOfCapStyle(int cap);
 /* 134 */
-EXTERN CONST84_RETURN char * Tk_NameOfColor(XColor *colorPtr);
+EXTERN const char *	Tk_NameOfColor(XColor *colorPtr);
 /* 135 */
-EXTERN CONST84_RETURN char * Tk_NameOfCursor(Display *display,
-				Tk_Cursor cursor);
+EXTERN const char *	Tk_NameOfCursor(Display *display, Tk_Cursor cursor);
 /* 136 */
-EXTERN CONST84_RETURN char * Tk_NameOfFont(Tk_Font font);
+EXTERN const char *	Tk_NameOfFont(Tk_Font font);
 /* 137 */
-EXTERN CONST84_RETURN char * Tk_NameOfImage(Tk_ImageMaster imageMaster);
+EXTERN const char *	Tk_NameOfImage(Tk_ImageMaster imageMaster);
 /* 138 */
-EXTERN CONST84_RETURN char * Tk_NameOfJoinStyle(int join);
+EXTERN const char *	Tk_NameOfJoinStyle(int join);
 /* 139 */
-EXTERN CONST84_RETURN char * Tk_NameOfJustify(Tk_Justify justify);
+EXTERN const char *	Tk_NameOfJustify(Tk_Justify justify);
 /* 140 */
-EXTERN CONST84_RETURN char * Tk_NameOfRelief(int relief);
+EXTERN const char *	Tk_NameOfRelief(int relief);
 /* 141 */
 EXTERN Tk_Window	Tk_NameToWindow(Tcl_Interp *interp,
 				const char *pathName, Tk_Window tkwin);
 /* 142 */
 EXTERN void		Tk_OwnSelection(Tk_Window tkwin, Atom selection,
 				Tk_LostSelProc *proc, ClientData clientData);
 /* 143 */
 EXTERN int		Tk_ParseArgv(Tcl_Interp *interp, Tk_Window tkwin,
-				int *argcPtr, CONST84 char **argv,
+				int *argcPtr, const char **argv,
 				const Tk_ArgvInfo *argTable, int flags);
 /* 144 */
-EXTERN void		Tk_PhotoPutBlock_NoComposite(Tk_PhotoHandle handle,
+TK_DEPRECATED("function signature changed")
+void			Tk_PhotoPutBlock_NoComposite(Tk_PhotoHandle handle,
 				Tk_PhotoImageBlock *blockPtr, int x, int y,
 				int width, int height);
 /* 145 */
-EXTERN void		Tk_PhotoPutZoomedBlock_NoComposite(
+TK_DEPRECATED("function signature changed")
+void			Tk_PhotoPutZoomedBlock_NoComposite(
 				Tk_PhotoHandle handle,
 				Tk_PhotoImageBlock *blockPtr, int x, int y,
 				int width, int height, int zoomX, int zoomY,
 				int subsampleX, int subsampleY);
 /* 146 */
@@ -484,17 +494,19 @@
 EXTERN int		Tk_PhotoGetImage(Tk_PhotoHandle handle,
 				Tk_PhotoImageBlock *blockPtr);
 /* 147 */
 EXTERN void		Tk_PhotoBlank(Tk_PhotoHandle handle);
 /* 148 */
-EXTERN void		Tk_PhotoExpand_Panic(Tk_PhotoHandle handle,
+TK_DEPRECATED("function signature changed")
+void			Tk_PhotoExpand_Panic(Tk_PhotoHandle handle,
 				int width, int height);
 /* 149 */
 EXTERN void		Tk_PhotoGetSize(Tk_PhotoHandle handle, int *widthPtr,
 				int *heightPtr);
 /* 150 */
-EXTERN void		Tk_PhotoSetSize_Panic(Tk_PhotoHandle handle,
+TK_DEPRECATED("function signature changed")
+void			Tk_PhotoSetSize_Panic(Tk_PhotoHandle handle,
 				int width, int height);
 /* 151 */
 EXTERN int		Tk_PointToChar(Tk_TextLayout layout, int x, int y);
 /* 152 */
 EXTERN int		Tk_PostscriptFontName(Tk_Font tkfont,
@@ -618,11 +630,11 @@
 EXTERN void		Tk_FreeBitmapFromObj(Tk_Window tkwin,
 				Tcl_Obj *objPtr);
 /* 194 */
 EXTERN void		Tk_FreeColorFromObj(Tk_Window tkwin, Tcl_Obj *objPtr);
 /* 195 */
-EXTERN void		Tk_FreeConfigOptions(char *recordPtr,
+EXTERN void		Tk_FreeConfigOptions(void *recordPtr,
 				Tk_OptionTable optionToken, Tk_Window tkwin);
 /* 196 */
 EXTERN void		Tk_FreeSavedOptions(Tk_SavedOptions *savePtr);
 /* 197 */
 EXTERN void		Tk_FreeCursorFromObj(Tk_Window tkwin,
@@ -640,16 +652,16 @@
 /* 202 */
 EXTERN XColor *		Tk_GetColorFromObj(Tk_Window tkwin, Tcl_Obj *objPtr);
 /* 203 */
 EXTERN Tk_Cursor	Tk_GetCursorFromObj(Tk_Window tkwin, Tcl_Obj *objPtr);
 /* 204 */
-EXTERN Tcl_Obj *	Tk_GetOptionInfo(Tcl_Interp *interp, char *recordPtr,
+EXTERN Tcl_Obj *	Tk_GetOptionInfo(Tcl_Interp *interp, void *recordPtr,
 				Tk_OptionTable optionTable, Tcl_Obj *namePtr,
 				Tk_Window tkwin);
 /* 205 */
 EXTERN Tcl_Obj *	Tk_GetOptionValue(Tcl_Interp *interp,
-				char *recordPtr, Tk_OptionTable optionTable,
+				void *recordPtr, Tk_OptionTable optionTable,
 				Tcl_Obj *namePtr, Tk_Window tkwin);
 /* 206 */
 EXTERN int		Tk_GetJustifyFromObj(Tcl_Interp *interp,
 				Tcl_Obj *objPtr, Tk_Justify *justifyPtr);
 /* 207 */
@@ -665,20 +677,20 @@
 /* 210 */
 EXTERN int		Tk_GetScrollInfoObj(Tcl_Interp *interp, int objc,
 				Tcl_Obj *const objv[], double *dblPtr,
 				int *intPtr);
 /* 211 */
-EXTERN int		Tk_InitOptions(Tcl_Interp *interp, char *recordPtr,
+EXTERN int		Tk_InitOptions(Tcl_Interp *interp, void *recordPtr,
 				Tk_OptionTable optionToken, Tk_Window tkwin);
 /* 212 */
 EXTERN void		Tk_MainEx(int argc, char **argv,
 				Tcl_AppInitProc *appInitProc,
 				Tcl_Interp *interp);
 /* 213 */
 EXTERN void		Tk_RestoreSavedOptions(Tk_SavedOptions *savePtr);
 /* 214 */
-EXTERN int		Tk_SetOptions(Tcl_Interp *interp, char *recordPtr,
+EXTERN int		Tk_SetOptions(Tcl_Interp *interp, void *recordPtr,
 				Tk_OptionTable optionTable, int objc,
 				Tcl_Obj *const objv[], Tk_Window tkwin,
 				Tk_SavedOptions *savePtr, int *maskPtr);
 /* 215 */
 EXTERN void		Tk_InitConsoleChannels(Tcl_Interp *interp);
@@ -774,15 +786,17 @@
 				int minWidth, int minHeight);
 /* 245 */
 EXTERN void		Tk_SetCaretPos(Tk_Window tkwin, int x, int y,
 				int height);
 /* 246 */
-EXTERN void		Tk_PhotoPutBlock_Panic(Tk_PhotoHandle handle,
+TK_DEPRECATED("function signature changed")
+void			Tk_PhotoPutBlock_Panic(Tk_PhotoHandle handle,
 				Tk_PhotoImageBlock *blockPtr, int x, int y,
 				int width, int height, int compRule);
 /* 247 */
-EXTERN void		Tk_PhotoPutZoomedBlock_Panic(Tk_PhotoHandle handle,
+TK_DEPRECATED("function signature changed")
+void			Tk_PhotoPutZoomedBlock_Panic(Tk_PhotoHandle handle,
 				Tk_PhotoImageBlock *blockPtr, int x, int y,
 				int width, int height, int zoomX, int zoomY,
 				int subsampleX, int subsampleY, int compRule);
 /* 248 */
 EXTERN int		Tk_CollapseMotionEvents(Display *display,
@@ -816,26 +830,26 @@
 /* 260 */
 EXTERN Tk_StyledElement	 Tk_GetStyledElement(Tk_Style style, int elementId,
 				Tk_OptionTable optionTable);
 /* 261 */
 EXTERN void		Tk_GetElementSize(Tk_Style style,
-				Tk_StyledElement element, char *recordPtr,
+				Tk_StyledElement element, void *recordPtr,
 				Tk_Window tkwin, int width, int height,
 				int inner, int *widthPtr, int *heightPtr);
 /* 262 */
 EXTERN void		Tk_GetElementBox(Tk_Style style,
-				Tk_StyledElement element, char *recordPtr,
+				Tk_StyledElement element, void *recordPtr,
 				Tk_Window tkwin, int x, int y, int width,
 				int height, int inner, int *xPtr, int *yPtr,
 				int *widthPtr, int *heightPtr);
 /* 263 */
 EXTERN int		Tk_GetElementBorderWidth(Tk_Style style,
-				Tk_StyledElement element, char *recordPtr,
+				Tk_StyledElement element, void *recordPtr,
 				Tk_Window tkwin);
 /* 264 */
 EXTERN void		Tk_DrawElement(Tk_Style style,
-				Tk_StyledElement element, char *recordPtr,
+				Tk_StyledElement element, void *recordPtr,
 				Tk_Window tkwin, Drawable d, int x, int y,
 				int width, int height, int state);
 /* 265 */
 EXTERN int		Tk_PhotoExpand(Tcl_Interp *interp,
 				Tk_PhotoHandle handle, int width, int height);
@@ -893,21 +907,21 @@
     void (*tk_CanvasPsPath) (Tcl_Interp *interp, Tk_Canvas canvas, double *coordPtr, int numPoints); /* 14 */
     int (*tk_CanvasPsStipple) (Tcl_Interp *interp, Tk_Canvas canvas, Pixmap bitmap); /* 15 */
     double (*tk_CanvasPsY) (Tk_Canvas canvas, double y); /* 16 */
     void (*tk_CanvasSetStippleOrigin) (Tk_Canvas canvas, GC gc); /* 17 */
     int (*tk_CanvasTagsParseProc) (ClientData clientData, Tcl_Interp *interp, Tk_Window tkwin, const char *value, char *widgRec, int offset); /* 18 */
-    CONST86 char * (*tk_CanvasTagsPrintProc) (ClientData clientData, Tk_Window tkwin, char *widgRec, int offset, Tcl_FreeProc **freeProcPtr); /* 19 */
+    const char * (*tk_CanvasTagsPrintProc) (ClientData clientData, Tk_Window tkwin, char *widgRec, int offset, Tcl_FreeProc **freeProcPtr); /* 19 */
     Tk_Window (*tk_CanvasTkwin) (Tk_Canvas canvas); /* 20 */
     void (*tk_CanvasWindowCoords) (Tk_Canvas canvas, double x, double y, short *screenXPtr, short *screenYPtr); /* 21 */
     void (*tk_ChangeWindowAttributes) (Tk_Window tkwin, unsigned long valueMask, XSetWindowAttributes *attsPtr); /* 22 */
     int (*tk_CharBbox) (Tk_TextLayout layout, int index, int *xPtr, int *yPtr, int *widthPtr, int *heightPtr); /* 23 */
     void (*tk_ClearSelection) (Tk_Window tkwin, Atom selection); /* 24 */
     int (*tk_ClipboardAppend) (Tcl_Interp *interp, Tk_Window tkwin, Atom target, Atom format, const char *buffer); /* 25 */
     int (*tk_ClipboardClear) (Tcl_Interp *interp, Tk_Window tkwin); /* 26 */
     int (*tk_ConfigureInfo) (Tcl_Interp *interp, Tk_Window tkwin, const Tk_ConfigSpec *specs, char *widgRec, const char *argvName, int flags); /* 27 */
     int (*tk_ConfigureValue) (Tcl_Interp *interp, Tk_Window tkwin, const Tk_ConfigSpec *specs, char *widgRec, const char *argvName, int flags); /* 28 */
-    int (*tk_ConfigureWidget) (Tcl_Interp *interp, Tk_Window tkwin, const Tk_ConfigSpec *specs, int argc, CONST84 char **argv, char *widgRec, int flags); /* 29 */
+    int (*tk_ConfigureWidget) (Tcl_Interp *interp, Tk_Window tkwin, const Tk_ConfigSpec *specs, int argc, const char **argv, char *widgRec, int flags); /* 29 */
     void (*tk_ConfigureWindow) (Tk_Window tkwin, unsigned int valueMask, XWindowChanges *valuePtr); /* 30 */
     Tk_TextLayout (*tk_ComputeTextLayout) (Tk_Font font, const char *str, int numChars, int wrapLength, Tk_Justify justify, int flags, int *widthPtr, int *heightPtr); /* 31 */
     Tk_Window (*tk_CoordsToWindow) (int rootX, int rootY, Tk_Window tkwin); /* 32 */
     unsigned long (*tk_CreateBinding) (Tcl_Interp *interp, Tk_BindingTable bindingTable, ClientData object, const char *eventStr, const char *script, int append); /* 33 */
     Tk_BindingTable (*tk_CreateBindingTable) (Tcl_Interp *interp); /* 34 */
@@ -929,11 +943,11 @@
     void (*tk_DeleteEventHandler) (Tk_Window token, unsigned long mask, Tk_EventProc *proc, ClientData clientData); /* 50 */
     void (*tk_DeleteGenericHandler) (Tk_GenericProc *proc, ClientData clientData); /* 51 */
     void (*tk_DeleteImage) (Tcl_Interp *interp, const char *name); /* 52 */
     void (*tk_DeleteSelHandler) (Tk_Window tkwin, Atom selection, Atom target); /* 53 */
     void (*tk_DestroyWindow) (Tk_Window tkwin); /* 54 */
-    CONST84_RETURN char * (*tk_DisplayName) (Tk_Window tkwin); /* 55 */
+    const char * (*tk_DisplayName) (Tk_Window tkwin); /* 55 */
     int (*tk_DistanceToTextLayout) (Tk_TextLayout layout, int x, int y); /* 56 */
     void (*tk_Draw3DPolygon) (Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, XPoint *pointPtr, int numPoints, int borderWidth, int leftRelief); /* 57 */
     void (*tk_Draw3DRectangle) (Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, int x, int y, int width, int height, int borderWidth, int relief); /* 58 */
     void (*tk_DrawChars) (Display *display, Drawable drawable, GC gc, Tk_Font tkfont, const char *source, int numBytes, int x, int y); /* 59 */
     void (*tk_DrawFocusHighlight) (Tk_Window tkwin, GC gc, int width, Drawable drawable); /* 60 */
@@ -951,18 +965,18 @@
     void (*tk_FreeGC) (Display *display, GC gc); /* 72 */
     void (*tk_FreeImage) (Tk_Image image); /* 73 */
     void (*tk_FreeOptions) (const Tk_ConfigSpec *specs, char *widgRec, Display *display, int needFlags); /* 74 */
     void (*tk_FreePixmap) (Display *display, Pixmap pixmap); /* 75 */
     void (*tk_FreeTextLayout) (Tk_TextLayout textLayout); /* 76 */
-    void (*tk_FreeXId) (Display *display, XID xid); /* 77 */
+    TCL_DEPRECATED_API("function does nothing, call can be removed") void (*tk_FreeXId) (Display *display, XID xid); /* 77 */
     GC (*tk_GCForColor) (XColor *colorPtr, Drawable drawable); /* 78 */
     void (*tk_GeometryRequest) (Tk_Window tkwin, int reqWidth, int reqHeight); /* 79 */
     Tk_3DBorder (*tk_Get3DBorder) (Tcl_Interp *interp, Tk_Window tkwin, Tk_Uid colorName); /* 80 */
     void (*tk_GetAllBindings) (Tcl_Interp *interp, Tk_BindingTable bindingTable, ClientData object); /* 81 */
     int (*tk_GetAnchor) (Tcl_Interp *interp, const char *str, Tk_Anchor *anchorPtr); /* 82 */
-    CONST84_RETURN char * (*tk_GetAtomName) (Tk_Window tkwin, Atom atom); /* 83 */
-    CONST84_RETURN char * (*tk_GetBinding) (Tcl_Interp *interp, Tk_BindingTable bindingTable, ClientData object, const char *eventStr); /* 84 */
+    const char * (*tk_GetAtomName) (Tk_Window tkwin, Atom atom); /* 83 */
+    const char * (*tk_GetBinding) (Tcl_Interp *interp, Tk_BindingTable bindingTable, ClientData object, const char *eventStr); /* 84 */
     Pixmap (*tk_GetBitmap) (Tcl_Interp *interp, Tk_Window tkwin, const char *str); /* 85 */
     Pixmap (*tk_GetBitmapFromData) (Tcl_Interp *interp, Tk_Window tkwin, const void *source, int width, int height); /* 86 */
     int (*tk_GetCapStyle) (Tcl_Interp *interp, const char *str, int *capPtr); /* 87 */
     XColor * (*tk_GetColor) (Tcl_Interp *interp, Tk_Window tkwin, Tk_Uid name); /* 88 */
     XColor * (*tk_GetColorByValue) (Tk_Window tkwin, XColor *colorPtr); /* 89 */
@@ -972,21 +986,21 @@
     Tk_Font (*tk_GetFont) (Tcl_Interp *interp, Tk_Window tkwin, const char *str); /* 93 */
     Tk_Font (*tk_GetFontFromObj) (Tk_Window tkwin, Tcl_Obj *objPtr); /* 94 */
     void (*tk_GetFontMetrics) (Tk_Font font, Tk_FontMetrics *fmPtr); /* 95 */
     GC (*tk_GetGC) (Tk_Window tkwin, unsigned long valueMask, XGCValues *valuePtr); /* 96 */
     Tk_Image (*tk_GetImage) (Tcl_Interp *interp, Tk_Window tkwin, const char *name, Tk_ImageChangedProc *changeProc, ClientData clientData); /* 97 */
-    ClientData (*tk_GetImageMasterData) (Tcl_Interp *interp, const char *name, CONST86 Tk_ImageType **typePtrPtr); /* 98 */
+    ClientData (*tk_GetImageMasterData) (Tcl_Interp *interp, const char *name, const Tk_ImageType **typePtrPtr); /* 98 */
     Tk_ItemType * (*tk_GetItemTypes) (void); /* 99 */
     int (*tk_GetJoinStyle) (Tcl_Interp *interp, const char *str, int *joinPtr); /* 100 */
     int (*tk_GetJustify) (Tcl_Interp *interp, const char *str, Tk_Justify *justifyPtr); /* 101 */
     int (*tk_GetNumMainWindows) (void); /* 102 */
     Tk_Uid (*tk_GetOption) (Tk_Window tkwin, const char *name, const char *className); /* 103 */
     int (*tk_GetPixels) (Tcl_Interp *interp, Tk_Window tkwin, const char *str, int *intPtr); /* 104 */
     Pixmap (*tk_GetPixmap) (Display *display, Drawable d, int width, int height, int depth); /* 105 */
     int (*tk_GetRelief) (Tcl_Interp *interp, const char *name, int *reliefPtr); /* 106 */
     void (*tk_GetRootCoords) (Tk_Window tkwin, int *xPtr, int *yPtr); /* 107 */
-    int (*tk_GetScrollInfo) (Tcl_Interp *interp, int argc, CONST84 char **argv, double *dblPtr, int *intPtr); /* 108 */
+    int (*tk_GetScrollInfo) (Tcl_Interp *interp, int argc, const char **argv, double *dblPtr, int *intPtr); /* 108 */
     int (*tk_GetScreenMM) (Tcl_Interp *interp, Tk_Window tkwin, const char *str, double *doublePtr); /* 109 */
     int (*tk_GetSelection) (Tcl_Interp *interp, Tk_Window tkwin, Atom selection, Atom target, Tk_GetSelProc *proc, ClientData clientData); /* 110 */
     Tk_Uid (*tk_GetUid) (const char *str); /* 111 */
     Visual * (*tk_GetVisual) (Tcl_Interp *interp, Tk_Window tkwin, const char *str, int *depthPtr, Colormap *colormapPtr); /* 112 */
     void (*tk_GetVRootGeometry) (Tk_Window tkwin, int *xPtr, int *yPtr, int *widthPtr, int *heightPtr); /* 113 */
@@ -1004,31 +1018,31 @@
     void (*tk_MapWindow) (Tk_Window tkwin); /* 125 */
     int (*tk_MeasureChars) (Tk_Font tkfont, const char *source, int numBytes, int maxPixels, int flags, int *lengthPtr); /* 126 */
     void (*tk_MoveResizeWindow) (Tk_Window tkwin, int x, int y, int width, int height); /* 127 */
     void (*tk_MoveWindow) (Tk_Window tkwin, int x, int y); /* 128 */
     void (*tk_MoveToplevelWindow) (Tk_Window tkwin, int x, int y); /* 129 */
-    CONST84_RETURN char * (*tk_NameOf3DBorder) (Tk_3DBorder border); /* 130 */
-    CONST84_RETURN char * (*tk_NameOfAnchor) (Tk_Anchor anchor); /* 131 */
-    CONST84_RETURN char * (*tk_NameOfBitmap) (Display *display, Pixmap bitmap); /* 132 */
-    CONST84_RETURN char * (*tk_NameOfCapStyle) (int cap); /* 133 */
-    CONST84_RETURN char * (*tk_NameOfColor) (XColor *colorPtr); /* 134 */
-    CONST84_RETURN char * (*tk_NameOfCursor) (Display *display, Tk_Cursor cursor); /* 135 */
-    CONST84_RETURN char * (*tk_NameOfFont) (Tk_Font font); /* 136 */
-    CONST84_RETURN char * (*tk_NameOfImage) (Tk_ImageMaster imageMaster); /* 137 */
-    CONST84_RETURN char * (*tk_NameOfJoinStyle) (int join); /* 138 */
-    CONST84_RETURN char * (*tk_NameOfJustify) (Tk_Justify justify); /* 139 */
-    CONST84_RETURN char * (*tk_NameOfRelief) (int relief); /* 140 */
+    const char * (*tk_NameOf3DBorder) (Tk_3DBorder border); /* 130 */
+    const char * (*tk_NameOfAnchor) (Tk_Anchor anchor); /* 131 */
+    const char * (*tk_NameOfBitmap) (Display *display, Pixmap bitmap); /* 132 */
+    const char * (*tk_NameOfCapStyle) (int cap); /* 133 */
+    const char * (*tk_NameOfColor) (XColor *colorPtr); /* 134 */
+    const char * (*tk_NameOfCursor) (Display *display, Tk_Cursor cursor); /* 135 */
+    const char * (*tk_NameOfFont) (Tk_Font font); /* 136 */
+    const char * (*tk_NameOfImage) (Tk_ImageMaster imageMaster); /* 137 */
+    const char * (*tk_NameOfJoinStyle) (int join); /* 138 */
+    const char * (*tk_NameOfJustify) (Tk_Justify justify); /* 139 */
+    const char * (*tk_NameOfRelief) (int relief); /* 140 */
     Tk_Window (*tk_NameToWindow) (Tcl_Interp *interp, const char *pathName, Tk_Window tkwin); /* 141 */
     void (*tk_OwnSelection) (Tk_Window tkwin, Atom selection, Tk_LostSelProc *proc, ClientData clientData); /* 142 */
-    int (*tk_ParseArgv) (Tcl_Interp *interp, Tk_Window tkwin, int *argcPtr, CONST84 char **argv, const Tk_ArgvInfo *argTable, int flags); /* 143 */
-    void (*tk_PhotoPutBlock_NoComposite) (Tk_PhotoHandle handle, Tk_PhotoImageBlock *blockPtr, int x, int y, int width, int height); /* 144 */
-    void (*tk_PhotoPutZoomedBlock_NoComposite) (Tk_PhotoHandle handle, Tk_PhotoImageBlock *blockPtr, int x, int y, int width, int height, int zoomX, int zoomY, int subsampleX, int subsampleY); /* 145 */
+    int (*tk_ParseArgv) (Tcl_Interp *interp, Tk_Window tkwin, int *argcPtr, const char **argv, const Tk_ArgvInfo *argTable, int flags); /* 143 */
+    TCL_DEPRECATED_API("function signature changed") void (*tk_PhotoPutBlock_NoComposite) (Tk_PhotoHandle handle, Tk_PhotoImageBlock *blockPtr, int x, int y, int width, int height); /* 144 */
+    TCL_DEPRECATED_API("function signature changed") void (*tk_PhotoPutZoomedBlock_NoComposite) (Tk_PhotoHandle handle, Tk_PhotoImageBlock *blockPtr, int x, int y, int width, int height, int zoomX, int zoomY, int subsampleX, int subsampleY); /* 145 */
     int (*tk_PhotoGetImage) (Tk_PhotoHandle handle, Tk_PhotoImageBlock *blockPtr); /* 146 */
     void (*tk_PhotoBlank) (Tk_PhotoHandle handle); /* 147 */
-    void (*tk_PhotoExpand_Panic) (Tk_PhotoHandle handle, int width, int height); /* 148 */
+    TCL_DEPRECATED_API("function signature changed") void (*tk_PhotoExpand_Panic) (Tk_PhotoHandle handle, int width, int height); /* 148 */
     void (*tk_PhotoGetSize) (Tk_PhotoHandle handle, int *widthPtr, int *heightPtr); /* 149 */
-    void (*tk_PhotoSetSize_Panic) (Tk_PhotoHandle handle, int width, int height); /* 150 */
+    TCL_DEPRECATED_API("function signature changed") void (*tk_PhotoSetSize_Panic) (Tk_PhotoHandle handle, int width, int height); /* 150 */
     int (*tk_PointToChar) (Tk_TextLayout layout, int x, int y); /* 151 */
     int (*tk_PostscriptFontName) (Tk_Font tkfont, Tcl_DString *dsPtr); /* 152 */
     void (*tk_PreserveColormap) (Display *display, Colormap colormap); /* 153 */
     void (*tk_QueueWindowEvent) (XEvent *eventPtr, Tcl_QueuePosition position); /* 154 */
     void (*tk_RedrawImage) (Tk_Image image, int imageX, int imageY, int width, int height, Drawable drawable, int drawableX, int drawableY); /* 155 */
@@ -1069,30 +1083,30 @@
     Tk_OptionTable (*tk_CreateOptionTable) (Tcl_Interp *interp, const Tk_OptionSpec *templatePtr); /* 190 */
     void (*tk_DeleteOptionTable) (Tk_OptionTable optionTable); /* 191 */
     void (*tk_Free3DBorderFromObj) (Tk_Window tkwin, Tcl_Obj *objPtr); /* 192 */
     void (*tk_FreeBitmapFromObj) (Tk_Window tkwin, Tcl_Obj *objPtr); /* 193 */
     void (*tk_FreeColorFromObj) (Tk_Window tkwin, Tcl_Obj *objPtr); /* 194 */
-    void (*tk_FreeConfigOptions) (char *recordPtr, Tk_OptionTable optionToken, Tk_Window tkwin); /* 195 */
+    void (*tk_FreeConfigOptions) (void *recordPtr, Tk_OptionTable optionToken, Tk_Window tkwin); /* 195 */
     void (*tk_FreeSavedOptions) (Tk_SavedOptions *savePtr); /* 196 */
     void (*tk_FreeCursorFromObj) (Tk_Window tkwin, Tcl_Obj *objPtr); /* 197 */
     void (*tk_FreeFontFromObj) (Tk_Window tkwin, Tcl_Obj *objPtr); /* 198 */
     Tk_3DBorder (*tk_Get3DBorderFromObj) (Tk_Window tkwin, Tcl_Obj *objPtr); /* 199 */
     int (*tk_GetAnchorFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, Tk_Anchor *anchorPtr); /* 200 */
     Pixmap (*tk_GetBitmapFromObj) (Tk_Window tkwin, Tcl_Obj *objPtr); /* 201 */
     XColor * (*tk_GetColorFromObj) (Tk_Window tkwin, Tcl_Obj *objPtr); /* 202 */
     Tk_Cursor (*tk_GetCursorFromObj) (Tk_Window tkwin, Tcl_Obj *objPtr); /* 203 */
-    Tcl_Obj * (*tk_GetOptionInfo) (Tcl_Interp *interp, char *recordPtr, Tk_OptionTable optionTable, Tcl_Obj *namePtr, Tk_Window tkwin); /* 204 */
-    Tcl_Obj * (*tk_GetOptionValue) (Tcl_Interp *interp, char *recordPtr, Tk_OptionTable optionTable, Tcl_Obj *namePtr, Tk_Window tkwin); /* 205 */
+    Tcl_Obj * (*tk_GetOptionInfo) (Tcl_Interp *interp, void *recordPtr, Tk_OptionTable optionTable, Tcl_Obj *namePtr, Tk_Window tkwin); /* 204 */
+    Tcl_Obj * (*tk_GetOptionValue) (Tcl_Interp *interp, void *recordPtr, Tk_OptionTable optionTable, Tcl_Obj *namePtr, Tk_Window tkwin); /* 205 */
     int (*tk_GetJustifyFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, Tk_Justify *justifyPtr); /* 206 */
     int (*tk_GetMMFromObj) (Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr, double *doublePtr); /* 207 */
     int (*tk_GetPixelsFromObj) (Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr, int *intPtr); /* 208 */
     int (*tk_GetReliefFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr, int *resultPtr); /* 209 */
     int (*tk_GetScrollInfoObj) (Tcl_Interp *interp, int objc, Tcl_Obj *const objv[], double *dblPtr, int *intPtr); /* 210 */
-    int (*tk_InitOptions) (Tcl_Interp *interp, char *recordPtr, Tk_OptionTable optionToken, Tk_Window tkwin); /* 211 */
+    int (*tk_InitOptions) (Tcl_Interp *interp, void *recordPtr, Tk_OptionTable optionToken, Tk_Window tkwin); /* 211 */
     void (*tk_MainEx) (int argc, char **argv, Tcl_AppInitProc *appInitProc, Tcl_Interp *interp); /* 212 */
     void (*tk_RestoreSavedOptions) (Tk_SavedOptions *savePtr); /* 213 */
-    int (*tk_SetOptions) (Tcl_Interp *interp, char *recordPtr, Tk_OptionTable optionTable, int objc, Tcl_Obj *const objv[], Tk_Window tkwin, Tk_SavedOptions *savePtr, int *maskPtr); /* 214 */
+    int (*tk_SetOptions) (Tcl_Interp *interp, void *recordPtr, Tk_OptionTable optionTable, int objc, Tcl_Obj *const objv[], Tk_Window tkwin, Tk_SavedOptions *savePtr, int *maskPtr); /* 214 */
     void (*tk_InitConsoleChannels) (Tcl_Interp *interp); /* 215 */
     int (*tk_CreateConsoleWindow) (Tcl_Interp *interp); /* 216 */
     void (*tk_CreateSmoothMethod) (Tcl_Interp *interp, const Tk_SmoothMethod *method); /* 217 */
     void (*reserved218)(void);
     void (*reserved219)(void);
@@ -1120,12 +1134,12 @@
     Tk_Window (*tk_CreateAnonymousWindow) (Tcl_Interp *interp, Tk_Window parent, const char *screenName); /* 241 */
     void (*tk_SetClassProcs) (Tk_Window tkwin, const Tk_ClassProcs *procs, ClientData instanceData); /* 242 */
     void (*tk_SetInternalBorderEx) (Tk_Window tkwin, int left, int right, int top, int bottom); /* 243 */
     void (*tk_SetMinimumRequestSize) (Tk_Window tkwin, int minWidth, int minHeight); /* 244 */
     void (*tk_SetCaretPos) (Tk_Window tkwin, int x, int y, int height); /* 245 */
-    void (*tk_PhotoPutBlock_Panic) (Tk_PhotoHandle handle, Tk_PhotoImageBlock *blockPtr, int x, int y, int width, int height, int compRule); /* 246 */
-    void (*tk_PhotoPutZoomedBlock_Panic) (Tk_PhotoHandle handle, Tk_PhotoImageBlock *blockPtr, int x, int y, int width, int height, int zoomX, int zoomY, int subsampleX, int subsampleY, int compRule); /* 247 */
+    TCL_DEPRECATED_API("function signature changed") void (*tk_PhotoPutBlock_Panic) (Tk_PhotoHandle handle, Tk_PhotoImageBlock *blockPtr, int x, int y, int width, int height, int compRule); /* 246 */
+    TCL_DEPRECATED_API("function signature changed") void (*tk_PhotoPutZoomedBlock_Panic) (Tk_PhotoHandle handle, Tk_PhotoImageBlock *blockPtr, int x, int y, int width, int height, int zoomX, int zoomY, int subsampleX, int subsampleY, int compRule); /* 247 */
     int (*tk_CollapseMotionEvents) (Display *display, int collapse); /* 248 */
     Tk_StyleEngine (*tk_RegisterStyleEngine) (const char *name, Tk_StyleEngine parent); /* 249 */
     Tk_StyleEngine (*tk_GetStyleEngine) (const char *name); /* 250 */
     int (*tk_RegisterStyledElement) (Tk_StyleEngine engine, Tk_ElementSpec *templatePtr); /* 251 */
     int (*tk_GetElementId) (const char *name); /* 252 */
@@ -1135,14 +1149,14 @@
     const char * (*tk_NameOfStyle) (Tk_Style style); /* 256 */
     Tk_Style (*tk_AllocStyleFromObj) (Tcl_Interp *interp, Tcl_Obj *objPtr); /* 257 */
     Tk_Style (*tk_GetStyleFromObj) (Tcl_Obj *objPtr); /* 258 */
     void (*tk_FreeStyleFromObj) (Tcl_Obj *objPtr); /* 259 */
     Tk_StyledElement (*tk_GetStyledElement) (Tk_Style style, int elementId, Tk_OptionTable optionTable); /* 260 */
-    void (*tk_GetElementSize) (Tk_Style style, Tk_StyledElement element, char *recordPtr, Tk_Window tkwin, int width, int height, int inner, int *widthPtr, int *heightPtr); /* 261 */
-    void (*tk_GetElementBox) (Tk_Style style, Tk_StyledElement element, char *recordPtr, Tk_Window tkwin, int x, int y, int width, int height, int inner, int *xPtr, int *yPtr, int *widthPtr, int *heightPtr); /* 262 */
-    int (*tk_GetElementBorderWidth) (Tk_Style style, Tk_StyledElement element, char *recordPtr, Tk_Window tkwin); /* 263 */
-    void (*tk_DrawElement) (Tk_Style style, Tk_StyledElement element, char *recordPtr, Tk_Window tkwin, Drawable d, int x, int y, int width, int height, int state); /* 264 */
+    void (*tk_GetElementSize) (Tk_Style style, Tk_StyledElement element, void *recordPtr, Tk_Window tkwin, int width, int height, int inner, int *widthPtr, int *heightPtr); /* 261 */
+    void (*tk_GetElementBox) (Tk_Style style, Tk_StyledElement element, void *recordPtr, Tk_Window tkwin, int x, int y, int width, int height, int inner, int *xPtr, int *yPtr, int *widthPtr, int *heightPtr); /* 262 */
+    int (*tk_GetElementBorderWidth) (Tk_Style style, Tk_StyledElement element, void *recordPtr, Tk_Window tkwin); /* 263 */
+    void (*tk_DrawElement) (Tk_Style style, Tk_StyledElement element, void *recordPtr, Tk_Window tkwin, Drawable d, int x, int y, int width, int height, int state); /* 264 */
     int (*tk_PhotoExpand) (Tcl_Interp *interp, Tk_PhotoHandle handle, int width, int height); /* 265 */
     int (*tk_PhotoPutBlock) (Tcl_Interp *interp, Tk_PhotoHandle handle, Tk_PhotoImageBlock *blockPtr, int x, int y, int width, int height, int compRule); /* 266 */
     int (*tk_PhotoPutZoomedBlock) (Tcl_Interp *interp, Tk_PhotoHandle handle, Tk_PhotoImageBlock *blockPtr, int x, int y, int width, int height, int zoomX, int zoomY, int subsampleX, int subsampleY, int compRule); /* 267 */
     int (*tk_PhotoSetSize) (Tcl_Interp *interp, Tk_PhotoHandle handle, int width, int height); /* 268 */
     long (*tk_GetUserInactiveTime) (Display *dpy); /* 269 */
@@ -1718,16 +1732,34 @@
 /* Functions that don't belong in the stub table */
 #undef Tk_MainEx
 #undef Tk_Init
 #undef Tk_SafeInit
 #undef Tk_CreateConsoleWindow
+
+#undef Tk_FreeXId
+#define Tk_FreeXId(display,xid)
+#undef Tk_GetStyleFromObj
+#undef Tk_FreeStyleFromObj
+#define Tk_GetStyleFromObj(obj) Tk_AllocStyleFromObj(NULL, obj)
+#define Tk_FreeStyleFromObj(obj) /* no-op */
+
 
 #if defined(_WIN32) && defined(UNICODE)
 #   define Tk_MainEx Tk_MainExW
     EXTERN void Tk_MainExW(int argc, wchar_t **argv,
 	    Tcl_AppInitProc *appInitProc, Tcl_Interp *interp);
 #endif
 
+
+#if defined(TK_NO_DEPRECATED) || TCL_MAJOR_VERSION > 8
+#undef Tk_PhotoPutBlock_NoComposite
+#undef Tk_PhotoPutZoomedBlock_NoComposite
+#undef Tk_PhotoExpand_Panic
+#undef Tk_PhotoPutBlock_Panic
+#undef Tk_PhotoPutZoomedBlock_Panic
+#undef Tk_PhotoSetSize_Panic
+#endif /* TK_NO_DEPRECATED */
+
 #undef TCL_STORAGE_CLASS
 #define TCL_STORAGE_CLASS DLLIMPORT
 
 #endif /* _TKDECLS */

Index: generic/tkEntry.c
==================================================================
--- generic/tkEntry.c
+++ generic/tkEntry.c
@@ -14,12 +14,12 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
 
 #include "tkInt.h"
-#include "default.h"
 #include "tkEntry.h"
+#include "default.h"
 
 /*
  * The following macro defines how many extra pixels to leave on each side of
  * the text in the entry.
  */
@@ -116,10 +116,16 @@
 	TK_OPTION_NULL_OK, 0, 0},
     {TK_OPTION_SYNONYM, "-invcmd", NULL, NULL,
 	NULL, 0, -1, 0, "-invalidcommand", 0},
     {TK_OPTION_JUSTIFY, "-justify", "justify", "Justify",
 	DEF_ENTRY_JUSTIFY, -1, Tk_Offset(Entry, justify), 0, 0, 0},
+    {TK_OPTION_STRING, "-placeholder", "placeHolder", "PlaceHolder",
+	DEF_ENTRY_PLACEHOLDER, -1, Tk_Offset(Entry, placeholderString),
+	TK_OPTION_NULL_OK, 0, 0},
+    {TK_OPTION_COLOR, "-placeholderforeground", "placeholderForeground",
+        "PlaceholderForeground", DEF_ENTRY_PLACEHOLDERFG, -1,
+        Tk_Offset(Entry, placeholderColorPtr), 0, 0, 0},
     {TK_OPTION_BORDER, "-readonlybackground", "readonlyBackground",
 	"ReadonlyBackground", DEF_ENTRY_READONLY_BG_COLOR, -1,
 	Tk_Offset(Entry, readonlyBorder), TK_OPTION_NULL_OK,
 	(ClientData) DEF_ENTRY_READONLY_BG_MONO, 0},
     {TK_OPTION_RELIEF, "-relief", "relief", "Relief",
@@ -256,10 +262,16 @@
 	TK_OPTION_NULL_OK, 0, 0},
     {TK_OPTION_SYNONYM, "-invcmd", NULL, NULL,
 	NULL, 0, -1, 0, "-invalidcommand", 0},
     {TK_OPTION_JUSTIFY, "-justify", "justify", "Justify",
 	DEF_ENTRY_JUSTIFY, -1, Tk_Offset(Entry, justify), 0, 0, 0},
+    {TK_OPTION_STRING, "-placeholder", "placeHolder", "PlaceHolder",
+	DEF_ENTRY_PLACEHOLDER, -1, Tk_Offset(Entry, placeholderString),
+	TK_OPTION_NULL_OK, 0, 0},
+    {TK_OPTION_COLOR, "-placeholderforeground", "placeholderForeground",
+        "PlaceholderForeground", DEF_ENTRY_PLACEHOLDERFG, -1,
+        Tk_Offset(Entry, placeholderColorPtr), 0, 0, 0},
     {TK_OPTION_RELIEF, "-relief", "relief", "Relief",
 	DEF_ENTRY_RELIEF, -1, Tk_Offset(Entry, relief), 0, 0, 0},
     {TK_OPTION_BORDER, "-readonlybackground", "readonlyBackground",
 	"ReadonlyBackground", DEF_ENTRY_READONLY_BG_COLOR, -1,
 	Tk_Offset(Entry, readonlyBorder), TK_OPTION_NULL_OK,
@@ -535,10 +547,12 @@
     entryPtr->selTextGC		= None;
     entryPtr->highlightGC	= None;
     entryPtr->avgWidth		= 1;
     entryPtr->validate		= VALIDATE_NONE;
 
+    entryPtr->placeholderGC	= None;
+
     /*
      * Keep a hold of the associated tkwin until we destroy the entry,
      * otherwise Tk might free it while we still need it.
      */
 
@@ -550,11 +564,11 @@
 	    ExposureMask|StructureNotifyMask|FocusChangeMask,
 	    EntryEventProc, entryPtr);
     Tk_CreateSelHandler(entryPtr->tkwin, XA_PRIMARY, XA_STRING,
 	    EntryFetchSelection, entryPtr, XA_STRING);
 
-    if ((Tk_InitOptions(interp, (char *) entryPtr, optionTable, tkwin)
+    if ((Tk_InitOptions(interp, entryPtr, optionTable, tkwin)
 	    != TCL_OK) ||
 	    (ConfigureEntry(interp, entryPtr, objc-2, objv+2) != TCL_OK)) {
 	Tk_DestroyWindow(entryPtr->tkwin);
 	return TCL_ERROR;
     }
@@ -638,21 +652,21 @@
 	if (objc != 3) {
 	    Tcl_WrongNumArgs(interp, 2, objv, "option");
 	    goto error;
 	}
 
-	objPtr = Tk_GetOptionValue(interp, (char *) entryPtr,
+	objPtr = Tk_GetOptionValue(interp, entryPtr,
 		entryPtr->optionTable, objv[2], entryPtr->tkwin);
 	if (objPtr == NULL) {
 	    goto error;
 	}
 	Tcl_SetObjResult(interp, objPtr);
 	break;
 
     case COMMAND_CONFIGURE:
 	if (objc <= 3) {
-	    objPtr = Tk_GetOptionInfo(interp, (char *) entryPtr,
+	    objPtr = Tk_GetOptionInfo(interp, entryPtr,
 		    entryPtr->optionTable,
 		    (objc == 3) ? objv[2] : NULL,
 		    entryPtr->tkwin);
 	    if (objPtr == NULL) {
 		goto error;
@@ -885,11 +899,12 @@
 	    } else {
 		entryPtr->selectFirst = index;
 		entryPtr->selectLast = index2;
 	    }
 	    if (!(entryPtr->flags & GOT_SELECTION)
-		    && (entryPtr->exportSelection)) {
+		    && (entryPtr->exportSelection)
+		    && (!Tcl_IsSafe(entryPtr->interp))) {
 		Tk_OwnSelection(entryPtr->tkwin, XA_PRIMARY,
 			EntryLostSelection, entryPtr);
 		entryPtr->flags |= GOT_SELECTION;
 	    }
 	    EventuallyRedraw(entryPtr);
@@ -1120,11 +1135,11 @@
     /*
      * Store old values that we need to effect certain behavior if they change
      * value.
      */
 
-    oldExport = entryPtr->exportSelection;
+    oldExport = (entryPtr->exportSelection) && (!Tcl_IsSafe(entryPtr->interp));
     if (entryPtr->type == TK_SPINBOX) {
 	oldValues = sbPtr->valueStr;
 	oldFormat = sbPtr->reqFormat;
 	oldFrom = sbPtr->fromValue;
 	oldTo = sbPtr->toValue;
@@ -1134,11 +1149,11 @@
 	if (!error) {
 	    /*
 	     * First pass: set options to new values.
 	     */
 
-	    if (Tk_SetOptions(interp, (char *) entryPtr,
+	    if (Tk_SetOptions(interp, entryPtr,
 		    entryPtr->optionTable, objc, objv,
 		    entryPtr->tkwin, &savedOptions, NULL) != TCL_OK) {
 		continue;
 	    }
 	} else {
@@ -1174,17 +1189,19 @@
 	    entryPtr->insertBorderWidth = entryPtr->insertWidth/2;
 	}
 
 	if (entryPtr->type == TK_SPINBOX) {
 	    if (sbPtr->fromValue > sbPtr->toValue) {
-		Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			"-to value must be greater than -from value",
-			-1));
-		Tcl_SetErrorCode(interp, "TK", "SPINBOX", "RANGE_SANITY",
-			NULL);
-		continue;
-	    }
+                /*
+                 * Swap -from and -to values.
+                 */
+
+                double tmpFromTo = sbPtr->fromValue;
+
+                sbPtr->fromValue = sbPtr->toValue;
+                sbPtr->toValue = tmpFromTo;
+            }
 
 	    if (sbPtr->reqFormat && (oldFormat != sbPtr->reqFormat)) {
 		/*
 		 * Make sure that the given format is somewhat correct, and
 		 * calculate the minimum space we'll need for the values as
@@ -1274,10 +1291,11 @@
 	/*
 	 * Claim the selection if we've suddenly started exporting it.
 	 */
 
 	if (entryPtr->exportSelection && (!oldExport)
+		&& (!Tcl_IsSafe(entryPtr->interp))
 		&& (entryPtr->selectFirst != -1)
 		&& !(entryPtr->flags & GOT_SELECTION)) {
 	    Tk_OwnSelection(entryPtr->tkwin, XA_PRIMARY, EntryLostSelection,
 		    entryPtr);
 	    entryPtr->flags |= GOT_SELECTION;
@@ -1482,13 +1500,25 @@
     gc = Tk_GetGC(entryPtr->tkwin, mask, &gcValues);
     if (entryPtr->textGC != None) {
 	Tk_FreeGC(entryPtr->display, entryPtr->textGC);
     }
     entryPtr->textGC = gc;
+
+    if (entryPtr->placeholderColorPtr != NULL) {
+	gcValues.foreground = entryPtr->placeholderColorPtr->pixel;
+    }
+    mask = GCForeground | GCFont | GCGraphicsExposures;
+    gc = Tk_GetGC(entryPtr->tkwin, mask, &gcValues);
+    if (entryPtr->placeholderGC != None) {
+	Tk_FreeGC(entryPtr->display, entryPtr->placeholderGC);
+    }
+    entryPtr->placeholderGC = gc;
 
     if (entryPtr->selFgColorPtr != NULL) {
 	gcValues.foreground = entryPtr->selFgColorPtr->pixel;
+    } else {
+        gcValues.foreground = colorPtr->pixel;
     }
     gcValues.font = Tk_FontId(entryPtr->tkfont);
     mask = GCForeground | GCFont;
     gc = Tk_GetGC(entryPtr->tkwin, mask, &gcValues);
     if (entryPtr->selTextGC != None) {
@@ -1732,13 +1762,19 @@
     /*
      * Draw the text in two pieces: first the unselected portion, then the
      * selected portion on top of it.
      */
 
-    Tk_DrawTextLayout(entryPtr->display, pixmap, entryPtr->textGC,
+    if ((entryPtr->numChars != 0) || (entryPtr->placeholderChars == 0)) {
+        Tk_DrawTextLayout(entryPtr->display, pixmap, entryPtr->textGC,
 	    entryPtr->textLayout, entryPtr->layoutX, entryPtr->layoutY,
 	    entryPtr->leftIndex, entryPtr->numChars);
+    } else {
+	Tk_DrawTextLayout(entryPtr->display, pixmap, entryPtr->placeholderGC,
+	    entryPtr->placeholderLayout, entryPtr->placeholderX, entryPtr->layoutY,
+	    entryPtr->placeholderLeftIndex, entryPtr->placeholderChars);
+    }
 
     if (showSelection && (entryPtr->state != STATE_DISABLED)
 	    && (entryPtr->selTextGC != entryPtr->textGC)
 	    && (entryPtr->selectFirst < entryPtr->selectLast)) {
 	int selFirst;
@@ -1922,23 +1958,23 @@
      * If we're displaying a special character instead of the value of the
      * entry, recompute the displayString.
      */
 
     if (entryPtr->showChar != NULL) {
-	Tcl_UniChar ch;
-	char buf[TCL_UTF_MAX];
+	int ch;
+	char buf[6];
 	int size;
 
 	/*
 	 * Normalize the special character so we can safely duplicate it in
 	 * the display string. If we didn't do this, then two malformed
 	 * characters might end up looking like one valid UTF character in the
 	 * resulting string.
 	 */
 
-	Tcl_UtfToUniChar(entryPtr->showChar, &ch);
-	size = Tcl_UniCharToUtf(ch, buf);
+	TkUtfToUniChar(entryPtr->showChar, &ch);
+	size = TkUniCharToUtf(ch, buf);
 
 	entryPtr->numDisplayBytes = entryPtr->numChars * size;
 	p = ckalloc(entryPtr->numDisplayBytes + 1);
 	entryPtr->displayString = p;
 
@@ -1946,10 +1982,62 @@
 	    memcpy(p, buf, size);
 	    p += size;
 	}
 	*p = '\0';
     }
+
+    /* Recompute layout of placeholder text.
+     * Only the placeholderX and placeholderLeftIndex value is needed.
+     * We use the same font so we can use the layoutY value from below.
+     */
+
+    Tk_FreeTextLayout(entryPtr->placeholderLayout);
+    if (entryPtr->placeholderString) {
+        entryPtr->placeholderChars = strlen(entryPtr->placeholderString);
+        entryPtr->placeholderLayout = Tk_ComputeTextLayout(entryPtr->tkfont,
+	        entryPtr->placeholderString, entryPtr->placeholderChars, 0,
+	        entryPtr->justify, TK_IGNORE_NEWLINES, &totalLength, NULL);
+	overflow = totalLength -
+	        (Tk_Width(entryPtr->tkwin) - 2*entryPtr->inset - entryPtr->xWidth);
+	if (overflow <= 0) {
+	    entryPtr->placeholderLeftIndex = 0;
+	    if (entryPtr->justify == TK_JUSTIFY_LEFT) {
+		entryPtr->placeholderX = entryPtr->inset;
+	    } else if (entryPtr->justify == TK_JUSTIFY_RIGHT) {
+		entryPtr->placeholderX = Tk_Width(entryPtr->tkwin) - entryPtr->inset
+		        - entryPtr->xWidth - totalLength;
+	    } else {
+		entryPtr->placeholderX = (Tk_Width(entryPtr->tkwin)
+		        - entryPtr->xWidth - totalLength)/2;
+	    }
+    	} else {
+
+	    /*
+	     * The whole string can't fit in the window. Compute the maximum
+	     * number of characters that may be off-screen to the left without
+	     * leaving empty space on the right of the window, then don't let
+	     * placeholderLeftIndex be any greater than that.
+	     */
+
+	    maxOffScreen = Tk_PointToChar(entryPtr->placeholderLayout, overflow, 0);
+	    Tk_CharBbox(entryPtr->placeholderLayout, maxOffScreen,
+		&rightX, NULL, NULL, NULL);
+	    if (rightX < overflow) {
+		maxOffScreen++;
+	    }
+	    entryPtr->placeholderLeftIndex = maxOffScreen;
+	    Tk_CharBbox(entryPtr->placeholderLayout, entryPtr->placeholderLeftIndex, &rightX,
+		NULL, NULL, NULL);
+	    entryPtr->placeholderX = entryPtr->inset -rightX;
+        }
+    } else {
+        entryPtr->placeholderChars = 0;
+        entryPtr->placeholderLayout = Tk_ComputeTextLayout(entryPtr->tkfont,
+	        entryPtr->placeholderString, 0, 0,
+	        entryPtr->justify, TK_IGNORE_NEWLINES, NULL, NULL);
+	entryPtr->placeholderX = entryPtr->inset;
+    }
 
     Tk_FreeTextLayout(entryPtr->textLayout);
     entryPtr->textLayout = Tk_ComputeTextLayout(entryPtr->tkfont,
 	    entryPtr->displayString, entryPtr->numChars, 0,
 	    entryPtr->justify, TK_IGNORE_NEWLINES, &totalLength, &height);
@@ -2042,13 +2130,11 @@
     int index,			/* Add the new elements before this character
 				 * index. */
     const char *value)		/* New characters to add (NULL-terminated
 				 * string). */
 {
-    ptrdiff_t byteIndex;
-    size_t byteCount, newByteCount;
-    int oldChars, charsAdded;
+    size_t byteIndex, byteCount, newByteCount, oldChars, charsAdded;
     const char *string;
     char *newStr;
 
     string = entryPtr->string;
     byteIndex = Tcl_UtfAtIndex(string, index) - string;
@@ -2743,11 +2829,12 @@
 
     /*
      * Grab the selection if we don't own it already.
      */
 
-    if (!(entryPtr->flags & GOT_SELECTION) && (entryPtr->exportSelection)) {
+    if (!(entryPtr->flags & GOT_SELECTION) && (entryPtr->exportSelection)
+	    && (!Tcl_IsSafe(entryPtr->interp))) {
 	Tk_OwnSelection(entryPtr->tkwin, XA_PRIMARY, EntryLostSelection,
 		entryPtr);
 	entryPtr->flags |= GOT_SELECTION;
     }
 
@@ -2810,11 +2897,12 @@
     Entry *entryPtr = clientData;
     int byteCount;
     const char *string;
     const char *selStart, *selEnd;
 
-    if ((entryPtr->selectFirst < 0) || !(entryPtr->exportSelection)) {
+    if ((entryPtr->selectFirst < 0) || (!entryPtr->exportSelection)
+	    || Tcl_IsSafe(entryPtr->interp)) {
 	return -1;
     }
     string = entryPtr->displayString;
     selStart = Tcl_UtfAtIndex(string, entryPtr->selectFirst);
     selEnd = Tcl_UtfAtIndex(selStart,
@@ -2863,11 +2951,12 @@
      * selection since it is always visible.
      * This is controlled by ::tk::AlwaysShowSelection.
      */
 
     if (TkpAlwaysShowSelection(entryPtr->tkwin)
-	    && (entryPtr->selectFirst >= 0) && entryPtr->exportSelection) {
+	    && (entryPtr->selectFirst >= 0) && entryPtr->exportSelection
+	    && (!Tcl_IsSafe(entryPtr->interp))) {
 	entryPtr->selectFirst = -1;
 	entryPtr->selectLast = -1;
 	EventuallyRedraw(entryPtr);
     }
 }
@@ -3128,12 +3217,12 @@
 	/* ARGSUSED */
 static char *
 EntryTextVarProc(
     ClientData clientData,	/* Information about button. */
     Tcl_Interp *interp,		/* Interpreter containing variable. */
-    const char *name1,		/* Not used. */
-    const char *name2,		/* Not used. */
+    const char *name1,		/* Name of variable. */
+    const char *name2,		/* Second part of variable name. */
     int flags)			/* Information about what happened. */
 {
     Entry *entryPtr = clientData;
     const char *value;
 
@@ -3141,10 +3230,23 @@
 	/*
 	 * Just abort early if we entered here while being deleted.
 	 */
 	return NULL;
     }
+
+    /*
+     * See ticket [5d991b82].
+     */
+
+    if (entryPtr->textVarName == NULL) {
+	if (!(flags & TCL_INTERP_DESTROYED)) {
+	    Tcl_UntraceVar2(interp, name1, name2,
+		    TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
+		    EntryTextVarProc, clientData);
+	}
+ 	return NULL;
+     }
 
     /*
      * If the variable is unset, then immediately recreate it unless the whole
      * interpreter is going away.
      */
@@ -3244,11 +3346,11 @@
  *	This function is invoked when any character is added or removed from
  *	the entry widget, or a focus has trigerred validation.
  *
  * Results:
  *	TCL_OK if the validatecommand accepts the new string, TCL_ERROR if any
- *	problems occured with validatecommand.
+ *	problems occurred with validatecommand.
  *
  * Side effects:
  *	The insertion/deletion may be aborted, and the validatecommand might
  *	turn itself off (if an error or loop condition arises).
  *
@@ -3301,11 +3403,11 @@
     Tcl_DStringFree(&script);
 
     /*
      * If e->validate has become VALIDATE_NONE during the validation, or we
      * now have VALIDATE_VAR set (from EntrySetValue) and didn't before, it
-     * means that a loop condition almost occured. Do not allow this
+     * means that a loop condition almost occurred. Do not allow this
      * validation result to finish.
      */
 
     if (entryPtr->validate == VALIDATE_NONE
 	    || (!varValidate && (entryPtr->flags & VALIDATE_VAR))) {
@@ -3410,11 +3512,11 @@
 {
     int spaceNeeded, cvtFlags;	/* Used to substitute string as proper Tcl
 				 * list element. */
     int number, length;
     register const char *string;
-    Tcl_UniChar ch;
+    int ch;
     char numStorage[2*TCL_INTEGER_SPACE];
 
     while (1) {
 	if (*before == '\0') {
 	    break;
@@ -3443,11 +3545,11 @@
 	 * There's a percent sequence here. Process it.
 	 */
 
 	before++; /* skip over % */
 	if (*before != '\0') {
-	    before += Tcl_UtfToUniChar(before, &ch);
+	    before += TkUtfToUniChar(before, &ch);
 	} else {
 	    ch = '%';
 	}
 	if (type == VALIDATE_BUTTON) {
 	    /*
@@ -3463,11 +3565,11 @@
 		break;
 	    case 'W':		/* widget name */
 		string = Tk_PathName(entryPtr->tkwin);
 		break;
 	    default:
-		length = Tcl_UniCharToUtf(ch, numStorage);
+		length = TkUniCharToUtf(ch, numStorage);
 		numStorage[length] = '\0';
 		string = numStorage;
 		break;
 	    }
 	} else {
@@ -3523,11 +3625,11 @@
 		break;
 	    case 'W': /* widget name */
 		string = Tk_PathName(entryPtr->tkwin);
 		break;
 	    default:
-		length = Tcl_UniCharToUtf(ch, numStorage);
+		length = TkUniCharToUtf(ch, numStorage);
 		numStorage[length] = '\0';
 		string = numStorage;
 		break;
 	    }
 	}
@@ -3638,10 +3740,12 @@
     sbPtr->increment		= 1.0;
     sbPtr->formatBuf		= ckalloc(TCL_DOUBLE_SPACE);
     sbPtr->bdRelief		= TK_RELIEF_FLAT;
     sbPtr->buRelief		= TK_RELIEF_FLAT;
 
+    entryPtr->placeholderGC	= None;
+
     /*
      * Keep a hold of the associated tkwin until we destroy the spinbox,
      * otherwise Tk might free it while we still need it.
      */
 
@@ -3653,11 +3757,11 @@
 	    PointerMotionMask|ExposureMask|StructureNotifyMask|FocusChangeMask,
 	    EntryEventProc, entryPtr);
     Tk_CreateSelHandler(entryPtr->tkwin, XA_PRIMARY, XA_STRING,
 	    EntryFetchSelection, entryPtr, XA_STRING);
 
-    if (Tk_InitOptions(interp, (char *) sbPtr, optionTable, tkwin)
+    if (Tk_InitOptions(interp, sbPtr, optionTable, tkwin)
 	    != TCL_OK) {
 	Tk_DestroyWindow(entryPtr->tkwin);
 	return TCL_ERROR;
     }
     if (ConfigureEntry(interp, entryPtr, objc-2, objv+2) != TCL_OK) {
@@ -3748,21 +3852,21 @@
 	if (objc != 3) {
 	    Tcl_WrongNumArgs(interp, 2, objv, "option");
 	    goto error;
 	}
 
-	objPtr = Tk_GetOptionValue(interp, (char *) entryPtr,
+	objPtr = Tk_GetOptionValue(interp, entryPtr,
 		entryPtr->optionTable, objv[2], entryPtr->tkwin);
 	if (objPtr == NULL) {
 	    goto error;
 	}
 	Tcl_SetObjResult(interp, objPtr);
 	break;
 
     case SB_CMD_CONFIGURE:
 	if (objc <= 3) {
-	    objPtr = Tk_GetOptionInfo(interp, (char *) entryPtr,
+	    objPtr = Tk_GetOptionInfo(interp, entryPtr,
 		    entryPtr->optionTable, (objc == 3) ? objv[2] : NULL,
 		    entryPtr->tkwin);
 	    if (objPtr == NULL) {
 		goto error;
 	    }
@@ -4032,11 +4136,12 @@
 	    } else {
 		entryPtr->selectFirst = index;
 		entryPtr->selectLast = index2;
 	    }
 	    if (!(entryPtr->flags & GOT_SELECTION)
-		    && entryPtr->exportSelection) {
+		    && entryPtr->exportSelection
+		    && (!Tcl_IsSafe(entryPtr->interp))) {
 		Tk_OwnSelection(entryPtr->tkwin, XA_PRIMARY,
 			EntryLostSelection, entryPtr);
 		entryPtr->flags |= GOT_SELECTION;
 	    }
 	    EventuallyRedraw(entryPtr);
@@ -4277,20 +4382,21 @@
 		 * Somehow the string changed from what we expected, so let's
 		 * do a search on the list to see if the current value is
 		 * there. If not, move to the first element of the list.
 		 */
 
-		int i, listc, elemLen, length = entryPtr->numChars;
+		int i, listc;
+		size_t elemLen, length = entryPtr->numChars;
 		const char *bytes;
 		Tcl_Obj **listv;
 
 		Tcl_ListObjGetElements(interp, sbPtr->listObj, &listc, &listv);
 		for (i = 0; i < listc; i++) {
-		    bytes = Tcl_GetStringFromObj(listv[i], &elemLen);
+		    bytes = TkGetStringFromObj(listv[i], &elemLen);
 		    if ((length == elemLen) &&
 			    (memcmp(bytes, entryPtr->string,
-				    (size_t) length) == 0)) {
+				    length) == 0)) {
 			sbPtr->eIndex = i;
 			break;
 		    }
 		}
 	    }

Index: generic/tkEntry.h
==================================================================
--- generic/tkEntry.h
+++ generic/tkEntry.h
@@ -126,10 +126,23 @@
     char *showChar;		/* Value of -show option. If non-NULL, first
 				 * character is used for displaying all
 				 * characters in entry. Malloc'ed. This is
 				 * only used by the Entry widget. */
 
+    /*
+     * Fields used in displaying help text if entry value is empty
+     */
+
+    Tk_TextLayout placeholderLayout;/* Cached placeholder text layout information. */
+    char *placeholderString;	/* String value of placeholder. */
+    int placeholderChars;	/* Number of chars in placeholder. */
+    XColor *placeholderColorPtr;/* Color value of placeholder foreground. */
+    GC placeholderGC;		/* For drawing placeholder text. */
+    int placeholderX;		/* Origin for layout. */
+    int placeholderLeftIndex;	/* Character index of left-most character
+				 * visible in window. */
+
     /*
      * Fields whose values are derived from the current values of the
      * configuration settings above.
      */
 
@@ -219,11 +232,11 @@
 				 * Malloc'ed. */
     char *reqFormat;		/* Sprintf conversion specifier used for the
 				 * value that the users requests. Malloc'ed */
     char *valueFormat;		/* Sprintf conversion specifier used for the
 				 * value. */
-    char digitFormat[10];	/* Sprintf conversion specifier computed from
+    char digitFormat[16];	/* Sprintf conversion specifier computed from
 				 * digits and other information; used for the
 				 * value. */
 
     char *valueStr;		/* Values List. Malloc'ed. */
     Tcl_Obj *listObj;		/* Pointer to the list object being used */

Index: generic/tkError.c
==================================================================
--- generic/tkError.c
+++ generic/tkError.c
@@ -80,12 +80,12 @@
     Tk_ErrorProc *errorProc,	/* Procedure to invoke when a matching error
 				 * occurs. NULL means just ignore matching
 				 * errors. */
     ClientData clientData)	/* Arbitrary value to pass to errorProc. */
 {
-    register TkErrorHandler *errorPtr;
-    register TkDisplay *dispPtr;
+    TkErrorHandler *errorPtr;
+    TkDisplay *dispPtr;
 
     /*
      * Find the display. If Tk doesn't know about this display then it's an
      * error: panic.
      */
@@ -145,12 +145,12 @@
 void
 Tk_DeleteErrorHandler(
     Tk_ErrorHandler handler)	/* Token for handler to delete; was previous
 				 * return value from Tk_CreateErrorHandler. */
 {
-    register TkErrorHandler *errorPtr = (TkErrorHandler *) handler;
-    register TkDisplay *dispPtr = errorPtr->dispPtr;
+    TkErrorHandler *errorPtr = (TkErrorHandler *) handler;
+    TkDisplay *dispPtr = errorPtr->dispPtr;
 
     errorPtr->lastRequest = NextRequest(dispPtr->display) - 1;
 
     /*
      * Every once-in-a-while, cleanup handlers that are no longer active. We
@@ -162,23 +162,30 @@
      * errors that might occur while the dead handlers are hanging around, but
      * reduces the overhead of scanning the list to clean up (particularly if
      * there are many handlers that stay around forever).
      */
 
-    dispPtr->deleteCount += 1;
-    if (dispPtr->deleteCount >= 10) {
-	register TkErrorHandler *prevPtr;
+    if (dispPtr->deleteCount++ >= 9) {
+	TkErrorHandler *prevPtr;
 	TkErrorHandler *nextPtr;
-	int lastSerial;
+	unsigned long lastSerial = LastKnownRequestProcessed(dispPtr->display);
+
+	/*
+	 * Last chance to catch errors for this handler: if no event/error
+	 * processing took place to follow up the end of this error handler
+	 * we need a round trip with the X server now.
+	 */
 
+	if (errorPtr->lastRequest > lastSerial) {
+	    XSync(dispPtr->display, False);
+	}
 	dispPtr->deleteCount = 0;
-	lastSerial = LastKnownRequestProcessed(dispPtr->display);
 	errorPtr = dispPtr->errorPtr;
 	for (prevPtr = NULL; errorPtr != NULL; errorPtr = nextPtr) {
 	    nextPtr = errorPtr->nextPtr;
 	    if ((errorPtr->lastRequest != (unsigned long) -1)
-		    && (errorPtr->lastRequest <= (unsigned long) lastSerial)) {
+		    && (errorPtr->lastRequest <= lastSerial)) {
 		if (prevPtr == NULL) {
 		    dispPtr->errorPtr = nextPtr;
 		} else {
 		    prevPtr->nextPtr = nextPtr;
 		}
@@ -211,15 +218,15 @@
  */
 
 static int
 ErrorProc(
     Display *display,		/* Display for which error occurred. */
-    register XErrorEvent *errEventPtr)
+    XErrorEvent *errEventPtr)
 				/* Information about error. */
 {
-    register TkDisplay *dispPtr;
-    register TkErrorHandler *errorPtr;
+    TkDisplay *dispPtr;
+    TkErrorHandler *errorPtr;
 
     /*
      * See if we know anything about the display. If not, then invoke the
      * default error handler.
      */

Index: generic/tkEvent.c
==================================================================
--- generic/tkEvent.c
+++ generic/tkEvent.c
@@ -354,10 +354,11 @@
 
     if (winPtr->inputContext == NULL) {
 	/* XCreateIC failed. */
 	return;
     }
+    winPtr->ximGeneration = dispPtr->ximGeneration;
 
     /*
      * Adjust the window's event mask if the IM requires it.
      */
     XGetICValues(winPtr->inputContext, XNFilterEvents, &im_event_mask, NULL);
@@ -1286,18 +1287,28 @@
      * set the input context focus to the receiving window. This code is only
      * ever active for X11.
      */
 
 #ifdef TK_USE_INPUT_METHODS
+    /*
+     * If the XIC has been invalidated, it must be recreated.
+     */
+    if (winPtr->dispPtr->ximGeneration != winPtr->ximGeneration) {
+	winPtr->flags &= ~TK_CHECKED_IC;
+	winPtr->inputContext = NULL;
+    }
+
     if ((winPtr->dispPtr->flags & TK_DISPLAY_USE_IM)) {
 	if (!(winPtr->flags & (TK_CHECKED_IC|TK_ALREADY_DEAD))) {
 	    winPtr->flags |= TK_CHECKED_IC;
 	    if (winPtr->dispPtr->inputMethod != NULL) {
 		CreateXIC(winPtr);
 	    }
 	}
-	if (eventPtr->type == FocusIn && winPtr->inputContext != NULL) {
+	if ((eventPtr->type == FocusIn) &&
+		(winPtr->dispPtr->inputMethod != NULL) &&
+		(winPtr->inputContext != NULL)) {
 	    XSetICFocus(winPtr->inputContext);
 	}
     }
 #endif /*TK_USE_INPUT_METHODS*/
 

Index: generic/tkFont.c
==================================================================
--- generic/tkFont.c
+++ generic/tkFont.c
@@ -39,11 +39,11 @@
  * for each named font that has been defined. The named font is only deleted
  * when the last reference to it goes away.
  */
 
 typedef struct NamedFont {
-    int refCount;		/* Number of users of named font. */
+    size_t refCount;		/* Number of users of named font. */
     int deletePending;		/* Non-zero if font should be deleted when
 				 * last reference goes away. */
     TkFontAttributes fa;	/* Desired attributes for named font. */
 } NamedFont;
 
@@ -349,11 +349,11 @@
 const Tcl_ObjType tkFontObjType = {
     "font",			/* name */
     FreeFontObjProc,		/* freeIntRepProc */
     DupFontObjProc,		/* dupIntRepProc */
     NULL,			/* updateStringProc */
-    SetFontFromAny		/* setFromAnyProc */
+    NULL			/* setFromAnyProc */
 };
 
 /*
  *---------------------------------------------------------------------------
  *
@@ -495,11 +495,11 @@
     case FONT_ACTUAL: {
 	int skip, result, n;
 	const char *s;
 	Tk_Font tkfont;
 	Tcl_Obj *optPtr, *charPtr, *resultPtr;
-	Tcl_UniChar uniChar = 0;
+	int uniChar = 0;
 	const TkFontAttributes *faPtr;
 	TkFontAttributes fa;
 
 	/*
 	 * Params 0 and 1 are 'font actual'. Param 2 is the font name. 3-4 may
@@ -560,21 +560,23 @@
 	/*
 	 * The 'charPtr' arg must be a single Unicode.
 	 */
 
 	if (charPtr != NULL) {
-	    if (Tcl_GetCharLength(charPtr) != 1) {
+	    const char *string = Tcl_GetString(charPtr);
+	    size_t len = TkUtfToUniChar(string, &uniChar);
+
+	    if (len != (size_t)charPtr->length) {
 		resultPtr = Tcl_NewStringObj(
 			"expected a single character but got \"", -1);
-		Tcl_AppendLimitedToObj(resultPtr, Tcl_GetString(charPtr),
+		Tcl_AppendLimitedToObj(resultPtr, string,
 			-1, 40, "...");
 		Tcl_AppendToObj(resultPtr, "\"", -1);
 		Tcl_SetObjResult(interp, resultPtr);
 		Tcl_SetErrorCode(interp, "TK", "VALUE", "FONT_SAMPLE", NULL);
 		return TCL_ERROR;
 	    }
-	    uniChar = Tcl_GetUniChar(charPtr, 0);
 	}
 
 	/*
 	 * Find the font.
 	 */
@@ -708,11 +710,12 @@
 	break;
     }
     case FONT_MEASURE: {
 	const char *string;
 	Tk_Font tkfont;
-	int length = 0, skip = 0;
+	size_t length = 0;
+	int skip = 0;
 
 	if (objc > 4) {
 	    skip = TkGetDisplayOf(interp, objc - 3, objv + 3, &tkwin);
 	    if (skip < 0) {
 		return TCL_ERROR;
@@ -725,11 +728,11 @@
 	}
 	tkfont = Tk_AllocFontFromObj(interp, tkwin, objv[2]);
 	if (tkfont == NULL) {
 	    return TCL_ERROR;
 	}
-	string = Tcl_GetStringFromObj(objv[3 + skip], &length);
+	string = TkGetStringFromObj(objv[3 + skip], &length);
 	Tcl_SetObjResult(interp, Tcl_NewIntObj(
 		Tk_TextWidth(tkfont, string, length)));
 	Tk_FreeFont(tkfont);
 	break;
     }
@@ -1224,11 +1227,11 @@
      * non-underlined font.
      */
 
     descent = fontPtr->fm.descent;
     fontPtr->underlinePos = descent / 2;
-    fontPtr->underlineHeight = TkFontGetPixels(tkwin, fontPtr->fa.size) / 10;
+    fontPtr->underlineHeight = (int) (TkFontGetPixels(tkwin, fontPtr->fa.size) / 10 + 0.5);
     if (fontPtr->underlineHeight == 0) {
 	fontPtr->underlineHeight = 1;
     }
     if (fontPtr->underlinePos + fontPtr->underlineHeight > descent) {
 	/*
@@ -1419,23 +1422,21 @@
     NamedFont *nfPtr;
 
     if (fontPtr == NULL) {
 	return;
     }
-    fontPtr->resourceRefCount--;
-    if (fontPtr->resourceRefCount > 0) {
+    if (fontPtr->resourceRefCount-- > 1) {
 	return;
     }
     if (fontPtr->namedHashPtr != NULL) {
 	/*
 	 * This font derived from a named font. Reduce the reference count on
 	 * the named font and free it if no-one else is using it.
 	 */
 
 	nfPtr = Tcl_GetHashValue(fontPtr->namedHashPtr);
-	nfPtr->refCount--;
-	if ((nfPtr->refCount == 0) && nfPtr->deletePending) {
+	if ((nfPtr->refCount-- <= 1) && nfPtr->deletePending) {
 	    Tcl_DeleteHashEntry(fontPtr->namedHashPtr);
 	    ckfree(nfPtr);
 	}
     }
 
@@ -1518,12 +1519,11 @@
     Tcl_Obj *objPtr)		/* The object we are releasing. */
 {
     TkFont *fontPtr = objPtr->internalRep.twoPtrValue.ptr1;
 
     if (fontPtr != NULL) {
-	fontPtr->objRefCount--;
-	if ((fontPtr->resourceRefCount == 0) && (fontPtr->objRefCount == 0)) {
+	if ((fontPtr->objRefCount-- <= 1) && (fontPtr->resourceRefCount == 0)) {
 	    ckfree(fontPtr);
 	}
 	objPtr->internalRep.twoPtrValue.ptr1 = NULL;
 	objPtr->internalRep.twoPtrValue.ptr2 = NULL;
     }
@@ -1692,11 +1692,11 @@
     } else if (strcasecmp(family, "ZapfChancery") == 0) {
 	family = "ZapfChancery";
     } else if (strcasecmp(family, "ZapfDingbats") == 0) {
 	family = "ZapfDingbats";
     } else {
-	Tcl_UniChar ch;
+	int ch;
 
 	/*
 	 * Inline, capitalize the first letter of each word, lowercase the
 	 * rest of the letters in each word, and then take out the spaces
 	 * between the words. This may make the DString shorter, which is safe
@@ -1710,18 +1710,18 @@
 	for (; *src != '\0'; ) {
 	    while (isspace(UCHAR(*src))) { /* INTL: ISO space */
 		src++;
 		upper = 1;
 	    }
-	    src += Tcl_UtfToUniChar(src, &ch);
+	    src += TkUtfToUniChar(src, &ch);
 	    if (upper) {
 		ch = Tcl_UniCharToUpper(ch);
 		upper = 0;
 	    } else {
 		ch = Tcl_UniCharToLower(ch);
 	    }
-	    dest += Tcl_UniCharToUtf(ch, dest);
+	    dest += TkUniCharToUtf(ch, dest);
 	}
 	*dest = '\0';
 	Tcl_DStringSetLength(dsPtr, dest - Tcl_DStringValue(dsPtr));
 	family = Tcl_DStringValue(dsPtr) + len;
     }
@@ -1792,11 +1792,11 @@
 	if (slantString != NULL) {
 	    Tcl_DStringAppend(dsPtr, slantString, -1);
 	}
     }
 
-    return fontPtr->fa.size;
+    return (int)(fontPtr->fa.size + 0.5);
 }
 
 /*
  *---------------------------------------------------------------------------
  *
@@ -3143,26 +3143,24 @@
 
 	cx[0] = cx[3] = chunkPtr->x;
 	cy[0] = cy[1] = chunkPtr->y - fontPtr->fm.ascent;
 	cx[1] = cx[2] = chunkPtr->x + chunkPtr->displayWidth;
 	cy[2] = cy[3] = chunkPtr->y + fontPtr->fm.descent;
-	if (	!PointInQuadrilateral(cx, cy, rx[0], ry[0]) ||
-		!PointInQuadrilateral(cx, cy, rx[1], ry[1]) ||
-		!PointInQuadrilateral(cx, cy, rx[2], ry[2]) ||
-		!PointInQuadrilateral(cx, cy, rx[3], ry[3])) {
-	    goto notReverseInside;
-	}
-    }
-    return 0;
+	if (	PointInQuadrilateral(cx, cy, rx[0], ry[0]) &&
+		PointInQuadrilateral(cx, cy, rx[1], ry[1]) &&
+		PointInQuadrilateral(cx, cy, rx[2], ry[2]) &&
+		PointInQuadrilateral(cx, cy, rx[3], ry[3])) {
+            return 0;
+        }
+    }
 
     /*
      * If we're overlapping now, we must be partially in and out of at least
      * one chunk. If that is the case, there must be one line segment of the
      * rectangle that is touching or crossing a line segment of a chunk.
      */
 
-  notReverseInside:
     chunkPtr = layoutPtr->chunks;
 
     for (i=0 ; i<layoutPtr->numChunks ; i++,chunkPtr++) {
 	int j;
 
@@ -3244,14 +3242,15 @@
 {
     TextLayout *layoutPtr = (TextLayout *) layout;
     LayoutChunk *chunkPtr = layoutPtr->chunks;
     int baseline = chunkPtr->y;
     Tcl_Obj *psObj = Tcl_NewObj();
-    int i, j, len;
+    int i, j;
+    size_t len;
     const char *p, *glyphname;
     char uindex[5], c, *ps;
-    Tcl_UniChar ch;
+    int ch;
 
     Tcl_AppendToObj(psObj, "[(", -1);
     for (i = 0; i < layoutPtr->numChunks; i++, chunkPtr++) {
 	if (baseline != chunkPtr->y) {
 	    Tcl_AppendToObj(psObj, ")]\n[(", -1);
@@ -3270,11 +3269,11 @@
 	     * from the standard set defined by Adobe. The rest get punted.
 	     * Eventually this should be revised to handle more sophsticiated
 	     * international postscript fonts.
 	     */
 
-	    p += Tcl_UtfToUniChar(p, &ch);
+	    p += TkUtfToUniChar(p, &ch);
 	    if ((ch == '(') || (ch == ')') || (ch == '\\') || (ch < 0x20)) {
 		/*
 		 * Tricky point: the "03" is necessary in the sprintf below,
 		 * so that a full three digits of octal are always generated.
 		 * Without the "03", a number following this sequence could be
@@ -3296,14 +3295,17 @@
 	    /*
 	     * This character doesn't belong to the ASCII character set, so we
 	     * use the full glyph name.
 	     */
 
+	    if (ch > 0xffff) {
+		goto noMapping;
+	    }
 	    sprintf(uindex, "%04X", ch);		/* endianness? */
 	    glyphname = Tcl_GetVar2(interp, "::tk::psglyphs", uindex, 0);
 	    if (glyphname) {
-		ps = Tcl_GetStringFromObj(psObj, &len);
+		ps = TkGetStringFromObj(psObj, &len);
 		if (ps[len-1] == '(') {
 		    /*
 		     * In-place edit. Ewww!
 		     */
 
@@ -3316,10 +3318,11 @@
 	    } else {
 		/*
 		 * No known mapping for the character into the space of
 		 * PostScript glyphs. Ignore it. :-(
 		 */
+noMapping:	;
 
 #ifdef TK_DEBUG_POSTSCRIPT_OUTPUT
 		fprintf(stderr, "Warning: no mapping to PostScript "
 			"glyphs for \\u%04x\n", ch);
 #endif
@@ -3397,11 +3400,11 @@
 	    break;
 	case FONT_SIZE:
 	    if (Tcl_GetIntFromObj(interp, valuePtr, &n) != TCL_OK) {
 		return TCL_ERROR;
 	    }
-	    faPtr->size = n;
+	    faPtr->size = (double)n;
 	    break;
 	case FONT_WEIGHT:
 	    n = TkFindStateNumObj(interp, optionPtr, weightMap, valuePtr);
 	    if (n == TK_FW_UNKNOWN) {
 		return TCL_ERROR;
@@ -3488,11 +3491,15 @@
 	    str = faPtr->family;
 	    valuePtr = Tcl_NewStringObj(str, ((str == NULL) ? 0 : -1));
 	    break;
 
 	case FONT_SIZE:
-	    valuePtr = Tcl_NewIntObj(faPtr->size);
+	    if (faPtr->size >= 0.0) {
+		valuePtr = Tcl_NewIntObj((int)(faPtr->size + 0.5));
+	    } else {
+		valuePtr = Tcl_NewIntObj(-(int)(-faPtr->size + 0.5));
+	    }
 	    break;
 
 	case FONT_WEIGHT:
 	    str = TkFindStateString(weightMap, faPtr->weight);
 	    valuePtr = Tcl_NewStringObj(str, -1);
@@ -3637,11 +3644,11 @@
     faPtr->family = Tk_GetUid(Tcl_GetString(objv[0]));
     if (objc > 1) {
 	if (Tcl_GetIntFromObj(interp, objv[1], &n) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	faPtr->size = n;
+	faPtr->size = (double)n;
     }
 
     i = 2;
     if (objc == 3) {
 	if (Tcl_ListObjGetElements(interp, objv[2], &objc, &objv) != TCL_OK) {
@@ -3881,11 +3888,11 @@
     /*
      * Pointsize in tenths of a point, but treat it as tenths of a pixel for
      * historical compatibility.
      */
 
-    faPtr->size = 12;
+    faPtr->size = 12.0;
 
     if (FieldSpecified(field[XLFD_POINT_SIZE])) {
 	if (field[XLFD_POINT_SIZE][0] == '[') {
 	    /*
 	     * Some X fonts have the point size specified as follows:
@@ -3895,14 +3902,14 @@
 	     * where N1 is the point size (in points, not decipoints!), and
 	     * N2, N3, and N4 are some additional numbers that I don't know
 	     * the purpose of, so I ignore them.
 	     */
 
-	    faPtr->size = atoi(field[XLFD_POINT_SIZE] + 1);
+	    faPtr->size = atof(field[XLFD_POINT_SIZE] + 1);
 	} else if (Tcl_GetInt(NULL, field[XLFD_POINT_SIZE],
-		&faPtr->size) == TCL_OK) {
-	    faPtr->size /= 10;
+		&i) == TCL_OK) {
+	    faPtr->size = i/10.0;
 	} else {
 	    return TCL_ERROR;
 	}
     }
 
@@ -3920,13 +3927,15 @@
 	     * where N1 is the pixel size, and where N2, N3, and N4 are some
 	     * additional numbers that I don't know the purpose of, so I
 	     * ignore them.
 	     */
 
-	    faPtr->size = atoi(field[XLFD_PIXEL_SIZE] + 1);
+	    faPtr->size = atof(field[XLFD_PIXEL_SIZE] + 1);
 	} else if (Tcl_GetInt(NULL, field[XLFD_PIXEL_SIZE],
-		&faPtr->size) != TCL_OK) {
+		&i) == TCL_OK) {
+	    faPtr->size = (double)i;
+	} else {
 	    return TCL_ERROR;
 	}
     }
 
     faPtr->size = -faPtr->size;
@@ -3998,25 +4007,25 @@
  *	None.
  *
  *---------------------------------------------------------------------------
  */
 
-int
+double
 TkFontGetPixels(
     Tk_Window tkwin,		/* For point->pixel conversion factor. */
-    int size)			/* Font size. */
+    double size)		/* Font size. */
 {
     double d;
 
-    if (size < 0) {
+    if (size <= 0.0) {
 	return -size;
     }
 
     d = size * 25.4 / 72.0;
     d *= WidthOfScreen(Tk_Screen(tkwin));
     d /= WidthMMOfScreen(Tk_Screen(tkwin));
-    return (int) (d + 0.5);
+    return d;
 }
 
 /*
  *---------------------------------------------------------------------------
  *
@@ -4032,25 +4041,25 @@
  *	None.
  *
  *---------------------------------------------------------------------------
  */
 
-int
+double
 TkFontGetPoints(
     Tk_Window tkwin,		/* For pixel->point conversion factor. */
-    int size)			/* Font size. */
+    double size)		/* Font size. */
 {
     double d;
 
-    if (size >= 0) {
+    if (size >= 0.0) {
 	return size;
     }
 
     d = -size * 72.0 / 25.4;
     d *= WidthMMOfScreen(Tk_Screen(tkwin));
     d /= WidthOfScreen(Tk_Screen(tkwin));
-    return (int) (d + 0.5);
+    return d;
 }
 
 /*
  *-------------------------------------------------------------------------
  *
@@ -4193,13 +4202,13 @@
 	    Tcl_Panic("TkDebugFont found empty hash table entry");
 	}
 	for ( ; (fontPtr != NULL); fontPtr = fontPtr->nextPtr) {
 	    objPtr = Tcl_NewObj();
 	    Tcl_ListObjAppendElement(NULL, objPtr,
-		    Tcl_NewIntObj(fontPtr->resourceRefCount));
+		    Tcl_NewWideIntObj(fontPtr->resourceRefCount));
 	    Tcl_ListObjAppendElement(NULL, objPtr,
-		    Tcl_NewIntObj(fontPtr->objRefCount));
+		    Tcl_NewWideIntObj(fontPtr->objRefCount));
 	    Tcl_ListObjAppendElement(NULL, resultPtr, objPtr);
 	}
     }
     return resultPtr;
 }

Index: generic/tkFont.h
==================================================================
--- generic/tkFont.h
+++ generic/tkFont.h
@@ -21,11 +21,11 @@
  */
 
 struct TkFontAttributes {
     Tk_Uid family;		/* Font family, or NULL to represent plaform-
 				 * specific default system font. */
-    int size;			/* Pointsize of font, 0 for default size, or
+    double size;		/* Pointsize of font, 0.0 for default size, or
 				 * negative number meaning pixel size. */
     int weight;			/* Weight flag; see below for def'n. */
     int slant;			/* Slant flag; see below for def'n. */
     int underline;		/* Non-zero for underline font. */
     int overstrike;		/* Non-zero for overstrike font. */
@@ -83,21 +83,21 @@
 typedef struct TkFont {
     /*
      * Fields used and maintained exclusively by generic code.
      */
 
-    int resourceRefCount;	/* Number of active uses of this font (each
+    TkSizeT resourceRefCount;	/* Number of active uses of this font (each
 				 * active use corresponds to a call to
 				 * Tk_AllocFontFromTable or Tk_GetFont). If
 				 * this count is 0, then this TkFont structure
 				 * is no longer valid and it isn't present in
 				 * a hash table: it is being kept around only
 				 * because there are objects referring to it.
 				 * The structure is freed when
 				 * resourceRefCount and objRefCount are both
 				 * 0. */
-    int objRefCount;		/* The number of Tcl objects that reference
+    TkSizeT objRefCount;		/* The number of Tcl objects that reference
 				 * this structure. */
     Tcl_HashEntry *cacheHashPtr;/* Entry in font cache for this structure,
 				 * used when deleting it. */
     Tcl_HashEntry *namedHashPtr;/* Pointer to hash table entry that
 				 * corresponds to the named font that the
@@ -196,12 +196,12 @@
 
 MODULE_SCOPE int	TkFontParseXLFD(const char *string,
 			    TkFontAttributes *faPtr, TkXLFDAttributes *xaPtr);
 MODULE_SCOPE const char *const * TkFontGetAliasList(const char *faceName);
 MODULE_SCOPE const char *const *const * TkFontGetFallbacks(void);
-MODULE_SCOPE int	TkFontGetPixels(Tk_Window tkwin, int size);
-MODULE_SCOPE int	TkFontGetPoints(Tk_Window tkwin, int size);
+MODULE_SCOPE double	TkFontGetPixels(Tk_Window tkwin, double size);
+MODULE_SCOPE double	TkFontGetPoints(Tk_Window tkwin, double size);
 MODULE_SCOPE const char *const * TkFontGetGlobalClass(void);
 MODULE_SCOPE const char *const * TkFontGetSymbolClass(void);
 MODULE_SCOPE int	TkCreateNamedFont(Tcl_Interp *interp, Tk_Window tkwin,
 			    const char *name, TkFontAttributes *faPtr);
 MODULE_SCOPE int	TkDeleteNamedFont(Tcl_Interp *interp,

Index: generic/tkFrame.c
==================================================================
--- generic/tkFrame.c
+++ generic/tkFrame.c
@@ -10,12 +10,12 @@
  *
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
 
-#include "default.h"
 #include "tkInt.h"
+#include "default.h"
 
 /*
  * The following enum is used to define the type of the frame.
  */
 
@@ -456,11 +456,10 @@
 				 * zero means create a frame. */
     Tcl_Obj *nameObj)		/* Should only be non-NULL if there is no main
 				 * window associated with the interpreter.
 				 * Gives the base name to use for the new
 				 * application. */
-    
 {
     int objc;
     Tcl_Obj **objv;
 
     if (TCL_OK != Tcl_ListObjGetElements(interp, listObj, &objc, &objv)) {
@@ -487,11 +486,12 @@
     Frame *framePtr;
     Tk_OptionTable optionTable;
     Tk_Window newWin;
     const char *className, *screenName, *visualName, *colormapName;
     const char *arg, *useOption;
-    int i, length, depth;
+    int i, depth;
+    size_t length;
     unsigned int mask;
     Colormap colormap;
     Visual *visual;
 
     if (objc < 2) {
@@ -514,28 +514,28 @@
      */
 
     className = colormapName = screenName = visualName = useOption = NULL;
     colormap = None;
     for (i = 2; i < objc; i += 2) {
-	arg = Tcl_GetStringFromObj(objv[i], &length);
+	arg = TkGetStringFromObj(objv[i], &length);
 	if (length < 2) {
 	    continue;
 	}
 	if ((arg[1] == 'c') && (length >= 3)
-		&& (strncmp(arg, "-class", (unsigned) length) == 0)) {
+		&& (strncmp(arg, "-class", length) == 0)) {
 	    className = Tcl_GetString(objv[i+1]);
 	} else if ((arg[1] == 'c') && (length >= 3)
-		&& (strncmp(arg, "-colormap", (unsigned) length) == 0)) {
+		&& (strncmp(arg, "-colormap", length) == 0)) {
 	    colormapName = Tcl_GetString(objv[i+1]);
 	} else if ((arg[1] == 's') && (type == TYPE_TOPLEVEL)
-		&& (strncmp(arg, "-screen", (unsigned) length) == 0)) {
+		&& (strncmp(arg, "-screen", length) == 0)) {
 	    screenName = Tcl_GetString(objv[i+1]);
 	} else if ((arg[1] == 'u') && (type == TYPE_TOPLEVEL)
-		&& (strncmp(arg, "-use", (unsigned) length) == 0)) {
+		&& (strncmp(arg, "-use", length) == 0)) {
 	    useOption = Tcl_GetString(objv[i+1]);
 	} else if ((arg[1] == 'v')
-		&& (strncmp(arg, "-visual", (unsigned) length) == 0)) {
+		&& (strncmp(arg, "-visual", length) == 0)) {
 	    visualName = Tcl_GetString(objv[i+1]);
 	}
     }
 
     /*
@@ -681,11 +681,11 @@
     mask = ExposureMask | StructureNotifyMask | FocusChangeMask;
     if (type == TYPE_TOPLEVEL) {
 	mask |= ActivateMask;
     }
     Tk_CreateEventHandler(newWin, mask, FrameEventProc, framePtr);
-    if ((Tk_InitOptions(interp, (char *) framePtr, optionTable, newWin)
+    if ((Tk_InitOptions(interp, framePtr, optionTable, newWin)
 	    != TCL_OK) ||
 	    (ConfigureFrame(interp, framePtr, objc-2, objv+2) != TCL_OK)) {
 	goto error;
     }
     if (framePtr->isContainer) {
@@ -742,11 +742,12 @@
     enum options {
 	FRAME_CGET, FRAME_CONFIGURE
     };
     register Frame *framePtr = clientData;
     int result = TCL_OK, index;
-    int c, i, length;
+    int c, i;
+    size_t length;
     Tcl_Obj *objPtr;
 
     if (objc < 2) {
 	Tcl_WrongNumArgs(interp, 1, objv, "option ?arg ...?");
 	return TCL_ERROR;
@@ -761,21 +762,21 @@
 	if (objc != 3) {
 	    Tcl_WrongNumArgs(interp, 2, objv, "option");
 	    result = TCL_ERROR;
 	    goto done;
 	}
-	objPtr = Tk_GetOptionValue(interp, (char *) framePtr,
+	objPtr = Tk_GetOptionValue(interp, framePtr,
 		framePtr->optionTable, objv[2], framePtr->tkwin);
 	if (objPtr == NULL) {
 	    result = TCL_ERROR;
 	    goto done;
 	}
 	Tcl_SetObjResult(interp, objPtr);
 	break;
     case FRAME_CONFIGURE:
 	if (objc <= 3) {
-	    objPtr = Tk_GetOptionInfo(interp, (char *) framePtr,
+	    objPtr = Tk_GetOptionInfo(interp, framePtr,
 		    framePtr->optionTable, (objc == 3) ? objv[2] : NULL,
 		    framePtr->tkwin);
 	    if (objPtr == NULL) {
 		result = TCL_ERROR;
 		goto done;
@@ -786,11 +787,11 @@
 	     * Don't allow the options -class, -colormap, -container, -screen,
 	     * -use, or -visual to be changed.
 	     */
 
 	    for (i = 2; i < objc; i++) {
-		const char *arg = Tcl_GetStringFromObj(objv[i], &length);
+		const char *arg = TkGetStringFromObj(objv[i], &length);
 
 		if (length < 2) {
 		    continue;
 		}
 		c = arg[1];
@@ -959,11 +960,11 @@
     }
 
     if (framePtr->type == TYPE_LABELFRAME) {
 	oldWindow = labelframePtr->labelWin;
     }
-    if (Tk_SetOptions(interp, (char *) framePtr,
+    if (Tk_SetOptions(interp, framePtr,
 	    framePtr->optionTable, objc, objv,
 	    framePtr->tkwin, &savedOptions, NULL) != TCL_OK) {
 	if (oldMenuName != NULL) {
 	    ckfree(oldMenuName);
 	}

Index: generic/tkGC.c
==================================================================
--- generic/tkGC.c
+++ generic/tkGC.c
@@ -21,11 +21,11 @@
  */
 
 typedef struct {
     GC gc;			/* Graphics context. */
     Display *display;		/* Display to which gc belongs. */
-    int refCount;		/* Number of active uses of gc. */
+    size_t refCount;		/* Number of active uses of gc. */
     Tcl_HashEntry *valueHashPtr;/* Entry in valueTable (needed when deleting
 				 * this structure). */
 } TkGC;
 
 typedef struct {
@@ -310,13 +310,11 @@
     idHashPtr = Tcl_FindHashEntry(&dispPtr->gcIdTable, (char *) gc);
     if (idHashPtr == NULL) {
 	Tcl_Panic("Tk_FreeGC received unknown gc argument");
     }
     gcPtr = Tcl_GetHashValue(idHashPtr);
-    gcPtr->refCount--;
-    if (gcPtr->refCount == 0) {
-	Tk_FreeXId(gcPtr->display, (XID) XGContextFromGC(gcPtr->gc));
+    if (gcPtr->refCount-- <= 1) {
 	XFreeGC(gcPtr->display, gcPtr->gc);
 	Tcl_DeleteHashEntry(gcPtr->valueHashPtr);
 	Tcl_DeleteHashEntry(idHashPtr);
 	ckfree(gcPtr);
     }
@@ -349,16 +347,10 @@
 
     for (entryPtr = Tcl_FirstHashEntry(&dispPtr->gcIdTable, &search);
 	    entryPtr != NULL; entryPtr = Tcl_NextHashEntry(&search)) {
 	gcPtr = Tcl_GetHashValue(entryPtr);
 
-	/*
-	 * This call is not needed, as it is only used on Unix to restore the
-	 * Id to the stack pool, and we don't want to use them anymore.
-	 *   Tk_FreeXId(gcPtr->display, (XID) XGContextFromGC(gcPtr->gc));
-	 */
-
 	XFreeGC(gcPtr->display, gcPtr->gc);
 	Tcl_DeleteHashEntry(gcPtr->valueHashPtr);
 	Tcl_DeleteHashEntry(entryPtr);
 	ckfree(gcPtr);
     }

Index: generic/tkGrab.c
==================================================================
--- generic/tkGrab.c
+++ generic/tkGrab.c
@@ -188,11 +188,11 @@
     int globalGrab;
     Tk_Window tkwin;
     TkDisplay *dispPtr;
     const char *arg;
     int index;
-    int len;
+    size_t len;
     static const char *const optionStrings[] = {
 	"current", "release", "set", "status", NULL
     };
     static const char *const flagStrings[] = {
 	"-global", NULL
@@ -225,11 +225,11 @@
 
     /*
      * First check for a window name or "-global" as the first argument.
      */
 
-    arg = Tcl_GetStringFromObj(objv[1], &len);
+    arg = TkGetStringFromObj(objv[1], &len);
     if (arg[0] == '.') {
 	/* [grab window] */
 	if (objc != 2) {
 	    Tcl_WrongNumArgs(interp, 1, objv, "?-global? window");
 	    return TCL_ERROR;

Index: generic/tkGrid.c
==================================================================
--- generic/tkGrid.c
+++ generic/tkGrid.c
@@ -1730,19 +1730,16 @@
     int usedX, usedY;
 
     masterPtr->flags &= ~REQUESTED_RELAYOUT;
 
     /*
-     * If the master has no slaves anymore, then don't do anything at all:
-     * just leave the master's size as-is, but signal the master with the
-     * <<GeometryManager>> virtual event.
+     * If the master has no slaves anymore, then don't change the master size.
      * Otherwise there is no way to "relinquish" control over the master
      * so another geometry manager can take over.
      */
 
     if (masterPtr->slavePtr == NULL) {
-        TkSendVirtualEvent(masterPtr->tkwin, "GeometryManager", NULL);
 	return;
     }
 
     if (masterPtr->masterDataPtr == NULL) {
 	return;
@@ -2777,15 +2774,19 @@
     slavePtr->masterPtr = NULL;
 
     /*
      * If we have emptied this master from slaves it means we are no longer
      * handling it and should mark it as free.
+     *
+     * Send the event "NoManagedChild" to the master to inform it about there
+     * being no managed children inside it.
      */
 
     if ((masterPtr->slavePtr == NULL) && (masterPtr->flags & ALLOCED_MASTER)) {
 	TkFreeGeometryMaster(masterPtr->tkwin, "grid");
 	masterPtr->flags &= ~ALLOCED_MASTER;
+	TkSendVirtualEvent(masterPtr->tkwin, "NoManagedChild", NULL);
     }
 }
 
 /*
  *----------------------------------------------------------------------
@@ -2868,21 +2869,22 @@
 		gridPtr->masterPtr->flags |= REQUESTED_RELAYOUT;
 		Tcl_DoWhenIdle(ArrangeGrid, gridPtr->masterPtr);
 	    }
 	}
     } else if (eventPtr->type == DestroyNotify) {
-	register Gridder *gridPtr2, *nextPtr;
+	register Gridder *slavePtr, *nextPtr;
 
 	if (gridPtr->masterPtr != NULL) {
 	    Unlink(gridPtr);
 	}
-	for (gridPtr2 = gridPtr->slavePtr; gridPtr2 != NULL;
-		gridPtr2 = nextPtr) {
-	    Tk_UnmapWindow(gridPtr2->tkwin);
-	    gridPtr2->masterPtr = NULL;
-	    nextPtr = gridPtr2->nextPtr;
-	    gridPtr2->nextPtr = NULL;
+	for (slavePtr = gridPtr->slavePtr; slavePtr != NULL;
+		slavePtr = nextPtr) {
+	    Tk_ManageGeometry(slavePtr->tkwin, NULL, NULL);
+	    Tk_UnmapWindow(slavePtr->tkwin);
+	    slavePtr->masterPtr = NULL;
+	    nextPtr = slavePtr->nextPtr;
+	    slavePtr->nextPtr = NULL;
 	}
 	Tcl_DeleteHashEntry(Tcl_FindHashEntry(&dispPtr->gridHashTable,
 		(char *) gridPtr->tkwin));
 	if (gridPtr->flags & REQUESTED_RELAYOUT) {
 	    Tcl_CancelIdleCall(ArrangeGrid, gridPtr);
@@ -2894,15 +2896,15 @@
 		&& !(gridPtr->flags & REQUESTED_RELAYOUT)) {
 	    gridPtr->flags |= REQUESTED_RELAYOUT;
 	    Tcl_DoWhenIdle(ArrangeGrid, gridPtr);
 	}
     } else if (eventPtr->type == UnmapNotify) {
-	register Gridder *gridPtr2;
+	register Gridder *slavePtr;
 
-	for (gridPtr2 = gridPtr->slavePtr; gridPtr2 != NULL;
-		gridPtr2 = gridPtr2->nextPtr) {
-	    Tk_UnmapWindow(gridPtr2->tkwin);
+	for (slavePtr = gridPtr->slavePtr; slavePtr != NULL;
+		slavePtr = slavePtr->nextPtr) {
+	    Tk_UnmapWindow(slavePtr->tkwin);
 	}
     }
 }
 
 /*
@@ -2964,14 +2966,14 @@
      * Count the number of windows, or window short-cuts.
      */
 
     firstChar = 0;
     for (numWindows=0, i=0; i < objc; i++) {
-	int length;
+	size_t length;
 	char prevChar = firstChar;
 
-	string = Tcl_GetStringFromObj(objv[i], &length);
+	string = TkGetStringFromObj(objv[i], &length);
     	firstChar = string[0];
 
 	if (firstChar == '.') {
 	    /*
 	     * Check that windows are valid, and locate the first slave's
@@ -3083,11 +3085,12 @@
 	    defaultRow = tmp;
 	}
     }
 
     /*
-     * If no -row is given, use the first unoccupied row of the master.
+     * If no -row is given, use the next row after the highest occupied row
+     * of the master.
      */
 
     if (defaultRow < 0) {
 	if (masterPtr != NULL && masterPtr->masterDataPtr != NULL) {
 	    SetGridSize(masterPtr);
@@ -3314,10 +3317,13 @@
 	    masterPtr = GetGrid(parent);
 	    InitMasterData(masterPtr);
     	}
 
 	if (slavePtr->masterPtr != NULL && slavePtr->masterPtr != masterPtr) {
+            if (slavePtr->masterPtr->tkwin != Tk_Parent(slavePtr->tkwin)) {
+                Tk_UnmaintainGeometry(slavePtr->tkwin, slavePtr->masterPtr->tkwin);
+            }
 	    Unlink(slavePtr);
 	    slavePtr->masterPtr = NULL;
 	}
 
 	if (slavePtr->masterPtr == NULL) {
@@ -3504,15 +3510,19 @@
     SetGridSize(masterPtr);
 
     /*
      * If we have emptied this master from slaves it means we are no longer
      * handling it and should mark it as free.
+     *
+     * Send the event "NoManagedChild" to the master to inform it about there
+     * being no managed children inside it.
      */
 
     if (masterPtr->slavePtr == NULL && masterPtr->flags & ALLOCED_MASTER) {
 	TkFreeGeometryMaster(masterPtr->tkwin, "grid");
 	masterPtr->flags &= ~ALLOCED_MASTER;
+	TkSendVirtualEvent(masterPtr->tkwin, "NoManagedChild", NULL);
     }
 
     return TCL_OK;
 }
 

Index: generic/tkImgBmap.c
==================================================================
--- generic/tkImgBmap.c
+++ generic/tkImgBmap.c
@@ -47,11 +47,11 @@
  * The following data structure represents all of the instances of an image
  * that lie within a particular window:
  */
 
 typedef struct BitmapInstance {
-    int refCount;		/* Number of instances that share this data
+    size_t refCount;		/* Number of instances that share this data
 				 * structure. */
     BitmapMaster *masterPtr;	/* Pointer to master for image. */
     Tk_Window tkwin;		/* Window in which the instances will be
 				 * displayed. */
     XColor *fg;			/* Foreground color for displaying image. */
@@ -949,12 +949,11 @@
     Display *display)		/* Display containing window that used image. */
 {
     BitmapInstance *instancePtr = clientData;
     BitmapInstance *prevPtr;
 
-    instancePtr->refCount--;
-    if (instancePtr->refCount > 0) {
+    if (instancePtr->refCount-- > 1) {
 	return;
     }
 
     /*
      * There are no more uses of the image within this widget. Free the
@@ -1078,14 +1077,14 @@
 static int
 GetByte(
     Tcl_Channel chan)	/* The channel we read from. */
 {
     char buffer;
-    int size;
+    size_t size;
 
     size = Tcl_Read(chan, &buffer, 1);
-    if (size <= 0) {
+    if ((size + 1) < 2) {
 	return EOF;
     } else {
 	return buffer;
     }
 }

Index: generic/tkImgGIF.c
==================================================================
--- generic/tkImgGIF.c
+++ generic/tkImgGIF.c
@@ -53,11 +53,11 @@
 
 typedef struct mFile {
     unsigned char *data;	/* mmencoded source string */
     int c;			/* bits left over from previous character */
     int state;			/* decoder state (0-4 or GIF_DONE) */
-    int length;			/* Total amount of bytes in data */
+    size_t length;			/* Total amount of bytes in data */
 } MFile;
 
 /*
  * Non-ASCII encoding support:
  * Most data in a GIF image is binary and is treated as such. However, a few
@@ -109,12 +109,12 @@
 /*
  * Type of a function used to do the writing to a file or buffer when
  * serializing in the GIF format.
  */
 
-typedef int (WriteBytesFunc) (ClientData clientData, const char *bytes,
-			    int byteCount);
+typedef size_t (WriteBytesFunc) (ClientData clientData, const char *bytes,
+			    size_t byteCount);
 
 /*
  * The format record for the GIF file format:
  */
 
@@ -185,18 +185,18 @@
 
 /*
  * these are for the BASE64 image reader code only
  */
 
-static int		Fread(GIFImageConfig *gifConfPtr, unsigned char *dst,
+static size_t		Fread(GIFImageConfig *gifConfPtr, unsigned char *dst,
 			    size_t size, size_t count, Tcl_Channel chan);
-static int		Mread(unsigned char *dst, size_t size, size_t count,
+static size_t		Mread(unsigned char *dst, size_t size, size_t count,
 			    MFile *handle);
 static int		Mgetc(MFile *handle);
 static int		char64(int c);
 static void		mInit(unsigned char *string, MFile *handle,
-			    int length);
+			    size_t length);
 
 /*
  * Types, defines and variables needed to write and compress a GIF.
  */
 
@@ -755,14 +755,14 @@
     int *widthPtr,		/* where to put the string width */
     int *heightPtr,		/* where to put the string height */
     Tcl_Interp *interp)		/* not used */
 {
     unsigned char *data, header[10];
-    int got, length;
+    size_t got, length;
     MFile handle;
 
-    data = Tcl_GetByteArrayFromObj(dataObj, &length);
+    data = TkGetByteArrayFromObj(dataObj, &length);
 
     /*
      * Header is a minimum of 10 bytes.
      */
 
@@ -824,13 +824,13 @@
     int destX, int destY,	/* The rectangular region of the */
     int width, int height,	/* image to copy */
     int srcX, int srcY)
 {
     MFile handle, *hdlPtr = &handle;
-    int length;
+    size_t length;
     const char *xferFormat;
-    unsigned char *data = Tcl_GetByteArrayFromObj(dataObj, &length);
+    unsigned char *data = TkGetByteArrayFromObj(dataObj, &length);
 
     mInit(data, hdlPtr, length);
 
     /*
      * Check whether the data is Base64 encoded by doing a character-by-
@@ -915,11 +915,11 @@
 {
     int i;
     unsigned char rgb[3];
 
     for (i = 0; i < number; ++i) {
-	if (Fread(gifConfPtr, rgb, sizeof(rgb), 1, chan) <= 0) {
+	if (((size_t)Fread(gifConfPtr, rgb, sizeof(rgb), 1, chan) + 1) < 2) {
 	    return 0;
 	}
 
 	if (buffer) {
 	    buffer[i][CM_RED] = rgb[0];
@@ -981,15 +981,15 @@
     Tcl_Channel chan,
     unsigned char *buf)
 {
     unsigned char count;
 
-    if (Fread(gifConfPtr, &count, 1, 1, chan) <= 0) {
+    if (((size_t)Fread(gifConfPtr, &count, 1, 1, chan) + 1) < 2) {
 	return -1;
     }
 
-    if ((count != 0) && (Fread(gifConfPtr, buf, count, 1, chan) <= 0)) {
+    if ((count != 0) && (((size_t)Fread(gifConfPtr, buf, count, 1, chan) + 1) < 2)) {
 	return -1;
     }
 
     return count;
 }
@@ -1047,11 +1047,11 @@
 
     /*
      * Initialize the decoder
      */
 
-    if (Fread(gifConfPtr, &initialCodeSize, 1, 1, chan) <= 0) {
+    if (((size_t)Fread(gifConfPtr, &initialCodeSize, 1, 1, chan) + 1) < 2) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		"error reading GIF image: %s", Tcl_PosixError(interp)));
 	return TCL_ERROR;
     }
 
@@ -1139,13 +1139,13 @@
 		if (oldCode == -1) {
 		    /*
 		     * Last pass reset the decoder, so the first code we see
 		     * must be a singleton. Seed the stack with it, and set up
 		     * the old/first code pointers for insertion into the
-		     * string table. We can't just roll this into the
-		     * clearCode test above, because at that point we have not
-		     * yet read the next code.
+		     * codes table. We can't just roll this into the clearCode
+		     * test above, because at that point we have not yet read
+		     * the next code.
 		     */
 
 		    *top++ = append[code];
 		    oldCode = code;
 		    firstCode = code;
@@ -1152,54 +1152,50 @@
 		    continue;
 		}
 
 		inCode = code;
 
-		if (code == maxCode) {
+		if ((code == maxCode) && (maxCode < (1 << MAX_LWZ_BITS))) {
 		    /*
 		     * maxCode is always one bigger than our highest assigned
 		     * code. If the code we see is equal to maxCode, then we
-		     * are about to add a new string to the table. ???
+		     * are about to add a new entry to the codes table.
 		     */
 
 		    *top++ = firstCode;
 		    code = oldCode;
 		}
 
 		while (code > clearCode) {
 		    /*
-		     * Populate the stack by tracing the string in the string
+		     * Populate the stack by tracing the code in the codes
 		     * table from its tail to its head
 		     */
 
 		    *top++ = append[code];
 		    code = prefix[code];
 		}
 		firstCode = append[code];
 
-		/*
-		 * If there's no more room in our string table, quit.
-		 * Otherwise, add a new string to the table
-		 */
-
-		if (maxCode >= (1 << MAX_LWZ_BITS)) {
-		    return TCL_OK;
-		}
-
-		/*
-		 * Push the head of the string onto the stack.
-		 */
-
-		*top++ = firstCode;
-
-		/*
-		 * Add a new string to the string table
-		 */
-
-		prefix[maxCode] = oldCode;
-		append[maxCode] = firstCode;
-		maxCode++;
+	        /*
+	         * Push the head of the code onto the stack.
+	         */
+
+	        *top++ = firstCode;
+
+                if (maxCode < (1 << MAX_LWZ_BITS)) {
+		    /*
+		     * If there's still room in our codes table, add a new entry.
+		     * Otherwise don't, and keep using the current table.
+                     * See DEFERRED CLEAR CODE IN LZW COMPRESSION in the GIF89a
+                     * specification.
+		     */
+
+		    prefix[maxCode] = oldCode;
+		    append[maxCode] = firstCode;
+		    maxCode++;
+                }
 
 		/*
 		 * maxCode tells us the maximum code value we can accept. If
 		 * we see that we need more bits to represent it than we are
 		 * requesting from the unpacker, we need to increase the
@@ -1375,11 +1371,11 @@
 
 static void
 mInit(
     unsigned char *string,	/* string containing initial mmencoded data */
     MFile *handle,		/* mmdecode "file" handle */
-    int length)			/* Number of bytes in string */
+    size_t length)			/* Number of bytes in string */
 {
     handle->data = string;
     handle->state = 0;
     handle->c = 0;
     handle->length = length;
@@ -1401,19 +1397,19 @@
  *	The base64 handle will change state.
  *
  *----------------------------------------------------------------------
  */
 
-static int
+static size_t
 Mread(
     unsigned char *dst,		/* where to put the result */
     size_t chunkSize,		/* size of each transfer */
     size_t numChunks,		/* number of chunks */
     MFile *handle)		/* mmdecode "file" handle */
 {
-    register int i, c;
-    int count = chunkSize * numChunks;
+    int c;
+    size_t i, count = chunkSize * numChunks;
 
     for (i=0; i<count && (c=Mgetc(handle)) != GIF_DONE; i++) {
 	*dst++ = c;
     }
     return i;
@@ -1550,11 +1546,11 @@
  * Results: - same as POSIX fread() or Tcl Tcl_Read()
  *
  *----------------------------------------------------------------------
  */
 
-static int
+static size_t
 Fread(
     GIFImageConfig *gifConfPtr,
     unsigned char *dst,		/* where to put the result */
     size_t hunk, size_t count,	/* how many */
     Tcl_Channel chan)
@@ -1564,23 +1560,24 @@
     }
 
     if (gifConfPtr->fromData == INLINE_DATA_BINARY) {
 	MFile *handle = (MFile *) chan;
 
-	if (handle->length <= 0 || (size_t) handle->length < hunk*count) {
-	    return -1;
+	if ((handle->length + 1 < 2) || (handle->length < hunk*count)) {
+	    return (size_t)-1;
 	}
-	memcpy(dst, handle->data, (size_t) (hunk * count));
+	memcpy(dst, handle->data, hunk * count);
 	handle->data += hunk * count;
-	return (int)(hunk * count);
+	handle->length -= hunk * count;
+	return hunk * count;
     }
 
     /*
      * Otherwise we've got a real file to read.
      */
 
-    return Tcl_Read(chan, (char *) dst, (int) (hunk * count));
+    return Tcl_Read(chan, (char *) dst, hunk * count);
 }
 
 /*
  * ChanWriteGIF - writes a image in GIF format.
  *-------------------------------------------------------------------------
@@ -1655,26 +1652,26 @@
     }
     Tcl_DecrRefCount(objPtr);
     return result;
 }
 
-static int
+static size_t
 WriteToChannel(
     ClientData clientData,
     const char *bytes,
-    int byteCount)
+    size_t byteCount)
 {
     Tcl_Channel handle = clientData;
 
     return Tcl_Write(handle, bytes, byteCount);
 }
 
-static int
+static size_t
 WriteToByteArray(
     ClientData clientData,
     const char *bytes,
-    int byteCount)
+    size_t byteCount)
 {
     Tcl_Obj *objPtr = clientData;
     Tcl_Obj *tmpObj = Tcl_NewByteArrayObj((unsigned char *) bytes, byteCount);
 
     Tcl_IncrRefCount(tmpObj);

ADDED   generic/tkImgListFormat.c
Index: generic/tkImgListFormat.c
==================================================================
--- /dev/null
+++ generic/tkImgListFormat.c
@@ -0,0 +1,1141 @@
+/*
+ * tkImgListFormat.c --
+ *
+ *      Implements the default image data format. I.e. the format used for
+ *      [imageName data] and [imageName put] if no other format is specified.
+ *
+ *      The default format consits of a list of scan lines (rows) with each
+ *      list element being itself a list of pixels (or columns). For details,
+ *      see the manpage photo.n
+ *
+ *      This image format cannot read/write files, it is meant for string
+ *      data only.
+ *
+ *
+ * Copyright (c) 1994 The Australian National University.
+ * Copyright (c) 1994-1997 Sun Microsystems, Inc.
+ * Copyright (c) 2002-2003 Donal K. Fellows
+ * Copyright (c) 2003 ActiveState Corporation.
+ *
+ * See the file "license.terms" for information on usage and redistribution of
+ * this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ *
+ * Authors:
+ *      Paul Mackerras (paulus@cs.anu.edu.au),
+ *              Department of Computer Science,
+ *              Australian National University.
+ *
+ *      Simon Bachmann (simonbachmann@bluewin.ch)
+ */
+
+
+#include "tkImgPhoto.h"
+
+/*
+ * Message to generate when an attempt to allocate memory for an image fails.
+ */
+
+#define TK_PHOTO_ALLOC_FAILURE_MESSAGE \
+        "not enough free memory for image buffer"
+
+
+/*
+ * Color name length limit: do not attempt to parse as color strings that are
+ * longer than this limit
+ */
+
+#define TK_PHOTO_MAX_COLOR_CHARS 99
+
+/*
+ * Symbols for the different formats of a color string.
+ */
+
+enum ColorFormatType {
+    COLORFORMAT_TKCOLOR,
+    COLORFORMAT_EMPTYSTRING,
+    COLORFORMAT_LIST,
+    COLORFORMAT_RGB1,
+    COLORFORMAT_RGB2,
+    COLORFORMAT_RGBA1,
+    COLORFORMAT_RGBA2
+};
+
+/*
+ * Names for the color format types above.
+ * Order must match the one in enum ColorFormatType
+ */
+
+static const char *const colorFormatNames[] = {
+    "tkcolor",
+    "emptystring",
+    "list",
+    "rgb-short",
+    "rgb",
+    "rgba-short",
+    "rgba",
+    NULL
+};
+
+/*
+ * The following data structure is used to return information from
+ * ParseFormatOptions:
+ */
+
+struct FormatOptions {
+    int options;         /* Individual bits indicate which options were
+                          * specified - see below. */
+    Tcl_Obj *formatName; /* Name specified without an option. */
+    enum ColorFormatType colorFormat;
+                         /* The color format type given with the
+                          * -colorformat option */
+};
+
+/*
+ * Bit definitions for use with ParseFormatOptions: each bit is set in the
+ * allowedOptions parameter on a call to ParseFormatOptions if that option
+ * is allowed for the current photo image subcommand. On return, the bit is
+ * set in the options field of the FormatOptions structure if that option
+ * was specified.
+ *
+ * OPT_COLORFORMAT:         Set if -alpha option allowed/specified.
+ */
+
+#define OPT_COLORFORMAT     1
+
+/*
+ * List of format option names. The order here must match the order of
+ * declarations of the FMT_OPT_* constants above.
+ */
+
+static const char *const formatOptionNames[] = {
+    "-colorformat",
+    NULL
+};
+
+/*
+ * Forward declarations
+ */
+
+static int      ParseFormatOptions(Tcl_Interp *interp, int allowedOptions,
+                    int objc, Tcl_Obj *const objv[], int *indexPtr,
+                    struct FormatOptions *optPtr);
+static Tcl_Obj  *GetBadOptMsg(const char *badValue, int allowedOpts);
+static int      StringMatchDef(Tcl_Obj *data, Tcl_Obj *formatString,
+                    int *widthPtr, int *heightPtr, Tcl_Interp *interp);
+static int      StringReadDef(Tcl_Interp *interp, Tcl_Obj *data,
+                    Tcl_Obj *formatString, Tk_PhotoHandle imageHandle,
+                    int destX, int destY, int width, int height,
+                    int srcX, int srcY);
+static int      StringWriteDef(Tcl_Interp *interp,
+                    Tcl_Obj *formatString,
+                    Tk_PhotoImageBlock *blockPtr);
+static int      ParseColor(Tcl_Interp *interp, Tcl_Obj *specObj,
+                    Display *display, Colormap colormap, unsigned char *redPtr,
+                    unsigned char *greenPtr, unsigned char *bluePtr,
+                    unsigned char *alphaPtr);
+static int      ParseColorAsList(Tcl_Interp *interp, const char *colorString,
+                    int colorStrLen, unsigned char *redPtr,
+                    unsigned char *greenPtr, unsigned char *bluePtr,
+                    unsigned char *alphaPtr);
+static int      ParseColorAsHex(Tcl_Interp *interp, const char *colorString,
+                    int colorStrLen, Display *display, Colormap colormap,
+                    unsigned char *redPtr, unsigned char *greenPtr,
+                    unsigned char *bluePtr, unsigned char *alphaPtr);
+static int      ParseColorAsStandard(Tcl_Interp *interp,
+                    const char *colorString, int colorStrLen,
+                    Display *display, Colormap colormap,
+                    unsigned char *redPtr, unsigned char *greenPtr,
+                    unsigned char *bluePtr, unsigned char *alphaPtr);
+
+/*
+ * The format record for the default image handler
+ */
+
+Tk_PhotoImageFormat tkImgFmtDefault = {
+    "default",      /* name */
+    NULL,           /* fileMatchProc: format doesn't support file ops */
+    StringMatchDef, /* stringMatchProc */
+    NULL,           /* fileReadProc: format doesn't support file read */
+    StringReadDef,  /* stringReadProc */
+    NULL,           /* fileWriteProc: format doesn't support file write */
+    StringWriteDef  /* stringWriteProc */
+};
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * ParseFormatOptions --
+ *
+ *      Parse the options passed to the image format handler.
+ *
+ * Results:
+ *      On success, the structure pointed to by optPtr is filled with the
+ *      values passed or with the defaults and TCL_OK returned.
+ *      If an error occurs, leaves an error message in interp and returns
+ *      TCL_ERROR.
+ *
+ * Side effects:
+ *      The value in *indexPtr is updated to the index of the fist
+ *      element in argv[] that does not look like an option/value, or to
+ *      argc if parsing reached the end of argv[].
+ *
+ *----------------------------------------------------------------------
+ */
+static int
+ParseFormatOptions(
+    Tcl_Interp *interp,               /* For error messages */
+    int allowedOptions,               /* Bitfield specifying which options are
+                                       * to be considered allowed */
+    int objc,                         /* Number of elements in argv[] */
+    Tcl_Obj *const objv[],            /* The arguments to parse */
+    int *indexPtr,                    /* Index giving the first element to
+                                       * parse. The value is updated to the
+                                       * index where parsing ended */
+    struct FormatOptions *optPtr)     /* Parsed option values are written to
+                                       * this struct */
+
+{
+    int index, optIndex, typeIndex, first;
+    const char *option;
+
+    first = 1;
+
+    /*
+     * Fill in default values
+     */
+    optPtr->options = 0;
+    optPtr->formatName = NULL;
+    optPtr->colorFormat = COLORFORMAT_RGB2;
+    for (index = *indexPtr; index < objc; *indexPtr = ++index) {
+        int optionExists;
+
+        /*
+         * The first value can be the format handler's name. It goes to
+         * optPtr->name.
+         */
+        option = Tcl_GetString(objv[index]);
+        if (option[0] != '-') {
+            if (first) {
+                optPtr->formatName = objv[index];
+                first = 0;
+                continue;
+            } else {
+                break;
+            }
+        }
+        first = 0;
+
+        /*
+         * Check if option is known and allowed
+         */
+
+        optionExists = 1;
+        if (Tcl_GetIndexFromObj(NULL, objv[index], formatOptionNames,
+                "format option", 0, &optIndex) != TCL_OK) {
+            optionExists = 0;
+        }
+        if (!optionExists || !((1 << optIndex) & allowedOptions)) {
+            Tcl_SetObjResult(interp, GetBadOptMsg(Tcl_GetString(objv[index]),
+                    allowedOptions));
+            Tcl_SetErrorCode(interp, "TK", "IMAGE", "PHOTO", "BAD_OPTION", NULL);
+            return TCL_ERROR;
+        }
+
+        /*
+         * Option-specific checks
+         */
+
+        switch (1 << optIndex) {
+        case OPT_COLORFORMAT:
+            *indexPtr = ++index;
+            if (index >= objc) {
+                Tcl_SetObjResult(interp, Tcl_ObjPrintf("the \"%s\" option "
+                        "requires a value", Tcl_GetString(objv[index - 1])));
+                Tcl_SetErrorCode(interp, "TK", "IMAGE", "PHOTO",
+                        "MISSING_VALUE", NULL);
+                return TCL_ERROR;
+            }
+            if (Tcl_GetIndexFromObj(NULL, objv[index], colorFormatNames, "",
+                    TCL_EXACT, &typeIndex) != TCL_OK
+                    || (typeIndex != COLORFORMAT_LIST
+                    && typeIndex != COLORFORMAT_RGB2
+                    && typeIndex != COLORFORMAT_RGBA2) ) {
+                Tcl_SetObjResult(interp, Tcl_ObjPrintf("bad color format "
+                        "\"%s\": must be rgb, rgba, or list",
+                        Tcl_GetString(objv[index])));
+                Tcl_SetErrorCode(interp, "TK", "IMAGE", "PHOTO",
+                        "BAD_COLOR_FORMAT", NULL);
+                return TCL_ERROR;
+            }
+            optPtr->colorFormat = typeIndex;
+            break;
+        default:
+            Tcl_Panic("ParseFormatOptions: unexpected switch fallthrough");
+        }
+
+        /*
+         * Add option to bitfield in optPtr
+         */
+        optPtr->options |= (1 << optIndex);
+    }
+
+    return TCL_OK;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ *  GetBadOptMsg --
+ *
+ *      Build a Tcl_Obj containing an error message in the form "bad option
+ *      "xx": must be y, or z", based on the bits set in allowedOpts.
+ *
+ * Results:
+ *      A Tcl Object containig the error message.
+ *
+ * Side effects:
+ *      None
+ *----------------------------------------------------------------------
+ */
+static Tcl_Obj *
+GetBadOptMsg(
+    const char *badValue,   /* the erroneous option */
+    int allowedOpts)        /* bitfield specifying the allowed options */
+{
+    int i, bit;
+    Tcl_Obj *resObj = Tcl_ObjPrintf("bad format option \"%s\": ", badValue);
+
+    if (allowedOpts == 0) {
+        Tcl_AppendToObj(resObj, "no options allowed", -1);
+    } else {
+        Tcl_AppendToObj(resObj, "must be ", -1);
+        bit = 1;
+        for (i = 0; formatOptionNames[i] != NULL; i++) {
+            if (allowedOpts & bit) {
+                if (allowedOpts & (bit -1)) {
+                    /*
+                     * not the first option
+                     */
+                    if (allowedOpts & ~((bit << 1) - 1)) {
+                        /*
+                         * not the last option
+                         */
+                        Tcl_AppendToObj(resObj, ", ", -1);
+                    } else {
+                        Tcl_AppendToObj(resObj, ", or ", -1);
+                    }
+                }
+                Tcl_AppendToObj(resObj, formatOptionNames[i], -1);
+            }
+            bit <<=1;
+        }
+    }
+    return resObj;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * StringMatchDef --
+ *
+ *      Default string match function. Test if image data in string form
+ *      appears to be in the default list-of-list-of-pixel-data format
+ *      accepted by the "<img> put" command.
+ *
+ * Results:
+ *      If thte data is in the default format, writes the size of the image
+ *      to widthPtr and heightPtr and returns 1. Otherwise, leaves an error
+ *      message in interp (if not NULL) and returns 0.
+ *      Note that this function does not parse all data points. A return
+ *      value of 1 does not guarantee that the data can be read without
+ *      errors.
+ *
+ * Side effects:
+ *      None
+ *----------------------------------------------------------------------
+ */
+static int
+StringMatchDef(
+    Tcl_Obj *data,          /* The data to check */
+    Tcl_Obj *formatString,  /* Value of the -format option, not used here */
+    int *widthPtr,          /* Width of image is written to this location */
+    int *heightPtr,         /* Height of image is written to this location */
+    Tcl_Interp *interp)     /* Error messages are left in this interpreter */
+{
+    int y, rowCount, colCount, curColCount;
+    unsigned char dummy;
+    Tcl_Obj **rowListPtr, *pixelData;
+
+    /*
+     * See if data can be parsed as a list, if every element is itself a valid
+     * list and all sublists have the same length.
+     */
+
+    if (Tcl_ListObjGetElements(interp, data, &rowCount, &rowListPtr)
+            != TCL_OK) {
+        return 0;
+    }
+    if (rowCount == 0) {
+        /*
+         * empty list is valid data
+         */
+
+        *widthPtr = 0;
+        *heightPtr = 0;
+        return 1;
+    }
+    colCount = -1;
+    for (y = 0; y < rowCount; y++) {
+        if (Tcl_ListObjLength(interp, rowListPtr[y], &curColCount) != TCL_OK) {
+            return 0;
+        }
+        if (colCount < 0) {
+            colCount = curColCount;
+        } else if (curColCount != colCount) {
+            if (interp != NULL) {
+                Tcl_SetObjResult(interp, Tcl_ObjPrintf("invalid row # %d: "
+                        "all rows must have the same number of elements", y));
+                Tcl_SetErrorCode(interp, "TK", "IMAGE", "PHOTO",
+                        "INVALID_DATA", NULL);
+            }
+            return 0;
+        }
+    }
+
+    /*
+     * Data in base64 encoding (or even binary data), might actually pass
+     * these tests. To avoid parsing it as list of lists format, check one
+     * pixel for validity.
+     */
+    if (Tcl_ListObjIndex(interp, rowListPtr[0], 0, &pixelData) != TCL_OK) {
+        return 0;
+    }
+    if (Tcl_GetCharLength(pixelData) > TK_PHOTO_MAX_COLOR_CHARS) {
+        return 0;
+    }
+    if (ParseColor(interp, pixelData, Tk_Display(Tk_MainWindow(interp)),
+            Tk_Colormap(Tk_MainWindow(interp)), &dummy, &dummy, &dummy, &dummy)
+            != TCL_OK) {
+        return 0;
+    }
+
+    /*
+     * Looks like we have valid data for this format.
+     * We do not check any pixel values - that's the job of ImgStringRead()
+     */
+
+    *widthPtr = colCount;
+    *heightPtr = rowCount;
+
+    return 1;
+
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * StringReadDef --
+ *
+ *      String read function for default format. (see manpage for details on
+ *      the format).
+ *
+ * Results:
+ *      A standard Tcl result.
+ *
+ * Side effects:
+ *      If the data has valid format, write it to the image identified by
+ *      imageHandle.
+ *      If the image data cannot be parsed, an error message is left in
+ *      interp.
+ *
+ *----------------------------------------------------------------------
+*/
+
+static int
+StringReadDef(
+    Tcl_Interp *interp,         /* leave error messages here */
+    Tcl_Obj *data,              /* the data to parse */
+    Tcl_Obj *formatString,      /* value of the -format option */
+    Tk_PhotoHandle imageHandle, /* write data to this image */
+    int destX, int destY,       /* start writing data at this point
+                                 * in destination image*/
+    int width, int height,      /* dimensions of area to write to */
+    int srcX, int srcY)         /* start reading source data at these
+                                 * coordinates */
+{
+    Tcl_Obj **rowListPtr, **colListPtr;
+    Tcl_Obj **objv;
+    int objc;
+    unsigned char *curPixelPtr;
+    int x, y, rowCount, colCount, curColCount;
+    Tk_PhotoImageBlock srcBlock;
+    Display *display;
+    Colormap colormap;
+    struct FormatOptions opts;
+    int optIndex;
+
+    /*
+     * Parse format suboptions
+     * We don't use any format suboptions, but we still need to provide useful
+     * error messages if suboptions were specified.
+     */
+
+    memset(&opts, 0, sizeof(opts));
+    if (formatString != NULL) {
+        if (Tcl_ListObjGetElements(interp, formatString, &objc, &objv)
+                != TCL_OK) {
+            return TCL_ERROR;
+        }
+        optIndex = 0;
+        if (ParseFormatOptions(interp, 0, objc, objv, &optIndex, &opts)
+                != TCL_OK) {
+            return TCL_ERROR;
+        }
+        if (optIndex < objc) {
+            Tcl_SetObjResult(interp,
+                    GetBadOptMsg(Tcl_GetString(objv[optIndex]), 0));
+            Tcl_SetErrorCode(interp, "TK", "IMAGE", "PHOTO", "BAD_OPTION", NULL);
+            return TCL_ERROR;
+        }
+    }
+
+    /*
+     * Check input data
+     */
+
+    if (Tcl_ListObjGetElements(interp, data, &rowCount, &rowListPtr)
+            != TCL_OK ) {
+        return TCL_ERROR;
+    }
+    if ( rowCount > 0 && Tcl_ListObjLength(interp, rowListPtr[0], &colCount)
+            != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (width <= 0 || height <= 0 || rowCount == 0 || colCount == 0) {
+        /*
+         * No changes with zero sized input or zero sized output region
+         */
+
+        return TCL_OK;
+    }
+    if (srcX < 0 || srcY < 0 || srcX >= rowCount || srcY >= colCount) {
+        Tcl_SetObjResult(interp, Tcl_ObjPrintf("source coordinates out of range"));
+        Tcl_SetErrorCode(interp, "TK", "IMAGE", "PHOTO", "COORDINATES", NULL);
+        return TCL_ERROR;
+    }
+
+    /*
+     * Memory allocation overflow protection.
+     * May not be able to trigger/ demo / test this.
+     */
+
+    if (colCount > (int)(UINT_MAX / 4 / rowCount)) {
+        Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+                        "photo image dimensions exceed Tcl memory limits"));
+        Tcl_SetErrorCode(interp, "TK", "IMAGE", "PHOTO",
+                "OVERFLOW", NULL);
+        return TCL_OK;
+    }
+
+    /*
+     * Read data and put it to imageHandle
+     */
+
+    srcBlock.width = colCount - srcX;
+    srcBlock.height = rowCount - srcY;
+    srcBlock.pixelSize = 4;
+    srcBlock.pitch = srcBlock.width * 4;
+    srcBlock.offset[0] = 0;
+    srcBlock.offset[1] = 1;
+    srcBlock.offset[2] = 2;
+    srcBlock.offset[3] = 3;
+    srcBlock.pixelPtr = attemptckalloc(srcBlock.pitch * srcBlock.height);
+    if (srcBlock.pixelPtr == NULL) {
+        Tcl_SetObjResult(interp, Tcl_ObjPrintf(TK_PHOTO_ALLOC_FAILURE_MESSAGE));
+        Tcl_SetErrorCode(interp, "TK", "MALLOC", NULL);
+        return TCL_ERROR;
+    }
+    curPixelPtr = srcBlock.pixelPtr;
+    display = Tk_Display(Tk_MainWindow(interp));
+    colormap = Tk_Colormap(Tk_MainWindow(interp));
+    for (y = srcY; y < rowCount; y++) {
+        /*
+         * We don't test the length of row, as that's been done in
+         * ImgStringMatch()
+         */
+
+        if (Tcl_ListObjGetElements(interp, rowListPtr[y], &curColCount,
+                &colListPtr) != TCL_OK) {
+            goto errorExit;
+        }
+        for (x = srcX; x < colCount; x++) {
+            if (ParseColor(interp, colListPtr[x], display, colormap,
+                    curPixelPtr, curPixelPtr + 1, curPixelPtr + 2,
+                    curPixelPtr + 3) != TCL_OK) {
+                goto errorExit;
+            }
+            curPixelPtr += 4;
+        }
+    }
+
+    /*
+     * Write image data to destHandle
+     */
+    if (Tk_PhotoPutBlock(interp, imageHandle, &srcBlock, destX, destY,
+            width, height, TK_PHOTO_COMPOSITE_SET) != TCL_OK) {
+        goto errorExit;
+    }
+
+    ckfree(srcBlock.pixelPtr);
+
+    return TCL_OK;
+
+  errorExit:
+    ckfree(srcBlock.pixelPtr);
+
+    return TCL_ERROR;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * StringWriteDef --
+ *
+ *      String write function for default image data format. See the user
+ *      documentation for details.
+ *
+ * Results:
+ *      The converted data is set as the result of interp. Returns a standard
+ *      Tcl result.
+ *
+ * Side effects:
+ *      None.
+ *
+ *----------------------------------------------------------------------
+ */
+
+static int
+StringWriteDef(
+    Tcl_Interp *interp,                 /* For the result and errors */
+    Tcl_Obj *formatString,              /* The value of the -format option */
+    Tk_PhotoImageBlock *blockPtr)       /* The image data to convert */
+{
+    int greenOffset, blueOffset, alphaOffset, hasAlpha;
+    Tcl_Obj *result, **objv = NULL;
+    int objc, allowedOpts, optIndex;
+    struct FormatOptions opts;
+
+    /*
+     * Parse format suboptions
+     */
+    if (Tcl_ListObjGetElements(interp, formatString, &objc, &objv)
+            != TCL_OK) {
+        return TCL_ERROR;
+    }
+    allowedOpts = OPT_COLORFORMAT;
+    optIndex = 0;
+    if (ParseFormatOptions(interp, allowedOpts, objc, objv, &optIndex, &opts)
+            != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (optIndex < objc) {
+        Tcl_SetObjResult(interp,
+                GetBadOptMsg(Tcl_GetString(objv[optIndex]), allowedOpts));
+        Tcl_SetErrorCode(interp, "TK", "IMAGE", "PHOTO", "BAD_OPTION", NULL);
+        return TCL_ERROR;
+    }
+
+    greenOffset = blockPtr->offset[1] - blockPtr->offset[0];
+    blueOffset = blockPtr->offset[2] - blockPtr->offset[0];
+
+    /*
+     * A negative alpha offset signals that the image is fully opaque.
+     * That's not really documented anywhere, but it's the way it is!
+     */
+
+    if (blockPtr->offset[3] < 0) {
+        hasAlpha = 0;
+        alphaOffset = 0;
+    } else {
+        hasAlpha = 1;
+        alphaOffset = blockPtr->offset[3] - blockPtr->offset[0];
+    }
+
+    if ((blockPtr->width > 0) && (blockPtr->height > 0)) {
+        int row, col;
+        Tcl_DString data, line;
+        char colorBuf[11];
+        unsigned char *pixelPtr;
+        unsigned char alphaVal = 255;
+
+        Tcl_DStringInit(&data);
+        for (row=0; row<blockPtr->height; row++) {
+            pixelPtr = blockPtr->pixelPtr + blockPtr->offset[0]
+                    + row * blockPtr->pitch;
+            Tcl_DStringInit(&line);
+            for (col=0; col<blockPtr->width; col++) {
+                if (hasAlpha) {
+                    alphaVal = pixelPtr[alphaOffset];
+                }
+
+                /*
+                 * We don't build lines as a list for #RGBA and #RGB. Since
+                 * these color formats look like comments, the first element
+                 * of the list would get quoted with an additional {} .
+                 * While this is not a problem if the data is used as
+                 * a list, it would cause problems if someone decides to parse
+                 * it as a string (and it looks kinda strange)
+                 */
+
+                switch (opts.colorFormat) {
+                case COLORFORMAT_RGB2:
+                    sprintf(colorBuf, "#%02x%02x%02x ",  pixelPtr[0],
+                            pixelPtr[greenOffset], pixelPtr[blueOffset]);
+                    Tcl_DStringAppend(&line, colorBuf, -1);
+                    break;
+                case COLORFORMAT_RGBA2:
+                    sprintf(colorBuf, "#%02x%02x%02x%02x ",
+                            pixelPtr[0], pixelPtr[greenOffset],
+                            pixelPtr[blueOffset], alphaVal);
+                    Tcl_DStringAppend(&line, colorBuf, -1);
+                    break;
+                case COLORFORMAT_LIST:
+                    Tcl_DStringStartSublist(&line);
+                    sprintf(colorBuf, "%d", pixelPtr[0]);
+                    Tcl_DStringAppendElement(&line, colorBuf);
+                    sprintf(colorBuf, "%d", pixelPtr[greenOffset]);
+                    Tcl_DStringAppendElement(&line, colorBuf);
+                    sprintf(colorBuf, "%d", pixelPtr[blueOffset]);
+                    Tcl_DStringAppendElement(&line, colorBuf);
+                    sprintf(colorBuf, "%d", alphaVal);
+                    Tcl_DStringAppendElement(&line, colorBuf);
+                    Tcl_DStringEndSublist(&line);
+                    break;
+                default:
+                    Tcl_Panic("unexpected switch fallthrough");
+                }
+                pixelPtr += blockPtr->pixelSize;
+            }
+            if (opts.colorFormat != COLORFORMAT_LIST) {
+                /*
+                 * For the #XXX formats, we need to remove the last
+                 * whitespace.
+                 */
+
+                *(Tcl_DStringValue(&line) + Tcl_DStringLength(&line) - 1)
+                        = '\0';
+            }
+            Tcl_DStringAppendElement(&data, Tcl_DStringValue(&line));
+            Tcl_DStringFree(&line);
+        }
+        result = Tcl_NewStringObj(Tcl_DStringValue(&data), -1);
+        Tcl_DStringFree(&data);
+    } else {
+        result = Tcl_NewObj();
+    }
+
+    Tcl_SetObjResult(interp, result);
+    return TCL_OK;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * ParseColor --
+ *
+ *      This function extracts color and alpha values from a string. It
+ *      understands standard Tk color formats, alpha suffixes and the color
+ *      formats specific to photo images, which include alpha data.
+ *
+ * Results:
+ *      On success, writes red, green, blue and alpha values to the
+ *      corresponding pointers. If the color spec contains no alpha
+ *      information, 255 is taken as transparency value.
+ *      If the input cannot be parsed, leaves an error message in
+ *      interp. Returns a standard Tcl result.
+ *
+ * Side effects:
+ *      None.
+ *
+ *----------------------------------------------------------------------
+ */
+static int
+ParseColor(
+    Tcl_Interp *interp,         /* error messages go there */
+    Tcl_Obj *specObj,           /* the color data to parse */
+    Display *display,           /* display of main window, needed to parse
+                                 * standard Tk colors */
+    Colormap colormap,          /* colormap of current display */
+    unsigned char *redPtr,      /* the result is written to these pointers */
+    unsigned char *greenPtr,
+    unsigned char *bluePtr,
+    unsigned char *alphaPtr)
+{
+    const char *specString;
+    size_t charCount;
+
+    /*
+     * Find out which color format we have
+     */
+
+    specString = TkGetStringFromObj(specObj, &charCount);
+
+    if (charCount == 0) {
+        /* Empty string */
+        *redPtr = *greenPtr = *bluePtr = *alphaPtr = 0;
+        return TCL_OK;
+    }
+    if (charCount > TK_PHOTO_MAX_COLOR_CHARS) {
+        Tcl_SetObjResult(interp, Tcl_ObjPrintf("invalid color"));
+        Tcl_SetErrorCode(interp, "TK", "IMAGE", "PHOTO",
+                "INVALID_COLOR", NULL);
+        return TCL_ERROR;
+    }
+    if (specString[0] == '#') {
+        return ParseColorAsHex(interp, specString, charCount, display,
+                colormap, redPtr, greenPtr, bluePtr, alphaPtr);
+    }
+    if (ParseColorAsList(interp, specString, charCount,
+            redPtr, greenPtr, bluePtr, alphaPtr) == TCL_OK) {
+        return TCL_OK;
+    }
+
+    /*
+     * Parsing the color as standard Tk color always is the last option tried
+     * because TkParseColor() is very slow with values it cannot parse.
+     */
+
+    Tcl_ResetResult(interp);
+    return ParseColorAsStandard(interp, specString, charCount, display,
+            colormap, redPtr, greenPtr, bluePtr, alphaPtr);
+
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * ParseColorAsList --
+ *
+ *      This function extracts color and alpha values from a list of 3 or 4
+ *      integers (the list color format).
+ *
+ * Results:
+ *      On success, writes red, green, blue and alpha values to the
+ *      corresponding pointers. If the color spec contains no alpha
+ *      information, 255 is taken as transparency value.
+ *      Returns a standard Tcl result.
+ *
+ * Side effects:
+ *      Does *not* leave error messages in interp. The reason is that
+ *      it is not always possible to tell if the list format was even
+ *      intended and thus it is hard to return meaningful messages.
+ *      A general error message from the caller is probably the best
+ *      alternative.
+ *
+ *----------------------------------------------------------------------
+ */
+static int
+ParseColorAsList(
+    Tcl_Interp *interp,         /* not used */
+    const char *colorString,    /* the color data to parse */
+    int colorStrLen,            /* length of the color string */
+    unsigned char *redPtr,      /* the result is written to these pointers */
+    unsigned char *greenPtr,
+    unsigned char *bluePtr,
+    unsigned char *alphaPtr)
+{
+
+    /*
+     * This is kinda ugly. The code would be certainly nicer if it
+     * used Tcl_ListObjGetElements() and Tcl_GetIntFromObj(). But with
+     * strtol() it's *much* faster.
+     */
+
+    const char *curPos;
+    int values[4];
+    int i;
+
+    curPos = colorString;
+    i = 0;
+
+    /*
+     * strtol can give false positives with a sequence of space chars.
+     * To avoid that, avance the pointer to the next non-blank char.
+     */
+
+    while(isspace(*curPos)) {
+        ++curPos;
+    }
+    while (i < 4 && *curPos != '\0') {
+        values[i] = strtol(curPos, (char **)&curPos, 0);
+        if (values[i] < 0 || values[i] > 255) {
+            return TCL_ERROR;
+        }
+        while(isspace(*curPos)) {
+            ++curPos;
+        }
+        ++i;
+    }
+
+    if (i < 3 || *curPos != '\0') {
+        return TCL_ERROR;
+    }
+    if (i < 4) {
+        values[3] = 255;
+    }
+
+    *redPtr = (unsigned char) values[0];
+    *greenPtr = (unsigned char) values[1];
+    *bluePtr = (unsigned char) values[2];
+    *alphaPtr = (unsigned char) values[3];
+
+    return TCL_OK;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * ParseColorAsHex --
+ *
+ *      This function extracts color and alpha values from a string
+ *      starting with '#', followed by hex digits. It undestands both
+ *      the #RGBA form and the #RBG (with optional suffix)
+ *
+ * Results:
+ *      On success, writes red, green, blue and alpha values to the
+ *      corresponding pointers. If the color spec contains no alpha
+ *      information, 255 is taken as transparency value.
+ *      Returns a standard Tcl result.
+ *
+ * Side effects:
+ *      None.
+ *
+ *----------------------------------------------------------------------
+ */
+static int
+ParseColorAsHex(
+    Tcl_Interp *interp,         /* error messages are left here */
+    const char *colorString,    /* the color data to parse */
+    int colorStrLen,            /* length of the color string */
+    Display *display,           /* display of main window */
+    Colormap colormap,          /* colormap of current display */
+    unsigned char *redPtr,      /* the result is written to these pointers */
+    unsigned char *greenPtr,
+    unsigned char *bluePtr,
+    unsigned char *alphaPtr)
+{
+    int i;
+    unsigned long int colorValue = 0;
+
+    if (colorStrLen - 1 != 4 && colorStrLen - 1 != 8) {
+        return ParseColorAsStandard(interp, colorString, colorStrLen,
+                display, colormap, redPtr, greenPtr, bluePtr, alphaPtr);
+    }
+    for (i = 1; i < colorStrLen; i++) {
+        if (!isxdigit(UCHAR(colorString[i]))) {
+            /*
+             * There still is a chance that this is a Tk color with
+             * an alpha suffix
+             */
+
+            return ParseColorAsStandard(interp, colorString, colorStrLen,
+                    display, colormap, redPtr, greenPtr, bluePtr, alphaPtr);
+        }
+    }
+
+    colorValue = strtoul(colorString + 1, NULL, 16);
+    switch (colorStrLen - 1) {
+    case 4:
+        /* #RGBA format */
+        *redPtr = (unsigned char) ((colorValue >> 12) * 0x11);
+        *greenPtr = (unsigned char) (((colorValue >> 8) & 0xf) * 0x11);
+        *bluePtr = (unsigned char) (((colorValue >> 4) & 0xf) * 0x11);
+        *alphaPtr = (unsigned char) ((colorValue & 0xf) * 0x11);
+        return TCL_OK;
+    case 8:
+        /* #RRGGBBAA format */
+        *redPtr = (unsigned char) (colorValue >> 24);
+        *greenPtr = (unsigned char) ((colorValue >> 16) & 0xff);
+        *bluePtr = (unsigned char) ((colorValue >> 8) & 0xff);
+        *alphaPtr = (unsigned char) (colorValue & 0xff);
+        return TCL_OK;
+    default:
+        Tcl_Panic("unexpected switch fallthrough");
+    }
+
+    /* Shouldn't get here */
+    return TCL_ERROR;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * ParseColorAsStandard --
+ *
+ *      This function tries to split a color stirng in a color and a
+ *      suffix part and to extract color and alpha values from them. The
+ *      color part is treated as regular Tk color.
+ *
+ * Results:
+ *      On success, writes red, green, blue and alpha values to the
+ *      corresponding pointers. If the color spec contains no alpha
+ *      information, 255 is taken as transparency value.
+ *      Returns a standard Tcl result.
+ *
+ * Side effects:
+ *      None.
+ *
+ *----------------------------------------------------------------------
+ */
+static int
+ParseColorAsStandard(
+    Tcl_Interp *interp,         /* error messages are left here */
+    const char *specString,    /* the color data to parse */
+    int specStrLen,            /* length of the color string */
+    Display *display,           /* display of main window */
+    Colormap colormap,          /* colormap of current display */
+    unsigned char *redPtr,      /* the result is written to these pointers */
+    unsigned char *greenPtr,
+    unsigned char *bluePtr,
+    unsigned char *alphaPtr)
+{
+    XColor parsedColor;
+    const char *suffixString, *colorString;
+    char colorBuffer[TK_PHOTO_MAX_COLOR_CHARS + 1];
+    char *tmpString;
+    double fracAlpha;
+    unsigned int suffixAlpha;
+    int i;
+
+    /*
+     * Split color data string in color and suffix parts
+     */
+
+    if ((suffixString = strrchr(specString, '@')) == NULL
+            && ((suffixString = strrchr(specString, '#')) == NULL
+                    || suffixString == specString)) {
+        suffixString = specString + specStrLen;
+        colorString = specString;
+    } else {
+        strncpy(colorBuffer, specString, suffixString - specString);
+        colorBuffer[suffixString - specString] = '\0';
+        colorString = (const char*)colorBuffer;
+    }
+
+    /*
+     * Try to parse as standard Tk color.
+     *
+     * We don't use Tk_GetColor() et al. here, as those functions
+     * migth return a color that does not exaxtly match the given name
+     * if the colormap is full. Also, we don't really want the color to be
+     * added to the colormap.
+     */
+
+    if ( ! TkParseColor(display, colormap, colorString, &parsedColor)) {
+         Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+            "invalid color name \"%s\"", specString));
+         Tcl_SetErrorCode(interp, "TK", "IMAGE", "PHOTO",
+                 "INVALID_COLOR", NULL);
+         return TCL_ERROR;
+    }
+
+    /*
+     * parse the Suffix
+     */
+
+    switch (suffixString[0]) {
+    case '\0':
+        suffixAlpha = 255;
+        break;
+    case '@':
+        fracAlpha = strtod(suffixString + 1, &tmpString);
+        if (*tmpString != '\0') {
+            Tcl_SetObjResult(interp, Tcl_ObjPrintf("invalid alpha "
+                    "suffix \"%s\": expected floating-point value",
+                    suffixString));
+            Tcl_SetErrorCode(interp, "TK", "IMAGE", "PHOTO",
+                    "INVALID COLOR", NULL);
+            return TCL_ERROR;
+        }
+        if (fracAlpha < 0 || fracAlpha > 1) {
+            Tcl_SetObjResult(interp, Tcl_ObjPrintf("invalid alpha suffix"
+                    " \"%s\": value must be in the range from 0 to 1",
+                    suffixString));
+            Tcl_SetErrorCode(interp, "TK", "IMAGE", "PHOTO",
+                    "INVALID_COLOR", NULL);
+            return TCL_ERROR;
+        }
+        suffixAlpha = (unsigned int) floor(fracAlpha * 255 + 0.5);
+        break;
+    case '#':
+        if (strlen(suffixString + 1) < 1 || strlen(suffixString + 1)> 2) {
+            Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+                    "invalid alpha suffix \"%s\"", suffixString));
+            Tcl_SetErrorCode(interp, "TK", "IMAGE", "PHOTO",
+                    "INVALID_COLOR", NULL);
+            return TCL_ERROR;
+        }
+        for (i = 1; i <= (int)strlen(suffixString + 1); i++) {
+            if ( ! isxdigit(UCHAR(suffixString[i]))) {
+                Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+                        "invalid alpha suffix \"%s\": expected hex digit",
+                        suffixString));
+                Tcl_SetErrorCode(interp, "TK", "IMAGE", "PHOTO",
+                        "INVALID_COLOR", NULL);
+                return TCL_ERROR;
+            }
+        }
+        if (strlen(suffixString + 1) == 1) {
+            sscanf(suffixString, "#%1x", &suffixAlpha);
+            suffixAlpha *= 0x11;
+        } else {
+            sscanf(suffixString, "#%2x", &suffixAlpha);
+        }
+        break;
+    default:
+        Tcl_Panic("unexpected switch fallthrough");
+    }
+
+    *redPtr = (unsigned char) (parsedColor.red >> 8);
+    *greenPtr = (unsigned char) (parsedColor.green >> 8);
+    *bluePtr = (unsigned char) (parsedColor.blue >> 8);
+    *alphaPtr = (unsigned char) suffixAlpha;
+
+    return TCL_OK;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * TkDebugStringMatchDef --
+ *
+ *      Debugging function for StringMatchDef. Basically just an alias for
+ *      that function, intended to expose it directly to tests, as
+ *      StirngMatchDef cannot be sufficiently tested otherwise.
+ *
+ * Results:
+ *      See StringMatchDef.
+ *
+ * Side effects:
+ *      None
+ *----------------------------------------------------------------------
+ */
+int
+TkDebugPhotoStringMatchDef(
+    Tcl_Interp *interp,     /* Error messages are left in this interpreter */
+    Tcl_Obj *data,          /* The data to check */
+    Tcl_Obj *formatString,  /* Value of the -format option, not used here */
+    int *widthPtr,          /* Width of image is written to this location */
+    int *heightPtr)         /* Height of image is written to this location */
+{
+    return StringMatchDef(data, formatString, widthPtr, heightPtr, interp);
+}
+
+
+/* Local Variables: */
+/* mode: c */
+/* fill-column: 78 */
+/* c-basic-offset: 4 */
+/* tab-width: 8 */
+/* indent-tabs-mode: nil */
+/* End: */

Index: generic/tkImgPNG.c
==================================================================
--- generic/tkImgPNG.c
+++ generic/tkImgPNG.c
@@ -33,11 +33,11 @@
 
 /*
  * Chunk type flags.
  */
 
-#define PNG_CF_ANCILLARY 0x10000000L	/* Non-critical chunk (can ignore). */
+#define PNG_CF_ANCILLARY 0x20000000L	/* Non-critical chunk (can ignore). */
 #define PNG_CF_PRIVATE   0x00100000L	/* Application-specific chunk. */
 #define PNG_CF_RESERVED  0x00001000L	/* Not used. */
 #define PNG_CF_COPYSAFE  0x00000010L	/* Opaque data safe for copying. */
 
 /*
@@ -125,11 +125,11 @@
      */
 
     Tcl_Channel channel;	/* Channel for from-file reads. */
     Tcl_Obj *objDataPtr;
     unsigned char *strDataBuf;	/* Raw source data for from-string reads. */
-    int strDataLen;		/* Length of source data. */
+    size_t strDataLen;		/* Length of source data. */
     unsigned char *base64Data;	/* base64 encoded string data. */
     unsigned char base64Bits;	/* Remaining bits from last base64 read. */
     unsigned char base64State;	/* Current state of base64 decoder. */
     double alpha;		/* Alpha from -format option. */
 
@@ -213,20 +213,20 @@
 			    Tcl_Channel chan, Tcl_Obj *objPtr, int dir);
 static inline unsigned char Paeth(int a, int b, int c);
 static int		ParseFormat(Tcl_Interp *interp, Tcl_Obj *fmtObj,
 			    PNGImage *pngPtr);
 static int		ReadBase64(Tcl_Interp *interp, PNGImage *pngPtr,
-			    unsigned char *destPtr, int destSz,
+			    unsigned char *destPtr, size_t destSz,
 			    unsigned long *crcPtr);
 static int		ReadByteArray(Tcl_Interp *interp, PNGImage *pngPtr,
-			    unsigned char *destPtr, int destSz,
+			    unsigned char *destPtr, size_t destSz,
 			    unsigned long *crcPtr);
 static int		ReadData(Tcl_Interp *interp, PNGImage *pngPtr,
-			    unsigned char *destPtr, int destSz,
+			    unsigned char *destPtr, size_t destSz,
 			    unsigned long *crcPtr);
 static int		ReadChunkHeader(Tcl_Interp *interp, PNGImage *pngPtr,
-			    int *sizePtr, unsigned long *typePtr,
+			    size_t *sizePtr, unsigned long *typePtr,
 			    unsigned long *crcPtr);
 static int		ReadIDAT(Tcl_Interp *interp, PNGImage *pngPtr,
 			    int chunkSz, unsigned long crc);
 static int		ReadIHDR(Tcl_Interp *interp, PNGImage *pngPtr);
 static inline int	ReadInt32(Tcl_Interp *interp, PNGImage *pngPtr,
@@ -249,13 +249,13 @@
 static int		UnfilterLine(Tcl_Interp *interp, PNGImage *pngPtr);
 static inline int	WriteByte(Tcl_Interp *interp, PNGImage *pngPtr,
 			    unsigned char c, unsigned long *crcPtr);
 static inline int	WriteChunk(Tcl_Interp *interp, PNGImage *pngPtr,
 			    unsigned long chunkType,
-			    const unsigned char *dataPtr, int dataSize);
+			    const unsigned char *dataPtr, size_t dataSize);
 static int		WriteData(Tcl_Interp *interp, PNGImage *pngPtr,
-			    const unsigned char *srcPtr, int srcSz,
+			    const unsigned char *srcPtr, size_t srcSz,
 			    unsigned long *crcPtr);
 static int		WriteExtraChunks(Tcl_Interp *interp,
 			    PNGImage *pngPtr);
 static int		WriteIHDR(Tcl_Interp *interp, PNGImage *pngPtr,
 			    Tk_PhotoImageBlock *blockPtr);
@@ -318,11 +318,11 @@
 
     if (objPtr) {
 	Tcl_IncrRefCount(objPtr);
 	pngPtr->objDataPtr = objPtr;
 	pngPtr->strDataBuf =
-		Tcl_GetByteArrayFromObj(objPtr, &pngPtr->strDataLen);
+		TkGetByteArrayFromObj(objPtr, &pngPtr->strDataLen);
     }
 
     /*
      * Initialize the palette transparency table to fully opaque.
      */
@@ -429,11 +429,11 @@
 static int
 ReadBase64(
     Tcl_Interp *interp,
     PNGImage *pngPtr,
     unsigned char *destPtr,
-    int destSz,
+    size_t destSz,
     unsigned long *crcPtr)
 {
     static const unsigned char from64[] = {
 	0x82, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x80, 0x80,
 	0x83, 0x80, 0x80, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83, 0x83,
@@ -554,26 +554,26 @@
 static int
 ReadByteArray(
     Tcl_Interp *interp,
     PNGImage *pngPtr,
     unsigned char *destPtr,
-    int destSz,
+    size_t destSz,
     unsigned long *crcPtr)
 {
     /*
      * Check to make sure the number of requested bytes are available.
      */
 
-    if (pngPtr->strDataLen < destSz) {
+    if ((size_t)pngPtr->strDataLen < destSz) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		"unexpected end of image data", -1));
 	Tcl_SetErrorCode(interp, "TK", "IMAGE", "PNG", "EARLY_END", NULL);
 	return TCL_ERROR;
     }
 
     while (destSz) {
-	int blockSz = PNG_MIN(destSz, PNG_BLOCK_SZ);
+	size_t blockSz = PNG_MIN(destSz, PNG_BLOCK_SZ);
 
 	memcpy(destPtr, pngPtr->strDataBuf, blockSz);
 
 	pngPtr->strDataBuf += blockSz;
 	pngPtr->strDataLen -= blockSz;
@@ -612,24 +612,24 @@
 static int
 ReadData(
     Tcl_Interp *interp,
     PNGImage *pngPtr,
     unsigned char *destPtr,
-    int destSz,
+    size_t destSz,
     unsigned long *crcPtr)
 {
     if (pngPtr->base64Data) {
 	return ReadBase64(interp, pngPtr, destPtr, destSz, crcPtr);
     } else if (pngPtr->strDataBuf) {
 	return ReadByteArray(interp, pngPtr, destPtr, destSz, crcPtr);
     }
 
     while (destSz) {
-	int blockSz = PNG_MIN(destSz, PNG_BLOCK_SZ);
+	size_t blockSz = PNG_MIN(destSz, PNG_BLOCK_SZ);
 
-	blockSz = Tcl_Read(pngPtr->channel, (char *)destPtr, blockSz);
-	if (blockSz < 0) {
+	blockSz = (size_t)Tcl_Read(pngPtr->channel, (char *)destPtr, blockSz);
+	if (blockSz == (size_t)-1) {
 	    /* TODO: failure info... */
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "channel read failed: %s", Tcl_PosixError(interp)));
 	    return TCL_ERROR;
 	}
@@ -857,11 +857,11 @@
 
 static int
 ReadChunkHeader(
     Tcl_Interp *interp,
     PNGImage *pngPtr,
-    int *sizePtr,
+    size_t *sizePtr,
     unsigned long *typePtr,
     unsigned long *crcPtr)
 {
     unsigned long chunkType = 0;
     int chunkSz = 0;
@@ -982,11 +982,11 @@
 		     * No nice ASCII conversion; shouldn't happen either, but
 		     * we'll be doubly careful.
 		     */
 
 		    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			    "encountered an unsupported criticial chunk type",
+			    "encountered an unsupported critical chunk type",
 			    -1));
 		} else {
 		    char typeString[5];
 
 		    typeString[0] = (char) ((chunkType >> 24) & 255);
@@ -993,11 +993,11 @@
 		    typeString[1] = (char) ((chunkType >> 16) & 255);
 		    typeString[2] = (char) ((chunkType >> 8) & 255);
 		    typeString[3] = (char) (chunkType & 255);
 		    typeString[4] = '\0';
 		    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-			    "encountered an unsupported criticial chunk type"
+			    "encountered an unsupported critical chunk type"
 			    " \"%s\"", typeString));
 		}
 		Tcl_SetErrorCode(interp, "TK", "IMAGE", "PNG",
 			"UNSUPPORTED_CRITICAL", NULL);
 		return TCL_ERROR;
@@ -1238,11 +1238,11 @@
     Tcl_Interp *interp,
     PNGImage *pngPtr)
 {
     unsigned char sigBuf[PNG_SIG_SZ];
     unsigned long chunkType;
-    int chunkSz;
+    size_t chunkSz;
     unsigned long crc;
     unsigned long width, height;
     int mismatch;
 
     /*
@@ -1262,11 +1262,11 @@
     /*
      * If reading from string, reset position and try base64 decode.
      */
 
     if (mismatch && pngPtr->strDataBuf) {
-	pngPtr->strDataBuf = Tcl_GetByteArrayFromObj(pngPtr->objDataPtr,
+	pngPtr->strDataBuf = TkGetByteArrayFromObj(pngPtr->objDataPtr,
 		&pngPtr->strDataLen);
 	pngPtr->base64Data = pngPtr->strDataBuf;
 
 	if (ReadData(interp, pngPtr, sigBuf, PNG_SIG_SZ, NULL) == TCL_ERROR) {
 	    return TCL_ERROR;
@@ -2096,11 +2096,11 @@
     /*
      * Process IDAT contents until there is no more in this chunk.
      */
 
     while (chunkSz && !Tcl_ZlibStreamEof(pngPtr->stream)) {
-	int len1, len2;
+	size_t len1, len2;
 
 	/*
 	 * Read another block of input into the zlib stream if data remains.
 	 */
 
@@ -2145,18 +2145,18 @@
 	 * Inflate, processing each output buffer's worth as a line of pixels,
 	 * until we cannot fill the buffer any more.
 	 */
 
     getNextLine:
-	Tcl_GetByteArrayFromObj(pngPtr->thisLineObj, &len1);
+	TkGetByteArrayFromObj(pngPtr->thisLineObj, &len1);
 	if (Tcl_ZlibStreamGet(pngPtr->stream, pngPtr->thisLineObj,
 		pngPtr->phaseSize - len1) == TCL_ERROR) {
 	    return TCL_ERROR;
 	}
-	Tcl_GetByteArrayFromObj(pngPtr->thisLineObj, &len2);
+	TkGetByteArrayFromObj(pngPtr->thisLineObj, &len2);
 
-	if (len2 == pngPtr->phaseSize) {
+	if (len2 == (size_t)pngPtr->phaseSize) {
 	    if (pngPtr->phase > 7) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
 			"extra data after final scan line of final phase",
 			-1));
 		Tcl_SetErrorCode(interp, "TK", "IMAGE", "PNG", "EXTRA_DATA",
@@ -2243,14 +2243,14 @@
 	int offset = pngPtr->block.offset[3];
 
 	p += offset;
 
 	if (16 == pngPtr->bitDepth) {
-	    register int channel;
+	    register unsigned int channel;
 
 	    while (p < endPtr) {
-		channel = (unsigned char)
+		channel = (unsigned int)
 			(((p[0] << 8) | p[1]) * pngPtr->alpha);
 
 		*p++ = (unsigned char) (channel >> 8);
 		*p++ = (unsigned char) (channel & 0xff);
 
@@ -2381,11 +2381,11 @@
     Tk_PhotoHandle imageHandle,
     int destX,
     int destY)
 {
     unsigned long chunkType;
-    int chunkSz;
+    size_t chunkSz;
     unsigned long crc;
 
     /*
      * Parse the PNG signature and IHDR (header) chunk.
      */
@@ -2766,11 +2766,11 @@
     PNGImage png;
     int match = 0;
 
     InitPNGImage(NULL, &png, NULL, pObjData, TCL_ZLIB_STREAM_INFLATE);
 
-    png.strDataBuf = Tcl_GetByteArrayFromObj(pObjData, &png.strDataLen);
+    png.strDataBuf = TkGetByteArrayFromObj(pObjData, &png.strDataLen);
 
     if (ReadIHDR(interp, &png) == TCL_OK) {
 	*widthPtr = png.block.width;
 	*heightPtr = png.block.height;
 	match = 1;
@@ -2844,11 +2844,11 @@
 static int
 WriteData(
     Tcl_Interp *interp,
     PNGImage *pngPtr,
     const unsigned char *srcPtr,
-    int srcSz,
+    size_t srcSz,
     unsigned long *crcPtr)
 {
     if (!srcPtr || !srcSz) {
 	return TCL_OK;
     }
@@ -2861,16 +2861,16 @@
      * TODO: is Tcl_AppendObjToObj faster here? i.e., does Tcl join the
      * objects immediately or store them in a multi-object rep?
      */
 
     if (pngPtr->objDataPtr) {
-	int objSz;
+	size_t objSz;
 	unsigned char *destPtr;
 
-	Tcl_GetByteArrayFromObj(pngPtr->objDataPtr, &objSz);
+	TkGetByteArrayFromObj(pngPtr->objDataPtr, &objSz);
 
-	if (objSz > INT_MAX - srcSz) {
+	if (objSz + srcSz > INT_MAX) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		    "image too large to store completely in byte array", -1));
 	    Tcl_SetErrorCode(interp, "TK", "IMAGE", "PNG", "TOO_LARGE", NULL);
 	    return TCL_ERROR;
 	}
@@ -2883,11 +2883,11 @@
 	    Tcl_SetErrorCode(interp, "TK", "MALLOC", NULL);
 	    return TCL_ERROR;
 	}
 
 	memcpy(destPtr+objSz, srcPtr, srcSz);
-    } else if (Tcl_Write(pngPtr->channel, (const char *) srcPtr, srcSz) < 0) {
+    } else if (Tcl_Write(pngPtr->channel, (const char *) srcPtr, srcSz) == TCL_IO_FAILURE) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		"write to channel failed: %s", Tcl_PosixError(interp)));
 	return TCL_ERROR;
     }
 
@@ -2959,11 +2959,11 @@
 WriteChunk(
     Tcl_Interp *interp,
     PNGImage *pngPtr,
     unsigned long chunkType,
     const unsigned char *dataPtr,
-    int dataSize)
+    size_t dataSize)
 {
     unsigned long crc = Tcl_ZlibCRC32(0, NULL, 0);
     int result = TCL_OK;
 
     /*
@@ -3130,13 +3130,14 @@
 WriteIDAT(
     Tcl_Interp *interp,
     PNGImage *pngPtr,
     Tk_PhotoImageBlock *blockPtr)
 {
-    int rowNum, flush = TCL_ZLIB_NO_FLUSH, outputSize, result;
+    int rowNum, flush = TCL_ZLIB_NO_FLUSH, result;
     Tcl_Obj *outputObj;
     unsigned char *outputBytes;
+    size_t outputSize;
 
     /*
      * Filter and compress each row one at a time.
      */
 
@@ -3224,11 +3225,11 @@
      * Now get the compressed data and write it as one big IDAT chunk.
      */
 
     outputObj = Tcl_NewObj();
     (void) Tcl_ZlibStreamGet(pngPtr->stream, outputObj, -1);
-    outputBytes = Tcl_GetByteArrayFromObj(outputObj, &outputSize);
+    outputBytes = TkGetByteArrayFromObj(outputObj, &outputSize);
     result = WriteChunk(interp, pngPtr, CHUNK_IDAT, outputBytes, outputSize);
     Tcl_DecrRefCount(outputObj);
     return result;
 }
 

Index: generic/tkImgPPM.c
==================================================================
--- generic/tkImgPPM.c
+++ generic/tkImgPPM.c
@@ -139,11 +139,12 @@
 				 * written to. */
     int srcX, int srcY)		/* Coordinates of top-left pixel to be used in
 				 * image being read. */
 {
     int fileWidth, fileHeight, maxIntensity;
-    int nLines, nBytes, h, type, count, bytesPerChannel = 1;
+    int nLines, h, type, bytesPerChannel = 1;
+    size_t nBytes, count;
     unsigned char *pixelPtr;
     Tk_PhotoImageBlock block;
 
     type = ReadPPMFileHeader(chan, &fileWidth, &fileHeight, &maxIntensity);
     if (type == 0) {
@@ -283,11 +284,12 @@
     const char *fileName,
     Tcl_Obj *format,
     Tk_PhotoImageBlock *blockPtr)
 {
     Tcl_Channel chan;
-    int w, h, greenOffset, blueOffset, nBytes;
+    int w, h, greenOffset, blueOffset;
+    size_t nBytes;
     unsigned char *pixelPtr, *pixLinePtr;
     char header[16 + TCL_INTEGER_SPACE * 2];
 
     chan = Tcl_OpenFileChannel(interp, fileName, "w", 0666);
     if (chan == NULL) {
@@ -313,20 +315,20 @@
     blueOffset = blockPtr->offset[2] - blockPtr->offset[0];
 
     if ((greenOffset == 1) && (blueOffset == 2) && (blockPtr->pixelSize == 3)
 	    && (blockPtr->pitch == (blockPtr->width * 3))) {
 	nBytes = blockPtr->height * blockPtr->pitch;
-	if (Tcl_Write(chan, (char *) pixLinePtr, nBytes) != nBytes) {
+	if ((size_t)Tcl_Write(chan, (char *) pixLinePtr, nBytes) != nBytes) {
 	    goto writeerror;
 	}
     } else {
 	for (h = blockPtr->height; h > 0; h--) {
 	    pixelPtr = pixLinePtr;
 	    for (w = blockPtr->width; w > 0; w--) {
-		if (    Tcl_Write(chan,(char *)&pixelPtr[0], 1) == -1 ||
-			Tcl_Write(chan,(char *)&pixelPtr[greenOffset],1)==-1 ||
-			Tcl_Write(chan,(char *)&pixelPtr[blueOffset],1) ==-1) {
+		if (Tcl_Write(chan,(char *)&pixelPtr[0], 1) == TCL_IO_FAILURE ||
+			Tcl_Write(chan,(char *)&pixelPtr[greenOffset],1) == TCL_IO_FAILURE ||
+			Tcl_Write(chan,(char *)&pixelPtr[blueOffset],1) == TCL_IO_FAILURE) {
 		    goto writeerror;
 		}
 		pixelPtr += blockPtr->pixelSize;
 	    }
 	    pixLinePtr += blockPtr->pitch;
@@ -760,14 +762,15 @@
     unsigned char **dataBufferPtr,
     int *dataSizePtr)
 {
 #define BUFFER_SIZE 1000
     char buffer[BUFFER_SIZE], c;
-    int i, numFields, dataSize, type = 0;
+    int i, numFields, type = 0;
+    size_t dataSize;
     unsigned char *dataBuffer;
 
-    dataBuffer = Tcl_GetByteArrayFromObj(dataPtr, &dataSize);
+    dataBuffer = TkGetByteArrayFromObj(dataPtr, &dataSize);
 
     /*
      * Read 4 space-separated fields from the string, ignoring comments (any
      * line that starts with "#").
      */

Index: generic/tkImgPhInstance.c
==================================================================
--- generic/tkImgPhInstance.c
+++ generic/tkImgPhInstance.c
@@ -108,11 +108,11 @@
 	/*
 	 * Free up our old color table, and get a new one.
 	 */
 
 	if (colorTablePtr != NULL) {
-	    colorTablePtr->liveRefCount -= 1;
+	    colorTablePtr->liveRefCount--;
 	    FreeColorTable(colorTablePtr, 0);
 	}
 	GetColorTable(instancePtr);
 
 	/*
@@ -416,10 +416,17 @@
 #define GetBValue(rgb)	(UCHAR(((rgb) & blue_mask) >> blue_shift))
 #define RGB(r, g, b)	((unsigned)( \
 	(UCHAR(r) << red_shift)   | \
 	(UCHAR(g) << green_shift) | \
 	(UCHAR(b) << blue_shift)  ))
+#ifdef MAC_OSX_TK
+#define RGBA(r, g, b, a) ((unsigned)( \
+	(UCHAR(r) << red_shift)   | \
+	(UCHAR(g) << green_shift) | \
+	(UCHAR(b) << blue_shift)  | \
+	(UCHAR(a) << alpha_shift) ))
+#endif
 #define RGB15(r, g, b)	((unsigned)( \
 	(((r) * red_mask / 255)   & red_mask)   | \
 	(((g) * green_mask / 255) & green_mask) | \
 	(((b) * blue_mask / 255)  & blue_mask)  ))
 #endif /* !_WIN32 */
@@ -483,10 +490,17 @@
 	green_shift++;
     }
     while ((0x0001 & (blue_mask >> blue_shift)) == 0) {
 	blue_shift++;
     }
+#ifdef MAC_OSX_TK
+    unsigned long alpha_mask = visual->alpha_mask;
+    unsigned long alpha_shift = 0;
+    while ((0x0001 & (alpha_mask >> alpha_shift)) == 0) {
+	alpha_shift++;
+    }
+#endif
 #endif /* !_WIN32 */
 
     /*
      * Only UNIX requires the special case for <24bpp. It varies with 3 extra
      * shifts and uses RGB15. The 24+bpp version could also then be further
@@ -583,11 +597,15 @@
 		    unalpha = 255 - alpha;	/* Calculate once. */
 		    r = ALPHA_BLEND(ra, r, alpha, unalpha);
 		    g = ALPHA_BLEND(ga, g, alpha, unalpha);
 		    b = ALPHA_BLEND(ba, b, alpha, unalpha);
 		}
+#ifndef MAC_OSX_TK
 		XPutPixel(bgImg, x, y, RGB(r, g, b));
+#else
+		XPutPixel(bgImg, x, y, RGBA(r, g, b, alpha));
+#endif
 	    }
 	}
     }
 #undef ALPHA_BLEND
 }
@@ -719,12 +737,11 @@
 				 * image. */
 {
     PhotoInstance *instancePtr = clientData;
     ColorTable *colorPtr;
 
-    instancePtr->refCount -= 1;
-    if (instancePtr->refCount > 0) {
+    if (instancePtr->refCount-- > 1) {
 	return;
     }
 
     /*
      * There are no more uses of the image within this widget. Decrement the
@@ -733,11 +750,11 @@
      * structure.
      */
 
     colorPtr = instancePtr->colorTablePtr;
     if (colorPtr != NULL) {
-	colorPtr->liveRefCount -= 1;
+	colorPtr->liveRefCount--;
     }
 
     Tcl_DoWhenIdle(TkImgDisposeInstance, instancePtr);
 }
 
@@ -1116,12 +1133,11 @@
 FreeColorTable(
     ColorTable *colorPtr,	/* Pointer to the color table which is no
 				 * longer required by an instance. */
     int force)			/* Force free to happen immediately. */
 {
-    colorPtr->refCount--;
-    if (colorPtr->refCount > 0) {
+    if (colorPtr->refCount-- > 1) {
 	return;
     }
 
     if (force) {
 	if (colorPtr->flags & DISPOSE_PENDING) {
@@ -1260,11 +1276,11 @@
 			}
 		    }
 		}
 	    } else {
 		/*
-		 * Monochrome display - allocate the shades of grey we want.
+		 * Monochrome display - allocate the shades of gray we want.
 		 */
 
 		for (i = 0; i < numColors; ++i) {
 		    if (igam == 1.0) {
 			r = CFRAC(i, numColors - 1);

Index: generic/tkImgPhoto.c
==================================================================
--- generic/tkImgPhoto.c
+++ generic/tkImgPhoto.c
@@ -46,45 +46,51 @@
  * allowedOptions parameter on a call to ParseSubcommandOptions if that option
  * is allowed for the current photo image subcommand. On return, the bit is
  * set in the options field of the SubcommandOptions structure if that option
  * was specified.
  *
+ * OPT_ALPHA:			Set if -alpha option allowed/specified.
  * OPT_BACKGROUND:		Set if -format option allowed/specified.
  * OPT_COMPOSITE:		Set if -compositingrule option allowed/spec'd.
  * OPT_FORMAT:			Set if -format option allowed/specified.
  * OPT_FROM:			Set if -from option allowed/specified.
  * OPT_GRAYSCALE:		Set if -grayscale option allowed/specified.
  * OPT_SHRINK:			Set if -shrink option allowed/specified.
  * OPT_SUBSAMPLE:		Set if -subsample option allowed/spec'd.
  * OPT_TO:			Set if -to option allowed/specified.
+ * OPT_WITHALPHA:		Set if -withalpha option allowed/specified.
  * OPT_ZOOM:			Set if -zoom option allowed/specified.
  */
 
-#define OPT_BACKGROUND	1
-#define OPT_COMPOSITE	2
-#define OPT_FORMAT	4
-#define OPT_FROM	8
-#define OPT_GRAYSCALE	0x10
-#define OPT_SHRINK	0x20
-#define OPT_SUBSAMPLE	0x40
-#define OPT_TO		0x80
-#define OPT_ZOOM	0x100
+#define OPT_ALPHA	1
+#define OPT_BACKGROUND	2
+#define OPT_COMPOSITE	4
+#define OPT_FORMAT	8
+#define OPT_FROM	0x10
+#define OPT_GRAYSCALE	0x20
+#define OPT_SHRINK	0x40
+#define OPT_SUBSAMPLE	0x80
+#define OPT_TO		0x100
+#define OPT_WITHALPHA	0x200
+#define OPT_ZOOM	0x400
 
 /*
  * List of option names. The order here must match the order of declarations
  * of the OPT_* constants above.
  */
 
 static const char *const optionNames[] = {
+    "-alpha",
     "-background",
     "-compositingrule",
     "-format",
     "-from",
     "-grayscale",
     "-shrink",
     "-subsample",
     "-to",
+    "-withalpha",
     "-zoom",
     NULL
 };
 
 /*
@@ -180,13 +186,10 @@
 			    PhotoMaster *masterPtr, int objc,
 			    Tcl_Obj *const objv[], int flags);
 static int		ToggleComplexAlphaIfNeeded(PhotoMaster *mPtr);
 static int		ImgPhotoSetSize(PhotoMaster *masterPtr, int width,
 			    int height);
-static int		ImgStringWrite(Tcl_Interp *interp,
-			    Tcl_Obj *formatString,
-			    Tk_PhotoImageBlock *blockPtr);
 static char *		ImgGetPhoto(PhotoMaster *masterPtr,
 			    Tk_PhotoImageBlock *blockPtr,
 			    struct SubcommandOptions *optPtr);
 static int		MatchFileFormat(Tcl_Interp *interp, Tcl_Channel chan,
 			    const char *fileName, Tcl_Obj *formatString,
@@ -400,18 +403,17 @@
 	PHOTO_GET, PHOTO_PUT, PHOTO_READ, PHOTO_REDITHER, PHOTO_TRANS,
 	PHOTO_WRITE
     };
 
     PhotoMaster *masterPtr = clientData;
-    int result, index, x, y, width, height, dataWidth, dataHeight, listObjc;
+    int result, index, x, y, width, height;
     struct SubcommandOptions options;
-    Tcl_Obj **listObjv, **srcObjv;
     unsigned char *pixelPtr;
     Tk_PhotoImageBlock block;
-    Tk_Window tkwin;
     Tk_PhotoImageFormat *imageFormat;
-    int imageWidth, imageHeight, matched, length, oldformat = 0;
+    size_t length;
+    int imageWidth, imageHeight, matched, oldformat = 0;
     Tcl_Channel chan;
     Tk_PhotoHandle srcHandle;
     ThreadSpecificData *tsdPtr =
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
@@ -444,16 +446,16 @@
 
 	if (objc != 3) {
 	    Tcl_WrongNumArgs(interp, 2, objv, "option");
 	    return TCL_ERROR;
 	}
-	arg = Tcl_GetStringFromObj(objv[2], &length);
-	if (strncmp(arg,"-data", (unsigned) length) == 0) {
+	arg = TkGetStringFromObj(objv[2], &length);
+	if (strncmp(arg,"-data", length) == 0) {
 	    if (masterPtr->dataString) {
 		Tcl_SetObjResult(interp, masterPtr->dataString);
 	    }
-	} else if (strncmp(arg,"-format", (unsigned) length) == 0) {
+	} else if (strncmp(arg,"-format", length) == 0) {
 	    if (masterPtr->format) {
 		Tcl_SetObjResult(interp, masterPtr->format);
 	    }
 	} else {
 	    Tk_ConfigureValue(interp, Tk_MainWindow(interp), configSpecs,
@@ -493,13 +495,13 @@
 	    Tcl_ListObjAppendList(interp, obj, Tcl_GetObjResult(interp));
 	    Tcl_SetObjResult(interp, obj);
 	    return TCL_OK;
 
 	} else if (objc == 3) {
-	    const char *arg = Tcl_GetStringFromObj(objv[2], &length);
+	    const char *arg = TkGetStringFromObj(objv[2], &length);
 
-	    if (length > 1 && !strncmp(arg, "-data", (unsigned) length)) {
+	    if (length > 1 && !strncmp(arg, "-data", length)) {
 		Tcl_AppendResult(interp, "-data {} {} {}", NULL);
 		if (masterPtr->dataString) {
 		    /*
 		     * TODO: Modifying result is bad!
 		     */
@@ -509,11 +511,11 @@
 		} else {
 		    Tcl_AppendResult(interp, " {}", NULL);
 		}
 		return TCL_OK;
 	    } else if (length > 1 &&
-		    !strncmp(arg, "-format", (unsigned) length)) {
+		    !strncmp(arg, "-format", length)) {
 		Tcl_AppendResult(interp, "-format {} {} {}", NULL);
 		if (masterPtr->format) {
 		    /*
 		     * TODO: Modifying result is bad!
 		     */
@@ -571,10 +573,13 @@
 	}
 	Tk_PhotoGetImage(srcHandle, &block);
 	if ((options.fromX2 > block.width) || (options.fromY2 > block.height)
 		|| (options.fromX2 > block.width)
 		|| (options.fromY2 > block.height)) {
+	    if (options.background) {
+		Tk_FreeColor(options.background);
+	    }
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		    "coordinates for -from option extend outside source image",
 		    -1));
 	    Tcl_SetErrorCode(interp, "TK", "IMAGE", "PHOTO", "BAD_FROM", NULL);
 	    return TCL_ERROR;
@@ -619,48 +624,61 @@
 			/ -options.subsampleY;
 	    }
 	    options.toY2 = options.toY + height * options.zoomY;
 	}
 
-	/*
-	 * Set the destination image size if the -shrink option was specified.
-	 */
-
-	if (options.options & OPT_SHRINK) {
-	    if (ImgPhotoSetSize(masterPtr, options.toX2,
-		    options.toY2) != TCL_OK) {
-		Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			TK_PHOTO_ALLOC_FAILURE_MESSAGE, -1));
-		Tcl_SetErrorCode(interp, "TK", "MALLOC", NULL);
-		return TCL_ERROR;
-	    }
-	}
-
 	/*
 	 * Copy the image data over using Tk_PhotoPutZoomedBlock.
 	 */
 
 	block.pixelPtr += options.fromX * block.pixelSize
 		+ options.fromY * block.pitch;
 	block.width = options.fromX2 - options.fromX;
 	block.height = options.fromY2 - options.fromY;
-	return Tk_PhotoPutZoomedBlock(interp, (Tk_PhotoHandle) masterPtr,
+	result = Tk_PhotoPutZoomedBlock(interp, (Tk_PhotoHandle) masterPtr,
 		&block, options.toX, options.toY, options.toX2 - options.toX,
 		options.toY2 - options.toY, options.zoomX, options.zoomY,
 		options.subsampleX, options.subsampleY,
 		options.compositingRule);
 
+	/*
+	 * Set the destination image size if the -shrink option was specified.
+	 * This has to be done _after_ copying the data. Otherwise, if source
+	 * and destination are the same image, block.pixelPtr would point to
+	 * an invalid memory block (bug [5239fd749b]).
+	 */
+
+	if (options.options & OPT_SHRINK) {
+	    if (ImgPhotoSetSize(masterPtr, options.toX2,
+		    options.toY2) != TCL_OK) {
+		if (options.background) {
+		    Tk_FreeColor(options.background);
+		}
+		Tcl_SetObjResult(interp, Tcl_NewStringObj(
+			TK_PHOTO_ALLOC_FAILURE_MESSAGE, -1));
+		Tcl_SetErrorCode(interp, "TK", "MALLOC", NULL);
+		return TCL_ERROR;
+	    }
+	}
+	Tk_ImageChanged(masterPtr->tkMaster, 0, 0, 0, 0,
+		masterPtr->width, masterPtr->height);
+	if (options.background) {
+	    Tk_FreeColor(options.background);
+	}
+	return result;
+
     case PHOTO_DATA: {
-	char *data;
+        char *data = NULL;
+        Tcl_Obj *freeObj = NULL;
 
 	/*
 	 * photo data command - first parse and check any options given.
 	 */
 
 	Tk_ImageStringWriteProc *stringWriteProc = NULL;
 
-	index = 2;
+	index = 1;
 	memset(&options, 0, sizeof(options));
 	options.name = NULL;
 	options.format = NULL;
 	options.fromX = 0;
 	options.fromY = 0;
@@ -667,11 +685,11 @@
 	if (ParseSubcommandOptions(&options, interp,
 		OPT_FORMAT | OPT_FROM | OPT_GRAYSCALE | OPT_BACKGROUND,
 		&index, objc, objv) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	if ((options.name != NULL) || (index < objc)) {
+	if ((options.name == NULL) || (index < objc)) {
 	    Tcl_WrongNumArgs(interp, 2, objv, "?-option value ...?");
 	    return TCL_ERROR;
 	}
 	if ((options.fromX > masterPtr->width)
 		|| (options.fromY > masterPtr->height)
@@ -689,54 +707,54 @@
 
 	if (!(options.options & OPT_FROM) || (options.fromX2 < 0)) {
 	    options.fromX2 = masterPtr->width;
 	    options.fromY2 = masterPtr->height;
 	}
+	if (!(options.options & OPT_FORMAT)) {
+            options.format = Tcl_NewStringObj("default", -1);
+            freeObj = options.format;
+	}
 
 	/*
 	 * Search for an appropriate image string format handler.
 	 */
 
-	if (options.options & OPT_FORMAT) {
-	    matched = 0;
-	    for (imageFormat = tsdPtr->formatList; imageFormat != NULL;
-	 	imageFormat = imageFormat->nextPtr) {
-		if ((strncasecmp(Tcl_GetString(options.format),
-			imageFormat->name, strlen(imageFormat->name)) == 0)) {
-		    matched = 1;
-		    if (imageFormat->stringWriteProc != NULL) {
-			stringWriteProc = imageFormat->stringWriteProc;
-			break;
-		    }
-		}
-	    }
-	    if (stringWriteProc == NULL) {
-		oldformat = 1;
-		for (imageFormat = tsdPtr->oldFormatList; imageFormat != NULL;
-			imageFormat = imageFormat->nextPtr) {
-		    if ((strncasecmp(Tcl_GetString(options.format),
-			    imageFormat->name,
-			    strlen(imageFormat->name)) == 0)) {
-			matched = 1;
-			if (imageFormat->stringWriteProc != NULL) {
-			    stringWriteProc = imageFormat->stringWriteProc;
-			    break;
-			}
-		    }
-		}
-	    }
-	    if (stringWriteProc == NULL) {
-		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-			"image string format \"%s\" is %s",
-			Tcl_GetString(options.format),
-			(matched ? "not supported" : "unknown")));
-		Tcl_SetErrorCode(interp, "TK", "LOOKUP", "PHOTO_FORMAT",
-			Tcl_GetString(options.format), NULL);
-		return TCL_ERROR;
-	    }
-	} else {
-	    stringWriteProc = ImgStringWrite;
+	matched = 0;
+	for (imageFormat = tsdPtr->formatList; imageFormat != NULL;
+                imageFormat = imageFormat->nextPtr) {
+	    if ((strncasecmp(Tcl_GetString(options.format),
+                    imageFormat->name, strlen(imageFormat->name)) == 0)) {
+                matched = 1;
+                if (imageFormat->stringWriteProc != NULL) {
+                    stringWriteProc = imageFormat->stringWriteProc;
+                    break;
+                }
+	    }
+	}
+	if (stringWriteProc == NULL) {
+	    oldformat = 1;
+	    for (imageFormat = tsdPtr->oldFormatList; imageFormat != NULL;
+                    imageFormat = imageFormat->nextPtr) {
+                if ((strncasecmp(Tcl_GetString(options.format),
+                        imageFormat->name,
+                        strlen(imageFormat->name)) == 0)) {
+                    matched = 1;
+                    if (imageFormat->stringWriteProc != NULL) {
+                        stringWriteProc = imageFormat->stringWriteProc;
+                        break;
+                    }
+                }
+	    }
+	}
+	if (stringWriteProc == NULL) {
+	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+                    "image string format \"%s\" is %s",
+                    Tcl_GetString(options.format),
+                    (matched ? "not supported" : "unknown")));
+	    Tcl_SetErrorCode(interp, "TK", "LOOKUP", "PHOTO_FORMAT",
+                    Tcl_GetString(options.format), NULL);
+	    goto dataErrorExit;
 	}
 
 	/*
 	 * Call the handler's string write function to write out the image.
 	 */
@@ -769,24 +787,51 @@
 	    Tk_FreeColor(options.background);
 	}
 	if (data) {
 	    ckfree(data);
 	}
+        if (freeObj != NULL) {
+            Tcl_DecrRefCount(freeObj);
+        }
 	return result;
+
+      dataErrorExit:
+        if (options.background) {
+	    Tk_FreeColor(options.background);
+	}
+	if (data) {
+	    ckfree(data);
+	}
+        if (freeObj != NULL) {
+            Tcl_DecrRefCount(freeObj);
+        }
+	return TCL_ERROR;
     }
 
     case PHOTO_GET: {
 	/*
 	 * photo get command - first parse and check parameters.
 	 */
 
-	Tcl_Obj *channels[3];
+	Tcl_Obj *channels[4];
+	int channelCount = 3;
 
-	if (objc != 4) {
-	    Tcl_WrongNumArgs(interp, 2, objv, "x y");
+        index = 3;
+        memset(&options, 0, sizeof(options));
+        options.name = NULL;
+        if (ParseSubcommandOptions(&options, interp, OPT_WITHALPHA,
+                &index, objc, objv) != TCL_OK) {
+            return TCL_ERROR;
+        }
+        if (options.name == NULL || index < objc) {
+	    Tcl_WrongNumArgs(interp, 2, objv, "x y ?-withalpha?");
 	    return TCL_ERROR;
 	}
+        if (options.options & OPT_WITHALPHA) {
+            channelCount = 4;
+        }
+
 	if ((Tcl_GetIntFromObj(interp, objv[2], &x) != TCL_OK)
 		|| (Tcl_GetIntFromObj(interp, objv[3], &y) != TCL_OK)) {
 	    return TCL_ERROR;
 	}
 	if ((x < 0) || (x >= masterPtr->width)
@@ -798,206 +843,86 @@
 		    NULL);
 	    return TCL_ERROR;
 	}
 
 	/*
-	 * Extract the value of the desired pixel and format it as a string.
+	 * Extract the value of the desired pixel and format it as a list.
 	 */
 
 	pixelPtr = masterPtr->pix32 + (y * masterPtr->width + x) * 4;
 	channels[0] = Tcl_NewIntObj(pixelPtr[0]);
 	channels[1] = Tcl_NewIntObj(pixelPtr[1]);
 	channels[2] = Tcl_NewIntObj(pixelPtr[2]);
-	Tcl_SetObjResult(interp, Tcl_NewListObj(3, channels));
+	channels[3] = Tcl_NewIntObj(pixelPtr[3]);
+	Tcl_SetObjResult(interp, Tcl_NewListObj(channelCount, channels));
 	return TCL_OK;
     }
 
-    case PHOTO_PUT:
+    case PHOTO_PUT: {
+	Tcl_Obj *format, *data;
+
 	/*
-	 * photo put command - first parse the options and colors specified.
+	 * photo put command - first parse the options.
 	 */
 
 	index = 2;
 	memset(&options, 0, sizeof(options));
 	options.name = NULL;
+	options.format = NULL;
 	if (ParseSubcommandOptions(&options, interp, OPT_TO|OPT_FORMAT,
 		&index, objc, objv) != TCL_OK) {
 	    return TCL_ERROR;
 	}
 	if ((options.name == NULL) || (index < objc)) {
 	    Tcl_WrongNumArgs(interp, 2, objv, "data ?-option value ...?");
 	    return TCL_ERROR;
 	}
 
-	if (MatchStringFormat(interp, options.name ? objv[2]:NULL,
-		options.format, &imageFormat, &imageWidth,
-		&imageHeight, &oldformat) == TCL_OK) {
-	    Tcl_Obj *format, *data;
-
-	    if (!(options.options & OPT_TO) || (options.toX2 < 0)) {
-		options.toX2 = options.toX + imageWidth;
-		options.toY2 = options.toY + imageHeight;
-	    }
-	    if (imageWidth > options.toX2 - options.toX) {
-		imageWidth = options.toX2 - options.toX;
-	    }
-	    if (imageHeight > options.toY2 - options.toY) {
-		imageHeight = options.toY2 - options.toY;
-	    }
-	    format = options.format;
-	    data = objv[2];
-	    if (oldformat) {
-		if (format) {
-		    format = (Tcl_Obj *) Tcl_GetString(format);
-		}
-		data = (Tcl_Obj *) Tcl_GetString(data);
-	    }
-	    if (imageFormat->stringReadProc(interp, data, format,
-		    (Tk_PhotoHandle) masterPtr, options.toX, options.toY,
-		    imageWidth, imageHeight, 0, 0) != TCL_OK) {
-		return TCL_ERROR;
-	    }
-	    masterPtr->flags |= IMAGE_CHANGED;
-	    return TCL_OK;
-	}
-	if (options.options & OPT_FORMAT) {
-	    return TCL_ERROR;
-	}
-	Tcl_ResetResult(interp);
-	if (Tcl_ListObjGetElements(interp, options.name,
-		&dataHeight, &srcObjv) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-	tkwin = Tk_MainWindow(interp);
-	block.pixelPtr = NULL;
-	dataWidth = 0;
-	pixelPtr = NULL;
-	for (y = 0; y < dataHeight; ++y) {
-	    if (Tcl_ListObjGetElements(interp, srcObjv[y],
-		    &listObjc, &listObjv) != TCL_OK) {
-		break;
-	    }
-
-	    if (y == 0) {
-		if (listObjc == 0) {
-		    /*
-		     * Lines must be non-empty...
-		     */
-
-		    break;
-		}
-		dataWidth = listObjc;
-		/*
- 		 * Memory allocation overflow protection.
- 		 * May not be able to trigger/ demo / test this.
- 		 */
-
-		if (dataWidth > (int)((UINT_MAX/3) / dataHeight)) {
-		    Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			"photo image dimensions exceed Tcl memory limits", -1));
-		    Tcl_SetErrorCode(interp, "TK", "IMAGE", "PHOTO",
-			"OVERFLOW", NULL);
-		    break;
-		}
-
-		pixelPtr = ckalloc(dataWidth * dataHeight * 3);
-		block.pixelPtr = pixelPtr;
-	    } else if (listObjc != dataWidth) {
-		Tcl_SetObjResult(interp, Tcl_NewStringObj(
-			"all elements of color list must have the same"
-			" number of elements", -1));
-		Tcl_SetErrorCode(interp, "TK", "IMAGE", "PHOTO",
-			"NON_RECTANGULAR", NULL);
-		break;
-	    }
-
-	    for (x = 0; x < dataWidth; ++x) {
-		const char *colorString = Tcl_GetString(listObjv[x]);
-		XColor color;
-		int tmpr, tmpg, tmpb;
-
-		/*
-		 * We do not use Tk_GetColorFromObj() because we absolutely do
-		 * not want to invoke the fallback code.
-		 */
-
-		if (colorString[0] == '#') {
-		    if (isxdigit(UCHAR(colorString[1])) &&
-			    isxdigit(UCHAR(colorString[2])) &&
-			    isxdigit(UCHAR(colorString[3]))) {
-			if (colorString[4] == '\0') {
-			    /* Got #rgb */
-			    sscanf(colorString+1, "%1x%1x%1x",
-				    &tmpr, &tmpg, &tmpb);
-			    *pixelPtr++ = tmpr * 0x11;
-			    *pixelPtr++ = tmpg * 0x11;
-			    *pixelPtr++ = tmpb * 0x11;
-			    continue;
-			} else if (isxdigit(UCHAR(colorString[4])) &&
-				isxdigit(UCHAR(colorString[5])) &&
-				isxdigit(UCHAR(colorString[6])) &&
-				colorString[7] == '\0') {
-			    /* Got #rrggbb */
-			    sscanf(colorString+1, "%2x%2x%2x",
-				    &tmpr, &tmpg, &tmpb);
-			    *pixelPtr++ = tmpr;
-			    *pixelPtr++ = tmpg;
-			    *pixelPtr++ = tmpb;
-			    continue;
-			}
-		    }
-		}
-
-		if (!TkParseColor(Tk_Display(tkwin), Tk_Colormap(tkwin),
-			colorString, &color)) {
-		    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-			    "can't parse color \"%s\"", colorString));
-		    Tcl_SetErrorCode(interp, "TK", "VALUE", "COLOR", NULL);
-		    break;
-		}
-		*pixelPtr++ = color.red >> 8;
-		*pixelPtr++ = color.green >> 8;
-		*pixelPtr++ = color.blue >> 8;
-	    }
-	    if (x < dataWidth) {
-		break;
-	    }
-	}
-	if (y < dataHeight || dataHeight == 0 || dataWidth == 0) {
-	    if (block.pixelPtr != NULL) {
-		ckfree(block.pixelPtr);
-	    }
-	    if (y < dataHeight) {
-		return TCL_ERROR;
-	    }
-	    return TCL_OK;
-	}
-
-	/*
-	 * Fill in default values for the -to option, then copy the block in
-	 * using Tk_PhotoPutBlock.
-	 */
-
-	if (!(options.options & OPT_TO) || (options.toX2 < 0)) {
-	    options.toX2 = options.toX + dataWidth;
-	    options.toY2 = options.toY + dataHeight;
-	}
-	block.width = dataWidth;
-	block.height = dataHeight;
-	block.pitch = dataWidth * 3;
-	block.pixelSize = 3;
-	block.offset[0] = 0;
-	block.offset[1] = 1;
-	block.offset[2] = 2;
-	block.offset[3] = 0;
-	result = Tk_PhotoPutBlock(interp, masterPtr, &block,
-		options.toX, options.toY, options.toX2 - options.toX,
-		options.toY2 - options.toY,
-		TK_PHOTO_COMPOSITE_SET);
-	ckfree(block.pixelPtr);
-	return result;
-
+	/*
+	 * See if there's a format that can read the data
+	 */
+
+	if (MatchStringFormat(interp, objv[2], options.format, &imageFormat,
+		&imageWidth, &imageHeight, &oldformat) != TCL_OK) {
+	    return TCL_ERROR;
+	}
+
+	if (!(options.options & OPT_TO) || (options.toX2 < 0)) {
+	    options.toX2 = options.toX + imageWidth;
+	    options.toY2 = options.toY + imageHeight;
+	}
+	if (imageWidth > options.toX2 - options.toX) {
+	    imageWidth = options.toX2 - options.toX;
+	}
+	if (imageHeight > options.toY2 - options.toY) {
+	    imageHeight = options.toY2 - options.toY;
+	}
+	format = options.format;
+	data = objv[2];
+	if (oldformat) {
+	    if (format) {
+		format = (Tcl_Obj *) Tcl_GetString(format);
+	    }
+	    data = (Tcl_Obj *) Tcl_GetString(data);
+	}
+
+	if (imageFormat->stringReadProc(interp, data, format,
+		(Tk_PhotoHandle) masterPtr, options.toX, options.toY,
+		options.toX2 - options.toX,
+		options.toY2 - options.toY, 0, 0) != TCL_OK) {
+	    return TCL_ERROR;
+	}
+	/*
+	 * SB: is the next line really needed? The stringReadProc
+	 * writes image data with Tk_PhotoPutBlock(), which in turn
+	 * takes care to notify the changed image and to set/unset the
+	 * IMAGE_CHANGED bit.
+	 */
+	masterPtr->flags |= IMAGE_CHANGED;
+
+	return TCL_OK;
+    }
     case PHOTO_READ: {
 	Tcl_Obj *format;
 
 	/*
 	 * photo read command - first parse the options specified.
@@ -1163,21 +1088,44 @@
 	    return TCL_ERROR;
 	}
 
 	switch ((enum transOptions) index) {
 	case PHOTO_TRANS_GET: {
-	    XRectangle testBox;
-	    TkRegion testRegion;
+	    int boolMode;
 
-	    if (objc != 5) {
-		Tcl_WrongNumArgs(interp, 3, objv, "x y");
+	    /*
+	     * parse fixed args and option
+	     */
+
+	    if (objc > 6 || objc < 5) {
+		Tcl_WrongNumArgs(interp, 3, objv, "x y ?-option?");
 		return TCL_ERROR;
 	    }
 	    if ((Tcl_GetIntFromObj(interp, objv[3], &x) != TCL_OK)
 		    || (Tcl_GetIntFromObj(interp, objv[4], &y) != TCL_OK)) {
 		return TCL_ERROR;
 	    }
+
+	    index = 4;
+	    memset(&options, 0, sizeof(options));
+	    if (ParseSubcommandOptions(&options, interp,
+		    OPT_ALPHA, &index, objc, objv) != TCL_OK) {
+		return TCL_ERROR;
+	    }
+	    if (index < objc) {
+		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+			"unknown option \"%s\": must be -alpha",
+			Tcl_GetString(objv[index])));
+		Tcl_SetErrorCode(interp, "TK", "IMAGE", "PHOTO", "BAD_OPTION",
+			NULL);
+		return TCL_ERROR;
+	    }
+	    boolMode = 1;
+	    if (options.options & OPT_ALPHA) {
+		boolMode = 0;
+	    }
+
 	    if ((x < 0) || (x >= masterPtr->width)
 		    || (y < 0) || (y >= masterPtr->height)) {
 		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 			"%s transparency get: coordinates out of range",
 			Tcl_GetString(objv[0])));
@@ -1184,82 +1132,116 @@
 		Tcl_SetErrorCode(interp, "TK", "IMAGE", "PHOTO", "COORDINATES",
 			NULL);
 		return TCL_ERROR;
 	    }
 
-	    testBox.x = x;
-	    testBox.y = y;
-	    testBox.width = 1;
-	    testBox.height = 1;
-	    /* What a way to do a test! */
-	    testRegion = TkCreateRegion();
-	    TkUnionRectWithRegion(&testBox, testRegion, testRegion);
-	    TkIntersectRegion(testRegion, masterPtr->validRegion, testRegion);
-	    TkClipBox(testRegion, &testBox);
-	    TkDestroyRegion(testRegion);
-
-	    Tcl_SetObjResult(interp, Tcl_NewBooleanObj(
-		    testBox.width==0 && testBox.height==0));
+	    /*
+	     * Extract and return the desired value
+	     */
+	    pixelPtr = masterPtr->pix32 + (y * masterPtr->width + x) * 4;
+	    if (boolMode) {
+		Tcl_SetObjResult(interp, Tcl_NewBooleanObj( ! pixelPtr[3]));
+	    } else {
+		Tcl_SetObjResult(interp, Tcl_NewIntObj(pixelPtr[3]));
+	    }
 	    return TCL_OK;
 	}
 
 	case PHOTO_TRANS_SET: {
-	    int transFlag;
+	    int newVal, boolMode;
 	    XRectangle setBox;
+	    TkRegion modRegion;
 
-	    if (objc != 6) {
-		Tcl_WrongNumArgs(interp, 3, objv, "x y boolean");
+	    /*
+	     * Parse args and option, check for valid values
+	     */
+
+	    if (objc < 6 || objc > 7) {
+		Tcl_WrongNumArgs(interp, 3, objv, "x y newVal ?-option?");
 		return TCL_ERROR;
 	    }
 	    if ((Tcl_GetIntFromObj(interp, objv[3], &x) != TCL_OK)
-		    || (Tcl_GetIntFromObj(interp, objv[4], &y) != TCL_OK)
-		    || (Tcl_GetBooleanFromObj(interp, objv[5],
-		    &transFlag) != TCL_OK)) {
+		    || (Tcl_GetIntFromObj(interp, objv[4], &y) != TCL_OK)) {
+		return TCL_ERROR;
+	    }
+
+	    index = 5;
+	    memset(&options, 0, sizeof(options));
+	    if (ParseSubcommandOptions(&options, interp,
+		    OPT_ALPHA, &index, objc, objv) != TCL_OK) {
+		return TCL_ERROR;
+	    }
+	    if (index < objc) {
+		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+			"unknown option \"%s\": must be -alpha",
+			Tcl_GetString(objv[index])));
+		Tcl_SetErrorCode(interp, "TK", "IMAGE", "PHOTO", "BAD_OPTION",
+			NULL);
 		return TCL_ERROR;
 	    }
+	    boolMode = 1;
+	    if (options.options & OPT_ALPHA) {
+		boolMode = 0;
+	    }
+
 	    if ((x < 0) || (x >= masterPtr->width)
 		|| (y < 0) || (y >= masterPtr->height)) {
 		Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 			"%s transparency set: coordinates out of range",
 			Tcl_GetString(objv[0])));
 		Tcl_SetErrorCode(interp, "TK", "IMAGE", "PHOTO", "COORDINATES",
 			NULL);
 		return TCL_ERROR;
 	    }
+
+	    if (boolMode) {
+		if (Tcl_GetBooleanFromObj(interp, objv[5], &newVal) != TCL_OK) {
+		    return TCL_ERROR;
+		}
+	    } else {
+		if (Tcl_GetIntFromObj(interp, objv[5], &newVal) != TCL_OK) {
+		    return TCL_ERROR;
+		}
+		if (newVal < 0 || newVal > 255) {
+		    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+			    "invalid alpha value \"%d\": "
+			    "must be integer between 0 and 255", newVal));
+		    Tcl_SetErrorCode(interp, "TK", "IMAGE", "PHOTO",
+			    "BAD_VALUE", NULL);
+		    return TCL_ERROR;
+		}
+	    }
+
+	    /*
+	     * Set new alpha value for the pixel
+	     */
+
+	    pixelPtr = masterPtr->pix32 + (y * masterPtr->width + x) * 4;
+	    if (boolMode) {
+		pixelPtr[3] = newVal ? 0 : 255;
+	    } else {
+		pixelPtr[3] = newVal;
+	    }
+
+	    /*
+	     * Update the validRegion of the image
+	     */
 
 	    setBox.x = x;
 	    setBox.y = y;
 	    setBox.width = 1;
 	    setBox.height = 1;
-	    pixelPtr = masterPtr->pix32 + (y * masterPtr->width + x) * 4;
-
-	    if (transFlag) {
-		/*
-		 * Make pixel transparent.
-		 */
-
-		TkRegion clearRegion = TkCreateRegion();
-
-		TkUnionRectWithRegion(&setBox, clearRegion, clearRegion);
-		TkSubtractRegion(masterPtr->validRegion, clearRegion,
-			masterPtr->validRegion);
-		TkDestroyRegion(clearRegion);
-
-		/*
-		 * Set the alpha value correctly.
-		 */
-
-		pixelPtr[3] = 0;
-	    } else {
-		/*
-		 * Make pixel opaque.
-		 */
-
+	    modRegion = TkCreateRegion();
+	    TkUnionRectWithRegion(&setBox, modRegion, modRegion);
+	    if (pixelPtr[3]) {
 		TkUnionRectWithRegion(&setBox, masterPtr->validRegion,
 			masterPtr->validRegion);
-		pixelPtr[3] = 255;
+	    } else {
+		TkSubtractRegion(masterPtr->validRegion, modRegion,
+			masterPtr->validRegion);
 	    }
+	    TkDestroyRegion(modRegion);
 
 	    /*
 	     * Inform the generic image code that the image
 	     * has (potentially) changed.
 	     */
@@ -1457,17 +1439,22 @@
  *
  * ParseSubcommandOptions --
  *
  *	This function is invoked to process one of the options which may be
  *	specified for the photo image subcommands, namely, -from, -to, -zoom,
- *	-subsample, -format, -shrink, and -compositingrule.
+ *	-subsample, -format, -shrink, -compositingrule, -alpha, -boolean and
+ *	-withalpha.
+ *	Parsing starts at the index in *optIndexPtr and stops at the end of
+ *	objv[] or at the first value that does not belong to an option.
  *
  * Results:
  *	A standard Tcl result.
  *
  * Side effects:
- *	Fields in *optPtr get filled in.
+ *	Fields in *optPtr get filled in. The value of optIndexPtr is updated
+ *	to contain the index of the first element in argv[] that was not
+ *	parsed, or argc if the end of objv[] was reached.
  *
  *----------------------------------------------------------------------
  */
 
 static int
@@ -1487,11 +1474,12 @@
     static const char *const compositingRules[] = {
 	"overlay", "set",	/* Note that these must match the
 				 * TK_PHOTO_COMPOSITE_* constants. */
 	NULL
     };
-    int index, c, bit, currentBit, length;
+    size_t length;
+    int index, c, bit, currentBit;
     int values[4], numValues, maxValues, argIndex;
     const char *option, *expandedOption, *needed;
     const char *const *listPtr;
     Tcl_Obj *msgObj;
 
@@ -1499,11 +1487,11 @@
 	/*
 	 * We can have one value specified without an option; it goes into
 	 * optPtr->name.
 	 */
 
-	expandedOption = option = Tcl_GetStringFromObj(objv[index], &length);
+	expandedOption = option = TkGetStringFromObj(objv[index], &length);
 	if (option[0] != '-') {
 	    if (optPtr->name == NULL) {
 		optPtr->name = objv[index];
 		continue;
 	    }
@@ -1517,11 +1505,11 @@
 	c = option[0];
 	bit = 0;
 	currentBit = 1;
 	for (listPtr = optionNames; *listPtr != NULL; ++listPtr) {
 	    if ((c == *listPtr[0])
-		    && (strncmp(option, *listPtr, (size_t) length) == 0)) {
+		    && (strncmp(option, *listPtr, length) == 0)) {
 		expandedOption = *listPtr;
 		if (bit != 0) {
 		    goto unknownOrAmbiguousOption;
 		}
 		bit = currentBit;
@@ -1533,11 +1521,15 @@
 	 * If this option is not recognized and allowed, put an error message
 	 * in the interpreter and return.
 	 */
 
 	if (!(allowedOptions & bit)) {
-	    goto unknownOrAmbiguousOption;
+	    if (optPtr->name != NULL) {
+		goto unknownOrAmbiguousOption;
+	    }
+	    optPtr->name = objv[index];
+	    continue;
 	}
 
 	/*
 	 * For the -from, -to, -zoom and -subsample options, parse the values
 	 * given. Report an error if too few or too many values are given.
@@ -1582,11 +1574,12 @@
 		    "compositing rule", 0, &optPtr->compositingRule)
 		    != TCL_OK) {
 		return TCL_ERROR;
 	    }
 	    *optIndexPtr = index;
-	} else if ((bit != OPT_SHRINK) && (bit != OPT_GRAYSCALE)) {
+	} else if (bit == OPT_TO || bit == OPT_FROM
+		|| bit == OPT_SUBSAMPLE || bit == OPT_ZOOM) {
 	    const char *val;
 
 	    maxValues = ((bit == OPT_FROM) || (bit == OPT_TO)) ? 4 : 2;
 	    argIndex = index + 1;
 	    for (numValues = 0; numValues < maxValues; ++numValues) {
@@ -1763,22 +1756,23 @@
 {
     PhotoInstance *instancePtr;
     const char *oldFileString, *oldPaletteString;
     Tcl_Obj *oldData, *data = NULL, *oldFormat, *format = NULL;
     Tcl_Obj *tempdata, *tempformat;
-    int length, i, j, result, imageWidth, imageHeight, oldformat;
+    size_t length;
+    int i, j, result, imageWidth, imageHeight, oldformat;
     double oldGamma;
     Tcl_Channel chan;
     Tk_PhotoImageFormat *imageFormat;
     const char **args;
 
     args = ckalloc((objc + 1) * sizeof(char *));
     for (i = 0, j = 0; i < objc; i++,j++) {
-	args[j] = Tcl_GetStringFromObj(objv[i], &length);
+	args[j] = TkGetStringFromObj(objv[i], &length);
 	if ((length > 1) && (args[j][0] == '-')) {
 	    if ((args[j][1] == 'd') &&
-		    !strncmp(args[j], "-data", (size_t) length)) {
+		    !strncmp(args[j], "-data", length)) {
 		if (++i < objc) {
 		    data = objv[i];
 		    j--;
 		} else {
 		    ckfree(args);
@@ -1787,11 +1781,11 @@
 		    Tcl_SetErrorCode(interp, "TK", "IMAGE", "PHOTO",
 			    "MISSING_VALUE", NULL);
 		    return TCL_ERROR;
 		}
 	    } else if ((args[j][1] == 'f') &&
-		    !strncmp(args[j], "-format", (size_t) length)) {
+		    !strncmp(args[j], "-format", length)) {
 		if (++i < objc) {
 		    format = objv[i];
 		    j--;
 		} else {
 		    ckfree(args);
@@ -1850,13 +1844,14 @@
     if (data) {
 	/*
 	 * Force into ByteArray format, which most (all) image handlers will
 	 * use anyway. Empty length means ignore the -data option.
 	 */
+	size_t bytesize;
 
-	(void) Tcl_GetByteArrayFromObj(data, &length);
-	if (length) {
+	(void) TkGetByteArrayFromObj(data, &bytesize);
+	if (bytesize) {
 	    Tcl_IncrRefCount(data);
 	} else {
 	    data = NULL;
 	}
 	if (masterPtr->dataString) {
@@ -1868,12 +1863,12 @@
 	/*
 	 * Stringify to ignore -format "". It may come in as a list or other
 	 * object.
 	 */
 
-	(void) Tcl_GetStringFromObj(format, &length);
-	if (length) {
+	(void) Tcl_GetString(format);
+	if (format->length) {
 	    Tcl_IncrRefCount(format);
 	} else {
 	    format = NULL;
 	}
 	if (masterPtr->format) {
@@ -2535,11 +2530,11 @@
 				/* The dimensions of the image are returned
 				 * here. */
     int *oldformat)		/* Returns 1 if the old image API is used. */
 {
     int matched = 0, useoldformat = 0;
-    Tk_PhotoImageFormat *formatPtr;
+    Tk_PhotoImageFormat *formatPtr, *defaultFormatPtr = NULL;
     ThreadSpecificData *tsdPtr =
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
     const char *formatString = NULL;
 
     if (formatObj) {
@@ -2551,10 +2546,20 @@
      * handle the image.
      */
 
     for (formatPtr = tsdPtr->formatList; formatPtr != NULL;
 	    formatPtr = formatPtr->nextPtr) {
+	/*
+	 * To keep the behaviour of older versions (Tk <= 8.6), the default
+	 * list-of-lists string format is checked last. Remember its position.
+	 */
+
+	if (strncasecmp("default", formatPtr->name, strlen(formatPtr->name))
+		== 0) {
+	    defaultFormatPtr = formatPtr;
+	}
+
 	if (formatObj != NULL) {
 	    if (strncasecmp(formatString,
 		    formatPtr->name, strlen(formatPtr->name)) != 0) {
 		continue;
 	    }
@@ -2566,10 +2571,20 @@
 		Tcl_SetErrorCode(interp, "TK", "IMAGE", "PHOTO",
 			"NOT_DATA_FORMAT", NULL);
 		return TCL_ERROR;
 	    }
 	}
+
+	/*
+	 * If this is the default format, and it was not passed as -format
+	 * option, skip the stringMatchProc test. It'll be done later
+	 */
+
+	if (formatObj == NULL && formatPtr == defaultFormatPtr) {
+	    continue;
+	}
+
 	if ((formatPtr->stringMatchProc != NULL)
 		&& (formatPtr->stringReadProc != NULL)
 		&& formatPtr->stringMatchProc(data, formatObj,
 			widthPtr, heightPtr, interp)) {
 	    break;
@@ -2603,27 +2618,50 @@
 			    widthPtr, heightPtr, interp)) {
 		break;
 	    }
 	}
     }
+
     if (formatPtr == NULL) {
-	if ((formatObj != NULL) && !matched) {
+	/*
+	 * Try the default format as last resort (only if no -format option
+	 * was passed).
+	 */
+
+	if ( formatObj == NULL && defaultFormatPtr == NULL) {
+	    Tcl_Panic("default image format handler not registered");
+	}
+	if ( formatObj == NULL
+		&& defaultFormatPtr->stringMatchProc != NULL
+		&& defaultFormatPtr->stringReadProc != NULL
+		&& defaultFormatPtr->stringMatchProc(data, formatObj,
+		widthPtr, heightPtr, interp) != 0) {
+	    useoldformat = 0;
+	    formatPtr = defaultFormatPtr;
+	} else if ((formatObj != NULL) && !matched) {
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "image format \"%s\" is not supported", formatString));
 	    Tcl_SetErrorCode(interp, "TK", "LOOKUP", "PHOTO_FORMAT",
 		    formatString, NULL);
+	    return TCL_ERROR;
 	} else {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		    "couldn't recognize image data", -1));
 	    Tcl_SetErrorCode(interp, "TK", "IMAGE", "PHOTO",
 		    "UNRECOGNIZED_DATA", NULL);
+	    return TCL_ERROR;
 	}
-	return TCL_ERROR;
     }
 
     *imageFormatPtr = formatPtr;
     *oldformat = useoldformat;
+
+    /*
+     * Some stringMatchProc might have left error messages and error codes in
+     * interp.	Clear them before return.
+     */
+    Tcl_ResetResult(interp);
     return TCL_OK;
 }
 
 /*
  *----------------------------------------------------------------------
@@ -2684,11 +2722,11 @@
 Tk_PhotoPutBlock(
     Tcl_Interp *interp,		/* Interpreter for passing back error
 				 * messages, or NULL. */
     Tk_PhotoHandle handle,	/* Opaque handle for the photo image to be
 				 * updated. */
-    register Tk_PhotoImageBlock *blockPtr,
+    Tk_PhotoImageBlock *blockPtr,
 				/* Pointer to a structure describing the pixel
 				 * data to be copied into the image. */
     int x, int y,		/* Coordinates of the top-left pixel to be
 				 * updated in the image. */
     int width, int height,	/* Dimensions of the area of the image to be
@@ -2695,10 +2733,12 @@
 				 * updated. */
     int compRule)		/* Compositing rule to use when processing
 				 * transparent pixels. */
 {
     register PhotoMaster *masterPtr = (PhotoMaster *) handle;
+    Tk_PhotoImageBlock sourceBlock;
+    unsigned char *memToFree;
     int xEnd, yEnd, greenOffset, blueOffset, alphaOffset;
     int wLeft, hLeft, wCopy, hCopy, pitch;
     unsigned char *srcPtr, *srcLinePtr, *destPtr, *destLinePtr;
     int sourceIsSimplePhoto = compRule & SOURCE_IS_SIMPLE_ALPHA_PHOTO;
     XRectangle rect;
@@ -2722,27 +2762,55 @@
     }
     if ((width <= 0) || (height <= 0)) {
 	return TCL_OK;
     }
 
-    xEnd = x + width;
-    yEnd = y + height;
-    if ((xEnd > masterPtr->width) || (yEnd > masterPtr->height)) {
-	int sameSrc = (blockPtr->pixelPtr == masterPtr->pix32);
-
-	if (ImgPhotoSetSize(masterPtr, MAX(xEnd, masterPtr->width),
-		MAX(yEnd, masterPtr->height)) == TCL_ERROR) {
+    /*
+     * Fix for bug e4336bef5d:
+     *
+     * Make a local copy of *blockPtr, as we might have to change some
+     * of its fields and don't want to interfere with the caller's data.
+     *
+     * If source and destination are the same image, create a copy  of the
+     * source data in our local sourceBlock.
+     *
+     * To find out, just comparing the pointers is not enough - they might have
+     * different values and still point to the same block of memory. (e.g.
+     * if the -from option was passed to [imageName copy])
+     */
+    sourceBlock = *blockPtr;
+    memToFree = NULL;
+    if (sourceBlock.pixelPtr >= masterPtr->pix32
+	    && sourceBlock.pixelPtr <= masterPtr->pix32 + masterPtr->width
+	    * masterPtr->height * 4) {
+	sourceBlock.pixelPtr = attemptckalloc(sourceBlock.height
+		* sourceBlock.pitch);
+	if (sourceBlock.pixelPtr == NULL) {
 	    if (interp != NULL) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
 			TK_PHOTO_ALLOC_FAILURE_MESSAGE, -1));
 		Tcl_SetErrorCode(interp, "TK", "MALLOC", NULL);
 	    }
 	    return TCL_ERROR;
 	}
-	if (sameSrc) {
-	    blockPtr->pixelPtr = masterPtr->pix32;
-	    blockPtr->pitch = masterPtr->width * 4;
+	memToFree = sourceBlock.pixelPtr;
+	memcpy(sourceBlock.pixelPtr, blockPtr->pixelPtr, sourceBlock.height
+	    * sourceBlock.pitch);
+    }
+
+
+    xEnd = x + width;
+    yEnd = y + height;
+    if ((xEnd > masterPtr->width) || (yEnd > masterPtr->height)) {
+	if (ImgPhotoSetSize(masterPtr, MAX(xEnd, masterPtr->width),
+		MAX(yEnd, masterPtr->height)) == TCL_ERROR) {
+	    if (interp != NULL) {
+		Tcl_SetObjResult(interp, Tcl_NewStringObj(
+			TK_PHOTO_ALLOC_FAILURE_MESSAGE, -1));
+		Tcl_SetErrorCode(interp, "TK", "MALLOC", NULL);
+	    }
+	    goto errorExit;
 	}
     }
 
     if ((y < masterPtr->ditherY) || ((y == masterPtr->ditherY)
 	    && (x < masterPtr->ditherX))) {
@@ -2757,18 +2825,18 @@
     /*
      * If this image block could have different red, green and blue
      * components, mark it as a color image.
      */
 
-    greenOffset = blockPtr->offset[1] - blockPtr->offset[0];
-    blueOffset = blockPtr->offset[2] - blockPtr->offset[0];
-    alphaOffset = blockPtr->offset[3];
-    if ((alphaOffset >= blockPtr->pixelSize) || (alphaOffset < 0)) {
+    greenOffset = sourceBlock.offset[1] - sourceBlock.offset[0];
+    blueOffset = sourceBlock.offset[2] - sourceBlock.offset[0];
+    alphaOffset = sourceBlock.offset[3];
+    if ((alphaOffset >= sourceBlock.pixelSize) || (alphaOffset < 0)) {
 	alphaOffset = 0;
 	sourceIsSimplePhoto = 1;
     } else {
-	alphaOffset -= blockPtr->offset[0];
+	alphaOffset -= sourceBlock.offset[0];
     }
     if ((greenOffset != 0) || (blueOffset != 0)) {
 	masterPtr->flags |= COLOR_IMAGE;
     }
 
@@ -2784,17 +2852,17 @@
      * Test to see if we can do the whole write in a single copy. This test is
      * probably too restrictive. We should also be able to do a memmove if
      * pixelSize == 3 and alphaOffset == 0. Maybe other cases too.
      */
 
-    if ((blockPtr->pixelSize == 4)
+    if ((sourceBlock.pixelSize == 4)
 	    && (greenOffset == 1) && (blueOffset == 2) && (alphaOffset == 3)
-	    && (width <= blockPtr->width) && (height <= blockPtr->height)
+	    && (width <= sourceBlock.width) && (height <= sourceBlock.height)
 	    && ((height == 1) || ((x == 0) && (width == masterPtr->width)
-		&& (blockPtr->pitch == pitch)))
+		&& (sourceBlock.pitch == pitch)))
 	    && (compRule == TK_PHOTO_COMPOSITE_SET)) {
-	memmove(destLinePtr, blockPtr->pixelPtr + blockPtr->offset[0],
+	memmove(destLinePtr, sourceBlock.pixelPtr + sourceBlock.offset[0],
 		((size_t)height * width * 4));
 
 	/*
 	 * We know there's an alpha offset and we're setting the data, so skip
 	 * directly to the point when we recompute the photo validity region.
@@ -2806,15 +2874,15 @@
     /*
      * Copy and merge pixels according to the compositing rule.
      */
 
     for (hLeft = height; hLeft > 0;) {
-	int pixelSize = blockPtr->pixelSize;
+	int pixelSize = sourceBlock.pixelSize;
 	int compRuleSet = (compRule == TK_PHOTO_COMPOSITE_SET);
 
-	srcLinePtr = blockPtr->pixelPtr + blockPtr->offset[0];
-	hCopy = MIN(hLeft, blockPtr->height);
+	srcLinePtr = sourceBlock.pixelPtr + sourceBlock.offset[0];
+	hCopy = MIN(hLeft, sourceBlock.height);
 	hLeft -= hCopy;
 	for (; hCopy > 0; --hCopy) {
 	    /*
 	     * If the layout of the source line matches our memory layout and
 	     * we're setting, we can just copy the bytes directly, which is
@@ -2821,14 +2889,14 @@
 	     * much faster.
 	     */
 
 	    if ((pixelSize == 4) && (greenOffset == 1)
 		    && (blueOffset == 2) && (alphaOffset == 3)
-		    && (width <= blockPtr->width)
+		    && (width <= sourceBlock.width)
 		    && compRuleSet) {
 		memcpy(destLinePtr, srcLinePtr, ((size_t)width * 4));
-		srcLinePtr += blockPtr->pitch;
+		srcLinePtr += sourceBlock.pitch;
 		destLinePtr += pitch;
 		continue;
 	    }
 
 	    /*
@@ -2835,11 +2903,11 @@
 	     * Have to copy the slow way.
 	     */
 
 	    destPtr = destLinePtr;
 	    for (wLeft = width; wLeft > 0;) {
-		wCopy = MIN(wLeft, blockPtr->width);
+		wCopy = MIN(wLeft, sourceBlock.width);
 		wLeft -= wCopy;
 		srcPtr = srcLinePtr;
 
 		/*
 		 * But we might be lucky and be able to use fairly fast loops.
@@ -2925,11 +2993,11 @@
 		    }
 
 		    destPtr += 4;
 		}
 	    }
-	    srcLinePtr += blockPtr->pitch;
+	    srcLinePtr += sourceBlock.pitch;
 	    destLinePtr += pitch;
 	}
     }
 
     /*
@@ -3041,11 +3109,19 @@
      * Tell the core image code that this image has changed.
      */
 
     Tk_ImageChanged(masterPtr->tkMaster, x, y, width, height,
 	    masterPtr->width, masterPtr->height);
+
+    if (memToFree) ckfree(memToFree);
+
     return TCL_OK;
+
+  errorExit:
+    if (memToFree) ckfree(memToFree);
+
+    return TCL_ERROR;
 }
 
 /*
  *----------------------------------------------------------------------
  *
@@ -3068,11 +3144,11 @@
 Tk_PhotoPutZoomedBlock(
     Tcl_Interp *interp,		/* Interpreter for passing back error
 				 * messages, or NULL. */
     Tk_PhotoHandle handle,	/* Opaque handle for the photo image to be
 				 * updated. */
-    register Tk_PhotoImageBlock *blockPtr,
+    Tk_PhotoImageBlock *blockPtr,
 				/* Pointer to a structure describing the pixel
 				 * data to be copied into the image. */
     int x, int y,		/* Coordinates of the top-left pixel to be
 				 * updated in the image. */
     int width, int height,	/* Dimensions of the area of the image to be
@@ -3083,10 +3159,12 @@
 				 * axes. */
     int compRule)		/* Compositing rule to use when processing
 				 * transparent pixels. */
 {
     register PhotoMaster *masterPtr = (PhotoMaster *) handle;
+    register Tk_PhotoImageBlock sourceBlock;
+    unsigned char *memToFree;
     int xEnd, yEnd, greenOffset, blueOffset, alphaOffset;
     int wLeft, hLeft, wCopy, hCopy, blockWid, blockHt;
     unsigned char *srcPtr, *srcLinePtr, *srcOrigPtr, *destPtr, *destLinePtr;
     int pitch, xRepeat, yRepeat, blockXSkip, blockYSkip, sourceIsSimplePhoto;
     XRectangle rect;
@@ -3119,27 +3197,53 @@
     }
     if (width <= 0 || height <= 0) {
 	return TCL_OK;
     }
 
-    xEnd = x + width;
-    yEnd = y + height;
-    if ((xEnd > masterPtr->width) || (yEnd > masterPtr->height)) {
-	int sameSrc = (blockPtr->pixelPtr == masterPtr->pix32);
-
-	if (ImgPhotoSetSize(masterPtr, MAX(xEnd, masterPtr->width),
-		MAX(yEnd, masterPtr->height)) == TCL_ERROR) {
+    /*
+     * Fix for Bug e4336bef5d:
+     * Make a local copy of *blockPtr, as we might have to change some
+     * of its fields and don't want to interfere with the caller's data.
+     *
+     * If source and destination are the same image, create a copy  of the
+     * source data in our local sourceBlock.
+     *
+     * To find out, just comparing the pointers is not enough - they might have
+     * different values and still point to the same block of memory. (e.g.
+     * if the -from option was passed to [imageName copy])
+     */
+    sourceBlock = *blockPtr;
+    memToFree = NULL;
+    if (sourceBlock.pixelPtr >= masterPtr->pix32
+	    && sourceBlock.pixelPtr <= masterPtr->pix32 + masterPtr->width
+	    * masterPtr->height * 4) {
+	sourceBlock.pixelPtr = attemptckalloc(sourceBlock.height
+		* sourceBlock.pitch);
+	if (sourceBlock.pixelPtr == NULL) {
 	    if (interp != NULL) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
 			TK_PHOTO_ALLOC_FAILURE_MESSAGE, -1));
 		Tcl_SetErrorCode(interp, "TK", "MALLOC", NULL);
 	    }
 	    return TCL_ERROR;
 	}
-	if (sameSrc) {
-	    blockPtr->pixelPtr = masterPtr->pix32;
-	    blockPtr->pitch = masterPtr->width * 4;
+	memToFree = sourceBlock.pixelPtr;
+	memcpy(sourceBlock.pixelPtr, blockPtr->pixelPtr, sourceBlock.height
+	    * sourceBlock.pitch);
+    }
+
+    xEnd = x + width;
+    yEnd = y + height;
+    if ((xEnd > masterPtr->width) || (yEnd > masterPtr->height)) {
+	if (ImgPhotoSetSize(masterPtr, MAX(xEnd, masterPtr->width),
+		MAX(yEnd, masterPtr->height)) == TCL_ERROR) {
+	    if (interp != NULL) {
+		Tcl_SetObjResult(interp, Tcl_NewStringObj(
+			TK_PHOTO_ALLOC_FAILURE_MESSAGE, -1));
+		Tcl_SetErrorCode(interp, "TK", "MALLOC", NULL);
+	    }
+	    goto errorExit;
 	}
     }
 
     if ((y < masterPtr->ditherY) || ((y == masterPtr->ditherY)
 	    && (x < masterPtr->ditherX))) {
@@ -3154,18 +3258,18 @@
     /*
      * If this image block could have different red, green and blue
      * components, mark it as a color image.
      */
 
-    greenOffset = blockPtr->offset[1] - blockPtr->offset[0];
-    blueOffset = blockPtr->offset[2] - blockPtr->offset[0];
-    alphaOffset = blockPtr->offset[3];
-    if ((alphaOffset >= blockPtr->pixelSize) || (alphaOffset < 0)) {
+    greenOffset = sourceBlock.offset[1] - sourceBlock.offset[0];
+    blueOffset = sourceBlock.offset[2] - sourceBlock.offset[0];
+    alphaOffset = sourceBlock.offset[3];
+    if ((alphaOffset >= sourceBlock.pixelSize) || (alphaOffset < 0)) {
 	alphaOffset = 0;
 	sourceIsSimplePhoto = 1;
     } else {
-	alphaOffset -= blockPtr->offset[0];
+	alphaOffset -= sourceBlock.offset[0];
     }
     if ((greenOffset != 0) || (blueOffset != 0)) {
 	masterPtr->flags |= COLOR_IMAGE;
     }
 
@@ -3172,38 +3276,38 @@
     /*
      * Work out what area the pixel data in the block expands to after
      * subsampling and zooming.
      */
 
-    blockXSkip = subsampleX * blockPtr->pixelSize;
-    blockYSkip = subsampleY * blockPtr->pitch;
+    blockXSkip = subsampleX * sourceBlock.pixelSize;
+    blockYSkip = subsampleY * sourceBlock.pitch;
     if (subsampleX > 0) {
-	blockWid = ((blockPtr->width + subsampleX - 1) / subsampleX) * zoomX;
+	blockWid = ((sourceBlock.width + subsampleX - 1) / subsampleX) * zoomX;
     } else if (subsampleX == 0) {
 	blockWid = width;
     } else {
-	blockWid = ((blockPtr->width - subsampleX - 1) / -subsampleX) * zoomX;
+	blockWid = ((sourceBlock.width - subsampleX - 1) / -subsampleX) * zoomX;
     }
     if (subsampleY > 0) {
-	blockHt = ((blockPtr->height + subsampleY - 1) / subsampleY) * zoomY;
+	blockHt = ((sourceBlock.height + subsampleY - 1) / subsampleY) * zoomY;
     } else if (subsampleY == 0) {
 	blockHt = height;
     } else {
-	blockHt = ((blockPtr->height - subsampleY - 1) / -subsampleY) * zoomY;
+	blockHt = ((sourceBlock.height - subsampleY - 1) / -subsampleY) * zoomY;
     }
 
     /*
      * Copy the data into our local 32-bit/pixel array.
      */
 
     destLinePtr = masterPtr->pix32 + (y * masterPtr->width + x) * 4;
-    srcOrigPtr = blockPtr->pixelPtr + blockPtr->offset[0];
+    srcOrigPtr = sourceBlock.pixelPtr + sourceBlock.offset[0];
     if (subsampleX < 0) {
-	srcOrigPtr += (blockPtr->width - 1) * blockPtr->pixelSize;
+	srcOrigPtr += (sourceBlock.width - 1) * sourceBlock.pixelSize;
     }
     if (subsampleY < 0) {
-	srcOrigPtr += (blockPtr->height - 1) * blockPtr->pitch;
+	srcOrigPtr += (sourceBlock.height - 1) * sourceBlock.pitch;
     }
 
     pitch = masterPtr->width * 4;
     for (hLeft = height; hLeft > 0; ) {
 	hCopy = MIN(hLeft, blockHt);
@@ -3349,11 +3453,19 @@
      * Tell the core image code that this image has changed.
      */
 
     Tk_ImageChanged(masterPtr->tkMaster, x, y, width, height, masterPtr->width,
 	    masterPtr->height);
+
+    if (memToFree) ckfree(memToFree);
+
     return TCL_OK;
+
+  errorExit:
+    if (memToFree) ckfree(memToFree);
+
+    return TCL_ERROR;
 }
 
 /*
  *----------------------------------------------------------------------
  *
@@ -3837,61 +3949,10 @@
 }
 
 /*
  *----------------------------------------------------------------------
  *
- * ImgStringWrite --
- *
- *	Default string write function. The data is formatted in the default
- *	format as accepted by the "<img> put" command.
- *
- * Results:
- *	A standard Tcl result.
- *
- * Side effects:
- *	See the user documentation.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-ImgStringWrite(
-    Tcl_Interp *interp,
-    Tcl_Obj *formatString,
-    Tk_PhotoImageBlock *blockPtr)
-{
-    int greenOffset, blueOffset;
-    Tcl_Obj *data;
-
-    greenOffset = blockPtr->offset[1] - blockPtr->offset[0];
-    blueOffset = blockPtr->offset[2] - blockPtr->offset[0];
-
-    data = Tcl_NewObj();
-    if ((blockPtr->width > 0) && (blockPtr->height > 0)) {
-	int row, col;
-
-	for (row=0; row<blockPtr->height; row++) {
-	    Tcl_Obj *line = Tcl_NewObj();
-	    unsigned char *pixelPtr = blockPtr->pixelPtr + blockPtr->offset[0]
-		    + row * blockPtr->pitch;
-
-	    for (col=0; col<blockPtr->width; col++) {
-		Tcl_AppendPrintfToObj(line, "%s#%02x%02x%02x",
-			col ? " " : "", *pixelPtr,
-			pixelPtr[greenOffset], pixelPtr[blueOffset]);
-		pixelPtr += blockPtr->pixelSize;
-	    }
-	    Tcl_ListObjAppendElement(NULL, data, line);
-	}
-    }
-    Tcl_SetObjResult(interp, data);
-    return TCL_OK;
-}
-
-/*
- *----------------------------------------------------------------------
- *
  * Tk_PhotoGetImage --
  *
  *	This function is called to obtain image data from a photo image. This
  *	function fills in the Tk_PhotoImageBlock structure pointed to by
  *	`blockPtr' with details of the address and layout of the image data in
@@ -3930,11 +3991,11 @@
 }
 
 /*
  *--------------------------------------------------------------
  *
- * TkPostscriptPhoto --
+ * ImgPostscriptPhoto --
  *
  *	This function is called to output the contents of a photo image in
  *	Postscript by calling the Tk_PostscriptPhoto function.
  *
  * Results:
@@ -3975,11 +4036,11 @@
  * always "overlay" and the function always panics on memory-allocation
  * failure.
  *
  *----------------------------------------------------------------------
  */
-
+#if !defined(TK_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9
 void
 Tk_PhotoPutBlock_NoComposite(
     Tk_PhotoHandle handle,
     Tk_PhotoImageBlock *blockPtr,
     int x, int y, int width, int height)
@@ -4061,13 +4122,15 @@
 {
     if (Tk_PhotoSetSize(NULL, handle, width, height) != TCL_OK) {
 	Tcl_Panic(TK_PHOTO_ALLOC_FAILURE_MESSAGE);
     }
 }
+#endif /* TK_NO_DEPRECATED */
 
 /*
  * Local Variables:
  * mode: c
  * c-basic-offset: 4
  * fill-column: 78
+ * tab-width: 8
  * End:
  */

Index: generic/tkImgPhoto.h
==================================================================
--- generic/tkImgPhoto.h
+++ generic/tkImgPhoto.h
@@ -91,14 +91,21 @@
  */
 
 struct ColorTable {
     ColorTableId id;		/* Information used in selecting this color
 				 * table. */
+#if TCL_MAJOR_VERSION > 8
+    size_t	refCount;		/* Number of instances using this map. */
+    size_t liveRefCount;		/* Number of instances which are actually in
+				 * use, using this map. */
+    int	flags;			/* See below. */
+#else
     int	flags;			/* See below. */
-    int	refCount;		/* Number of instances using this map. */
-    int liveRefCount;		/* Number of instances which are actually in
+    unsigned int	refCount;		/* Number of instances using this map. */
+    unsigned int liveRefCount;		/* Number of instances which are actually in
 				 * use, using this map. */
+#endif
     int	numColors;		/* Number of colors allocated for this map. */
 
     XVisualInfo	visualInfo;	/* Information about the visual for windows
 				 * using this color table. */
 
@@ -199,11 +206,15 @@
     Display *display;		/* Display for windows using this instance. */
     Colormap colormap;		/* The image may only be used in windows with
 				 * this particular colormap. */
     PhotoInstance *nextPtr;	/* Pointer to the next instance in the list of
 				 * instances associated with this master. */
-    int refCount;		/* Number of instances using this structure. */
+#if TCL_MAJOR_VERSION > 8
+    size_t refCount;		/* Number of instances using this structure. */
+#else
+    unsigned int refCount;	/* Number of instances using this structure. */
+#endif
     Tk_Uid palette;		/* Palette for these particular instances. */
     double gamma;		/* Gamma value for these instances. */
     Tk_Uid defaultPalette;	/* Default palette to use if a palette is not
 				 * specified for the master. */
     ColorTable *colorTablePtr;	/* Pointer to information about colors

Index: generic/tkInt.decls
==================================================================
--- generic/tkInt.decls
+++ generic/tkInt.decls
@@ -97,11 +97,11 @@
 declare 21 {
     int TkFindStateNum(Tcl_Interp *interp, const char *option,
 	    const TkStateMap *mapPtr, const char *strKey)
 }
 declare 22 {
-    CONST86 char *TkFindStateString(const TkStateMap *mapPtr, int numKey)
+    const char *TkFindStateString(const TkStateMap *mapPtr, int numKey)
 }
 declare 23 {
     void TkFocusDeadWindow(TkWindow *winPtr)
 }
 declare 24 {
@@ -180,11 +180,11 @@
 }
 declare 45 {
     void TkInstallFrameMenu(Tk_Window tkwin)
 }
 declare 46 {
-    CONST86 char *TkKeysymToString(KeySym keysym)
+    const char *TkKeysymToString(KeySym keysym)
 }
 declare 47 {
     int TkLineToArea(double end1Ptr[], double end2Ptr[], double rectPtr[])
 }
 declare 48 {
@@ -387,11 +387,11 @@
 declare 108 {
     int TkGetWindowFromObj(Tcl_Interp *interp, Tk_Window tkwin,
 	    Tcl_Obj *objPtr, Tk_Window *windowPtr)
 }
 declare 109 {
-    CONST86 char *TkpGetString(TkWindow *winPtr, XEvent *eventPtr, Tcl_DString *dsPtr)
+    const char *TkpGetString(TkWindow *winPtr, XEvent *eventPtr, Tcl_DString *dsPtr)
 }
 declare 110 {
     void TkpGetSubFonts(Tcl_Interp *interp, Tk_Font tkfont)
 }
 declare 111 {
@@ -568,51 +568,51 @@
 declare 169 {
     int TkStateParseProc(ClientData clientData, Tcl_Interp *interp,
 	    Tk_Window tkwin, const char *value, char *widgRec, int offset)
 }
 declare 170 {
-    CONST86 char *TkStatePrintProc(ClientData clientData, Tk_Window tkwin,
+    const char *TkStatePrintProc(ClientData clientData, Tk_Window tkwin,
 	    char *widgRec, int offset, Tcl_FreeProc **freeProcPtr)
 }
 declare 171 {
     int TkCanvasDashParseProc(ClientData clientData, Tcl_Interp *interp,
 	    Tk_Window tkwin, const char *value, char *widgRec, int offset)
 }
 declare 172 {
-    CONST86 char *TkCanvasDashPrintProc(ClientData clientData, Tk_Window tkwin,
+    const char *TkCanvasDashPrintProc(ClientData clientData, Tk_Window tkwin,
 	    char *widgRec, int offset, Tcl_FreeProc **freeProcPtr)
 }
 declare 173 {
     int TkOffsetParseProc(ClientData clientData, Tcl_Interp *interp,
 	    Tk_Window tkwin, const char *value, char *widgRec, int offset)
 }
 declare 174 {
-    CONST86 char *TkOffsetPrintProc(ClientData clientData, Tk_Window tkwin,
+    const char *TkOffsetPrintProc(ClientData clientData, Tk_Window tkwin,
 	    char *widgRec, int offset, Tcl_FreeProc **freeProcPtr)
 }
 declare 175 {
     int TkPixelParseProc(ClientData clientData, Tcl_Interp *interp,
 	    Tk_Window tkwin, const char *value, char *widgRec, int offset)
 }
 declare 176 {
-    CONST86 char *TkPixelPrintProc(ClientData clientData, Tk_Window tkwin,
+    const char *TkPixelPrintProc(ClientData clientData, Tk_Window tkwin,
 	    char *widgRec, int offset, Tcl_FreeProc **freeProcPtr)
 }
 declare 177 {
     int TkOrientParseProc(ClientData clientData, Tcl_Interp *interp,
 	    Tk_Window tkwin, const char *value, char *widgRec, int offset)
 }
 declare 178 {
-    CONST86 char *TkOrientPrintProc(ClientData clientData, Tk_Window tkwin,
+    const char *TkOrientPrintProc(ClientData clientData, Tk_Window tkwin,
 	    char *widgRec, int offset, Tcl_FreeProc **freeProcPtr)
 }
 declare 179 {
     int TkSmoothParseProc(ClientData clientData, Tcl_Interp *interp,
 	    Tk_Window tkwin, const char *value, char *widgRec, int offset)
 }
 declare 180 {
-    CONST86 char *TkSmoothPrintProc(ClientData clientData, Tk_Window tkwin,
+    const char *TkSmoothPrintProc(ClientData clientData, Tk_Window tkwin,
 	    char *widgRec, int offset, Tcl_FreeProc **freeProcPtr)
 }
 
 # Angled text API, exposed for Emiliano Gavilán's RBC work.
 declare 181 {
@@ -632,10 +632,17 @@
 declare 184 {
     void TkDrawAngledChars(Display *display,Drawable drawable, GC gc,
 	    Tk_Font tkfont, const char *source, int numBytes, double x,
 	    double y, double angle)
 }
+
+# Debugging / testing functions for photo images
+declare 185 {
+    int TkDebugPhotoStringMatchDef(Tcl_Interp *inter, Tcl_Obj *data,
+            Tcl_Obj *formatString, int *widthPtr, int *heightPtr)
+}
+
 
 ##############################################################################
 
 # Define the platform specific internal Tcl interface. These functions are
 # only available on the designated platform.
@@ -981,13 +988,13 @@
     int TkSetMacColor(unsigned long pixel, void *macColor)
 }
 declare 39 aqua {
     void TkSetWMName(TkWindow *winPtr, Tk_Uid titleUid)
 }
-declare 40 aqua {
-    void TkSuspendClipboard(void)
-}
+#
+# Slot 40 unused (WAS: TkSuspendClipboard)
+#
 declare 41 aqua {
     int TkMacOSXZoomToplevel(void *whichWindow, short zoomPart)
 }
 declare 42 aqua {
     Tk_Window Tk_TopCoordsToWindow(Tk_Window tkwin, int rootX, int rootY,
@@ -1420,32 +1427,86 @@
 	    int x, int y, unsigned int width, unsigned int height)
 }
 
 # New in Tk 8.6
 declare 107 win {
-   int XFlush(Display *display)
+    int XFlush(Display *display)
 }
 declare 108 win {
-   int XGrabServer(Display *display)
+    int XGrabServer(Display *display)
 }
 declare 109 win {
-   int XUngrabServer(Display *display)
+    int XUngrabServer(Display *display)
 }
 declare 110 win {
-   int XFree(void *data)
+    int XFree(void *data)
 }
 declare 111 win {
-   int XNoOp(Display *display)
+    int XNoOp(Display *display)
 }
 declare 112 win {
-   XAfterFunction XSynchronize(Display *display, Bool onoff)
+    XAfterFunction XSynchronize(Display *display, Bool onoff)
 }
 declare 113 win {
-   int XSync(Display *display, Bool discard)
+    int XSync(Display *display, Bool discard)
 }
 declare 114 win {
-   VisualID XVisualIDFromVisual(Visual *visual)
+    VisualID XVisualIDFromVisual(Visual *visual)
+}
+
+# For tktreectrl
+declare 120 win {
+    int XOffsetRegion(Region rgn, int dx, int dy)
+}
+declare 121 win {
+    int XUnionRegion(Region srca, Region srcb, Region dr_return)
+}
+
+# For 3dcanvas
+declare 122 win {
+    Window XCreateWindow(Display *display, Window parent, int x, int y,
+	    unsigned int width, unsigned int height,
+	    unsigned int border_width, int depth, unsigned int clazz,
+	    Visual *visual, unsigned long value_mask,
+	    XSetWindowAttributes *attributes)
+}
+
+# Various, e.g. for stub-enabled BLT
+declare 129 win {
+    int XLowerWindow(Display *d, Window w)
+}
+declare 130 win {
+    int XFillArcs(Display *d, Drawable dr, GC gc, XArc *a, int n)
+}
+declare 131 win {
+    int XDrawArcs(Display *d, Drawable dr, GC gc, XArc *a, int n)
+}
+declare 132 win {
+    int XDrawRectangles(Display *d, Drawable dr, GC gc, XRectangle *r, int n)
+}
+declare 133 win {
+    int XDrawSegments(Display *d, Drawable dr, GC gc, XSegment *s, int n)
+}
+declare 134 win {
+    int XDrawPoint(Display *d, Drawable dr, GC gc, int x, int y)
+}
+declare 135 win {
+    int XDrawPoints(Display *d, Drawable dr, GC gc, XPoint *p, int n, int m)
+}
+declare 136 win {
+    int XReparentWindow(Display *d, Window w, Window p, int x, int y)
+}
+declare 137 win {
+    int XPutImage(Display *d, Drawable dr, GC gc, XImage *im,
+	    int sx, int sy, int dx, int dy,
+	    unsigned int w, unsigned int h)
+}
+declare 138 win {
+    Region XPolygonRegion(XPoint *pts, int n, int rule)
+}
+declare 139 win {
+    int XPointInRegion(Region rgn, int x, int y)
 }
 
 ################################
 # X functions for Aqua
 
@@ -1723,11 +1784,11 @@
 declare 79 aqua {
     Status XStringListToTextProperty(char **list, int count,
 	    XTextProperty *text_prop_return)
 }
 declare 80 aqua {
-    void XDrawSegments(Display *display, Drawable d, GC gc,
+    int XDrawSegments(Display *display, Drawable d, GC gc,
 	    XSegment *segments, int nsegments)
 }
 declare 81 aqua {
     void XForceScreenSaver(Display *display, int mode)
 }
@@ -1741,14 +1802,14 @@
 }
 declare 84 aqua {
     void XClearWindow(Display *d, Window w)
 }
 declare 85 aqua {
-    void XDrawPoint(Display *display, Drawable d, GC gc, int x, int y)
+    int XDrawPoint(Display *display, Drawable d, GC gc, int x, int y)
 }
 declare 86 aqua {
-    void XDrawPoints(Display *display, Drawable d, GC gc, XPoint *points,
+    int XDrawPoints(Display *display, Drawable d, GC gc, XPoint *points,
 	    int npoints, int mode)
 }
 declare 87 aqua {
     int XWarpPointer(Display *display, Window src_w, Window dest_w,
 	    int src_x, int src_y, unsigned int src_width,

Index: generic/tkInt.h
==================================================================
--- generic/tkInt.h
+++ generic/tkInt.h
@@ -23,11 +23,10 @@
  * Ensure WORDS_BIGENDIAN is defined correctly:
  * Needs to happen here in addition to configure to work with fat compiles on
  * Darwin (where configure runs only once for multiple architectures).
  */
 
-#include <stdio.h>
 #ifdef HAVE_SYS_TYPES_H
 #    include <sys/types.h>
 #endif
 #ifdef HAVE_SYS_PARAM_H
 #    include <sys/param.h>
@@ -57,34 +56,56 @@
 #   else
 #	define MODULE_SCOPE extern
 #   endif
 #endif
 
+#ifndef TkSizeT
+#   if TCL_MAJOR_VERSION > 8
+#	define TkSizeT size_t
+#   else
+#	define TkSizeT int
+#   endif
+#endif
+
 /*
  * Macros used to cast between pointers and integers (e.g. when storing an int
  * in ClientData), on 64-bit architectures they avoid gcc warning about "cast
  * to/from pointer from/to integer of different size".
  */
 
 #if !defined(INT2PTR) && !defined(PTR2INT)
 #   if defined(HAVE_INTPTR_T) || defined(intptr_t)
 #	define INT2PTR(p) ((void*)(intptr_t)(p))
-#	define PTR2INT(p) ((int)(intptr_t)(p))
+#	define PTR2INT(p) ((intptr_t)(p))
 #   else
 #	define INT2PTR(p) ((void*)(p))
-#	define PTR2INT(p) ((int)(p))
+#	define PTR2INT(p) ((long)(p))
 #   endif
 #endif
 #if !defined(UINT2PTR) && !defined(PTR2UINT)
 #   if defined(HAVE_UINTPTR_T) || defined(uintptr_t)
 #	define UINT2PTR(p) ((void*)(uintptr_t)(p))
-#	define PTR2UINT(p) ((unsigned int)(uintptr_t)(p))
+#	define PTR2UINT(p) ((uintptr_t)(p))
 #   else
 #	define UINT2PTR(p) ((void*)(p))
-#	define PTR2UINT(p) ((unsigned int)(p))
+#	define PTR2UINT(p) ((unsigned long)(p))
+#   endif
+#endif
+
+#ifndef TCL_AUTO_LENGTH
+#   define TCL_AUTO_LENGTH (-1)
+#endif
+
+#ifndef TCL_Z_MODIFIER
+#   if defined(_WIN64)
+#	define TCL_Z_MODIFIER	"I"
+#   elif defined(__GNUC__) && !defined(_WIN32)
+#	define TCL_Z_MODIFIER	"z"
+#   else
+#	define TCL_Z_MODIFIER	""
 #   endif
-#endif
+#endif /* !TCL_Z_MODIFIER */
 
 /*
  * Opaque type declarations:
  */
 
@@ -105,20 +126,20 @@
 
 typedef struct TkCursor {
     Tk_Cursor cursor;		/* System specific identifier for cursor. */
     Display *display;		/* Display containing cursor. Needed for
 				 * disposal and retrieval of cursors. */
-    int resourceRefCount;	/* Number of active uses of this cursor (each
+    TkSizeT resourceRefCount;	/* Number of active uses of this cursor (each
 				 * active use corresponds to a call to
 				 * Tk_AllocPreserveFromObj or Tk_Preserve). If
 				 * this count is 0, then this structure is no
 				 * longer valid and it isn't present in a hash
 				 * table: it is being kept around only because
 				 * there are objects referring to it. The
 				 * structure is freed when resourceRefCount
 				 * and objRefCount are both 0. */
-    int objRefCount;		/* Number of Tcl objects that reference this
+    TkSizeT objRefCount;		/* Number of Tcl objects that reference this
 				 * structure.. */
     Tcl_HashTable *otherTable;	/* Second table (other than idTable) used to
 				 * index this entry. */
     Tcl_HashEntry *hashPtr;	/* Entry in otherTable for this structure
 				 * (needed when deleting). */
@@ -264,11 +285,11 @@
 
     struct TkErrorHandler *errorPtr;
 				/* First in list of error handlers for this
 				 * display. NULL means no handlers exist at
 				 * present. */
-    int deleteCount;		/* Counts # of handlers deleted since last
+    TkSizeT deleteCount;		/* Counts # of handlers deleted since last
 				 * time inactive handlers were garbage-
 				 * collected. When this number gets big,
 				 * handlers get cleaned up. */
 
     /*
@@ -421,10 +442,11 @@
     Atom compoundTextAtom;	/* Atom for COMPOUND_TEXT. */
     Atom applicationAtom;	/* Atom for TK_APPLICATION. */
     Atom windowAtom;		/* Atom for TK_WINDOW. */
     Atom clipboardAtom;		/* Atom for CLIPBOARD. */
     Atom utf8Atom;		/* Atom for UTF8_STRING. */
+    Atom atomPairAtom;          /* Atom for ATOM_PAIR. */
 
     Tk_Window clipWindow;	/* Window used for clipboard ownership and to
 				 * retrieve selections between processes. NULL
 				 * means clipboard info hasn't been
 				 * initialized. */
@@ -476,11 +498,11 @@
     XIMStyle inputStyle;	/* Input style selected for this display. */
     XFontSet inputXfs;		/* XFontSet cached for over-the-spot XIM. */
 #endif /* TK_USE_INPUT_METHODS */
     Tcl_HashTable winTable;	/* Maps from X window ids to TkWindow ptrs. */
 
-    int refCount;		/* Reference count of how many Tk applications
+    TkSizeT refCount;		/* Reference count of how many Tk applications
 				 * are using this display. Used to clean up
 				 * the display when we no longer have any Tk
 				 * applications using it. */
 
     /*
@@ -506,10 +528,13 @@
     TkCaret caret;		/* Information about the caret for this
 				 * display. This is not a pointer. */
 
     int iconDataSize;		/* Size of default iconphoto image data. */
     unsigned char *iconDataPtr;	/* Default iconphoto image data, if set. */
+#ifdef TK_USE_INPUT_METHODS
+    int ximGeneration;          /* Used to invalidate XIC */
+#endif /* TK_USE_INPUT_METHODS */
 } TkDisplay;
 
 /*
  * Flag values for TkDisplay flags.
  *  TK_DISPLAY_COLLAPSE_MOTION_EVENTS:	(default on)
@@ -577,11 +602,11 @@
  * by a call to TkCreateMainWindow). It stores information that is shared by
  * all of the windows associated with a particular main window.
  */
 
 typedef struct TkMainInfo {
-    int refCount;		/* Number of windows whose "mainPtr" fields
+    TkSizeT refCount;		/* Number of windows whose "mainPtr" fields
 				 * point here. When this becomes zero, can
 				 * free up the structure (the reference count
 				 * is zero because windows can get deleted in
 				 * almost any order; the main window isn't
 				 * necessarily the last one deleted). */
@@ -588,11 +613,15 @@
     struct TkWindow *winPtr;	/* Pointer to main window. */
     Tcl_Interp *interp;		/* Interpreter associated with application. */
     Tcl_HashTable nameTable;	/* Hash table mapping path names to TkWindow
 				 * structs for all windows related to this
 				 * main window. Managed by tkWindow.c. */
-    long deletionEpoch;		/* Incremented by window deletions. */
+#if TCL_MAJOR_VERSION > 8
+    size_t deletionEpoch;		/* Incremented by window deletions. */
+#else
+    long deletionEpoch;
+#endif
     Tk_BindingTable bindingTable;
 				/* Used in conjunction with "bind" command to
 				 * bind events to Tcl commands. */
     TkBindInfo bindInfo;	/* Information used by tkBind.c on a per
 				 * application basis. */
@@ -807,25 +836,28 @@
     int internalBorderBottom;
 
     int minReqWidth;		/* Minimum requested width. */
     int minReqHeight;		/* Minimum requested height. */
     char *geometryMaster;
+#ifdef TK_USE_INPUT_METHODS
+    int ximGeneration;          /* Used to invalidate XIC */
+#endif /* TK_USE_INPUT_METHODS */
 } TkWindow;
 
 /*
  * Real definition of some events. Note that these events come from outside
  * but have internally generated pieces added to them.
  */
 
 typedef struct {
-    XKeyEvent keyEvent;		/* The real event from X11. */
-    char *charValuePtr;		/* A pointer to a string that holds the key's
+    XKeyEvent keyEvent;	/* The real event from X11. */
+    char *charValuePtr;	/* A pointer to a string that holds the key's
 				 * %A substitution text (before backslash
 				 * adding), or NULL if that has not been
 				 * computed yet. If non-NULL, this string was
 				 * allocated with ckalloc(). */
-    int charValueLen;		/* Length of string in charValuePtr when that
+    TkSizeT charValueLen;	/* Length of string in charValuePtr when that
 				 * is non-NULL. */
     KeySym keysym;		/* Key symbol computed after input methods
 				 * have been invoked */
 } TkKeyEvent;
 
@@ -834,10 +866,15 @@
  */
 
 #define TK_MAKE_MENU_TEAROFF	0	/* Only non-transient case. */
 #define TK_MAKE_MENU_POPUP	1
 #define TK_MAKE_MENU_DROPDOWN	2
+
+/* See TIP #494 */
+#ifndef TCL_IO_FAILURE
+#   define TCL_IO_FAILURE (-1)
+#endif
 
 /*
  * The following structure is used with TkMakeEnsemble to create ensemble
  * commands and optionally to create sub-ensembles.
  */
@@ -937,10 +974,11 @@
 
 MODULE_SCOPE const Tk_SmoothMethod tkBezierSmoothMethod;
 MODULE_SCOPE Tk_ImageType	tkBitmapImageType;
 MODULE_SCOPE Tk_PhotoImageFormat tkImgFmtGIF;
 MODULE_SCOPE void		(*tkHandleEventProc) (XEvent* eventPtr);
+MODULE_SCOPE Tk_PhotoImageFormat tkImgFmtDefault;
 MODULE_SCOPE Tk_PhotoImageFormat tkImgFmtPNG;
 MODULE_SCOPE Tk_PhotoImageFormat tkImgFmtPPM;
 MODULE_SCOPE TkMainInfo		*tkMainWindowList;
 MODULE_SCOPE Tk_ImageType	tkPhotoImageType;
 MODULE_SCOPE Tcl_HashTable	tkPredefBitmapTable;
@@ -1194,11 +1232,11 @@
 MODULE_SCOPE void	TkUnderlineCharsInContext(Display *display,
 			    Drawable drawable, GC gc, Tk_Font tkfont,
 			    const char *string, int numBytes, int x, int y,
 			    int firstByte, int lastByte);
 MODULE_SCOPE void	TkpGetFontAttrsForChar(Tk_Window tkwin, Tk_Font tkfont,
-			    Tcl_UniChar c, struct TkFontAttributes *faPtr);
+			    int c, struct TkFontAttributes *faPtr);
 MODULE_SCOPE Tcl_Obj *	TkNewWindowObj(Tk_Window tkwin);
 MODULE_SCOPE void	TkpShowBusyWindow(TkBusy busy);
 MODULE_SCOPE void	TkpHideBusyWindow(TkBusy busy);
 MODULE_SCOPE void	TkpMakeTransparentWindowExist(Tk_Window tkwin,
 			    Window parent);
@@ -1215,10 +1253,11 @@
 MODULE_SCOPE int	TkInitTkCmd(Tcl_Interp *interp,
 			    ClientData clientData);
 MODULE_SCOPE int	TkInitFontchooser(Tcl_Interp *interp,
 			    ClientData clientData);
 MODULE_SCOPE void	TkpWarpPointer(TkDisplay *dispPtr);
+MODULE_SCOPE void	TkpCancelWarp(TkDisplay *dispPtr);
 MODULE_SCOPE int	TkListCreateFrame(ClientData clientData,
 			    Tcl_Interp *interp, Tcl_Obj *listObj,
 			    int toplevel, Tcl_Obj *nameObj);
 
 #ifdef _WIN32
@@ -1230,10 +1269,25 @@
 #endif
 #ifdef HAVE_XFT
 MODULE_SCOPE void	TkUnixSetXftClipRegion(TkRegion clipRegion);
 #endif
 
+#if TCL_UTF_MAX > 4
+#   define TkUtfToUniChar (size_t)Tcl_UtfToUniChar
+#   define TkUniCharToUtf (size_t)Tcl_UniCharToUtf
+#else
+    MODULE_SCOPE size_t TkUtfToUniChar(const char *, int *);
+    MODULE_SCOPE size_t TkUniCharToUtf(int, char *);
+#endif
+
+#define TkGetStringFromObj(objPtr, lenPtr) \
+	(((objPtr)->bytes ? 0 : Tcl_GetString(objPtr)), \
+	*(lenPtr) = (objPtr)->length, (objPtr)->bytes)
+
+MODULE_SCOPE unsigned char *TkGetByteArrayFromObj(Tcl_Obj *objPtr,
+	size_t *lengthPtr);
+
 /*
  * Unsupported commands.
  */
 
 MODULE_SCOPE int	TkUnsupported1ObjCmd(ClientData clientData,

Index: generic/tkIntDecls.h
==================================================================
--- generic/tkIntDecls.h
+++ generic/tkIntDecls.h
@@ -102,11 +102,11 @@
 /* 21 */
 EXTERN int		TkFindStateNum(Tcl_Interp *interp,
 				const char *option, const TkStateMap *mapPtr,
 				const char *strKey);
 /* 22 */
-EXTERN CONST86 char *	TkFindStateString(const TkStateMap *mapPtr,
+EXTERN const char *	TkFindStateString(const TkStateMap *mapPtr,
 				int numKey);
 /* 23 */
 EXTERN void		TkFocusDeadWindow(TkWindow *winPtr);
 /* 24 */
 EXTERN int		TkFocusFilterEvent(TkWindow *winPtr,
@@ -165,11 +165,11 @@
 				TkWindow *destPtr, int leaveType,
 				int enterType, Tcl_QueuePosition position);
 /* 45 */
 EXTERN void		TkInstallFrameMenu(Tk_Window tkwin);
 /* 46 */
-EXTERN CONST86 char *	TkKeysymToString(KeySym keysym);
+EXTERN const char *	TkKeysymToString(KeySym keysym);
 /* 47 */
 EXTERN int		TkLineToArea(double end1Ptr[], double end2Ptr[],
 				double rectPtr[]);
 /* 48 */
 EXTERN double		TkLineToPoint(double end1Ptr[], double end2Ptr[],
@@ -322,11 +322,11 @@
 /* 108 */
 EXTERN int		TkGetWindowFromObj(Tcl_Interp *interp,
 				Tk_Window tkwin, Tcl_Obj *objPtr,
 				Tk_Window *windowPtr);
 /* 109 */
-EXTERN CONST86 char *	TkpGetString(TkWindow *winPtr, XEvent *eventPtr,
+EXTERN const char *	TkpGetString(TkWindow *winPtr, XEvent *eventPtr,
 				Tcl_DString *dsPtr);
 /* 110 */
 EXTERN void		TkpGetSubFonts(Tcl_Interp *interp, Tk_Font tkfont);
 /* 111 */
 EXTERN Tcl_Obj *	TkpGetSystemDefault(Tk_Window tkwin,
@@ -486,51 +486,51 @@
 /* 169 */
 EXTERN int		TkStateParseProc(ClientData clientData,
 				Tcl_Interp *interp, Tk_Window tkwin,
 				const char *value, char *widgRec, int offset);
 /* 170 */
-EXTERN CONST86 char *	TkStatePrintProc(ClientData clientData,
+EXTERN const char *	TkStatePrintProc(ClientData clientData,
 				Tk_Window tkwin, char *widgRec, int offset,
 				Tcl_FreeProc **freeProcPtr);
 /* 171 */
 EXTERN int		TkCanvasDashParseProc(ClientData clientData,
 				Tcl_Interp *interp, Tk_Window tkwin,
 				const char *value, char *widgRec, int offset);
 /* 172 */
-EXTERN CONST86 char *	TkCanvasDashPrintProc(ClientData clientData,
+EXTERN const char *	TkCanvasDashPrintProc(ClientData clientData,
 				Tk_Window tkwin, char *widgRec, int offset,
 				Tcl_FreeProc **freeProcPtr);
 /* 173 */
 EXTERN int		TkOffsetParseProc(ClientData clientData,
 				Tcl_Interp *interp, Tk_Window tkwin,
 				const char *value, char *widgRec, int offset);
 /* 174 */
-EXTERN CONST86 char *	TkOffsetPrintProc(ClientData clientData,
+EXTERN const char *	TkOffsetPrintProc(ClientData clientData,
 				Tk_Window tkwin, char *widgRec, int offset,
 				Tcl_FreeProc **freeProcPtr);
 /* 175 */
 EXTERN int		TkPixelParseProc(ClientData clientData,
 				Tcl_Interp *interp, Tk_Window tkwin,
 				const char *value, char *widgRec, int offset);
 /* 176 */
-EXTERN CONST86 char *	TkPixelPrintProc(ClientData clientData,
+EXTERN const char *	TkPixelPrintProc(ClientData clientData,
 				Tk_Window tkwin, char *widgRec, int offset,
 				Tcl_FreeProc **freeProcPtr);
 /* 177 */
 EXTERN int		TkOrientParseProc(ClientData clientData,
 				Tcl_Interp *interp, Tk_Window tkwin,
 				const char *value, char *widgRec, int offset);
 /* 178 */
-EXTERN CONST86 char *	TkOrientPrintProc(ClientData clientData,
+EXTERN const char *	TkOrientPrintProc(ClientData clientData,
 				Tk_Window tkwin, char *widgRec, int offset,
 				Tcl_FreeProc **freeProcPtr);
 /* 179 */
 EXTERN int		TkSmoothParseProc(ClientData clientData,
 				Tcl_Interp *interp, Tk_Window tkwin,
 				const char *value, char *widgRec, int offset);
 /* 180 */
-EXTERN CONST86 char *	TkSmoothPrintProc(ClientData clientData,
+EXTERN const char *	TkSmoothPrintProc(ClientData clientData,
 				Tk_Window tkwin, char *widgRec, int offset,
 				Tcl_FreeProc **freeProcPtr);
 /* 181 */
 EXTERN void		TkDrawAngledTextLayout(Display *display,
 				Drawable drawable, GC gc,
@@ -548,10 +548,14 @@
 /* 184 */
 EXTERN void		TkDrawAngledChars(Display *display,
 				Drawable drawable, GC gc, Tk_Font tkfont,
 				const char *source, int numBytes, double x,
 				double y, double angle);
+/* 185 */
+EXTERN int		TkDebugPhotoStringMatchDef(Tcl_Interp *inter,
+				Tcl_Obj *data, Tcl_Obj *formatString,
+				int *widthPtr, int *heightPtr);
 
 typedef struct TkIntStubs {
     int magic;
     void *hooks;
 
@@ -575,11 +579,11 @@
     void (*tkDoConfigureNotify) (TkWindow *winPtr); /* 17 */
     void (*tkDrawInsetFocusHighlight) (Tk_Window tkwin, GC gc, int width, Drawable drawable, int padding); /* 18 */
     void (*tkEventDeadWindow) (TkWindow *winPtr); /* 19 */
     void (*tkFillPolygon) (Tk_Canvas canvas, double *coordPtr, int numPoints, Display *display, Drawable drawable, GC gc, GC outlineGC); /* 20 */
     int (*tkFindStateNum) (Tcl_Interp *interp, const char *option, const TkStateMap *mapPtr, const char *strKey); /* 21 */
-    CONST86 char * (*tkFindStateString) (const TkStateMap *mapPtr, int numKey); /* 22 */
+    const char * (*tkFindStateString) (const TkStateMap *mapPtr, int numKey); /* 22 */
     void (*tkFocusDeadWindow) (TkWindow *winPtr); /* 23 */
     int (*tkFocusFilterEvent) (TkWindow *winPtr, XEvent *eventPtr); /* 24 */
     TkWindow * (*tkFocusKeyEvent) (TkWindow *winPtr, XEvent *eventPtr); /* 25 */
     void (*tkFontPkgInit) (TkMainInfo *mainPtr); /* 26 */
     void (*tkFontPkgFree) (TkMainInfo *mainPtr); /* 27 */
@@ -599,11 +603,11 @@
     void (*tkGrabDeadWindow) (TkWindow *winPtr); /* 41 */
     int (*tkGrabState) (TkWindow *winPtr); /* 42 */
     void (*tkIncludePoint) (Tk_Item *itemPtr, double *pointPtr); /* 43 */
     void (*tkInOutEvents) (XEvent *eventPtr, TkWindow *sourcePtr, TkWindow *destPtr, int leaveType, int enterType, Tcl_QueuePosition position); /* 44 */
     void (*tkInstallFrameMenu) (Tk_Window tkwin); /* 45 */
-    CONST86 char * (*tkKeysymToString) (KeySym keysym); /* 46 */
+    const char * (*tkKeysymToString) (KeySym keysym); /* 46 */
     int (*tkLineToArea) (double end1Ptr[], double end2Ptr[], double rectPtr[]); /* 47 */
     double (*tkLineToPoint) (double end1Ptr[], double end2Ptr[], double pointPtr[]); /* 48 */
     int (*tkMakeBezierCurve) (Tk_Canvas canvas, double *pointPtr, int numPoints, int numSteps, XPoint xPoints[], double dblPoints[]); /* 49 */
     void (*tkMakeBezierPostscript) (Tcl_Interp *interp, Tk_Canvas canvas, double *pointPtr, int numPoints); /* 50 */
     void (*tkOptionClassChanged) (TkWindow *winPtr); /* 51 */
@@ -662,11 +666,11 @@
     int (*tkFindStateNumObj) (Tcl_Interp *interp, Tcl_Obj *optionPtr, const TkStateMap *mapPtr, Tcl_Obj *keyPtr); /* 104 */
     Tcl_HashTable * (*tkGetBitmapPredefTable) (void); /* 105 */
     TkDisplay * (*tkGetDisplayList) (void); /* 106 */
     TkMainInfo * (*tkGetMainInfoList) (void); /* 107 */
     int (*tkGetWindowFromObj) (Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr, Tk_Window *windowPtr); /* 108 */
-    CONST86 char * (*tkpGetString) (TkWindow *winPtr, XEvent *eventPtr, Tcl_DString *dsPtr); /* 109 */
+    const char * (*tkpGetString) (TkWindow *winPtr, XEvent *eventPtr, Tcl_DString *dsPtr); /* 109 */
     void (*tkpGetSubFonts) (Tcl_Interp *interp, Tk_Font tkfont); /* 110 */
     Tcl_Obj * (*tkpGetSystemDefault) (Tk_Window tkwin, const char *dbName, const char *className); /* 111 */
     void (*tkpMenuThreadInit) (void); /* 112 */
     void (*tkClipBox) (TkRegion rgn, XRectangle *rect_return); /* 113 */
     TkRegion (*tkCreateRegion) (void); /* 114 */
@@ -750,25 +754,26 @@
     int (*tkTextXviewCmd) (struct TkText *textPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[]); /* 165 */
     void (*tkTextChanged) (struct TkSharedText *sharedTextPtr, struct TkText *textPtr, const struct TkTextIndex *index1Ptr, const struct TkTextIndex *index2Ptr); /* 166 */
     int (*tkBTreeNumLines) (TkTextBTree tree, const struct TkText *textPtr); /* 167 */
     void (*tkTextInsertDisplayProc) (struct TkText *textPtr, struct TkTextDispChunk *chunkPtr, int x, int y, int height, int baseline, Display *display, Drawable dst, int screenY); /* 168 */
     int (*tkStateParseProc) (ClientData clientData, Tcl_Interp *interp, Tk_Window tkwin, const char *value, char *widgRec, int offset); /* 169 */
-    CONST86 char * (*tkStatePrintProc) (ClientData clientData, Tk_Window tkwin, char *widgRec, int offset, Tcl_FreeProc **freeProcPtr); /* 170 */
+    const char * (*tkStatePrintProc) (ClientData clientData, Tk_Window tkwin, char *widgRec, int offset, Tcl_FreeProc **freeProcPtr); /* 170 */
     int (*tkCanvasDashParseProc) (ClientData clientData, Tcl_Interp *interp, Tk_Window tkwin, const char *value, char *widgRec, int offset); /* 171 */
-    CONST86 char * (*tkCanvasDashPrintProc) (ClientData clientData, Tk_Window tkwin, char *widgRec, int offset, Tcl_FreeProc **freeProcPtr); /* 172 */
+    const char * (*tkCanvasDashPrintProc) (ClientData clientData, Tk_Window tkwin, char *widgRec, int offset, Tcl_FreeProc **freeProcPtr); /* 172 */
     int (*tkOffsetParseProc) (ClientData clientData, Tcl_Interp *interp, Tk_Window tkwin, const char *value, char *widgRec, int offset); /* 173 */
-    CONST86 char * (*tkOffsetPrintProc) (ClientData clientData, Tk_Window tkwin, char *widgRec, int offset, Tcl_FreeProc **freeProcPtr); /* 174 */
+    const char * (*tkOffsetPrintProc) (ClientData clientData, Tk_Window tkwin, char *widgRec, int offset, Tcl_FreeProc **freeProcPtr); /* 174 */
     int (*tkPixelParseProc) (ClientData clientData, Tcl_Interp *interp, Tk_Window tkwin, const char *value, char *widgRec, int offset); /* 175 */
-    CONST86 char * (*tkPixelPrintProc) (ClientData clientData, Tk_Window tkwin, char *widgRec, int offset, Tcl_FreeProc **freeProcPtr); /* 176 */
+    const char * (*tkPixelPrintProc) (ClientData clientData, Tk_Window tkwin, char *widgRec, int offset, Tcl_FreeProc **freeProcPtr); /* 176 */
     int (*tkOrientParseProc) (ClientData clientData, Tcl_Interp *interp, Tk_Window tkwin, const char *value, char *widgRec, int offset); /* 177 */
-    CONST86 char * (*tkOrientPrintProc) (ClientData clientData, Tk_Window tkwin, char *widgRec, int offset, Tcl_FreeProc **freeProcPtr); /* 178 */
+    const char * (*tkOrientPrintProc) (ClientData clientData, Tk_Window tkwin, char *widgRec, int offset, Tcl_FreeProc **freeProcPtr); /* 178 */
     int (*tkSmoothParseProc) (ClientData clientData, Tcl_Interp *interp, Tk_Window tkwin, const char *value, char *widgRec, int offset); /* 179 */
-    CONST86 char * (*tkSmoothPrintProc) (ClientData clientData, Tk_Window tkwin, char *widgRec, int offset, Tcl_FreeProc **freeProcPtr); /* 180 */
+    const char * (*tkSmoothPrintProc) (ClientData clientData, Tk_Window tkwin, char *widgRec, int offset, Tcl_FreeProc **freeProcPtr); /* 180 */
     void (*tkDrawAngledTextLayout) (Display *display, Drawable drawable, GC gc, Tk_TextLayout layout, int x, int y, double angle, int firstChar, int lastChar); /* 181 */
     void (*tkUnderlineAngledTextLayout) (Display *display, Drawable drawable, GC gc, Tk_TextLayout layout, int x, int y, double angle, int underline); /* 182 */
     int (*tkIntersectAngledTextLayout) (Tk_TextLayout layout, int x, int y, int width, int height, double angle); /* 183 */
     void (*tkDrawAngledChars) (Display *display, Drawable drawable, GC gc, Tk_Font tkfont, const char *source, int numBytes, double x, double y, double angle); /* 184 */
+    int (*tkDebugPhotoStringMatchDef) (Tcl_Interp *inter, Tcl_Obj *data, Tcl_Obj *formatString, int *widthPtr, int *heightPtr); /* 185 */
 } TkIntStubs;
 
 extern const TkIntStubs *tkIntStubsPtr;
 
 #ifdef __cplusplus
@@ -1137,10 +1142,12 @@
 	(tkIntStubsPtr->tkUnderlineAngledTextLayout) /* 182 */
 #define TkIntersectAngledTextLayout \
 	(tkIntStubsPtr->tkIntersectAngledTextLayout) /* 183 */
 #define TkDrawAngledChars \
 	(tkIntStubsPtr->tkDrawAngledChars) /* 184 */
+#define TkDebugPhotoStringMatchDef \
+	(tkIntStubsPtr->tkDebugPhotoStringMatchDef) /* 185 */
 
 #endif /* defined(USE_TK_STUBS) */
 
 /* !END!: Do not edit above this line. */
 

Index: generic/tkIntPlatDecls.h
==================================================================
--- generic/tkIntPlatDecls.h
+++ generic/tkIntPlatDecls.h
@@ -222,12 +222,11 @@
 				int *yOffset);
 /* 38 */
 EXTERN int		TkSetMacColor(unsigned long pixel, void *macColor);
 /* 39 */
 EXTERN void		TkSetWMName(TkWindow *winPtr, Tk_Uid titleUid);
-/* 40 */
-EXTERN void		TkSuspendClipboard(void);
+/* Slot 40 is reserved */
 /* 41 */
 EXTERN int		TkMacOSXZoomToplevel(void *whichWindow,
 				short zoomPart);
 /* 42 */
 EXTERN Tk_Window	Tk_TopCoordsToWindow(Tk_Window tkwin, int rootX,
@@ -382,11 +381,11 @@
     TkRegion (*tkMacOSXVisableClipRgn) (TkWindow *winPtr); /* 35 */
     void (*tkMacOSXWinBounds) (TkWindow *winPtr, void *geometry); /* 36 */
     void (*tkMacOSXWindowOffset) (void *wRef, int *xOffset, int *yOffset); /* 37 */
     int (*tkSetMacColor) (unsigned long pixel, void *macColor); /* 38 */
     void (*tkSetWMName) (TkWindow *winPtr, Tk_Uid titleUid); /* 39 */
-    void (*tkSuspendClipboard) (void); /* 40 */
+    void (*reserved40)(void);
     int (*tkMacOSXZoomToplevel) (void *whichWindow, short zoomPart); /* 41 */
     Tk_Window (*tk_TopCoordsToWindow) (Tk_Window tkwin, int rootX, int rootY, int *newX, int *newY); /* 42 */
     MacDrawable * (*tkMacOSXContainerId) (TkWindow *winPtr); /* 43 */
     MacDrawable * (*tkMacOSXGetHostToplevel) (TkWindow *winPtr); /* 44 */
     void (*tkMacOSXPreprocessMenu) (void); /* 45 */
@@ -597,12 +596,11 @@
 	(tkIntPlatStubsPtr->tkMacOSXWindowOffset) /* 37 */
 #define TkSetMacColor \
 	(tkIntPlatStubsPtr->tkSetMacColor) /* 38 */
 #define TkSetWMName \
 	(tkIntPlatStubsPtr->tkSetWMName) /* 39 */
-#define TkSuspendClipboard \
-	(tkIntPlatStubsPtr->tkSuspendClipboard) /* 40 */
+/* Slot 40 is reserved */
 #define TkMacOSXZoomToplevel \
 	(tkIntPlatStubsPtr->tkMacOSXZoomToplevel) /* 41 */
 #define Tk_TopCoordsToWindow \
 	(tkIntPlatStubsPtr->tk_TopCoordsToWindow) /* 42 */
 #define TkMacOSXContainerId \
@@ -664,6 +662,9 @@
 /* !END!: Do not edit above this line. */
 
 #undef TCL_STORAGE_CLASS
 #define TCL_STORAGE_CLASS DLLIMPORT
 
+#undef TkWinGetPlatformId
+#define TkWinGetPlatformId() (2) /* VER_PLATFORM_WIN32_NT */
+
 #endif /* _TKINTPLATDECLS */

Index: generic/tkIntXlibDecls.h
==================================================================
--- generic/tkIntXlibDecls.h
+++ generic/tkIntXlibDecls.h
@@ -21,15 +21,29 @@
 
 #ifndef _TCL
 #   include <tcl.h>
 #endif
 
+#ifndef EXTERN
+#   define EXTERN extern TCL_STORAGE_CLASS
+#endif
+
+/* Some (older) versions of X11/Xutil.h have a wrong signature of those
+   two functions, so move them out of the way temporarly. */
+#define XOffsetRegion _XOffsetRegion
+#define XUnionRegion _XUnionRegion
 #include "X11/Xutil.h"
+#undef XOffsetRegion
+#undef XUnionRegion
 
 #ifdef BUILD_tk
-#undef TCL_STORAGE_CLASS
-#define TCL_STORAGE_CLASS DLLEXPORT
+#  undef TCL_STORAGE_CLASS
+#  define TCL_STORAGE_CLASS DLLEXPORT
+#else
+#  ifndef TCL_STORAGE_CLASS
+#    define TCL_STORAGE_CLASS DLLIMPORT
+#  endif
 #endif
 
 typedef int (*XAfterFunction) (	    /* WARNING, this type not in Xlib spec */
     Display*		/* display */
 );
@@ -354,10 +368,65 @@
 EXTERN XAfterFunction	XSynchronize(Display *display, Bool onoff);
 /* 113 */
 EXTERN int		XSync(Display *display, Bool discard);
 /* 114 */
 EXTERN VisualID		XVisualIDFromVisual(Visual *visual);
+/* Slot 115 is reserved */
+/* Slot 116 is reserved */
+/* Slot 117 is reserved */
+/* Slot 118 is reserved */
+/* Slot 119 is reserved */
+/* 120 */
+EXTERN int		XOffsetRegion(Region rgn, int dx, int dy);
+/* 121 */
+EXTERN int		XUnionRegion(Region srca, Region srcb,
+				Region dr_return);
+/* 122 */
+EXTERN Window		XCreateWindow(Display *display, Window parent, int x,
+				int y, unsigned int width,
+				unsigned int height,
+				unsigned int border_width, int depth,
+				unsigned int clazz, Visual *visual,
+				unsigned long value_mask,
+				XSetWindowAttributes *attributes);
+/* Slot 123 is reserved */
+/* Slot 124 is reserved */
+/* Slot 125 is reserved */
+/* Slot 126 is reserved */
+/* Slot 127 is reserved */
+/* Slot 128 is reserved */
+/* 129 */
+EXTERN int		XLowerWindow(Display *d, Window w);
+/* 130 */
+EXTERN int		XFillArcs(Display *d, Drawable dr, GC gc, XArc *a,
+				int n);
+/* 131 */
+EXTERN int		XDrawArcs(Display *d, Drawable dr, GC gc, XArc *a,
+				int n);
+/* 132 */
+EXTERN int		XDrawRectangles(Display *d, Drawable dr, GC gc,
+				XRectangle *r, int n);
+/* 133 */
+EXTERN int		XDrawSegments(Display *d, Drawable dr, GC gc,
+				XSegment *s, int n);
+/* 134 */
+EXTERN int		XDrawPoint(Display *d, Drawable dr, GC gc, int x,
+				int y);
+/* 135 */
+EXTERN int		XDrawPoints(Display *d, Drawable dr, GC gc,
+				XPoint *p, int n, int m);
+/* 136 */
+EXTERN int		XReparentWindow(Display *d, Window w, Window p,
+				int x, int y);
+/* 137 */
+EXTERN int		XPutImage(Display *d, Drawable dr, GC gc, XImage *im,
+				int sx, int sy, int dx, int dy,
+				unsigned int w, unsigned int h);
+/* 138 */
+EXTERN Region		XPolygonRegion(XPoint *pts, int n, int rule);
+/* 139 */
+EXTERN int		XPointInRegion(Region rgn, int x, int y);
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
 /* 0 */
 EXTERN int		XSetDashes(Display *display, GC gc, int dash_offset,
 				_Xconst char *dash_list, int n);
@@ -582,11 +651,11 @@
 				XTextProperty *text_prop);
 /* 79 */
 EXTERN Status		XStringListToTextProperty(char **list, int count,
 				XTextProperty *text_prop_return);
 /* 80 */
-EXTERN void		XDrawSegments(Display *display, Drawable d, GC gc,
+EXTERN int		XDrawSegments(Display *display, Drawable d, GC gc,
 				XSegment *segments, int nsegments);
 /* 81 */
 EXTERN void		XForceScreenSaver(Display *display, int mode);
 /* 82 */
 EXTERN int		XDrawLine(Display *d, Drawable dr, GC g, int x1,
@@ -596,14 +665,14 @@
 				int x, int y, unsigned int width,
 				unsigned int height);
 /* 84 */
 EXTERN void		XClearWindow(Display *d, Window w);
 /* 85 */
-EXTERN void		XDrawPoint(Display *display, Drawable d, GC gc,
+EXTERN int		XDrawPoint(Display *display, Drawable d, GC gc,
 				int x, int y);
 /* 86 */
-EXTERN void		XDrawPoints(Display *display, Drawable d, GC gc,
+EXTERN int		XDrawPoints(Display *display, Drawable d, GC gc,
 				XPoint *points, int npoints, int mode);
 /* 87 */
 EXTERN int		XWarpPointer(Display *display, Window src_w,
 				Window dest_w, int src_x, int src_y,
 				unsigned int src_width,
@@ -740,10 +809,35 @@
     int (*xFree) (void *data); /* 110 */
     int (*xNoOp) (Display *display); /* 111 */
     XAfterFunction (*xSynchronize) (Display *display, Bool onoff); /* 112 */
     int (*xSync) (Display *display, Bool discard); /* 113 */
     VisualID (*xVisualIDFromVisual) (Visual *visual); /* 114 */
+    void (*reserved115)(void);
+    void (*reserved116)(void);
+    void (*reserved117)(void);
+    void (*reserved118)(void);
+    void (*reserved119)(void);
+    int (*xOffsetRegion) (Region rgn, int dx, int dy); /* 120 */
+    int (*xUnionRegion) (Region srca, Region srcb, Region dr_return); /* 121 */
+    Window (*xCreateWindow) (Display *display, Window parent, int x, int y, unsigned int width, unsigned int height, unsigned int border_width, int depth, unsigned int clazz, Visual *visual, unsigned long value_mask, XSetWindowAttributes *attributes); /* 122 */
+    void (*reserved123)(void);
+    void (*reserved124)(void);
+    void (*reserved125)(void);
+    void (*reserved126)(void);
+    void (*reserved127)(void);
+    void (*reserved128)(void);
+    int (*xLowerWindow) (Display *d, Window w); /* 129 */
+    int (*xFillArcs) (Display *d, Drawable dr, GC gc, XArc *a, int n); /* 130 */
+    int (*xDrawArcs) (Display *d, Drawable dr, GC gc, XArc *a, int n); /* 131 */
+    int (*xDrawRectangles) (Display *d, Drawable dr, GC gc, XRectangle *r, int n); /* 132 */
+    int (*xDrawSegments) (Display *d, Drawable dr, GC gc, XSegment *s, int n); /* 133 */
+    int (*xDrawPoint) (Display *d, Drawable dr, GC gc, int x, int y); /* 134 */
+    int (*xDrawPoints) (Display *d, Drawable dr, GC gc, XPoint *p, int n, int m); /* 135 */
+    int (*xReparentWindow) (Display *d, Window w, Window p, int x, int y); /* 136 */
+    int (*xPutImage) (Display *d, Drawable dr, GC gc, XImage *im, int sx, int sy, int dx, int dy, unsigned int w, unsigned int h); /* 137 */
+    Region (*xPolygonRegion) (XPoint *pts, int n, int rule); /* 138 */
+    int (*xPointInRegion) (Region rgn, int x, int y); /* 139 */
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
     int (*xSetDashes) (Display *display, GC gc, int dash_offset, _Xconst char *dash_list, int n); /* 0 */
     XModifierKeymap * (*xGetModifierMapping) (Display *d); /* 1 */
     XImage * (*xCreateImage) (Display *d, Visual *v, unsigned int ui1, int i1, int i2, char *cp, unsigned int ui2, unsigned int ui3, int i3, int i4); /* 2 */
@@ -822,17 +916,17 @@
     int (*_XInitImageFuncPtrs) (XImage *image); /* 75 */
     XIC (*xCreateIC) (void); /* 76 */
     XVisualInfo * (*xGetVisualInfo) (Display *display, long vinfo_mask, XVisualInfo *vinfo_template, int *nitems_return); /* 77 */
     void (*xSetWMClientMachine) (Display *display, Window w, XTextProperty *text_prop); /* 78 */
     Status (*xStringListToTextProperty) (char **list, int count, XTextProperty *text_prop_return); /* 79 */
-    void (*xDrawSegments) (Display *display, Drawable d, GC gc, XSegment *segments, int nsegments); /* 80 */
+    int (*xDrawSegments) (Display *display, Drawable d, GC gc, XSegment *segments, int nsegments); /* 80 */
     void (*xForceScreenSaver) (Display *display, int mode); /* 81 */
     int (*xDrawLine) (Display *d, Drawable dr, GC g, int x1, int y1, int x2, int y2); /* 82 */
     int (*xFillRectangle) (Display *display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height); /* 83 */
     void (*xClearWindow) (Display *d, Window w); /* 84 */
-    void (*xDrawPoint) (Display *display, Drawable d, GC gc, int x, int y); /* 85 */
-    void (*xDrawPoints) (Display *display, Drawable d, GC gc, XPoint *points, int npoints, int mode); /* 86 */
+    int (*xDrawPoint) (Display *display, Drawable d, GC gc, int x, int y); /* 85 */
+    int (*xDrawPoints) (Display *display, Drawable d, GC gc, XPoint *points, int npoints, int mode); /* 86 */
     int (*xWarpPointer) (Display *display, Window src_w, Window dest_w, int src_x, int src_y, unsigned int src_width, unsigned int src_height, int dest_x, int dest_y); /* 87 */
     void (*xQueryColor) (Display *display, Colormap colormap, XColor *def_in_out); /* 88 */
     void (*xQueryColors) (Display *display, Colormap colormap, XColor *defs_in_out, int ncolors); /* 89 */
     Status (*xQueryTree) (Display *d, Window w1, Window *w2, Window *w3, Window **w4, unsigned int *ui); /* 90 */
     int (*xSync) (Display *display, Bool flag); /* 91 */
@@ -1079,10 +1173,49 @@
 	(tkIntXlibStubsPtr->xSynchronize) /* 112 */
 #define XSync \
 	(tkIntXlibStubsPtr->xSync) /* 113 */
 #define XVisualIDFromVisual \
 	(tkIntXlibStubsPtr->xVisualIDFromVisual) /* 114 */
+/* Slot 115 is reserved */
+/* Slot 116 is reserved */
+/* Slot 117 is reserved */
+/* Slot 118 is reserved */
+/* Slot 119 is reserved */
+#define XOffsetRegion \
+	(tkIntXlibStubsPtr->xOffsetRegion) /* 120 */
+#define XUnionRegion \
+	(tkIntXlibStubsPtr->xUnionRegion) /* 121 */
+#define XCreateWindow \
+	(tkIntXlibStubsPtr->xCreateWindow) /* 122 */
+/* Slot 123 is reserved */
+/* Slot 124 is reserved */
+/* Slot 125 is reserved */
+/* Slot 126 is reserved */
+/* Slot 127 is reserved */
+/* Slot 128 is reserved */
+#define XLowerWindow \
+	(tkIntXlibStubsPtr->xLowerWindow) /* 129 */
+#define XFillArcs \
+	(tkIntXlibStubsPtr->xFillArcs) /* 130 */
+#define XDrawArcs \
+	(tkIntXlibStubsPtr->xDrawArcs) /* 131 */
+#define XDrawRectangles \
+	(tkIntXlibStubsPtr->xDrawRectangles) /* 132 */
+#define XDrawSegments \
+	(tkIntXlibStubsPtr->xDrawSegments) /* 133 */
+#define XDrawPoint \
+	(tkIntXlibStubsPtr->xDrawPoint) /* 134 */
+#define XDrawPoints \
+	(tkIntXlibStubsPtr->xDrawPoints) /* 135 */
+#define XReparentWindow \
+	(tkIntXlibStubsPtr->xReparentWindow) /* 136 */
+#define XPutImage \
+	(tkIntXlibStubsPtr->xPutImage) /* 137 */
+#define XPolygonRegion \
+	(tkIntXlibStubsPtr->xPolygonRegion) /* 138 */
+#define XPointInRegion \
+	(tkIntXlibStubsPtr->xPointInRegion) /* 139 */
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
 #define XSetDashes \
 	(tkIntXlibStubsPtr->xSetDashes) /* 0 */
 #define XGetModifierMapping \

Index: generic/tkListbox.c
==================================================================
--- generic/tkListbox.c
+++ generic/tkListbox.c
@@ -10,12 +10,12 @@
  *
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
 
-#include "default.h"
 #include "tkInt.h"
+#include "default.h"
 
 #ifdef _WIN32
 #include "tkWinInt.h"
 #endif
 
@@ -565,11 +565,11 @@
     Tk_CreateEventHandler(listPtr->tkwin,
 	    ExposureMask|StructureNotifyMask|FocusChangeMask,
 	    ListboxEventProc, listPtr);
     Tk_CreateSelHandler(listPtr->tkwin, XA_PRIMARY, XA_STRING,
 	    ListboxFetchSelection, listPtr, XA_STRING);
-    if (Tk_InitOptions(interp, (char *)listPtr,
+    if (Tk_InitOptions(interp, listPtr,
 	    optionTables->listboxOptionTable, tkwin) != TCL_OK) {
 	Tk_DestroyWindow(listPtr->tkwin);
 	return TCL_ERROR;
     }
 
@@ -680,11 +680,11 @@
 	    Tcl_WrongNumArgs(interp, 2, objv, "option");
 	    result = TCL_ERROR;
 	    break;
 	}
 
-	objPtr = Tk_GetOptionValue(interp, (char *) listPtr,
+	objPtr = Tk_GetOptionValue(interp, listPtr,
 		listPtr->optionTable, objv[2], listPtr->tkwin);
 	if (objPtr == NULL) {
 	    result = TCL_ERROR;
 	    break;
 	}
@@ -692,11 +692,11 @@
 	result = TCL_OK;
 	break;
 
     case COMMAND_CONFIGURE:
 	if (objc <= 3) {
-	    objPtr = Tk_GetOptionInfo(interp, (char *) listPtr,
+	    objPtr = Tk_GetOptionInfo(interp, listPtr,
 		    listPtr->optionTable,
 		    (objc == 3) ? objv[2] : NULL, listPtr->tkwin);
 	    if (objPtr == NULL) {
 		result = TCL_ERROR;
 		break;
@@ -924,11 +924,11 @@
 	    break;
 	}
 
 	attrPtr = ListboxGetItemAttributes(interp, listPtr, index);
 	if (objc <= 4) {
-	    objPtr = Tk_GetOptionInfo(interp, (char *) attrPtr,
+	    objPtr = Tk_GetOptionInfo(interp, attrPtr,
 		    listPtr->itemAttrOptionTable,
 		    (objc == 4) ? objv[3] : NULL, listPtr->tkwin);
 	    if (objPtr == NULL) {
 		result = TCL_ERROR;
 		break;
@@ -1100,11 +1100,12 @@
      */
 
     if ((listPtr->topIndex <= index) && (index < lastVisibleIndex)) {
 	Tcl_Obj *el, *results[4];
 	const char *stringRep;
-	int pixelWidth, stringLen, x, y, result;
+	int pixelWidth, x, y, result;
+	size_t stringLen;
 	Tk_FontMetrics fm;
 
 	/*
 	 * Compute the pixel width of the requested element.
 	 */
@@ -1112,11 +1113,11 @@
 	result = Tcl_ListObjIndex(interp, listPtr->listObj, index, &el);
 	if (result != TCL_OK) {
 	    return result;
 	}
 
-	stringRep = Tcl_GetStringFromObj(el, &stringLen);
+	stringRep = TkGetStringFromObj(el, &stringLen);
 	Tk_GetFontMetrics(listPtr->tkfont, &fm);
 	pixelWidth = Tk_TextWidth(listPtr->tkfont, stringRep, stringLen);
 
         if (listPtr->justify == TK_JUSTIFY_LEFT) {
             x = (listPtr->inset + listPtr->selBorderWidth) - listPtr->xOffset;
@@ -1413,11 +1414,11 @@
 	attrs = ckalloc(sizeof(ItemAttr));
 	attrs->border = NULL;
 	attrs->selBorder = NULL;
 	attrs->fgColor = NULL;
 	attrs->selFgColor = NULL;
-	Tk_InitOptions(interp, (char *)attrs, listPtr->itemAttrOptionTable,
+	Tk_InitOptions(interp, attrs, listPtr->itemAttrOptionTable,
 		listPtr->tkwin);
 	Tcl_SetHashValue(entry, attrs);
     } else {
 	attrs = Tcl_GetHashValue(entry);
     }
@@ -1563,11 +1564,11 @@
     Tk_SavedOptions savedOptions;
     Tcl_Obj *oldListObj = NULL;
     Tcl_Obj *errorResult = NULL;
     int oldExport, error;
 
-    oldExport = listPtr->exportSelection;
+    oldExport = (listPtr->exportSelection) && (!Tcl_IsSafe(listPtr->interp));
     if (listPtr->listVarName != NULL) {
 	Tcl_UntraceVar2(interp, listPtr->listVarName, NULL,
 		TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
 		ListboxListVarProc, listPtr);
     }
@@ -1576,11 +1577,11 @@
 	if (!error) {
 	    /*
 	     * First pass: set options to new values.
 	     */
 
-	    if (Tk_SetOptions(interp, (char *) listPtr,
+	    if (Tk_SetOptions(interp, listPtr,
 		    listPtr->optionTable, objc, objv,
 		    listPtr->tkwin, &savedOptions, NULL) != TCL_OK) {
 		continue;
 	    }
 	} else {
@@ -1605,14 +1606,15 @@
 	}
 	listPtr->inset = listPtr->highlightWidth + listPtr->borderWidth;
 
 	/*
 	 * Claim the selection if we've suddenly started exporting it and
-	 * there is a selection to export.
+	 * there is a selection to export and this interp is unsafe.
 	 */
 
-	if (listPtr->exportSelection && !oldExport
+	if (listPtr->exportSelection && (!oldExport)
+		&& (!Tcl_IsSafe(listPtr->interp))
 		&& (listPtr->numSelected != 0)) {
 	    Tk_OwnSelection(listPtr->tkwin, XA_PRIMARY,
 		    ListboxLostSelection, listPtr);
 	}
 
@@ -1721,11 +1723,11 @@
     Tcl_Obj *const objv[],	/* Arguments. */
     int index)			/* Index of the listbox item being configure */
 {
     Tk_SavedOptions savedOptions;
 
-    if (Tk_SetOptions(interp, (char *)attrs,
+    if (Tk_SetOptions(interp, attrs,
 	    listPtr->itemAttrOptionTable, objc, objv, listPtr->tkwin,
 	    &savedOptions, NULL) != TCL_OK) {
 	Tk_RestoreSavedOptions(&savedOptions);
 	return TCL_ERROR;
     }
@@ -1837,11 +1839,12 @@
     ClientData clientData)	/* Information about window. */
 {
     register Listbox *listPtr = clientData;
     register Tk_Window tkwin = listPtr->tkwin;
     GC gc;
-    int i, limit, x, y, prevSelected, freeGC, stringLen;
+    int i, limit, x, y, prevSelected, freeGC;
+    size_t stringLen;
     Tk_FontMetrics fm;
     Tcl_Obj *curElement;
     Tcl_HashEntry *entry;
     const char *stringRep;
     ItemAttr *attrs;
@@ -2071,11 +2074,11 @@
 	/*
 	 * Draw the actual text of this item.
 	 */
 
         Tcl_ListObjIndex(listPtr->interp, listPtr->listObj, i, &curElement);
-        stringRep = Tcl_GetStringFromObj(curElement, &stringLen);
+        stringRep = TkGetStringFromObj(curElement, &stringLen);
         textWidth = Tk_TextWidth(listPtr->tkfont, stringRep, stringLen);
 
 	Tk_GetFontMetrics(listPtr->tkfont, &fm);
 	y += fm.ascent + listPtr->selBorderWidth;
 
@@ -2233,11 +2236,12 @@
 				 * must be 1. */
     int updateGrid)		/* Non-zero means call Tk_SetGrid or
 				 * Tk_UnsetGrid to update gridding for the
 				 * window. */
 {
-    int width, height, pixelWidth, pixelHeight, textLength, i, result;
+    int width, height, pixelWidth, pixelHeight, i, result;
+    size_t textLength;
     Tk_FontMetrics fm;
     Tcl_Obj *element;
     const char *text;
 
     if (fontChanged || maxIsStale) {
@@ -2254,11 +2258,11 @@
 	    result = Tcl_ListObjIndex(listPtr->interp, listPtr->listObj, i,
 		    &element);
 	    if (result != TCL_OK) {
 		continue;
 	    }
-	    text = Tcl_GetStringFromObj(element, &textLength);
+	    text = TkGetStringFromObj(element, &textLength);
 	    Tk_GetFontMetrics(listPtr->tkfont, &fm);
 	    pixelWidth = Tk_TextWidth(listPtr->tkfont, text, textLength);
 	    if (pixelWidth > listPtr->maxWidth) {
 		listPtr->maxWidth = pixelWidth;
 	    }
@@ -2320,11 +2324,12 @@
     int index,			/* Add the new elements before this
 				 * element. */
     int objc,			/* Number of new elements to add. */
     Tcl_Obj *const objv[])	/* New elements (one per entry). */
 {
-    int i, oldMaxWidth, pixelWidth, result, length;
+    int i, oldMaxWidth, pixelWidth, result;
+    size_t length;
     Tcl_Obj *newListObj;
     const char *stringRep;
 
     oldMaxWidth = listPtr->maxWidth;
     for (i = 0; i < objc; i++) {
@@ -2331,11 +2336,11 @@
 	/*
 	 * Check if any of the new elements are wider than the current widest;
 	 * if so, update our notion of "widest."
 	 */
 
-	stringRep = Tcl_GetStringFromObj(objv[i], &length);
+	stringRep = TkGetStringFromObj(objv[i], &length);
 	pixelWidth = Tk_TextWidth(listPtr->tkfont, stringRep, length);
 	if (pixelWidth > listPtr->maxWidth) {
 	    listPtr->maxWidth = pixelWidth;
 	}
     }
@@ -2434,11 +2439,12 @@
 ListboxDeleteSubCmd(
     register Listbox *listPtr,	/* Listbox widget to modify. */
     int first,			/* Index of first element to delete. */
     int last)			/* Index of last element to delete. */
 {
-    int count, i, widthChanged, length, result, pixelWidth;
+    int count, i, widthChanged, result, pixelWidth;
+    size_t length;
     Tcl_Obj *newListObj, *element;
     const char *stringRep;
     Tcl_HashEntry *entry;
 
     /*
@@ -2489,11 +2495,11 @@
 	 * element to disappear for us to have to recompute the width.
 	 */
 
 	if (widthChanged == 0) {
 	    Tcl_ListObjIndex(listPtr->interp, listPtr->listObj, i, &element);
-	    stringRep = Tcl_GetStringFromObj(element, &length);
+	    stringRep = TkGetStringFromObj(element, &length);
 	    pixelWidth = Tk_TextWidth(listPtr->tkfont, stringRep, length);
 	    if (pixelWidth == listPtr->maxWidth) {
 		widthChanged = 1;
 	    }
 	}
@@ -3077,11 +3083,12 @@
 
     if (firstRedisplay >= 0) {
 	EventuallyRedrawRange(listPtr, first, last);
     }
     if ((oldCount == 0) && (listPtr->numSelected > 0)
-	    && listPtr->exportSelection) {
+	    && (listPtr->exportSelection)
+	    && (!Tcl_IsSafe(listPtr->interp))) {
 	Tk_OwnSelection(listPtr->tkwin, XA_PRIMARY,
 		ListboxLostSelection, listPtr);
     }
     return TCL_OK;
 }
@@ -3118,16 +3125,17 @@
 				 * not including terminating NULL
 				 * character. */
 {
     register Listbox *listPtr = clientData;
     Tcl_DString selection;
-    int length, count, needNewline, stringLen, i;
+    int count, needNewline, i;
+    size_t length, stringLen;
     Tcl_Obj *curElement;
     const char *stringRep;
     Tcl_HashEntry *entry;
 
-    if (!listPtr->exportSelection) {
+    if ((!listPtr->exportSelection) || Tcl_IsSafe(listPtr->interp)) {
 	return -1;
     }
 
     /*
      * Use a dynamic string to accumulate the contents of the selection.
@@ -3141,11 +3149,11 @@
 	    if (needNewline) {
 		Tcl_DStringAppend(&selection, "\n", 1);
 	    }
 	    Tcl_ListObjIndex(listPtr->interp, listPtr->listObj, i,
 		    &curElement);
-	    stringRep = Tcl_GetStringFromObj(curElement, &stringLen);
+	    stringRep = TkGetStringFromObj(curElement, &stringLen);
 	    Tcl_DStringAppend(&selection, stringRep, stringLen);
 	    needNewline = 1;
 	}
     }
 
@@ -3156,18 +3164,18 @@
 
     /*
      * Copy the requested portion of the selection to the buffer.
      */
 
-    count = length - offset;
-    if (count <= 0) {
+    if (length <= (size_t)offset) {
 	count = 0;
     } else {
+	count = length - offset;
 	if (count > maxBytes) {
 	    count = maxBytes;
 	}
-	memcpy(buffer, Tcl_DStringValue(&selection) + offset, (size_t) count);
+	memcpy(buffer, Tcl_DStringValue(&selection) + offset, count);
     }
     buffer[count] = '\0';
     Tcl_DStringFree(&selection);
     return count;
 }
@@ -3194,11 +3202,12 @@
 ListboxLostSelection(
     ClientData clientData)	/* Information about listbox widget. */
 {
     register Listbox *listPtr = clientData;
 
-    if ((listPtr->exportSelection) && (listPtr->nElements > 0)) {
+    if ((listPtr->exportSelection) && (!Tcl_IsSafe(listPtr->interp))
+	    && (listPtr->nElements > 0)) {
 	ListboxSelect(listPtr, 0, listPtr->nElements-1, 0);
         GenerateListboxSelectEvent(listPtr);
     }
 }
 
@@ -3426,18 +3435,31 @@
 
 static char *
 ListboxListVarProc(
     ClientData clientData,	/* Information about button. */
     Tcl_Interp *interp,		/* Interpreter containing variable. */
-    const char *name1,		/* Not used. */
-    const char *name2,		/* Not used. */
+    const char *name1,		/* Name of variable. */
+    const char *name2,		/* Second part of variable name. */
     int flags)			/* Information about what happened. */
 {
     Listbox *listPtr = clientData;
     Tcl_Obj *oldListObj, *varListObj;
     int oldLength, i;
     Tcl_HashEntry *entry;
+
+    /*
+     * See ticket [5d991b82].
+     */
+
+    if (listPtr->listVarName == NULL) {
+	if (!(flags & TCL_INTERP_DESTROYED)) {
+	    Tcl_UntraceVar2(interp, name1, name2,
+		    TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
+		    ListboxListVarProc, clientData);
+	}
+	return NULL;
+    }
 
     /*
      * Bwah hahahaha! Puny mortal, you can't unset a -listvar'd variable!
      */
 

Index: generic/tkMain.c
==================================================================
--- generic/tkMain.c
+++ generic/tkMain.c
@@ -28,18 +28,10 @@
 #	define _UNICODE
 #   endif
 #endif
 
 #include "tkInt.h"
-#include <ctype.h>
-#include <stdio.h>
-#include <string.h>
-#ifdef NO_STDLIB_H
-#   include "../compat/stdlib.h"
-#else
-#   include <stdlib.h>
-#endif
 
 extern int TkCygwinMainEx(int, char **, Tcl_AppInitProc *, Tcl_Interp *);
 
 /*
  * The default prompt used when the user has not overridden it.
@@ -194,11 +186,11 @@
 
     /*
      * Ensure that we are getting a compatible version of Tcl.
      */
 
-    if (Tcl_InitStubs(interp, "8.6", 0) == NULL) {
+    if (Tcl_InitStubs(interp, "8.6-", 0) == NULL) {
 	if (Tcl_InitStubs(interp, "8.1", 0) == NULL) {
 	    abort();
 	} else {
 	    Tcl_Panic("%s", Tcl_GetString(Tcl_GetObjResult(interp)));
 	}
@@ -233,11 +225,15 @@
 
     is.interp = interp;
     is.gotPartial = 0;
     Tcl_Preserve(interp);
 
-#if defined(_WIN32) && !defined(__CYGWIN__)
+#if defined(_WIN32)
+#if !defined(STATIC_BUILD)
+    /* If compiled for Win32 but running on Cygwin, don't use console */
+    if (!tclStubsPtr->reserved9)
+#endif
     Tk_InitConsoleChannels(interp);
 #endif
 
 #ifdef MAC_OSX_TK
     if (Tcl_GetStartupScript(NULL) == NULL) {
@@ -418,18 +414,19 @@
 StdinProc(
     ClientData clientData,	/* The state of interactive cmd line */
     int mask)			/* Not used. */
 {
     char *cmd;
-    int code, count;
+    int code;
+    size_t count;
     InteractiveState *isPtr = clientData;
     Tcl_Channel chan = isPtr->input;
     Tcl_Interp *interp = isPtr->interp;
 
     count = Tcl_Gets(chan, &isPtr->line);
 
-    if (count < 0 && !isPtr->gotPartial) {
+    if (count == (size_t)-1 && !isPtr->gotPartial) {
 	if (isPtr->tty) {
 	    Tcl_Exit(0);
 	} else {
 	    Tcl_DeleteChannelHandler(chan, StdinProc, isPtr);
 	}

Index: generic/tkMenu.c
==================================================================
--- generic/tkMenu.c
+++ generic/tkMenu.c
@@ -36,11 +36,11 @@
  *
  * To handle all of the constraints, Tk menubars and tearoff menus are
  * implemented using menu clones. Menu clones are full menus in their own
  * right; they have a Tk window and pathname associated with them; they have a
  * TkMenu structure and array of entries. However, they are linked with the
- * original menu that they were cloned from. The reflect the attributes of the
+ * original menu that they were cloned from. They reflect the attributes of the
  * original, or "master", menu. So if an item is added to a menu, and that
  * menu has clones, then the item must be added to all of its clones also.
  * Menus are cloned when a menu is torn-off or when a menu is assigned as a
  * menubar using the "-menu" option of the toplevel's pathname configure
  * subcommand. When a clone is destroyed, only the clone is destroyed, but
@@ -257,10 +257,13 @@
 	Tk_Offset(TkMenu, activeBorderWidthPtr), -1, 0, NULL, 0},
     {TK_OPTION_COLOR, "-activeforeground", "activeForeground",
 	"Background", DEF_MENU_ACTIVE_FG_COLOR,
 	Tk_Offset(TkMenu, activeFgPtr), -1, 0,
 	(ClientData) DEF_MENU_ACTIVE_FG_MONO, 0},
+    {TK_OPTION_RELIEF, "-activerelief", "activeRelief", "Relief",
+	DEF_MENU_ACTIVE_RELIEF, Tk_Offset(TkMenu, activeReliefPtr),
+	-1, 0, NULL, 0},
     {TK_OPTION_BORDER, "-background", "background", "Background",
 	DEF_MENU_BG_COLOR, Tk_Offset(TkMenu, borderPtr), -1, 0,
 	(ClientData) DEF_MENU_BG_MONO, 0},
     {TK_OPTION_SYNONYM, "-bd", NULL, NULL,
 	NULL, 0, -1, 0, "-borderwidth", 0},
@@ -463,11 +466,11 @@
     Tk_SetClass(menuPtr->tkwin, "Menu");
     Tk_SetClassProcs(menuPtr->tkwin, &menuClass, menuPtr);
     Tk_CreateEventHandler(newWin,
 	    ExposureMask|StructureNotifyMask|ActivateMask,
 	    TkMenuEventProc, menuPtr);
-    if (Tk_InitOptions(interp, (char *) menuPtr,
+    if (Tk_InitOptions(interp, menuPtr,
 	    tsdPtr->menuOptionTable, menuPtr->tkwin)
 	    != TCL_OK) {
     	Tk_DestroyWindow(menuPtr->tkwin);
     	return TCL_ERROR;
     }
@@ -670,11 +673,11 @@
 
 	if (objc != 3) {
 	    Tcl_WrongNumArgs(interp, 2, objv, "option");
 	    goto error;
 	}
-	resultPtr = Tk_GetOptionValue(interp, (char *) menuPtr,
+	resultPtr = Tk_GetOptionValue(interp, menuPtr,
 		tsdPtr->menuOptionTable, objv[2],
 		menuPtr->tkwin);
 	if (resultPtr == NULL) {
 	    goto error;
 	}
@@ -690,21 +693,21 @@
 	break;
     case MENU_CONFIGURE: {
 	Tcl_Obj *resultPtr;
 
 	if (objc == 2) {
-	    resultPtr = Tk_GetOptionInfo(interp, (char *) menuPtr,
+	    resultPtr = Tk_GetOptionInfo(interp, menuPtr,
 		    tsdPtr->menuOptionTable, NULL,
 		    menuPtr->tkwin);
 	    if (resultPtr == NULL) {
 		result = TCL_ERROR;
 	    } else {
 		result = TCL_OK;
 		Tcl_SetObjResult(interp, resultPtr);
 	    }
 	} else if (objc == 3) {
-	    resultPtr = Tk_GetOptionInfo(interp, (char *) menuPtr,
+	    resultPtr = Tk_GetOptionInfo(interp, menuPtr,
 		    tsdPtr->menuOptionTable, objv[2],
 		    menuPtr->tkwin);
 	    if (resultPtr == NULL) {
 		result = TCL_ERROR;
 	    } else {
@@ -774,11 +777,11 @@
 	if (index < 0) {
 	    goto done;
 	}
 	mePtr = menuPtr->entries[index];
 	Tcl_Preserve(mePtr);
-	resultPtr = Tk_GetOptionValue(interp, (char *) mePtr,
+	resultPtr = Tk_GetOptionValue(interp, mePtr,
 		mePtr->optionTable, objv[3], menuPtr->tkwin);
 	Tcl_Release(mePtr);
 	if (resultPtr == NULL) {
 	    goto error;
 	}
@@ -800,20 +803,20 @@
 	    goto done;
 	}
 	mePtr = menuPtr->entries[index];
 	Tcl_Preserve(mePtr);
 	if (objc == 3) {
-	    resultPtr = Tk_GetOptionInfo(interp, (char *) mePtr,
+	    resultPtr = Tk_GetOptionInfo(interp, mePtr,
 		    mePtr->optionTable, NULL, menuPtr->tkwin);
 	    if (resultPtr == NULL) {
 		result = TCL_ERROR;
 	    } else {
 		result = TCL_OK;
 		Tcl_SetObjResult(interp, resultPtr);
 	    }
 	} else if (objc == 4) {
-	    resultPtr = Tk_GetOptionInfo(interp, (char *) mePtr,
+	    resultPtr = Tk_GetOptionInfo(interp, mePtr,
 		    mePtr->optionTable, objv[3], menuPtr->tkwin);
 	    if (resultPtr == NULL) {
 		result = TCL_ERROR;
 	    } else {
 		result = TCL_OK;
@@ -1526,11 +1529,11 @@
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     for (menuListPtr = menuPtr->masterMenuPtr; menuListPtr != NULL;
 	    menuListPtr = menuListPtr->nextInstancePtr) {
 	menuListPtr->errorStructPtr = ckalloc(sizeof(Tk_SavedOptions));
-	result = Tk_SetOptions(interp, (char *) menuListPtr,
+	result = Tk_SetOptions(interp, menuListPtr,
 		tsdPtr->menuOptionTable, objc, objv,
 		menuListPtr->tkwin, menuListPtr->errorStructPtr, NULL);
 	if (result != TCL_OK) {
 	    for (cleanupPtr = menuPtr->masterMenuPtr;
 		    cleanupPtr != menuListPtr;
@@ -1698,16 +1701,16 @@
      */
 
     if (mePtr->labelPtr == NULL) {
 	mePtr->labelLength = 0;
     } else {
-	(void)Tcl_GetStringFromObj(mePtr->labelPtr, &mePtr->labelLength);
+	(void)TkGetStringFromObj(mePtr->labelPtr, &mePtr->labelLength);
     }
     if (mePtr->accelPtr == NULL) {
 	mePtr->accelLength = 0;
     } else {
-	(void)Tcl_GetStringFromObj(mePtr->accelPtr, &mePtr->accelLength);
+	(void)TkGetStringFromObj(mePtr->accelPtr, &mePtr->accelLength);
     }
 
     /*
      * If this is a cascade entry, the platform-specific data of the child
      * menu has to be updated. Also, the links that point to parents and
@@ -1922,11 +1925,11 @@
 		MenuVarProc, mePtr);
     }
 
     result = TCL_OK;
     if (menuPtr->tkwin != NULL) {
-	if (Tk_SetOptions(menuPtr->interp, (char *) mePtr,
+	if (Tk_SetOptions(menuPtr->interp, mePtr,
 		mePtr->optionTable, objc, objv, menuPtr->tkwin,
 		&errorStruct, NULL) != TCL_OK) {
 	    return TCL_ERROR;
 	}
 	result = PostProcessEntry(mePtr);
@@ -2296,11 +2299,11 @@
     mePtr->onValuePtr = NULL;
     mePtr->offValuePtr = NULL;
     mePtr->entryFlags = 0;
     mePtr->index = index;
     mePtr->nextCascadePtr = NULL;
-    if (Tk_InitOptions(menuPtr->interp, (char *) mePtr,
+    if (Tk_InitOptions(menuPtr->interp, mePtr,
 	    mePtr->optionTable, menuPtr->tkwin) != TCL_OK) {
 	ckfree(mePtr);
 	return NULL;
     }
     TkMenuInitializeEntryDrawingFields(mePtr);
@@ -2493,10 +2496,26 @@
 
     	return NULL;
     }
 
     menuPtr = mePtr->menuPtr;
+
+    if (menuPtr->menuFlags & MENU_DELETION_PENDING) {
+    	return NULL;
+    }
+
+    /*
+     * See ticket [5d991b82].
+     */
+
+    if (mePtr->namePtr == NULL) {
+	Tcl_UntraceVar2(interp, name1, name2,
+		TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
+		MenuVarProc, clientData);
+	return NULL;
+     }
+
     name = Tcl_GetString(mePtr->namePtr);
 
     /*
      * If the variable is being unset, then re-establish the trace.
      */

Index: generic/tkMenu.h
==================================================================
--- generic/tkMenu.h
+++ generic/tkMenu.h
@@ -66,15 +66,15 @@
     struct TkMenu *menuPtr;	/* Menu with which this entry is
 				 * associated. */
     Tk_OptionTable optionTable;	/* Option table for this menu entry. */
     Tcl_Obj *labelPtr;		/* Main text label displayed in entry (NULL if
 				 * no label). */
-    int labelLength;		/* Number of non-NULL characters in label. */
+    TkSizeT labelLength;	/* Number of non-NULL characters in label. */
     int state;			/* State of button for display purposes:
 				 * normal, active, or disabled. */
     int underline;		/* Value of -underline option: specifies index
-				 * of character to underline (<0 means don't
+				 * of character to underline (-1 means don't
 				 * underline anything). */
     Tcl_Obj *underlinePtr;	/* Index of character to underline. */
     Tcl_Obj *bitmapPtr;		/* Bitmap to display in menu entry, or None.
 				 * If not None then label is ignored. */
     Tcl_Obj *imagePtr;		/* Name of image to display, or NULL. If not
@@ -87,11 +87,11 @@
     Tk_Image selectImage;	/* Image to display in entry when selected, or
 				 * NULL if none. Ignored if image is NULL. */
     Tcl_Obj *accelPtr;		/* Accelerator string displayed at right of
 				 * menu entry. NULL means no such accelerator.
 				 * Malloc'ed. */
-    int accelLength;		/* Number of non-NULL characters in
+    TkSizeT accelLength;	/* Number of non-NULL characters in
 				 * accelerator. */
     int indicatorOn;		/* True means draw indicator, false means
 				 * don't draw it. This field is ignored unless
 				 * the entry is a radio or check button. */
     /*
@@ -380,10 +380,11 @@
 				 * this widget to be extended. */
     Tk_SavedOptions *errorStructPtr;
 				/* We actually have to allocate these because
 				 * multiple menus get changed during one
 				 * ConfigureMenu call. */
+    Tcl_Obj *activeReliefPtr;	/* 3-d effect for active element. */
 } TkMenu;
 
 /*
  * When the toplevel configure -menu command is executed, the menu may not
  * exist yet. We need to keep a linked list of windows that reference a

Index: generic/tkMenuDraw.c
==================================================================
--- generic/tkMenuDraw.c
+++ generic/tkMenuDraw.c
@@ -622,11 +622,10 @@
     Tk_Font tkfont;
     Tk_FontMetrics menuMetrics;
     int width;
     int borderWidth;
     Tk_3DBorder border;
-    int activeBorderWidth;
     int relief;
 
 
     menuPtr->menuFlags &= ~REDRAW_PENDING;
     if ((menuPtr->tkwin == NULL) || !Tk_IsMapped(tkwin)) {
@@ -634,12 +633,10 @@
     }
 
     Tk_GetPixelsFromObj(NULL, menuPtr->tkwin, menuPtr->borderWidthPtr,
 	    &borderWidth);
     border = Tk_Get3DBorderFromObj(menuPtr->tkwin, menuPtr->borderPtr);
-    Tk_GetPixelsFromObj(NULL, menuPtr->tkwin,
-	    menuPtr->activeBorderWidthPtr, &activeBorderWidth);
 
     if (menuPtr->menuType == MENUBAR) {
 	Tk_Fill3DRectangle(tkwin, Tk_WindowId(tkwin), border, borderWidth,
 		borderWidth, Tk_Width(tkwin) - 2 * borderWidth,
 		Tk_Height(tkwin) - 2 * borderWidth, 0, TK_RELIEF_FLAT);
@@ -666,53 +663,40 @@
 		continue;
 	    }
 	}
 	mePtr->entryFlags &= ~ENTRY_NEEDS_REDISPLAY;
 
-	if (menuPtr->menuType == MENUBAR) {
-	    width = mePtr->width;
-	} else {
-	    if (mePtr->entryFlags & ENTRY_LAST_COLUMN) {
-		width = Tk_Width(menuPtr->tkwin) - mePtr->x
-			- activeBorderWidth;
-	    } else {
-		width = mePtr->width + borderWidth;
-	    }
-	}
 	TkpDrawMenuEntry(mePtr, Tk_WindowId(menuPtr->tkwin), tkfont,
-		&menuMetrics, mePtr->x, mePtr->y, width,
+		&menuMetrics, mePtr->x, mePtr->y, mePtr->width,
 		mePtr->height, strictMotif, 1);
 	if ((index > 0) && (menuPtr->menuType != MENUBAR)
 		&& mePtr->columnBreak) {
 	    mePtr = menuPtr->entries[index - 1];
 	    Tk_Fill3DRectangle(tkwin, Tk_WindowId(tkwin), border,
-		mePtr->x, mePtr->y + mePtr->height,
-		mePtr->width,
-		Tk_Height(tkwin) - mePtr->y - mePtr->height -
-		activeBorderWidth, 0,
-		TK_RELIEF_FLAT);
+		mePtr->x, mePtr->y + mePtr->height, mePtr->width,
+		Tk_Height(tkwin) - mePtr->y - mePtr->height - borderWidth,
+		0, TK_RELIEF_FLAT);
 	}
     }
 
     if (menuPtr->menuType != MENUBAR) {
 	int x, y, height;
 
 	if (menuPtr->numEntries == 0) {
 	    x = y = borderWidth;
-	    width = Tk_Width(tkwin) - 2 * activeBorderWidth;
-	    height = Tk_Height(tkwin) - 2 * activeBorderWidth;
+	    width = Tk_Width(tkwin) - 2 * borderWidth;
+	    height = Tk_Height(tkwin) - 2 * borderWidth;
 	} else {
 	    mePtr = menuPtr->entries[menuPtr->numEntries - 1];
 	    Tk_Fill3DRectangle(tkwin, Tk_WindowId(tkwin),
 		border, mePtr->x, mePtr->y + mePtr->height, mePtr->width,
-		Tk_Height(tkwin) - mePtr->y - mePtr->height
-		- activeBorderWidth, 0,
-		TK_RELIEF_FLAT);
+		Tk_Height(tkwin) - mePtr->y - mePtr->height - borderWidth,
+		0, TK_RELIEF_FLAT);
 	    x = mePtr->x + mePtr->width;
 	    y = mePtr->y + mePtr->height;
-	    width = Tk_Width(tkwin) - x - activeBorderWidth;
-	    height = Tk_Height(tkwin) - y - activeBorderWidth;
+	    width = Tk_Width(tkwin) - x - borderWidth;
+	    height = Tk_Height(tkwin) - y - borderWidth;
 	}
 	Tk_Fill3DRectangle(tkwin, Tk_WindowId(tkwin), border, x, y,
 		width, height, 0, TK_RELIEF_FLAT);
     }
 

Index: generic/tkMenubutton.c
==================================================================
--- generic/tkMenubutton.c
+++ generic/tkMenubutton.c
@@ -306,11 +306,11 @@
 
     Tk_CreateEventHandler(mbPtr->tkwin,
 	    ExposureMask|StructureNotifyMask|FocusChangeMask,
 	    MenuButtonEventProc, mbPtr);
 
-    if (Tk_InitOptions(interp, (char *) mbPtr, optionTable, tkwin) != TCL_OK) {
+    if (Tk_InitOptions(interp, mbPtr, optionTable, tkwin) != TCL_OK) {
 	Tk_DestroyWindow(mbPtr->tkwin);
 	return TCL_ERROR;
     }
 
     if (ConfigureMenuButton(interp, mbPtr, objc-2, objv+2) != TCL_OK) {
@@ -367,21 +367,21 @@
 	if (objc != 3) {
 	    Tcl_WrongNumArgs(interp, 1, objv, "cget option");
 	    goto error;
 	}
 
-	objPtr = Tk_GetOptionValue(interp, (char *) mbPtr,
+	objPtr = Tk_GetOptionValue(interp, mbPtr,
 		mbPtr->optionTable, objv[2], mbPtr->tkwin);
 	if (objPtr == NULL) {
 	    goto error;
 	}
 	Tcl_SetObjResult(interp, objPtr);
 	break;
 
     case COMMAND_CONFIGURE:
 	if (objc <= 3) {
-	    objPtr = Tk_GetOptionInfo(interp, (char *) mbPtr,
+	    objPtr = Tk_GetOptionInfo(interp, mbPtr,
 		    mbPtr->optionTable, (objc == 3) ? objv[2] : NULL,
 		    mbPtr->tkwin);
 	    if (objPtr == NULL) {
 		goto error;
 	    }
@@ -522,11 +522,11 @@
 	if (!error) {
 	    /*
 	     * First pass: set options to new values.
 	     */
 
-	    if (Tk_SetOptions(interp, (char *) mbPtr,
+	    if (Tk_SetOptions(interp, mbPtr,
 		    mbPtr->optionTable, objc, objv,
 		    mbPtr->tkwin, &savedOptions, NULL) != TCL_OK) {
 		continue;
 	    }
 	} else {
@@ -878,10 +878,23 @@
     int flags)			/* Information about what happened. */
 {
     register TkMenuButton *mbPtr = clientData;
     const char *value;
     unsigned len;
+
+    /*
+     * See ticket [5d991b82].
+     */
+
+    if (mbPtr->textVarName == NULL) {
+	if (!(flags & TCL_INTERP_DESTROYED)) {
+	    Tcl_UntraceVar2(interp, name1, name2,
+		    TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
+		    MenuButtonTextVarProc, clientData);
+	}
+	return NULL;
+    }
 
     /*
      * If the variable is unset, then immediately recreate it unless the whole
      * interpreter is going away.
      */

Index: generic/tkMessage.c
==================================================================
--- generic/tkMessage.c
+++ generic/tkMessage.c
@@ -11,12 +11,12 @@
  *
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
 
-#include "default.h"
 #include "tkInt.h"
+#include "default.h"
 
 /*
  * A data structure of the following type is kept for each message widget
  * managed by this file:
  */
@@ -240,11 +240,11 @@
      */
 
     optionTable = Tk_CreateOptionTable(interp, optionSpecs);
 
     msgPtr = ckalloc(sizeof(Message));
-    memset(msgPtr, 0, (size_t) sizeof(Message));
+    memset(msgPtr, 0, sizeof(Message));
 
     /*
      * Set values for those fields that don't take a 0 or NULL value.
      */
 
@@ -265,11 +265,11 @@
     Tk_SetClass(msgPtr->tkwin, "Message");
     Tk_SetClassProcs(msgPtr->tkwin, &messageClass, msgPtr);
     Tk_CreateEventHandler(msgPtr->tkwin,
 	    ExposureMask|StructureNotifyMask|FocusChangeMask,
 	    MessageEventProc, msgPtr);
-    if (Tk_InitOptions(interp, (char *)msgPtr, optionTable, tkwin) != TCL_OK) {
+    if (Tk_InitOptions(interp, msgPtr, optionTable, tkwin) != TCL_OK) {
 	Tk_DestroyWindow(msgPtr->tkwin);
 	return TCL_ERROR;
     }
 
     if (ConfigureMessage(interp, msgPtr, objc-2, objv+2, 0) != TCL_OK) {
@@ -329,11 +329,11 @@
     case MESSAGE_CGET:
 	if (objc != 3) {
 	    Tcl_WrongNumArgs(interp, 2, objv, "option");
 	    result = TCL_ERROR;
 	} else {
-	    objPtr = Tk_GetOptionValue(interp, (char *) msgPtr,
+	    objPtr = Tk_GetOptionValue(interp, msgPtr,
 		    msgPtr->optionTable, objv[2], msgPtr->tkwin);
 	    if (objPtr == NULL) {
 		result = TCL_ERROR;
 	    } else {
 		Tcl_SetObjResult(interp, objPtr);
@@ -341,11 +341,11 @@
 	    }
 	}
 	break;
     case MESSAGE_CONFIGURE:
 	if (objc <= 3) {
-	    objPtr = Tk_GetOptionInfo(interp, (char *) msgPtr,
+	    objPtr = Tk_GetOptionInfo(interp, msgPtr,
 		    msgPtr->optionTable, (objc == 3) ? objv[2] : NULL,
 		    msgPtr->tkwin);
 	    if (objPtr == NULL) {
 		result = TCL_ERROR;
 	    } else {
@@ -453,11 +453,11 @@
 	Tcl_UntraceVar2(interp, msgPtr->textVarName, NULL,
 		TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
 		MessageTextVarProc, msgPtr);
     }
 
-    if (Tk_SetOptions(interp, (char *) msgPtr, msgPtr->optionTable, objc, objv,
+    if (Tk_SetOptions(interp, msgPtr, msgPtr->optionTable, objc, objv,
 	    msgPtr->tkwin, &savedOptions, NULL) != TCL_OK) {
 	Tk_RestoreSavedOptions(&savedOptions);
 	return TCL_ERROR;
     }
 
@@ -835,10 +835,23 @@
     const char *name2,		/* Second part of variable name. */
     int flags)			/* Information about what happened. */
 {
     register Message *msgPtr = clientData;
     const char *value;
+
+    /*
+     * See ticket [5d991b82].
+     */
+
+    if (msgPtr->textVarName == NULL) {
+	if (!(flags & TCL_INTERP_DESTROYED)) {
+	    Tcl_UntraceVar2(interp, name1, name2,
+		    TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
+		    MessageTextVarProc, clientData);
+	}
+	return NULL;
+    }
 
     /*
      * If the variable is unset, then immediately recreate it unless the whole
      * interpreter is going away.
      */

Index: generic/tkObj.c
==================================================================
--- generic/tkObj.c
+++ generic/tkObj.c
@@ -71,12 +71,16 @@
  */
 
 typedef struct WindowRep {
     Tk_Window tkwin;		/* Cached window; NULL if not found. */
     TkMainInfo *mainPtr;	/* MainWindow associated with tkwin. */
-    long epoch;			/* Value of mainPtr->deletionEpoch at last
+#if TCL_MAJOR_VERSION > 8
+    size_t epoch;			/* Value of mainPtr->deletionEpoch at last
 				 * successful lookup. */
+#else
+    long epoch;
+#endif
 } WindowRep;
 
 /*
  * Prototypes for functions defined later in this file:
  */
@@ -102,11 +106,11 @@
 static const Tcl_ObjType pixelObjType = {
     "pixel",			/* name */
     FreePixelInternalRep,	/* freeIntRepProc */
     DupPixelInternalRep,	/* dupIntRepProc */
     NULL,			/* updateStringProc */
-    SetPixelFromAny		/* setFromAnyProc */
+    NULL			/* setFromAnyProc */
 };
 
 /*
  * The following structure defines the implementation of the "pixel" Tcl
  * object, used for measuring distances. The pixel object remembers its
@@ -116,11 +120,11 @@
 static const Tcl_ObjType mmObjType = {
     "mm",			/* name */
     FreeMMInternalRep,		/* freeIntRepProc */
     DupMMInternalRep,		/* dupIntRepProc */
     UpdateStringOfMM,		/* updateStringProc */
-    SetMMFromAny		/* setFromAnyProc */
+    NULL			/* setFromAnyProc */
 };
 
 /*
  * The following structure defines the implementation of the "window"
  * Tcl object.
@@ -129,11 +133,11 @@
 static const Tcl_ObjType windowObjType = {
     "window",			/* name */
     FreeWindowInternalRep,	/* freeIntRepProc */
     DupWindowInternalRep,	/* dupIntRepProc */
     NULL,			/* updateStringProc */
-    SetWindowFromAny		/* setFromAnyProc */
+    NULL			/* setFromAnyProc */
 };
 
 /*
  *----------------------------------------------------------------------
  *
@@ -151,12 +155,23 @@
 {
     ThreadSpecificData *tsdPtr =
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
     if (tsdPtr->doubleTypePtr == NULL) {
-	tsdPtr->doubleTypePtr = Tcl_GetObjType("double");
-	tsdPtr->intTypePtr = Tcl_GetObjType("int");
+	/* Smart initialization of doubleTypePtr/intTypePtr without
+	 * hash-table lookup or creating complete Tcl_Obj's */
+	Tcl_Obj obj;
+	obj.length = 3;
+	obj.bytes = (char *)"0.0";
+	obj.typePtr = NULL;
+	Tcl_GetDoubleFromObj(NULL, &obj, &obj.internalRep.doubleValue);
+	tsdPtr->doubleTypePtr = obj.typePtr;
+	obj.bytes += 2;
+	obj.length = 1;
+	obj.typePtr = NULL;
+	Tcl_GetLongFromObj(NULL, &obj, &obj.internalRep.longValue);
+	tsdPtr->intTypePtr = obj.typePtr;
     }
     return tsdPtr;
 }
 
 /*
@@ -655,20 +670,20 @@
 UpdateStringOfMM(
     register Tcl_Obj *objPtr)   /* pixel obj with string rep to update. */
 {
     MMRep *mmPtr;
     char buffer[TCL_DOUBLE_SPACE];
-    register int len;
+    size_t len;
 
     mmPtr = objPtr->internalRep.twoPtrValue.ptr1;
     /* assert( mmPtr->units == -1 && objPtr->bytes == NULL ); */
     if ((mmPtr->units != -1) || (objPtr->bytes != NULL)) {
 	Tcl_Panic("UpdateStringOfMM: false precondition");
     }
 
     Tcl_PrintDouble(NULL, mmPtr->value, buffer);
-    len = (int)strlen(buffer);
+    len = strlen(buffer);
 
     objPtr->bytes = ckalloc(len + 1);
     strcpy(objPtr->bytes, buffer);
     objPtr->length = len;
 }
@@ -879,11 +894,11 @@
 
     /*
      * Free the old internalRep before setting the new one.
      */
 
-    (void)Tcl_GetString(objPtr);
+    Tcl_GetString(objPtr);
     typePtr = objPtr->typePtr;
     if ((typePtr != NULL) && (typePtr->freeIntRepProc != NULL)) {
 	typePtr->freeIntRepProc(objPtr);
     }
 
@@ -1110,11 +1125,11 @@
  *
  * Results:
  *	None
  *
  * Side effects:
- *	All instances of Tcl_ObjType structues used in Tk are registered with
+ *	All instances of Tcl_ObjType structures used in Tk are registered with
  *	Tcl.
  *
  *----------------------------------------------------------------------
  */
 

Index: generic/tkOldConfig.c
==================================================================
--- generic/tkOldConfig.c
+++ generic/tkOldConfig.c
@@ -23,24 +23,28 @@
  *			Tk_Uid's.
  */
 
 #define INIT		0x20
 
+#ifndef TK_CONFIG_OPTION_SPECIFIED
+#  define TK_CONFIG_OPTION_SPECIFIED      (1 << 4)
+#endif
+
 /*
  * Forward declarations for functions defined later in this file:
  */
 
 static int		DoConfig(Tcl_Interp *interp, Tk_Window tkwin,
 			    Tk_ConfigSpec *specPtr, Tk_Uid value,
-			    int valueIsUid, char *widgRec);
+			    int valueIsUid, void *widgRec);
 static Tk_ConfigSpec *	FindConfigSpec(Tcl_Interp *interp,
 			    Tk_ConfigSpec *specs, const char *argvName,
 			    int needFlags, int hateFlags);
 static char *		FormatConfigInfo(Tcl_Interp *interp, Tk_Window tkwin,
-			    const Tk_ConfigSpec *specPtr, char *widgRec);
+			    const Tk_ConfigSpec *specPtr, void *widgRec);
 static const char *	FormatConfigValue(Tcl_Interp *interp, Tk_Window tkwin,
-			    const Tk_ConfigSpec *specPtr, char *widgRec,
+			    const Tk_ConfigSpec *specPtr, void *widgRec,
 			    char *buffer, Tcl_FreeProc **freeProcPtr);
 static Tk_ConfigSpec *	GetCachedSpecs(Tcl_Interp *interp,
 			    const Tk_ConfigSpec *staticSpecs);
 static void		DeleteSpecCacheTable(ClientData clientData,
 			    Tcl_Interp *interp);
@@ -338,24 +342,24 @@
 				 * X resources). */
     Tk_ConfigSpec *specPtr,	/* Specifier to apply. */
     Tk_Uid value,		/* Value to use to fill in widgRec. */
     int valueIsUid,		/* Non-zero means value is a Tk_Uid; zero
 				 * means it's an ordinary string. */
-    char *widgRec)		/* Record whose fields are to be modified.
+    void *widgRec)		/* Record whose fields are to be modified.
 				 * Values must be properly initialized. */
 {
-    char *ptr;
+    void *ptr;
     Tk_Uid uid;
     int nullValue;
 
     nullValue = 0;
     if ((*value == 0) && (specPtr->specFlags & TK_CONFIG_NULL_OK)) {
 	nullValue = 1;
     }
 
     do {
-	ptr = widgRec + specPtr->offset;
+	ptr = (char *)widgRec + specPtr->offset;
 	switch (specPtr->type) {
 	case TK_CONFIG_BOOLEAN:
 	    if (Tcl_GetBoolean(interp, value, (int *) ptr) != TCL_OK) {
 		return TCL_ERROR;
 	    }
@@ -687,11 +691,11 @@
 				 * floating-point precision. */
     Tk_Window tkwin,		/* Window corresponding to widget. */
     register const Tk_ConfigSpec *specPtr,
 				/* Pointer to information describing
 				 * option. */
-    char *widgRec)		/* Pointer to record holding current values of
+    void *widgRec)		/* Pointer to record holding current values of
 				 * info for widget. */
 {
     const char *argv[6];
     char *result;
     char buffer[200];
@@ -753,22 +757,23 @@
 FormatConfigValue(
     Tcl_Interp *interp,		/* Interpreter for use in real conversions. */
     Tk_Window tkwin,		/* Window corresponding to widget. */
     const Tk_ConfigSpec *specPtr, /* Pointer to information describing option.
 				 * Must not point to a synonym option. */
-    char *widgRec,		/* Pointer to record holding current values of
+    void *widgRec,		/* Pointer to record holding current values of
 				 * info for widget. */
     char *buffer,		/* Static buffer to use for small values.
 				 * Must have at least 200 bytes of storage. */
     Tcl_FreeProc **freeProcPtr)	/* Pointer to word to fill in with address of
 				 * function to free the result, or NULL if
 				 * result is static. */
 {
-    const char *ptr, *result;
+    void *ptr;
+    const char *result;
 
     *freeProcPtr = NULL;
-    ptr = widgRec + specPtr->offset;
+    ptr = (char *)widgRec + specPtr->offset;
     result = "";
     switch (specPtr->type) {
     case TK_CONFIG_BOOLEAN:
 	if (*((int *) ptr) == 0) {
 	    result = "0";

Index: generic/tkOldTest.c
==================================================================
--- generic/tkOldTest.c
+++ generic/tkOldTest.c
@@ -170,13 +170,13 @@
     timPtr = ckalloc(sizeof(TImageMaster));
     timPtr->master = master;
     timPtr->interp = interp;
     timPtr->width = 30;
     timPtr->height = 15;
-    timPtr->imageName = ckalloc((unsigned) (strlen(name) + 1));
+    timPtr->imageName = ckalloc(strlen(name) + 1);
     strcpy(timPtr->imageName, name);
-    timPtr->varName = ckalloc((unsigned) (strlen(varName) + 1));
+    timPtr->varName = ckalloc(strlen(varName) + 1);
     strcpy(timPtr->varName, varName);
     Tcl_CreateObjCommand(interp, name, ImageObjCmd, timPtr, NULL);
     *clientDataPtr = timPtr;
     Tk_ImageChanged(master, 0, 0, 30, 15, 30, 15);
     return TCL_OK;

Index: generic/tkOption.c
==================================================================
--- generic/tkOption.c
+++ generic/tkOption.c
@@ -258,11 +258,11 @@
     register Element *elPtr;
     Element newEl;
     register const char *p;
     const char *field;
     int count, firstField;
-    ptrdiff_t length;
+    size_t length;
 #define TMP_SIZE 100
     char tmp[TMP_SIZE+1];
     ThreadSpecificData *tsdPtr =
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
 
@@ -309,11 +309,11 @@
 	}
 	length = p - field;
 	if (length > TMP_SIZE) {
 	    length = TMP_SIZE;
 	}
-	strncpy(tmp, field, (size_t) length);
+	strncpy(tmp, field, length);
 	tmp[length] = 0;
 	newEl.nameUid = Tk_GetUid(tmp);
 	if (isupper(UCHAR(*field))) {
 	    newEl.flags |= CLASS;
 	}
@@ -1079,11 +1079,12 @@
 				 * TK_INTERACTIVE_PRIO. Must be between 0 and
 				 * TK_MAX_PRIO. */
 {
     const char *realName;
     Tcl_Obj *buffer;
-    int result, bufferSize;
+    int result;
+    size_t bufferSize;
     Tcl_Channel chan;
     Tcl_DString newName;
 
     /*
      * Prevent file system access in a safe interpreter.
@@ -1110,11 +1111,11 @@
 
     buffer = Tcl_NewObj();
     Tcl_IncrRefCount(buffer);
     Tcl_SetChannelOption(NULL, chan, "-encoding", "utf-8");
     bufferSize = Tcl_ReadChars(chan, buffer, -1, 0);
-    if (bufferSize < 0) {
+    if (bufferSize == (size_t)-1) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		"error reading file \"%s\": %s",
 		fileName, Tcl_PosixError(interp)));
 	Tcl_Close(NULL, chan);
 	return TCL_ERROR;

Index: generic/tkPack.c
==================================================================
--- generic/tkPack.c
+++ generic/tkPack.c
@@ -120,12 +120,14 @@
 static void		ArrangePacking(ClientData clientData);
 static int		ConfigureSlaves(Tcl_Interp *interp, Tk_Window tkwin,
 			    int objc, Tcl_Obj *const objv[]);
 static void		DestroyPacker(void *memPtr);
 static Packer *		GetPacker(Tk_Window tkwin);
+#ifndef TK_NO_DEPRECATED
 static int		PackAfter(Tcl_Interp *interp, Packer *prevPtr,
 			    Packer *masterPtr, int objc,Tcl_Obj *const objv[]);
+#endif /* !TK_NO_DEPRECATED */
 static void		PackStructureProc(ClientData clientData,
 			    XEvent *eventPtr);
 static void		Unlink(Packer *packPtr);
 static int		XExpansion(Packer *slavePtr, int cavityWidth);
 static int		YExpansion(Packer *slavePtr, int cavityHeight);
@@ -195,15 +197,18 @@
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
     Tk_Window tkwin = clientData;
     const char *argv2;
     static const char *const optionStrings[] = {
-	/* after, append, before and unpack are deprecated */
+#ifndef TK_NO_DEPRECATED
 	"after", "append", "before", "unpack",
+#endif /* !TK_NO_DEPRECATED */
 	"configure", "forget", "info", "propagate", "slaves", NULL };
     enum options {
+#ifndef TK_NO_DEPRECATED
 	PACK_AFTER, PACK_APPEND, PACK_BEFORE, PACK_UNPACK,
+#endif /* !TK_NO_DEPRECATED */
 	PACK_CONFIGURE, PACK_FORGET, PACK_INFO, PACK_PROPAGATE, PACK_SLAVES };
     int index;
 
     if (objc >= 2) {
 	const char *string = Tcl_GetString(objv[1]);
@@ -217,24 +222,27 @@
 	return TCL_ERROR;
     }
 
     if (Tcl_GetIndexFromObjStruct(interp, objv[1], optionStrings,
 	    sizeof(char *), "option", 0, &index) != TCL_OK) {
+#ifndef TK_NO_DEPRECATED
 	/*
 	 * Call it again without the deprecated ones to get a proper error
 	 * message. This works well since there can't be any ambiguity between
 	 * deprecated and new options.
 	 */
 
 	Tcl_ResetResult(interp);
 	Tcl_GetIndexFromObjStruct(interp, objv[1], &optionStrings[4],
 		sizeof(char *), "option", 0, &index);
+#endif /* TK_NO_DEPRECATED */
 	return TCL_ERROR;
     }
 
     argv2 = Tcl_GetString(objv[2]);
     switch ((enum options) index) {
+#ifndef TK_NO_DEPRECATED
     case PACK_AFTER: {
 	Packer *prevPtr;
 	Tk_Window tkwin2;
 
 	if (TkGetWindowFromObj(interp, tkwin, objv[2], &tkwin2) != TCL_OK) {
@@ -295,10 +303,11 @@
 		}
 	    }
 	}
 	return PackAfter(interp, prevPtr, masterPtr, objc-3, objv+3);
     }
+#endif /* !TK_NO_DEPRECATED */
     case PACK_CONFIGURE:
 	if (argv2[0] != '.') {
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "bad argument \"%s\": must be name of window", argv2));
 	    Tcl_SetErrorCode(interp, "TK", "VALUE", "WINDOW_PATH", NULL);
@@ -456,10 +465,11 @@
 		    TkNewWindowObj(slavePtr->tkwin));
 	}
 	Tcl_SetObjResult(interp, resultObj);
 	break;
     }
+#ifndef TK_NO_DEPRECATED
     case PACK_UNPACK: {
 	Tk_Window tkwin2;
 	Packer *packPtr;
 
 	if (objc != 3) {
@@ -479,10 +489,11 @@
 	    Unlink(packPtr);
 	    Tk_UnmapWindow(packPtr->tkwin);
 	}
 	break;
     }
+#endif /* !TK_NO_DEPRECATED */
     }
 
     return TCL_OK;
 }
 
@@ -597,19 +608,16 @@
     int maxWidth, maxHeight, tmp;
 
     masterPtr->flags &= ~REQUESTED_REPACK;
 
     /*
-     * If the master has no slaves anymore, then don't do anything at all:
-     * just leave the master's size as-is, but signal the master with the
-     * <<GeometryManager>> virtual event.
+     * If the master has no slaves anymore, then leave the master's size as-is.
      * Otherwise there is no way to "relinquish" control over the master
      * so another geometry manager can take over.
      */
 
     if (masterPtr->slavePtr == NULL) {
-        TkSendVirtualEvent(masterPtr->tkwin, "GeometryManager", NULL);
 	return;
     }
 
     /*
      * Abort any nested call to ArrangePacking for this window, since we'll do
@@ -1089,10 +1097,11 @@
  *	in the future.
  *
  *------------------------------------------------------------------------
  */
 
+#ifndef TK_NO_DEPRECATED
 static int
 PackAfter(
     Tcl_Interp *interp,		/* Interpreter for error reporting. */
     Packer *prevPtr,		/* Pack windows in argv just after this
 				 * window; NULL means pack as first child of
@@ -1171,12 +1180,12 @@
 	packPtr->iPadX = packPtr->iPadY = 0;
 	packPtr->flags &= ~(FILLX|FILLY|EXPAND);
 	packPtr->flags |= OLD_STYLE;
 	for (index = 0 ; index < optionCount; index++) {
 	    Tcl_Obj *curOptPtr = options[index];
-	    const char *curOpt = Tcl_GetString(curOptPtr);
-	    size_t length = curOptPtr->length;
+	    size_t length;
+	    const char *curOpt = TkGetStringFromObj(curOptPtr, &length);
 
 	    c = curOpt[0];
 
 	    if ((c == 't')
 		    && (strncmp(curOpt, "top", length)) == 0) {
@@ -1309,10 +1318,11 @@
 	masterPtr->flags |= REQUESTED_REPACK;
 	Tcl_DoWhenIdle(ArrangePacking, masterPtr);
     }
     return TCL_OK;
 }
+#endif /* !TK_NO_DEPRECATED */
 
 /*
  *----------------------------------------------------------------------
  *
  * Unlink --
@@ -1362,15 +1372,19 @@
     packPtr->masterPtr = NULL;
 
     /*
      * If we have emptied this master from slaves it means we are no longer
      * handling it and should mark it as free.
+     *
+     * Send the event "NoManagedChild" to the master to inform it about there
+     * being no managed children inside it.
      */
 
-    if (masterPtr->slavePtr == NULL && masterPtr->flags & ALLOCED_MASTER) {
+    if ((masterPtr->slavePtr == NULL) && (masterPtr->flags & ALLOCED_MASTER)) {
 	TkFreeGeometryMaster(masterPtr->tkwin, "pack");
 	masterPtr->flags &= ~ALLOCED_MASTER;
+	TkSendVirtualEvent(masterPtr->tkwin, "NoManagedChild", NULL);
     }
 
 }
 
 /*

Index: generic/tkPanedWindow.c
==================================================================
--- generic/tkPanedWindow.c
+++ generic/tkPanedWindow.c
@@ -11,12 +11,12 @@
  *
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
 
-#include "default.h"
 #include "tkInt.h"
+#include "default.h"
 
 /*
  * Flag values for "sticky"ness. The 16 combinations subsume the packer's
  * notion of anchor and fill.
  *
@@ -234,11 +234,11 @@
 static void		AdjustForSticky(int sticky, int cavityWidth,
 			    int cavityHeight, int *xPtr, int *yPtr,
 			    int *slaveWidthPtr, int *slaveHeightPtr);
 static void		MoveSash(PanedWindow *pwPtr, int sash, int diff);
 static int		ObjectIsEmpty(Tcl_Obj *objPtr);
-static char *		ComputeSlotAddress(char *recordPtr, int offset);
+static void *	ComputeSlotAddress(void *recordPtr, int offset);
 static int		PanedWindowIdentifyCoords(PanedWindow *pwPtr,
 			    Tcl_Interp *interp, int x, int y);
 
 /*
  * Sashes are between panes only, so there is one less sash than slaves
@@ -457,11 +457,11 @@
      * otherwise Tk might free it while we still need it.
      */
 
     Tcl_Preserve(pwPtr->tkwin);
 
-    if (Tk_InitOptions(interp, (char *) pwPtr, pwOpts->pwOptions,
+    if (Tk_InitOptions(interp, pwPtr, pwOpts->pwOptions,
 	    tkwin) != TCL_OK) {
 	Tk_DestroyWindow(pwPtr->tkwin);
 	return TCL_ERROR;
     }
 
@@ -576,11 +576,11 @@
 	if (objc != 3) {
 	    Tcl_WrongNumArgs(interp, 2, objv, "option");
 	    result = TCL_ERROR;
 	    break;
 	}
-	resultObj = Tk_GetOptionValue(interp, (char *) pwPtr,
+	resultObj = Tk_GetOptionValue(interp, pwPtr,
 		pwPtr->optionTable, objv[2], pwPtr->tkwin);
 	if (resultObj == NULL) {
 	    result = TCL_ERROR;
 	} else {
 	    Tcl_SetObjResult(interp, resultObj);
@@ -588,11 +588,11 @@
 	break;
 
     case PW_CONFIGURE:
 	resultObj = NULL;
 	if (objc <= 3) {
-	    resultObj = Tk_GetOptionInfo(interp, (char *) pwPtr,
+	    resultObj = Tk_GetOptionInfo(interp, pwPtr,
 		    pwPtr->optionTable,
 		    (objc == 3) ? objv[2] : NULL, pwPtr->tkwin);
 	    if (resultObj == NULL) {
 		result = TCL_ERROR;
 	    } else {
@@ -667,11 +667,11 @@
 	}
 	resultObj = NULL;
 	for (i = 0; i < pwPtr->numSlaves; i++) {
 	    if (pwPtr->slaves[i]->tkwin == tkwin) {
 		resultObj = Tk_GetOptionValue(interp,
-			(char *) pwPtr->slaves[i], pwPtr->slaveOpts,
+			pwPtr->slaves[i], pwPtr->slaveOpts,
 			objv[3], tkwin);
 	    }
 	}
 	if (resultObj == NULL) {
 	    if (i == pwPtr->numSlaves) {
@@ -707,11 +707,11 @@
                 break;
             }
 	    for (i = 0; i < pwPtr->numSlaves; i++) {
 		if (pwPtr->slaves[i]->tkwin == tkwin) {
 		    resultObj = Tk_GetOptionInfo(interp,
-			    (char *) pwPtr->slaves[i], pwPtr->slaveOpts,
+			    pwPtr->slaves[i], pwPtr->slaveOpts,
 			    (objc == 4) ? objv[3] : NULL,
 			    pwPtr->tkwin);
 		    if (resultObj == NULL) {
 			result = TCL_ERROR;
 		    } else {
@@ -846,11 +846,11 @@
      * return from Tk_SetOptions once, here, so we can save a little bit of
      * extra testing in the for loop below.
      */
 
     memset((void *)&options, 0, sizeof(Slave));
-    if (Tk_SetOptions(interp, (char *) &options, pwPtr->slaveOpts,
+    if (Tk_SetOptions(interp, &options, pwPtr->slaveOpts,
 	    objc - firstOptionArg, objv + firstOptionArg,
 	    pwPtr->tkwin, NULL, NULL) != TCL_OK) {
 	return TCL_ERROR;
     }
 
@@ -923,11 +923,11 @@
 		pwPtr->tkwin);
 
 	found = 0;
 	for (j = 0; j < pwPtr->numSlaves; j++) {
 	    if (pwPtr->slaves[j] != NULL && pwPtr->slaves[j]->tkwin == tkwin) {
-		Tk_SetOptions(interp, (char *) pwPtr->slaves[j],
+		Tk_SetOptions(interp, pwPtr->slaves[j],
 			pwPtr->slaveOpts, objc - firstOptionArg,
 			objv + firstOptionArg, pwPtr->tkwin, NULL, NULL);
 		if (pwPtr->slaves[j]->minSize < 0) {
 		    pwPtr->slaves[j]->minSize = 0;
 		}
@@ -970,13 +970,13 @@
 	 * out with their "natural" dimensions.
 	 */
 
 	slavePtr = ckalloc(sizeof(Slave));
 	memset(slavePtr, 0, sizeof(Slave));
-	Tk_InitOptions(interp, (char *)slavePtr, pwPtr->slaveOpts,
+	Tk_InitOptions(interp, slavePtr, pwPtr->slaveOpts,
 		pwPtr->tkwin);
-	Tk_SetOptions(interp, (char *)slavePtr, pwPtr->slaveOpts,
+	Tk_SetOptions(interp, slavePtr, pwPtr->slaveOpts,
 		objc - firstOptionArg, objv + firstOptionArg,
 		pwPtr->tkwin, NULL, NULL);
 	slavePtr->tkwin = tkwin;
 	slavePtr->masterPtr = pwPtr;
 	doubleBw = 2 * Tk_Changes(slavePtr->tkwin)->border_width;
@@ -1247,11 +1247,11 @@
     Tcl_Obj *const objv[])	/* Argument values. */
 {
     Tk_SavedOptions savedOptions;
     int typemask = 0;
 
-    if (Tk_SetOptions(interp, (char *) pwPtr, pwPtr->optionTable, objc, objv,
+    if (Tk_SetOptions(interp, pwPtr, pwPtr->optionTable, objc, objv,
 	    pwPtr->tkwin, &savedOptions, &typemask) != TCL_OK) {
 	Tk_RestoreSavedOptions(&savedOptions);
 	return TCL_ERROR;
     }
 
@@ -1482,14 +1482,14 @@
      * Set up boilerplate geometry values for sashes (width, height, common
      * coordinates).
      */
 
     if (horizontal) {
-	sashHeight = Tk_Height(tkwin) - (2 * Tk_InternalBorderWidth(tkwin));
+	sashHeight = Tk_Height(tkwin) - (2 * Tk_InternalBorderLeft(tkwin));
 	sashWidth = pwPtr->sashWidth;
     } else {
-	sashWidth = Tk_Width(tkwin) - (2 * Tk_InternalBorderWidth(tkwin));
+	sashWidth = Tk_Width(tkwin) - (2 * Tk_InternalBorderLeft(tkwin));
 	sashHeight = pwPtr->sashWidth;
     }
 
     /*
      * Draw the sashes.
@@ -1752,11 +1752,11 @@
     /*
      * First pass; compute sizes
      */
 
     paneDynSize = paneDynMinSize = 0;
-    internalBW = Tk_InternalBorderWidth(pwPtr->tkwin);
+    internalBW = Tk_InternalBorderLeft(pwPtr->tkwin);
     pwHeight = Tk_Height(pwPtr->tkwin) - (2 * internalBW);
     pwWidth = Tk_Width(pwPtr->tkwin) - (2 * internalBW);
     x = y = internalBW;
     stretchReserve = (horizontal ? pwWidth : pwHeight);
 
@@ -1787,14 +1787,22 @@
 	 * Compute the total size needed by all the slaves and the left-over,
 	 * or shortage of space available.
 	 */
 
 	if (horizontal) {
-	    paneSize = slavePtr->paneWidth;
+            if (slavePtr->width > 0) {
+                paneSize = slavePtr->width;
+            } else {
+                paneSize = slavePtr->paneWidth;
+            }
 	    stretchReserve -= paneSize + (2 * slavePtr->padx);
 	} else {
-	    paneSize = slavePtr->paneHeight;
+            if (slavePtr->height > 0) {
+                paneSize = slavePtr->height;
+            } else {
+                paneSize = slavePtr->paneHeight;
+            }
 	    stretchReserve -= paneSize + (2 * slavePtr->pady);
 	}
 	if (IsStretchable(slavePtr->stretch,i,first,last)
 		&& Tk_IsMapped(pwPtr->tkwin)) {
 	    paneDynSize += paneSize;
@@ -1840,14 +1848,22 @@
 	/*
 	 * Calculate pane width and height.
 	 */
 
 	if (horizontal) {
-	    paneSize = slavePtr->paneWidth;
+            if (slavePtr->width > 0) {
+                paneSize = slavePtr->width;
+            } else {
+                paneSize = slavePtr->paneWidth;
+            }
 	    pwSize = pwWidth;
 	} else {
-	    paneSize = slavePtr->paneHeight;
+            if (slavePtr->height > 0) {
+                paneSize = slavePtr->height;
+            } else {
+                paneSize = slavePtr->paneHeight;
+            }
 	    pwSize = pwHeight;
 	}
 	if (IsStretchable(slavePtr->stretch, i, first, last)) {
 	    double frac;
 
@@ -2182,11 +2198,11 @@
     Slave *slavePtr;
     const int horizontal = (pwPtr->orient == ORIENT_HORIZONTAL);
 
     pwPtr->flags |= REQUESTED_RELAYOUT;
 
-    x = y = internalBw = Tk_InternalBorderWidth(pwPtr->tkwin);
+    x = y = internalBw = Tk_InternalBorderLeft(pwPtr->tkwin);
     reqWidth = reqHeight = 0;
 
     /*
      * Sashes and handles share space on the display. To simplify processing
      * below, precompute the x and y offsets of the handles and sashes within
@@ -2437,11 +2453,12 @@
 				 * internal value is to be stored. */
     char *oldInternalPtr,	/* Pointer to storage for the old value. */
     int flags)			/* Flags for the option, set Tk_SetOptions. */
 {
     int sticky = 0;
-    char c, *internalPtr;
+    char c;
+    void *internalPtr;
     const char *string;
 
     internalPtr = ComputeSlotAddress(recordPtr, internalOffset);
 
     if (flags & TK_OPTION_NULL_OK && ObjectIsEmpty(*value)) {
@@ -2888,35 +2905,35 @@
 
 	if (Tcl_GetIntFromObj(interp, objv[4], &y) != TCL_OK) {
 	    return TCL_ERROR;
 	}
 
-        internalBW = Tk_InternalBorderWidth(pwPtr->tkwin);
+        internalBW = Tk_InternalBorderLeft(pwPtr->tkwin);
 	if (pwPtr->orient == ORIENT_HORIZONTAL) {
 	    if (x < 0) {
 		x = 0;
 	    }
             pwWidth = Tk_Width(pwPtr->tkwin) - (2 * internalBW);
             if (x > pwWidth) {
                 x = pwWidth;
             }
-            y = Tk_InternalBorderWidth(pwPtr->tkwin);
+            y = Tk_InternalBorderLeft(pwPtr->tkwin);
 	    sashWidth = pwPtr->sashWidth;
 	    sashHeight = Tk_Height(pwPtr->tkwin) -
-		    (2 * Tk_InternalBorderWidth(pwPtr->tkwin));
+		    (2 * Tk_InternalBorderLeft(pwPtr->tkwin));
 	} else {
 	    if (y < 0) {
 		y = 0;
 	    }
             pwHeight = Tk_Height(pwPtr->tkwin) - (2 * internalBW);
             if (y > pwHeight) {
                 y = pwHeight;
             }
-	    x = Tk_InternalBorderWidth(pwPtr->tkwin);
+	    x = Tk_InternalBorderLeft(pwPtr->tkwin);
 	    sashHeight = pwPtr->sashWidth;
 	    sashWidth = Tk_Width(pwPtr->tkwin) -
-		    (2 * Tk_InternalBorderWidth(pwPtr->tkwin));
+		    (2 * Tk_InternalBorderLeft(pwPtr->tkwin));
 	}
 
 	if (sashWidth < 1) {
 	    sashWidth = 1;
 	}
@@ -2974,20 +2991,17 @@
 
 static int
 ObjectIsEmpty(
     Tcl_Obj *objPtr)		/* Object to test. May be NULL. */
 {
-    int length;
-
     if (objPtr == NULL) {
 	return 1;
     }
-    if (objPtr->bytes != NULL) {
-	return (objPtr->length == 0);
+    if (objPtr->bytes == NULL) {
+	Tcl_GetString(objPtr);
     }
-    (void)Tcl_GetStringFromObj(objPtr, &length);
-    return (length == 0);
+    return (objPtr->length == 0);
 }
 
 /*
  *----------------------------------------------------------------------
  *
@@ -3004,17 +3018,17 @@
  *	None.
  *
  *----------------------------------------------------------------------
  */
 
-static char *
+static void *
 ComputeSlotAddress(
-    char *recordPtr,	/* Pointer to the start of a record. */
+    void *recordPtr,	/* Pointer to the start of a record. */
     int offset)		/* Offset of a slot within that record; may be < 0. */
 {
     if (offset >= 0) {
-	return recordPtr + offset;
+	return (char *)recordPtr + offset;
     } else {
 	return NULL;
     }
 }
 
@@ -3051,11 +3065,11 @@
 	if (Tk_IsMapped(pwPtr->tkwin)) {
 	    sashHeight = Tk_Height(pwPtr->tkwin);
 	} else {
 	    sashHeight = Tk_ReqHeight(pwPtr->tkwin);
 	}
-	sashHeight -= 2 * Tk_InternalBorderWidth(pwPtr->tkwin);
+	sashHeight -= 2 * Tk_InternalBorderLeft(pwPtr->tkwin);
 	if (pwPtr->showHandle && pwPtr->handleSize > pwPtr->sashWidth) {
 	    sashWidth = pwPtr->handleSize;
 	    lpad = (pwPtr->handleSize - pwPtr->sashWidth) / 2;
 	    rpad = pwPtr->handleSize - lpad;
 	    lpad += pwPtr->sashPad;
@@ -3079,11 +3093,11 @@
 	if (Tk_IsMapped(pwPtr->tkwin)) {
 	    sashWidth = Tk_Width(pwPtr->tkwin);
 	} else {
 	    sashWidth = Tk_ReqWidth(pwPtr->tkwin);
 	}
-	sashWidth -= 2 * Tk_InternalBorderWidth(pwPtr->tkwin);
+	sashWidth -= 2 * Tk_InternalBorderLeft(pwPtr->tkwin);
 	lpad = rpad = 0;
     }
 
     GetFirstLastVisiblePane(pwPtr, &first, &last);
     isHandle = 0;

Index: generic/tkPlace.c
==================================================================
--- generic/tkPlace.c
+++ generic/tkPlace.c
@@ -288,11 +288,11 @@
 
 	    slavePtr = FindSlave(tkwin);
 	    if (slavePtr == NULL) {
 		return TCL_OK;
 	    }
-	    objPtr = Tk_GetOptionInfo(interp, (char *) slavePtr, optionTable,
+	    objPtr = Tk_GetOptionInfo(interp, slavePtr, optionTable,
 		    (objc == 4) ? objv[3] : NULL, tkwin);
 	    if (objPtr == NULL) {
 		return TCL_ERROR;
 	    }
 	    Tcl_SetObjResult(interp, objPtr);
@@ -626,11 +626,11 @@
 	return TCL_ERROR;
     }
 
     slavePtr = CreateSlave(tkwin, table);
 
-    if (Tk_SetOptions(interp, (char *) slavePtr, table, objc, objv,
+    if (Tk_SetOptions(interp, slavePtr, table, objc, objv,
 	    slavePtr->tkwin, &savedOptions, &mask) != TCL_OK) {
 	goto error;
     }
 
     /*

Index: generic/tkRectOval.c
==================================================================
--- generic/tkRectOval.c
+++ generic/tkRectOval.c
@@ -757,15 +757,107 @@
 
     Tk_CanvasDrawableCoords(canvas, rectOvalPtr->bbox[0],rectOvalPtr->bbox[1],
 	    &x1, &y1);
     Tk_CanvasDrawableCoords(canvas, rectOvalPtr->bbox[2],rectOvalPtr->bbox[3],
 	    &x2, &y2);
-    if (x2 <= x1) {
-	x2 = x1+1;
+    if (x2 == x1) {
+
+        /*
+         * The width of the bounding box corresponds to less than one pixel
+         * on screen. Adjustment is needed to avoid drawing attempts with zero
+         * width items (which would draw nothing). The bounding box spans
+         * either 1 or 2 pixels. Select which pixel will be drawn.
+         */
+
+        short ix1 = (short) (rectOvalPtr->bbox[0]);
+        short ix2 = (short) (rectOvalPtr->bbox[2]);
+
+        if (ix1 == ix2) {
+
+            /*
+             * x1 and x2 are "within the same pixel". Use this pixel.
+             * Note: the degenerated case (bbox[0]==bbox[2]) of a completely
+             * flat box results in arbitrary selection of the pixel at the
+             * right (with positive coordinate) or left (with negative
+             * coordinate) of the box. There is no "best choice" here.
+             */
+
+            if (ix1 > 0) {
+                x2 += 1;
+            } else {
+                x1 -= 1;
+            }
+        } else {
+
+            /*
+             * (x1,x2) span two pixels. Select the one with the larger
+             * covered "area".
+             */
+
+            if (ix1 > 0) {
+                if ((rectOvalPtr->bbox[2] - ix2) > (ix2 - rectOvalPtr->bbox[0])) {
+                    x2 += 1;
+                } else {
+                    x1 -= 1;
+                }
+            } else {
+                if ((rectOvalPtr->bbox[2] - ix1) > (ix1 - rectOvalPtr->bbox[0])) {
+                    x2 += 1;
+                } else {
+                    x1 -= 1;
+                }
+            }
+        }
     }
-    if (y2 <= y1) {
-	y2 = y1+1;
+    if (y2 == y1) {
+
+        /*
+         * The height of the bounding box corresponds to less than one pixel
+         * on screen. Adjustment is needed to avoid drawing attempts with zero
+         * height items (which would draw nothing). The bounding box spans
+         * either 1 or 2 pixels. Select which pixel will be drawn.
+         */
+
+        short iy1 = (short) (rectOvalPtr->bbox[1]);
+        short iy2 = (short) (rectOvalPtr->bbox[3]);
+
+        if (iy1 == iy2) {
+
+            /*
+             * y1 and y2 are "within the same pixel". Use this pixel.
+             * Note: the degenerated case (bbox[1]==bbox[3]) of a completely
+             * flat box results in arbitrary selection of the pixel below
+             * (with positive coordinate) or above (with negative coordinate)
+             * the box. There is no "best choice" here.
+             */
+
+            if (iy1 > 0) {
+                y2 += 1;
+            } else {
+                y1 -= 1;
+            }
+        } else {
+
+            /*
+             * (y1,y2) span two pixels. Select the one with the larger
+             * covered "area".
+             */
+
+            if (iy1 > 0) {
+                if ((rectOvalPtr->bbox[3] - iy2) > (iy2 - rectOvalPtr->bbox[1])) {
+                    y2 += 1;
+                } else {
+                    y1 -= 1;
+                }
+            } else {
+                if ((rectOvalPtr->bbox[3] - iy1) > (iy1 - rectOvalPtr->bbox[1])) {
+                    y2 += 1;
+                } else {
+                    y1 -= 1;
+                }
+            }
+        }
     }
 
     /*
      * Display filled part first (if wanted), then outline. If we're
      * stippling, then modify the stipple offset in the GC. Be sure to reset

Index: generic/tkScale.c
==================================================================
--- generic/tkScale.c
+++ generic/tkScale.c
@@ -15,13 +15,17 @@
  *
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
 
-#include "default.h"
 #include "tkInt.h"
 #include "tkScale.h"
+#include "default.h"
+
+#if defined(_WIN32)
+#define snprintf _snprintf
+#endif
 
 /*
  * The following table defines the legal values for the -orient option. It is
  * used together with the "enum orient" declaration in tkScale.h.
  */
@@ -294,11 +298,11 @@
     Tk_SetClassProcs(scalePtr->tkwin, &scaleClass, scalePtr);
     Tk_CreateEventHandler(scalePtr->tkwin,
 	    ExposureMask|StructureNotifyMask|FocusChangeMask,
 	    ScaleEventProc, scalePtr);
 
-    if ((Tk_InitOptions(interp, (char *) scalePtr, optionTable, tkwin)
+    if ((Tk_InitOptions(interp, scalePtr, optionTable, tkwin)
 	    != TCL_OK) ||
 	    (ConfigureScale(interp, scalePtr, objc - 2, objv + 2) != TCL_OK)) {
 	Tk_DestroyWindow(scalePtr->tkwin);
 	return TCL_ERROR;
     }
@@ -357,20 +361,20 @@
     case COMMAND_CGET:
 	if (objc != 3) {
 	    Tcl_WrongNumArgs(interp, 1, objv, "cget option");
 	    goto error;
 	}
-	objPtr = Tk_GetOptionValue(interp, (char *) scalePtr,
+	objPtr = Tk_GetOptionValue(interp, scalePtr,
 		scalePtr->optionTable, objv[2], scalePtr->tkwin);
 	if (objPtr == NULL) {
 	    goto error;
 	}
 	Tcl_SetObjResult(interp, objPtr);
 	break;
     case COMMAND_CONFIGURE:
 	if (objc <= 3) {
-	    objPtr = Tk_GetOptionInfo(interp, (char *) scalePtr,
+	    objPtr = Tk_GetOptionInfo(interp, scalePtr,
 		    scalePtr->optionTable,
 		    (objc == 3) ? objv[2] : NULL, scalePtr->tkwin);
 	    if (objPtr == NULL) {
 		goto error;
 	    }
@@ -576,11 +580,11 @@
 	if (!error) {
 	    /*
 	     * First pass: set options to new values.
 	     */
 
-	    if (Tk_SetOptions(interp, (char *) scalePtr,
+	    if (Tk_SetOptions(interp, scalePtr,
 		    scalePtr->optionTable, objc, objv, scalePtr->tkwin,
 		    &savedOptions, NULL) != TCL_OK) {
 		continue;
 	    }
 	} else {
@@ -632,11 +636,11 @@
 	    scalePtr->tickInterval = -scalePtr->tickInterval;
 	}
 
 	ComputeFormat(scalePtr);
 
-	scalePtr->labelLength = scalePtr->label ? (int)strlen(scalePtr->label) : 0;
+	scalePtr->labelLength = scalePtr->label ? strlen(scalePtr->label) : 0;
 
 	Tk_SetBackgroundFromBorder(scalePtr->tkwin, scalePtr->bgBorder);
 
 	if (scalePtr->highlightWidth < 0) {
 	    scalePtr->highlightWidth = 0;
@@ -675,13 +679,13 @@
 		valuePtr, &varValue) != TCL_OK)) {
 	    ScaleSetVariable(scalePtr);
 	} else {
 	    char varString[TCL_DOUBLE_SPACE], scaleString[TCL_DOUBLE_SPACE];
 
-	    sprintf(varString, scalePtr->format, varValue);
-	    sprintf(scaleString, scalePtr->format, scalePtr->value);
-	    if (strcmp(varString, scaleString)) {
+            Tcl_PrintDouble(NULL, varValue, varString);
+            Tcl_PrintDouble(NULL, scalePtr->value, scaleString);
+            if (strcmp(varString, scaleString)) {
 		ScaleSetVariable(scalePtr);
 	    }
 	}
 	Tcl_TraceVar2(interp, Tcl_GetString(scalePtr->varNamePtr),
 		NULL, TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
@@ -934,14 +938,20 @@
      * Vertical scale: compute the amount of space needed to display the
      * scales value by formatting strings for the two end points; use
      * whichever length is longer.
      */
 
-    sprintf(valueString, scalePtr->format, scalePtr->fromValue);
+    if (snprintf(valueString, TCL_DOUBLE_SPACE, scalePtr->format,
+            scalePtr->fromValue) < 0) {
+        valueString[TCL_DOUBLE_SPACE - 1] = '\0';
+    }
     valuePixels = Tk_TextWidth(scalePtr->tkfont, valueString, -1);
 
-    sprintf(valueString, scalePtr->format, scalePtr->toValue);
+    if (snprintf(valueString, TCL_DOUBLE_SPACE, scalePtr->format,
+            scalePtr->toValue) < 0) {
+        valueString[TCL_DOUBLE_SPACE - 1] = '\0';
+    }
     tmp = Tk_TextWidth(scalePtr->tkfont, valueString, -1);
     if (valuePixels < tmp) {
 	valuePixels = tmp;
     }
 
@@ -1179,10 +1189,23 @@
     register TkScale *scalePtr = clientData;
     const char *resultStr;
     double value;
     Tcl_Obj *valuePtr;
     int result;
+
+    /*
+     * See ticket [5d991b82].
+     */
+
+    if (scalePtr->varNamePtr == NULL) {
+	if (!(flags & TCL_INTERP_DESTROYED)) {
+	    Tcl_UntraceVar2(interp, name1, name2,
+		    TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
+		    ScaleVarProc, clientData);
+	}
+	return NULL;
+    }
 
     /*
      * If the variable is unset, then immediately recreate it unless the whole
      * interpreter is going away.
      */
@@ -1312,11 +1335,14 @@
     register TkScale *scalePtr)	/* Info about widget. */
 {
     if (scalePtr->varNamePtr != NULL) {
 	char string[TCL_DOUBLE_SPACE];
 
-	sprintf(string, scalePtr->format, scalePtr->value);
+        if (snprintf(string, TCL_DOUBLE_SPACE, scalePtr->format,
+                scalePtr->value) < 0) {
+            string[TCL_DOUBLE_SPACE - 1] = '\0';
+        }
 	scalePtr->flags |= SETTING_VAR;
 	Tcl_ObjSetVar2(scalePtr->interp, scalePtr->varNamePtr, NULL,
 		Tcl_NewStringObj(string, -1), TCL_GLOBAL_ONLY);
 	scalePtr->flags &= ~SETTING_VAR;
     }

Index: generic/tkScale.h
==================================================================
--- generic/tkScale.h
+++ generic/tkScale.h
@@ -71,11 +71,11 @@
 				 * multiple of this value. */
     int digits;			/* Number of significant digits to print in
 				 * values. 0 means we get to choose the number
 				 * based on resolution and/or the range of the
 				 * scale. */
-    char format[10];		/* Sprintf conversion specifier computed from
+    char format[16];		/* Sprintf conversion specifier computed from
 				 * digits and other information. */
     double bigIncrement;	/* Amount to use for large increments to scale
 				 * value. (0 means we pick a value). */
     char *command;		/* Command prefix to use when invoking Tcl
 				 * commands because the scale value changed.
@@ -83,11 +83,11 @@
     int repeatDelay;		/* How long to wait before auto-repeating on
 				 * scrolling actions (in ms). */
     int repeatInterval;		/* Interval between autorepeats (in ms). */
     char *label;		/* Label to display above or to right of
 				 * scale; NULL means don't display a label. */
-    int labelLength;		/* Number of non-NULL chars. in label. */
+    TkSizeT labelLength;	/* Number of non-NULL chars. in label. */
     enum state state;		/* Values are active, normal, or disabled.
 				 * Value of scale cannot be changed when
 				 * disabled. */
 
     /*

Index: generic/tkScrollbar.c
==================================================================
--- generic/tkScrollbar.c
+++ generic/tkScrollbar.c
@@ -177,14 +177,16 @@
     scrollPtr->arrowLength = 0;
     scrollPtr->sliderFirst = 0;
     scrollPtr->sliderLast = 0;
     scrollPtr->activeField = 0;
     scrollPtr->activeRelief = TK_RELIEF_RAISED;
+#ifndef TK_NO_DEPRECATED
     scrollPtr->totalUnits = 0;
     scrollPtr->windowUnits = 0;
     scrollPtr->firstUnit = 0;
     scrollPtr->lastUnit = 0;
+#endif /* TK_NO_DEPRECATED */
     scrollPtr->firstFraction = 0.0;
     scrollPtr->lastFraction = 0.0;
     scrollPtr->cursor = None;
     scrollPtr->takeFocus = NULL;
     scrollPtr->flags = 0;
@@ -222,12 +224,12 @@
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])		/* Argument strings. */
 {
     register TkScrollbar *scrollPtr = clientData;
-    int result = TCL_OK;
-    int length, cmdIndex;
+    int result = TCL_OK, cmdIndex;
+    size_t length;
     static const char *const commandNames[] = {
         "activate", "cget", "configure", "delta", "fraction",
         "get", "identify", "set", NULL
     };
     enum command {
@@ -267,11 +269,11 @@
 	}
 	if (objc != 3) {
 		Tcl_WrongNumArgs(interp, 1, objv, "activate element");
 	    goto error;
 	}
-	c = Tcl_GetStringFromObj(objv[2], &length)[0];
+	c = TkGetStringFromObj(objv[2], &length)[0];
 	oldActiveField = scrollPtr->activeField;
 	if ((c == 'a') && (strcmp(Tcl_GetString(objv[2]), "arrow1") == 0)) {
 	    scrollPtr->activeField = TOP_ARROW;
 	} else if ((c == 'a') && (strcmp(Tcl_GetString(objv[2]), "arrow2") == 0)) {
 	    scrollPtr->activeField = BOTTOM_ARROW;
@@ -375,21 +377,23 @@
 
 	if (objc != 2) {
 		Tcl_WrongNumArgs(interp, 1, objv, "get");
 	    goto error;
 	}
-	if (scrollPtr->flags & NEW_STYLE_COMMANDS) {
-	    resObjs[0] = Tcl_NewDoubleObj(scrollPtr->firstFraction);
-	    resObjs[1] = Tcl_NewDoubleObj(scrollPtr->lastFraction);
-	    Tcl_SetObjResult(interp, Tcl_NewListObj(2, resObjs));
-	} else {
+#ifndef TK_NO_DEPRECATED
+	if (scrollPtr->flags & OLD_STYLE_COMMANDS) {
 	    resObjs[0] = Tcl_NewIntObj(scrollPtr->totalUnits);
 	    resObjs[1] = Tcl_NewIntObj(scrollPtr->windowUnits);
 	    resObjs[2] = Tcl_NewIntObj(scrollPtr->firstUnit);
 	    resObjs[3] = Tcl_NewIntObj(scrollPtr->lastUnit);
 	    Tcl_SetObjResult(interp, Tcl_NewListObj(4, resObjs));
+	    break;
 	}
+#endif /* TK_NO_DEPRECATED */
+	resObjs[0] = Tcl_NewDoubleObj(scrollPtr->firstFraction);
+	resObjs[1] = Tcl_NewDoubleObj(scrollPtr->lastFraction);
+	Tcl_SetObjResult(interp, Tcl_NewListObj(2, resObjs));
 	break;
     }
     case COMMAND_IDENTIFY: {
 	int x, y;
 	const char *zone = "";
@@ -411,12 +415,10 @@
 	}
 	Tcl_SetObjResult(interp, Tcl_NewStringObj(zone, -1));
 	break;
     }
     case COMMAND_SET: {
-	int totalUnits, windowUnits, firstUnit, lastUnit;
-
 	if (objc == 4) {
 	    double first, last;
 
 	    if (Tcl_GetDoubleFromObj(interp, objv[2], &first) != TCL_OK) {
 		goto error;
@@ -436,12 +438,14 @@
 	    } else if (last > 1.0) {
 		scrollPtr->lastFraction = 1.0;
 	    } else {
 		scrollPtr->lastFraction = last;
 	    }
-	    scrollPtr->flags |= NEW_STYLE_COMMANDS;
+#ifndef TK_NO_DEPRECATED
+	    scrollPtr->flags &= ~OLD_STYLE_COMMANDS;
 	} else if (objc == 6) {
+	    int totalUnits, windowUnits, firstUnit, lastUnit;
 	    if (Tcl_GetIntFromObj(interp, objv[2], &totalUnits) != TCL_OK) {
 		goto error;
 	    }
 	    if (totalUnits < 0) {
 		totalUnits = 0;
@@ -474,15 +478,14 @@
 		scrollPtr->lastFraction = 1.0;
 	    } else {
 		scrollPtr->firstFraction = ((double) firstUnit)/totalUnits;
 		scrollPtr->lastFraction = ((double) (lastUnit+1))/totalUnits;
 	    }
-	    scrollPtr->flags &= ~NEW_STYLE_COMMANDS;
+	    scrollPtr->flags |= OLD_STYLE_COMMANDS;
+#endif /* !TK_NO_DEPRECATED */
 	} else {
 		Tcl_WrongNumArgs(interp, 1, objv, "set firstFraction lastFraction");
-		Tcl_AppendResult(interp, " or \"", Tcl_GetString(objv[0]),
-			" set totalUnits windowUnits firstUnit lastUnit\"", NULL);
 	    goto error;
 	}
 	TkpComputeScrollbarGeometry(scrollPtr);
 	TkScrollbarEventuallyRedraw(scrollPtr);
 	break;

Index: generic/tkScrollbar.h
==================================================================
--- generic/tkScrollbar.h
+++ generic/tkScrollbar.h
@@ -91,25 +91,29 @@
      * information is provided by the application by invoking the "set" widget
      * command. This information can now be provided in two ways: the "old"
      * form (totalUnits, windowUnits, firstUnit, and lastUnit), or the "new"
      * form (firstFraction and lastFraction). FirstFraction and lastFraction
      * will always be valid, but the old-style information is only valid if
-     * the NEW_STYLE_COMMANDS flag is 0.
+     * the OLD_STYLE_COMMANDS flag is 1.
      */
 
+#ifndef TK_NO_DEPRECATED
     int totalUnits;		/* Total dimension of application, in units.
-				 * Valid only if the NEW_STYLE_COMMANDS flag
-				 * isn't set. */
+				 * Valid only if the OLD_STYLE_COMMANDS flag
+				 * is set. */
     int windowUnits;		/* Maximum number of units that can be
 				 * displayed in the window at once. Valid only
-				 * if the NEW_STYLE_COMMANDS flag isn't set. */
+				 * if the OLD_STYLE_COMMANDS flag is set. */
     int firstUnit;		/* Number of last unit visible in
 				 * application's window. Valid only if the
-				 * NEW_STYLE_COMMANDS flag isn't set. */
+				 * OLD_STYLE_COMMANDS flag is set. */
     int lastUnit;		/* Index of last unit visible in window.
-				 * Valid only if the NEW_STYLE_COMMANDS flag
+				 * Valid only if the OLD_STYLE_COMMANDS flag
 				 * isn't set. */
+#else
+    int dummy1,dummy2,dummy3,dummy4; /* sizeof(TkScrollbar) should not depend on TK_NO_DEPRECATED */
+#endif /* TK_NO_DEPRECATED */
     double firstFraction;	/* Position of first visible thing in window,
 				 * specified as a fraction between 0 and
 				 * 1.0. */
     double lastFraction;	/* Position of last visible thing in window,
 				 * specified as a fraction between 0 and
@@ -142,20 +146,22 @@
 /*
  * Flag bits for scrollbars:
  *
  * REDRAW_PENDING:		Non-zero means a DoWhenIdle handler has
  *				already been queued to redraw this window.
- * NEW_STYLE_COMMANDS:		Non-zero means the new style of commands
+ * OLD_STYLE_COMMANDS:		Non-zero means the old style of commands
  *				should be used to communicate with the widget:
- *				".t yview scroll 2 lines", instead of
- *				".t yview 40", for example.
+ *				".t yview 40", instead of
+ *				".t yview scroll 2 lines", for example.
  * GOT_FOCUS:			Non-zero means this window has the input
  *				focus.
  */
 
 #define REDRAW_PENDING		1
-#define NEW_STYLE_COMMANDS	2
+#ifndef TK_NO_DEPRECATED
+#   define OLD_STYLE_COMMANDS	2
+#endif /* TK_NO_DEPRECATED */
 #define GOT_FOCUS		4
 
 /*
  * Declaration of scrollbar class functions structure
  * and default scrollbar width, for use in configSpec.

Index: generic/tkSelect.c
==================================================================
--- generic/tkSelect.c
+++ generic/tkSelect.c
@@ -24,11 +24,11 @@
     Tcl_Interp *interp;		/* Interpreter in which to invoke command. */
     int cmdLength;		/* # of non-NULL bytes in command. */
     int charOffset;		/* The offset of the next char to retrieve. */
     int byteOffset;		/* The expected byte offset of the next
 				 * chunk. */
-    char buffer[TCL_UTF_MAX];	/* A buffer to hold part of a UTF character
+    char buffer[4];		/* A buffer to hold part of a UTF character
 				 * that is split across chunks. */
     char command[1];		/* Command to invoke. Actual space is
 				 * allocated as large as necessary. This must
 				 * be the last entry in the structure. */
 } CommandInfo;
@@ -188,12 +188,12 @@
 		    /*
 		     * The clientData is selection controlled memory, so we
 		     * should make a copy for this selPtr.
 		     */
 
-		    unsigned cmdInfoLen = Tk_Offset(CommandInfo, command) +
-			    ((CommandInfo *)clientData)->cmdLength + 1;
+		    unsigned cmdInfoLen = Tk_Offset(CommandInfo, command) + 1 +
+			    ((CommandInfo *)clientData)->cmdLength;
 
 		    selPtr->clientData = ckalloc(cmdInfoLen);
 		    memcpy(selPtr->clientData, clientData, cmdInfoLen);
 		} else {
 		    selPtr->clientData = clientData;
@@ -355,11 +355,11 @@
 {
     register TkWindow *winPtr = (TkWindow *) tkwin;
     TkDisplay *dispPtr = winPtr->dispPtr;
     TkSelectionInfo *infoPtr;
     Tk_LostSelProc *clearProc = NULL;
-    ClientData clearData = NULL;/* Initialization needed only to prevent
+    void *clearData = NULL;/* Initialization needed only to prevent
 				 * compiler warning. */
 
     if (dispPtr->multipleAtom == None) {
 	TkSelInit(tkwin);
     }
@@ -464,11 +464,11 @@
     TkDisplay *dispPtr = winPtr->dispPtr;
     TkSelectionInfo *infoPtr;
     TkSelectionInfo *prevPtr;
     TkSelectionInfo *nextPtr;
     Tk_LostSelProc *clearProc = NULL;
-    ClientData clearData = NULL;/* Initialization needed only to prevent
+    void *clearData = NULL;/* Initialization needed only to prevent
 				 * compiler warning. */
 
     if (dispPtr->multipleAtom == None) {
 	TkSelInit(tkwin);
     }
@@ -829,11 +829,11 @@
     case SELECTION_HANDLE: {
 	Atom target, format;
 	const char *targetName = NULL;
 	const char *formatName = NULL;
 	register CommandInfo *cmdInfoPtr;
-	int cmdLength;
+	size_t cmdLength;
 	static const char *const handleOptionStrings[] = {
 	    "-format", "-selection", "-type", NULL
 	};
 	enum handleOptions {
 	    HANDLE_FORMAT, HANDLE_SELECTION, HANDLE_TYPE
@@ -898,11 +898,11 @@
 	} else if (formatName != NULL) {
 	    format = Tk_InternAtom(tkwin, formatName);
 	} else {
 	    format = XA_STRING;
 	}
-	string = Tcl_GetStringFromObj(objs[1], &cmdLength);
+	string = TkGetStringFromObj(objs[1], &cmdLength);
 	if (cmdLength == 0) {
 	    Tk_DeleteSelHandler(tkwin, selection, target);
 	} else {
 	    cmdInfoPtr = ckalloc(Tk_Offset(CommandInfo, command)
 		    + 1 + cmdLength);
@@ -1183,10 +1183,11 @@
     dispPtr->textAtom		= Tk_InternAtom(tkwin, "TEXT");
     dispPtr->compoundTextAtom	= Tk_InternAtom(tkwin, "COMPOUND_TEXT");
     dispPtr->applicationAtom	= Tk_InternAtom(tkwin, "TK_APPLICATION");
     dispPtr->windowAtom		= Tk_InternAtom(tkwin, "TK_WINDOW");
     dispPtr->clipboardAtom	= Tk_InternAtom(tkwin, "CLIPBOARD");
+    dispPtr->atomPairAtom	= Tk_InternAtom(tkwin, "ATOM_PAIR");
 
     /*
      * Using UTF8_STRING instead of the XA_UTF8_STRING macro allows us to
      * support older X servers that didn't have UTF8_STRING yet. This is
      * necessary on Unix systems. For more information, see:
@@ -1243,11 +1244,11 @@
 	}
 	prevPtr = infoPtr;
     }
 
     if (infoPtr != NULL && (infoPtr->owner == tkwin) &&
-	    (eventPtr->xselectionclear.serial >= (unsigned) infoPtr->serial)) {
+	    (eventPtr->xselectionclear.serial >= (unsigned long) infoPtr->serial)) {
 	if (prevPtr == NULL) {
 	    dispPtr->selectionInfoPtr = infoPtr->nextPtr;
 	} else {
 	    prevPtr->nextPtr = infoPtr->nextPtr;
 	}

Index: generic/tkSelect.h
==================================================================
--- generic/tkSelect.h
+++ generic/tkSelect.h
@@ -23,18 +23,22 @@
  */
 
 typedef struct TkSelectionInfo {
     Atom selection;		/* Selection name, e.g. XA_PRIMARY. */
     Tk_Window owner;		/* Current owner of this selection. */
-    int serial;			/* Serial number of last XSelectionSetOwner
+#if TCL_MAJOR_VERSION > 8
+    unsigned long serial;	/* Serial number of last XSelectionSetOwner
 				 * request made to server for this selection
 				 * (used to filter out redundant
 				 * SelectionClear events). */
+#else
+    int serial;
+#endif
     Time time;			/* Timestamp used to acquire selection. */
     Tk_LostSelProc *clearProc;	/* Procedure to call when owner loses
 				 * selection. */
-    ClientData clearData;	/* Info to pass to clearProc. */
+    void *clearData;	/* Info to pass to clearProc. */
     struct TkSelectionInfo *nextPtr;
 				/* Next in list of current selections on this
 				 * display. NULL means end of list. */
 } TkSelectionInfo;
 
@@ -50,12 +54,12 @@
 				 * as TARGETS or STRING. */
     Atom format;		/* Format in which selection info will be
 				 * returned, such as STRING or ATOM. */
     Tk_SelectionProc *proc;	/* Procedure to generate selection in this
 				 * format. */
-    ClientData clientData;	/* Argument to pass to proc. */
-    int size;			/* Size of units returned by proc (8 for
+    void *clientData;	/* Argument to pass to proc. */
+    TkSizeT size;			/* Size of units returned by proc (8 for
 				 * STRING, 32 for almost anything else). */
     struct TkSelHandler *nextPtr;
 				/* Next selection handler associated with same
 				 * window (NULL for end of list). */
 } TkSelHandler;

Index: generic/tkSquare.c
==================================================================
--- generic/tkSquare.c
+++ generic/tkSquare.c
@@ -170,20 +170,20 @@
 	    Tk_PathName(squarePtr->tkwin), SquareWidgetObjCmd, squarePtr,
 	    SquareDeletedProc);
     squarePtr->gc = None;
     squarePtr->optionTable = optionTable;
 
-    if (Tk_InitOptions(interp, (char *) squarePtr, optionTable, tkwin)
+    if (Tk_InitOptions(interp, squarePtr, optionTable, tkwin)
 	    != TCL_OK) {
 	Tk_DestroyWindow(squarePtr->tkwin);
 	ckfree(squarePtr);
 	return TCL_ERROR;
     }
 
     Tk_CreateEventHandler(squarePtr->tkwin, ExposureMask|StructureNotifyMask,
 	    SquareObjEventProc, squarePtr);
-    if (Tk_SetOptions(interp, (char *) squarePtr, optionTable, objc - 2,
+    if (Tk_SetOptions(interp, squarePtr, optionTable, objc - 2,
 	    objv + 2, tkwin, NULL, NULL) != TCL_OK) {
 	goto error;
     }
     if (SquareConfigure(interp, squarePtr) != TCL_OK) {
 	goto error;
@@ -248,11 +248,11 @@
     case SQUARE_CGET:
 	if (objc != 3) {
 	    Tcl_WrongNumArgs(interp, 2, objv, "option");
 	    goto error;
 	}
-	resultObjPtr = Tk_GetOptionValue(interp, (char *) squarePtr,
+	resultObjPtr = Tk_GetOptionValue(interp, squarePtr,
 		squarePtr->optionTable, objv[2], squarePtr->tkwin);
 	if (resultObjPtr == NULL) {
 	    result = TCL_ERROR;
 	} else {
 	    Tcl_SetObjResult(interp, resultObjPtr);
@@ -259,23 +259,23 @@
 	}
 	break;
     case SQUARE_CONFIGURE:
 	resultObjPtr = NULL;
 	if (objc == 2) {
-	    resultObjPtr = Tk_GetOptionInfo(interp, (char *) squarePtr,
+	    resultObjPtr = Tk_GetOptionInfo(interp, squarePtr,
 		    squarePtr->optionTable, NULL, squarePtr->tkwin);
 	    if (resultObjPtr == NULL) {
 		result = TCL_ERROR;
 	    }
 	} else if (objc == 3) {
-	    resultObjPtr = Tk_GetOptionInfo(interp, (char *) squarePtr,
+	    resultObjPtr = Tk_GetOptionInfo(interp, squarePtr,
 		    squarePtr->optionTable, objv[2], squarePtr->tkwin);
 	    if (resultObjPtr == NULL) {
 		result = TCL_ERROR;
 	    }
 	} else {
-	    result = Tk_SetOptions(interp, (char *) squarePtr,
+	    result = Tk_SetOptions(interp, squarePtr,
 		    squarePtr->optionTable, objc - 2, objv + 2,
 		    squarePtr->tkwin, NULL, NULL);
 	    if (result == TCL_OK) {
 		result = SquareConfigure(interp, squarePtr);
 	    }

Index: generic/tkStubInit.c
==================================================================
--- generic/tkStubInit.c
+++ generic/tkStubInit.c
@@ -36,10 +36,47 @@
 /*
  * Remove macro that might interfere with the definition below.
  */
 
 #undef Tk_MainEx
+#undef Tk_FreeXId
+#undef Tk_FreeStyleFromObj
+#undef Tk_GetStyleFromObj
+#undef TkWinGetPlatformId
+
+#if defined(TK_NO_DEPRECATED) || TCL_MAJOR_VERSION > 8
+#define Tk_MainEx 0
+#define Tk_FreeXId 0
+#define Tk_FreeStyleFromObj 0
+#define Tk_GetStyleFromObj 0
+#define TkWinGetPlatformId 0
+#define Tk_PhotoPutBlock_NoComposite 0
+#define Tk_PhotoPutZoomedBlock_NoComposite 0
+#define Tk_PhotoExpand_Panic 0
+#define Tk_PhotoPutBlock_Panic 0
+#define Tk_PhotoPutZoomedBlock_Panic 0
+#define Tk_PhotoSetSize_Panic 0
+#else
+static void
+doNothing(void)
+{
+    /* dummy implementation, no need to do anything */
+}
+#define Tk_FreeXId ((void (*)(Display *, XID)) doNothing)
+#define Tk_FreeStyleFromObj ((void (*)(Tcl_Obj *)) doNothing)
+#define Tk_GetStyleFromObj getStyleFromObj
+static Tk_Style Tk_GetStyleFromObj(Tcl_Obj *obj)
+{
+	return Tk_AllocStyleFromObj(NULL, obj);
+}
+#if defined(_WIN32) || defined(__CYGWIN__)
+#define TkWinGetPlatformId winGetPlatformId
+static int TkWinGetPlatformId(void) {
+    return 2;
+}
+#endif /* defined(_WIN32) || defined(__CYGWIN__) */
+#endif /* !TK_NO_DEPRECATED */
 
 #ifdef _WIN32
 
 int
 TkpCmapStressed(Tk_Window tkwin, Colormap colormap)
@@ -60,10 +97,15 @@
 }
 
 #   define TkUnixContainerId 0
 #   define TkUnixDoOneXEvent 0
 #   define TkUnixSetMenubar 0
+#   define XCreateWindow 0
+#   define XOffsetRegion 0
+#   define XUnionRegion 0
+#   define XPolygonRegion 0
+#   define XPointInRegion 0
 #   define TkWmCleanup (void (*)(TkDisplay *)) TkpSync
 #   define TkSendCleanup (void (*)(TkDisplay *)) TkpSync
 #   define TkpTestsendCmd 0
 
 #else /* !_WIN32 */
@@ -198,11 +240,10 @@
 #	define TkWinXCleanup 0
 #	define TkWinXInit 0
 #	define TkWinSetForegroundWindow 0
 #	define TkWinDialogDebug 0
 #	define TkWinGetMenuSystemDefault 0
-#	define TkWinGetPlatformId 0
 #	define TkWinSetHINSTANCE 0
 #	define TkWinGetPlatformTheme 0
 #	define TkWinChildProc 0
 
 #   elif !defined(MAC_OSX_TK) /* UNIX */
@@ -231,10 +272,18 @@
  * WARNING: The contents of this file is automatically generated by the
  * tools/genStubs.tcl script. Any modifications to the function declarations
  * below should be made in the generic/tk.decls script.
  */
 
+#ifdef __GNUC__
+/*
+ * The rest of this file shouldn't warn about deprecated functions; they're
+ * there because we intend them to be so and know that this file is OK to
+ * touch those fields.
+ */
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
 /* !BEGIN!: Do not edit below this line. */
 
 static const TkIntStubs tkIntStubs = {
     TCL_STUB_MAGIC,
     0,
@@ -448,10 +497,11 @@
     TkSmoothPrintProc, /* 180 */
     TkDrawAngledTextLayout, /* 181 */
     TkUnderlineAngledTextLayout, /* 182 */
     TkIntersectAngledTextLayout, /* 183 */
     TkDrawAngledChars, /* 184 */
+    TkDebugPhotoStringMatchDef, /* 185 */
 };
 
 static const TkIntPlatStubs tkIntPlatStubs = {
     TCL_STUB_MAGIC,
     0,
@@ -542,11 +592,11 @@
     TkMacOSXVisableClipRgn, /* 35 */
     TkMacOSXWinBounds, /* 36 */
     TkMacOSXWindowOffset, /* 37 */
     TkSetMacColor, /* 38 */
     TkSetWMName, /* 39 */
-    TkSuspendClipboard, /* 40 */
+    0, /* 40 */
     TkMacOSXZoomToplevel, /* 41 */
     Tk_TopCoordsToWindow, /* 42 */
     TkMacOSXContainerId, /* 43 */
     TkMacOSXGetHostToplevel, /* 44 */
     TkMacOSXPreprocessMenu, /* 45 */
@@ -696,10 +746,35 @@
     XFree, /* 110 */
     XNoOp, /* 111 */
     XSynchronize, /* 112 */
     XSync, /* 113 */
     XVisualIDFromVisual, /* 114 */
+    0, /* 115 */
+    0, /* 116 */
+    0, /* 117 */
+    0, /* 118 */
+    0, /* 119 */
+    XOffsetRegion, /* 120 */
+    XUnionRegion, /* 121 */
+    XCreateWindow, /* 122 */
+    0, /* 123 */
+    0, /* 124 */
+    0, /* 125 */
+    0, /* 126 */
+    0, /* 127 */
+    0, /* 128 */
+    XLowerWindow, /* 129 */
+    XFillArcs, /* 130 */
+    XDrawArcs, /* 131 */
+    XDrawRectangles, /* 132 */
+    XDrawSegments, /* 133 */
+    XDrawPoint, /* 134 */
+    XDrawPoints, /* 135 */
+    XReparentWindow, /* 136 */
+    XPutImage, /* 137 */
+    XPolygonRegion, /* 138 */
+    XPointInRegion, /* 139 */
 #endif /* WIN */
 #ifdef MAC_OSX_TK /* AQUA */
     XSetDashes, /* 0 */
     XGetModifierMapping, /* 1 */
     XCreateImage, /* 2 */

Index: generic/tkStyle.c
==================================================================
--- generic/tkStyle.c
+++ generic/tkStyle.c
@@ -153,11 +153,11 @@
 static const Tcl_ObjType styleObjType = {
     "style",			/* name */
     FreeStyleObjProc,		/* freeIntRepProc */
     DupStyleObjProc,		/* dupIntRepProc */
     NULL,			/* updateStringProc */
-    SetStyleFromAny		/* setFromAnyProc */
+    NULL			/* setFromAnyProc */
 };
 
 /*
  *---------------------------------------------------------------------------
  *
@@ -1074,11 +1074,11 @@
 void
 Tk_GetElementSize(
     Tk_Style style,		/* The widget style. */
     Tk_StyledElement element,	/* The styled element, previously returned by
 				 * Tk_GetStyledElement. */
-    char *recordPtr,		/* The widget record. */
+    void *recordPtr,		/* The widget record. */
     Tk_Window tkwin,		/* The widget window. */
     int width, int height,	/* Requested size. */
     int inner,			/* If TRUE, compute the outer size according
 				 * to the requested minimum inner size. If
 				 * FALSE, compute the inner size according to
@@ -1115,11 +1115,11 @@
 void
 Tk_GetElementBox(
     Tk_Style style,		/* The widget style. */
     Tk_StyledElement element,	/* The styled element, previously returned by
 				 * Tk_GetStyledElement. */
-    char *recordPtr,		/* The widget record. */
+    void *recordPtr,		/* The widget record. */
     Tk_Window tkwin,		/* The widget window. */
     int x, int y,		/* Top left corner of available area. */
     int width, int height,	/* Size of available area. */
     int inner,			/* Boolean. If TRUE, compute the bounding box
 				 * according to the requested inscribed box
@@ -1157,11 +1157,11 @@
 int
 Tk_GetElementBorderWidth(
     Tk_Style style,		/* The widget style. */
     Tk_StyledElement element,	/* The styled element, previously returned by
 				 * Tk_GetStyledElement. */
-    char *recordPtr,		/* The widget record. */
+    void *recordPtr,		/* The widget record. */
     Tk_Window tkwin)		/* The widget window. */
 {
     Style *stylePtr = (Style *) style;
     StyledWidgetSpec *widgetSpecPtr = (StyledWidgetSpec *) element;
 
@@ -1188,11 +1188,11 @@
 void
 Tk_DrawElement(
     Tk_Style style,		/* The widget style. */
     Tk_StyledElement element,	/* The styled element, previously returned by
 				 * Tk_GetStyledElement. */
-    char *recordPtr,		/* The widget record. */
+    void *recordPtr,		/* The widget record. */
     Tk_Window tkwin,		/* The widget window. */
     Drawable d,			/* Where to draw element. */
     int x, int y,		/* Top left corner of element. */
     int width, int height,	/* Size of element. */
     int state)			/* Drawing state flags. */
@@ -1403,63 +1403,16 @@
 Tk_AllocStyleFromObj(
     Tcl_Interp *interp,		/* Interp for error return. */
     Tcl_Obj *objPtr)		/* Object containing name of the style to
 				 * retrieve. */
 {
-    Style *stylePtr;
-
-    if (objPtr->typePtr != &styleObjType) {
-	SetStyleFromAny(interp, objPtr);
-    }
-    stylePtr = objPtr->internalRep.twoPtrValue.ptr1;
-
-    return (Tk_Style) stylePtr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * Tk_GetStyleFromObj --
- *
- *	Find the style that corresponds to a given object. The style must have
- *	already been created by Tk_CreateStyle.
- *
- * Results:
- *	The return value is a token for the style that matches objPtr, or NULL
- *	if none found.
- *
- * Side effects:
- *	If the object is not already a style ref, the conversion will free any
- *	old internal representation.
- *
- *----------------------------------------------------------------------
- */
-
-Tk_Style
-Tk_GetStyleFromObj(
-    Tcl_Obj *objPtr)		/* The object from which to get the style. */
-{
-    if (objPtr->typePtr != &styleObjType) {
-	SetStyleFromAny(NULL, objPtr);
-    }
-
-    return objPtr->internalRep.twoPtrValue.ptr1;
-}
-
-/*
- *---------------------------------------------------------------------------
- *
- * Tk_FreeStyleFromObj --
- *
- *	No-op. Present only for stubs compatibility.
- *
- *---------------------------------------------------------------------------
- */
-void
-Tk_FreeStyleFromObj(
-    Tcl_Obj *objPtr)
-{
+    if (objPtr->typePtr != &styleObjType) {
+	if (SetStyleFromAny(interp, objPtr) != TCL_OK) {
+	    return NULL;
+	}
+    }
+    return objPtr->internalRep.twoPtrValue.ptr1;
 }
 
 /*
  *----------------------------------------------------------------------
  *
@@ -1467,12 +1420,12 @@
  *
  *	Convert the internal representation of a Tcl object to the style
  *	internal form.
  *
  * Results:
- *	Always returns TCL_OK. If an error occurs is returned (e.g. the style
- *	doesn't exist), an error message will be left in interp's result.
+ *	If an error occurs is returned (e.g. the style doesn't exist), an
+ *	error message will be left in interp's result and TCL_ERROR is returned.
  *
  * Side effects:
  *	The object is left with its typePtr pointing to styleObjType.
  *
  *----------------------------------------------------------------------
@@ -1483,10 +1436,11 @@
     Tcl_Interp *interp,		/* Used for error reporting if not NULL. */
     Tcl_Obj *objPtr)		/* The object to convert. */
 {
     const Tcl_ObjType *typePtr;
     const char *name;
+    Tk_Style style;
 
     /*
      * Free the old internalRep before setting the new one.
      */
 
@@ -1494,12 +1448,16 @@
     typePtr = objPtr->typePtr;
     if ((typePtr != NULL) && (typePtr->freeIntRepProc != NULL)) {
 	typePtr->freeIntRepProc(objPtr);
     }
 
+    style = Tk_GetStyle(interp, name);
+    if (style == NULL) {
+    	return TCL_ERROR;
+    }
     objPtr->typePtr = &styleObjType;
-    objPtr->internalRep.twoPtrValue.ptr1 = Tk_GetStyle(interp, name);
+    objPtr->internalRep.twoPtrValue.ptr1 = style;
 
     return TCL_OK;
 }
 
 /*

Index: generic/tkTest.c
==================================================================
--- generic/tkTest.c
+++ generic/tkTest.c
@@ -166,11 +166,11 @@
 #if !(defined(_WIN32) || defined(MAC_OSX_TK) || defined(__CYGWIN__))
 static int		TestmenubarObjCmd(ClientData dummy,
 			    Tcl_Interp *interp, int objc,
 			    Tcl_Obj *const objv[]);
 #endif
-#if defined(_WIN32) || defined(MAC_OSX_TK)
+#if defined(_WIN32)
 static int		TestmetricsObjCmd(ClientData dummy,
 			    Tcl_Interp *interp, int objc,
 			    Tcl_Obj * const objv[]);
 #endif
 static int		TestobjconfigObjCmd(ClientData dummy,
@@ -189,10 +189,13 @@
 			    char *saveInternalPtr);
 static void		CustomOptionFree(ClientData clientData,
 			    Tk_Window tkwin, char *internalPtr);
 static int		TestpropObjCmd(ClientData dummy,
 			    Tcl_Interp *interp, int objc,
+			    Tcl_Obj * const objv[]);
+static int		TestprintfObjCmd(ClientData dummy,
+			    Tcl_Interp *interp, int objc,
 			    Tcl_Obj * const objv[]);
 #if !(defined(_WIN32) || defined(MAC_OSX_TK) || defined(__CYGWIN__))
 static int		TestwrapperObjCmd(ClientData dummy,
 			    Tcl_Interp *interp, int objc,
 			    Tcl_Obj * const objv[]);
@@ -201,10 +204,13 @@
 static int		TrivialConfigObjCmd(ClientData dummy,
 			    Tcl_Interp *interp, int objc,
 			    Tcl_Obj * const objv[]);
 static void		TrivialEventProc(ClientData clientData,
 			    XEvent *eventPtr);
+static int              TestPhotoStringMatchCmd(ClientData dummy,
+                            Tcl_Interp *interp, int objc,
+                            Tcl_Obj * const objv[]);
 
 /*
  *----------------------------------------------------------------------
  *
  * Tktest_Init --
@@ -225,11 +231,11 @@
 Tktest_Init(
     Tcl_Interp *interp)		/* Interpreter for application. */
 {
     static int initialized = 0;
 
-    if (Tcl_InitStubs(interp, "8.1", 0) == NULL) {
+    if (Tcl_InitStubs(interp, "8.6-", 0) == NULL) {
 	return TCL_ERROR;
     }
     if (Tk_InitStubs(interp, TK_VERSION, 0) == NULL) {
 	return TCL_ERROR;
     }
@@ -237,11 +243,11 @@
     /*
      * Create additional commands for testing Tk.
      */
 
     if (Tcl_PkgProvideEx(interp, "Tktest", TK_PATCH_LEVEL, NULL) == TCL_ERROR) {
-        return TCL_ERROR;
+	return TCL_ERROR;
     }
 
     Tcl_CreateObjCommand(interp, "square", SquareObjCmd, NULL, NULL);
     Tcl_CreateObjCommand(interp, "testbitmap", TestbitmapObjCmd,
 	    (ClientData) Tk_MainWindow(interp), NULL);
@@ -261,24 +267,28 @@
 	    (ClientData) Tk_MainWindow(interp), NULL);
     Tcl_CreateObjCommand(interp, "testmakeexist", TestmakeexistObjCmd,
 	    (ClientData) Tk_MainWindow(interp), NULL);
     Tcl_CreateObjCommand(interp, "testprop", TestpropObjCmd,
 	    (ClientData) Tk_MainWindow(interp), NULL);
+    Tcl_CreateObjCommand(interp, "testprintf", TestprintfObjCmd, NULL, NULL);
     Tcl_CreateObjCommand(interp, "testtext", TkpTesttextCmd,
 	    (ClientData) Tk_MainWindow(interp), NULL);
+    Tcl_CreateObjCommand(interp, "testphotostringmatch",
+            TestPhotoStringMatchCmd, (ClientData) Tk_MainWindow(interp),
+            NULL);
 
-#if defined(_WIN32) || defined(MAC_OSX_TK)
+#if defined(_WIN32)
     Tcl_CreateObjCommand(interp, "testmetrics", TestmetricsObjCmd,
 	    (ClientData) Tk_MainWindow(interp), NULL);
-#elif !defined(__CYGWIN__)
+#elif !defined(__CYGWIN__) && !defined(MAC_OSX_TK)
     Tcl_CreateObjCommand(interp, "testmenubar", TestmenubarObjCmd,
 	    (ClientData) Tk_MainWindow(interp), NULL);
     Tcl_CreateObjCommand(interp, "testsend", TkpTestsendCmd,
 	    (ClientData) Tk_MainWindow(interp), NULL);
     Tcl_CreateObjCommand(interp, "testwrapper", TestwrapperObjCmd,
 	    (ClientData) Tk_MainWindow(interp), NULL);
-#endif /* _WIN32 || MAC_OSX_TK */
+#endif /* _WIN32 */
 
     /*
      * Create test image type.
      */
 
@@ -450,11 +460,11 @@
  *
  * Results:
  *	A standard Tcl result.
  *
  * Side effects:
- *	All the intepreters created by previous calls to "testnewapp" get
+ *	All the interpreters created by previous calls to "testnewapp" get
  *	deleted.
  *
  *----------------------------------------------------------------------
  */
 
@@ -663,19 +673,19 @@
 	recordPtr->anchorPtr = NULL;
 	recordPtr->pixelPtr = NULL;
 	recordPtr->mmPtr = NULL;
 	recordPtr->stringTablePtr = NULL;
 	recordPtr->customPtr = NULL;
-	result = Tk_InitOptions(interp, (char *) recordPtr, optionTable,
+	result = Tk_InitOptions(interp, recordPtr, optionTable,
 		tkwin);
 	if (result == TCL_OK) {
 	    recordPtr->header.widgetCmd = Tcl_CreateObjCommand(interp,
 		    Tcl_GetString(objv[2]), TrivialConfigObjCmd,
 		    (ClientData) recordPtr, TrivialCmdDeletedProc);
 	    Tk_CreateEventHandler(tkwin, StructureNotifyMask,
 		    TrivialEventProc, (ClientData) recordPtr);
-	    result = Tk_SetOptions(interp, (char *) recordPtr, optionTable,
+	    result = Tk_SetOptions(interp, recordPtr, optionTable,
 		    objc-3, objv+3, tkwin, NULL, NULL);
 	    if (result != TCL_OK) {
 		Tk_DestroyWindow(tkwin);
 	    }
 	} else {
@@ -706,16 +716,16 @@
 	recordPtr->header.interp = interp;
 	recordPtr->header.optionTable = optionTable;
 	recordPtr->header.tkwin = tkwin;
 	recordPtr->base1ObjPtr = recordPtr->base2ObjPtr = NULL;
 	recordPtr->extension3ObjPtr = recordPtr->extension4ObjPtr = NULL;
-	result = Tk_InitOptions(interp, (char *)recordPtr, optionTable, tkwin);
+	result = Tk_InitOptions(interp, recordPtr, optionTable, tkwin);
 	if (result == TCL_OK) {
-	    result = Tk_SetOptions(interp, (char *) recordPtr, optionTable,
+	    result = Tk_SetOptions(interp, recordPtr, optionTable,
 		    objc-3, objv+3, tkwin, NULL, NULL);
 	    if (result != TCL_OK) {
-		Tk_FreeConfigOptions((char *) recordPtr, optionTable, tkwin);
+		Tk_FreeConfigOptions(recordPtr, optionTable, tkwin);
 	    }
 	}
 	if (result == TCL_OK) {
 	    recordPtr->header.widgetCmd = Tcl_CreateObjCommand(interp,
 		    Tcl_GetString(objv[2]), TrivialConfigObjCmd,
@@ -760,13 +770,13 @@
 	recordPtr->header.optionTable = optionTable;
 	recordPtr->header.tkwin = tkwin;
 	recordPtr->base1ObjPtr = recordPtr->base2ObjPtr = NULL;
 	recordPtr->extension3ObjPtr = recordPtr->extension4ObjPtr = NULL;
 	recordPtr->extension5ObjPtr = NULL;
-	result = Tk_InitOptions(interp, (char *)recordPtr, optionTable, tkwin);
+	result = Tk_InitOptions(interp, recordPtr, optionTable, tkwin);
 	if (result == TCL_OK) {
-	    result = Tk_SetOptions(interp, (char *) recordPtr, optionTable,
+	    result = Tk_SetOptions(interp, recordPtr, optionTable,
 		    objc-3, objv+3, tkwin, NULL, NULL);
 	    if (result != TCL_OK) {
 		Tk_FreeConfigOptions((char *) recordPtr, optionTable, tkwin);
 	    }
 	}
@@ -794,11 +804,11 @@
 	Tk_OptionTable optionTable;
 
 	widgetRecord.intPtr = NULL;
 	optionTable = Tk_CreateOptionTable(interp, errorSpecs);
 	tables[index] = optionTable;
-	return Tk_InitOptions(interp, (char *) &widgetRecord, optionTable,
+	return Tk_InitOptions(interp, &widgetRecord, optionTable,
 		(Tk_Window) NULL);
     }
 
     case DEL:
 	if (objc != 3) {
@@ -942,19 +952,19 @@
 	recordPtr->anchor = TK_ANCHOR_N;
 	recordPtr->pixels = 0;
 	recordPtr->mm = 0.0;
 	recordPtr->tkwin = NULL;
 	recordPtr->custom = NULL;
-	result = Tk_InitOptions(interp, (char *) recordPtr, optionTable,
+	result = Tk_InitOptions(interp, recordPtr, optionTable,
 		tkwin);
 	if (result == TCL_OK) {
 	    recordPtr->header.widgetCmd = Tcl_CreateObjCommand(interp,
 		    Tcl_GetString(objv[2]), TrivialConfigObjCmd,
 		    recordPtr, TrivialCmdDeletedProc);
 	    Tk_CreateEventHandler(tkwin, StructureNotifyMask,
 		    TrivialEventProc, recordPtr);
-	    result = Tk_SetOptions(interp, (char *) recordPtr, optionTable,
+	    result = Tk_SetOptions(interp, recordPtr, optionTable,
 		    objc - 3, objv + 3, tkwin, NULL, NULL);
 	    if (result != TCL_OK) {
 		Tk_DestroyWindow(tkwin);
 	    }
 	} else {
@@ -1003,22 +1013,22 @@
 	tables[index] = recordPtr->header.optionTable;
 	recordPtr->header.tkwin = NULL;
 	recordPtr->one = recordPtr->two = recordPtr->three = NULL;
 	recordPtr->four = recordPtr->five = NULL;
 	Tcl_SetObjResult(interp, objv[2]);
-	result = Tk_InitOptions(interp, (char *) recordPtr,
+	result = Tk_InitOptions(interp, recordPtr,
 		recordPtr->header.optionTable, (Tk_Window) NULL);
 	if (result == TCL_OK) {
-	    result = Tk_SetOptions(interp, (char *) recordPtr,
+	    result = Tk_SetOptions(interp, recordPtr,
 		    recordPtr->header.optionTable, objc - 3, objv + 3,
 		    (Tk_Window) NULL, NULL, NULL);
 	    if (result == TCL_OK) {
 		recordPtr->header.widgetCmd = Tcl_CreateObjCommand(interp,
 			Tcl_GetString(objv[2]), TrivialConfigObjCmd,
 			(ClientData) recordPtr, TrivialCmdDeletedProc);
 	    } else {
-		Tk_FreeConfigOptions((char *) recordPtr,
+		Tk_FreeConfigOptions(recordPtr,
 			recordPtr->header.optionTable, (Tk_Window) NULL);
 	    }
 	}
 	if (result != TCL_OK) {
 	    ckfree(recordPtr);
@@ -1043,12 +1053,12 @@
 
 	tkwin = Tk_CreateWindowFromPath(interp, mainWin, ".config", NULL);
 	Tk_SetClass(tkwin, "Config");
 	optionTable = Tk_CreateOptionTable(interp, errorSpecs);
 	tables[index] = optionTable;
-	Tk_InitOptions(interp, (char *) &record, optionTable, tkwin);
-	if (Tk_SetOptions(interp, (char *) &record, optionTable, 1,
+	Tk_InitOptions(interp, &record, optionTable, tkwin);
+	if (Tk_SetOptions(interp, &record, optionTable, 1,
 		&newObjPtr, tkwin, NULL, NULL) != TCL_OK) {
 	    result = TCL_ERROR;
 	}
 	Tcl_DecrRefCount(newObjPtr);
 	Tk_FreeConfigOptions( (char *) &record, optionTable, tkwin);
@@ -1081,14 +1091,14 @@
 		slaveSpecs);
 	tables[index] = recordPtr->header.optionTable;
 	recordPtr->header.tkwin = tkwin;
 	recordPtr->windowPtr = NULL;
 
-	result = Tk_InitOptions(interp,  (char *) recordPtr,
+	result = Tk_InitOptions(interp, recordPtr,
 		recordPtr->header.optionTable, tkwin);
 	if (result == TCL_OK) {
-	    result = Tk_SetOptions(interp, (char *) recordPtr,
+	    result = Tk_SetOptions(interp, recordPtr,
 		    recordPtr->header.optionTable, objc - 3, objv + 3,
 		    tkwin, NULL, NULL);
 	    if (result == TCL_OK) {
 		recordPtr->header.widgetCmd = Tcl_CreateObjCommand(interp,
 			Tcl_GetString(objv[2]), TrivialConfigObjCmd,
@@ -1095,11 +1105,11 @@
 			recordPtr, TrivialCmdDeletedProc);
 		Tk_CreateEventHandler(tkwin, StructureNotifyMask,
 			TrivialEventProc, recordPtr);
 		Tcl_SetObjResult(interp, objv[2]);
 	    } else {
-		Tk_FreeConfigOptions((char *) recordPtr,
+		Tk_FreeConfigOptions(recordPtr,
 			recordPtr->header.optionTable, tkwin);
 	    }
 	}
 	if (result != TCL_OK) {
 	    Tk_DestroyWindow(tkwin);
@@ -1166,11 +1176,11 @@
 	if (objc != 3) {
 	    Tcl_WrongNumArgs(interp, 2, objv, "option");
 	    result = TCL_ERROR;
 	    goto done;
 	}
-	resultObjPtr = Tk_GetOptionValue(interp, (char *) clientData,
+	resultObjPtr = Tk_GetOptionValue(interp, clientData,
 		headerPtr->optionTable, objv[2], tkwin);
 	if (resultObjPtr != NULL) {
 	    Tcl_SetObjResult(interp, resultObjPtr);
 	    result = TCL_OK;
 	} else {
@@ -1177,36 +1187,36 @@
 	    result = TCL_ERROR;
 	}
 	break;
     case CONFIGURE:
 	if (objc == 2) {
-	    resultObjPtr = Tk_GetOptionInfo(interp, (char *) clientData,
+	    resultObjPtr = Tk_GetOptionInfo(interp, clientData,
 		    headerPtr->optionTable, NULL, tkwin);
 	    if (resultObjPtr == NULL) {
 		result = TCL_ERROR;
 	    } else {
 		Tcl_SetObjResult(interp, resultObjPtr);
 	    }
 	} else if (objc == 3) {
-	    resultObjPtr = Tk_GetOptionInfo(interp, (char *) clientData,
+	    resultObjPtr = Tk_GetOptionInfo(interp, clientData,
 		    headerPtr->optionTable, objv[2], tkwin);
 	    if (resultObjPtr == NULL) {
 		result = TCL_ERROR;
 	    } else {
 		Tcl_SetObjResult(interp, resultObjPtr);
 	    }
 	} else {
-	    result = Tk_SetOptions(interp, (char *) clientData,
+	    result = Tk_SetOptions(interp, clientData,
 		    headerPtr->optionTable, objc - 2, objv + 2,
 		    tkwin, NULL, &mask);
 	    if (result == TCL_OK) {
 		Tcl_SetObjResult(interp, Tcl_NewIntObj(mask));
 	    }
 	}
 	break;
     case CSAVE:
-	result = Tk_SetOptions(interp, (char *) clientData,
+	result = Tk_SetOptions(interp, clientData,
 		headerPtr->optionTable, objc - 2, objv + 2,
 		tkwin, &saved, &mask);
 	Tk_FreeSavedOptions(&saved);
 	if (result == TCL_OK) {
 	    Tcl_SetObjResult(interp, Tcl_NewIntObj(mask));
@@ -1548,13 +1558,12 @@
 				 * imageX and imageY. */
 {
     TImageInstance *instPtr = (TImageInstance *) clientData;
     char buffer[200 + TCL_INTEGER_SPACE * 6];
 
-    sprintf(buffer, "%s display %d %d %d %d %d %d",
-	    instPtr->masterPtr->imageName, imageX, imageY, width, height,
-	    drawableX, drawableY);
+    sprintf(buffer, "%s display %d %d %d %d",
+	    instPtr->masterPtr->imageName, imageX, imageY, width, height);
     Tcl_SetVar2(instPtr->masterPtr->interp, instPtr->masterPtr->varName, NULL,
 	    buffer, TCL_GLOBAL_ONLY|TCL_APPEND_VALUE|TCL_LIST_ELEMENT);
     if (width > (instPtr->masterPtr->width - imageX)) {
 	width = instPtr->masterPtr->width - imageX;
     }
@@ -1763,11 +1772,11 @@
  *	None.
  *
  *----------------------------------------------------------------------
  */
 
-#if defined(_WIN32) || defined(MAC_OSX_TK)
+#if defined(_WIN32)
 static int
 TestmetricsObjCmd(
     ClientData clientData,	/* Main window for application. */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
@@ -1774,42 +1783,19 @@
     Tcl_Obj *const objv[])		/* Argument strings. */
 {
     char buf[TCL_INTEGER_SPACE];
     int val;
 
-#ifdef _WIN32
     if (objc < 2) {
 	Tcl_WrongNumArgs(interp, 1, objv, "option ?arg ...?");
 	return TCL_ERROR;
     }
-#else
-    Tk_Window tkwin = (Tk_Window) clientData;
-    TkWindow *winPtr;
-
-    if (objc != 3) {
-	Tcl_WrongNumArgs(interp, 1, objv, "option window");
-	return TCL_ERROR;
-    }
-
-    winPtr = (TkWindow *) Tk_NameToWindow(interp, Tcl_GetString(objv[2]), tkwin);
-    if (winPtr == NULL) {
-	return TCL_ERROR;
-    }
-#endif
 
     if (strcmp(Tcl_GetString(objv[1]), "cyvscroll") == 0) {
-#ifdef _WIN32
 	val = GetSystemMetrics(SM_CYVSCROLL);
-#else
-	val = ((TkScrollbar *) winPtr->instanceData)->width;
-#endif
     } else  if (strcmp(Tcl_GetString(objv[1]), "cxhscroll") == 0) {
-#ifdef _WIN32
 	val = GetSystemMetrics(SM_CXHSCROLL);
-#else
-	val = ((TkScrollbar *) winPtr->instanceData)->width;
-#endif
     } else {
 	Tcl_AppendResult(interp, "bad option \"", Tcl_GetString(objv[1]),
 		"\": must be cxhscroll or cyvscroll", NULL);
 	return TCL_ERROR;
     }
@@ -1893,10 +1879,64 @@
     if (property != NULL) {
 	XFree(property);
     }
     return TCL_OK;
 }
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * TestpropObjCmd --
+ *
+ *	This function implements the "testprop" command. It fetches and prints
+ *	the value of a property on a window.
+ *
+ * Results:
+ *	A standard Tcl result.
+ *
+ * Side effects:
+ *	None.
+ *
+ *----------------------------------------------------------------------
+ */
+
+	/* ARGSUSED */
+static int
+TestprintfObjCmd(
+    ClientData clientData,	/* Not used */
+    Tcl_Interp *interp,		/* Current interpreter. */
+    int objc,			/* Number of arguments. */
+    Tcl_Obj *const objv[])	/* Argument strings. */
+{
+    char buffer[256];
+    Tcl_WideInt wideInt;
+#ifdef _WIN32
+    __int64 longLongInt;
+#else
+    long long longLongInt;
+#endif
+
+    if (objc != 2) {
+	Tcl_WrongNumArgs(interp, 1, objv, "wideint");
+	return TCL_ERROR;
+    }
+    if (Tcl_GetWideIntFromObj(interp, objv[1], &wideInt) != TCL_OK) {
+	return TCL_ERROR;
+    }
+    longLongInt = wideInt;
+
+    /* Just add a lot of arguments to sprintf. Reason: on AMD64, the first
+     * 4 or 6 arguments (we assume 8, just in case) might be put in registers,
+     * which still woudn't tell if the assumed size is correct: We want this
+     * test-case to fail if the 64-bit value is printed as truncated to 32-bit.
+     */
+    sprintf(buffer, "%s%s%s%s%s%s%s%s%" TCL_LL_MODIFIER "d %"
+	    TCL_LL_MODIFIER "u", "", "", "", "", "", "", "", "",
+	    (Tcl_WideInt)longLongInt, (Tcl_WideUInt)longLongInt);
+    Tcl_AppendResult(interp, buffer, NULL);
+    return TCL_OK;
+}
 
 #if !(defined(_WIN32) || defined(MAC_OSX_TK) || defined(__CYGWIN__))
 /*
  *----------------------------------------------------------------------
  *
@@ -1988,11 +2028,11 @@
     int objEmpty;
     char *newStr, *string, *internalPtr;
 
     objEmpty = 0;
 
-    if (internalOffset >= 0) {
+    if (internalOffset != -1) {
 	internalPtr = recordPtr + internalOffset;
     } else {
 	internalPtr = NULL;
     }
 
@@ -2064,13 +2104,61 @@
 {
     if (*(char **)internalPtr != NULL) {
 	ckfree(*(char **)internalPtr);
     }
 }
+/*
+ *----------------------------------------------------------------------
+ *
+ * TestPhotoStringMatchCmd --
+ *
+ *	This function implements the "testphotostringmatch" command. It
+ *	provides a way from Tcl to call the string match function for the
+ *	default image handler directly.
+ *
+ * Results:
+ *	A standard Tcl result. If data is in the proper format, the result in
+ *	interp will contain width and height as a list. If the data cannot be
+ *	parsed as default image format, returns TCL_ERROR and leaves an
+ *	appropriate error message in interp.
+ *
+ * Side effects:
+ *	None.
+ *
+ *----------------------------------------------------------------------
+ */
+
+	/* ARGSUSED */
+static int
+TestPhotoStringMatchCmd(
+    ClientData clientData,	/* Main window for application. */
+    Tcl_Interp *interp,		/* Current interpreter. */
+    int objc,			/* Number of arguments. */
+    Tcl_Obj *const objv[])		/* Argument strings. */
+{
+    Tcl_Obj *dummy = NULL;
+    Tcl_Obj *resultObj[2];
+    int width, height;
+
+    if (objc != 2) {
+        Tcl_WrongNumArgs(interp, 1, objv, "imageData");
+        return TCL_ERROR;
+    }
+    if (TkDebugPhotoStringMatchDef(interp, objv[1], dummy, &width, &height)) {
+        resultObj[0] = Tcl_NewIntObj(width);
+        resultObj[1] = Tcl_NewIntObj(height);
+        Tcl_SetObjResult(interp, Tcl_NewListObj(2, resultObj));
+        return TCL_OK;
+    } else {
+        return TCL_ERROR;
+    }
+}
+
+
 
 /*
  * Local Variables:
  * mode: c
  * c-basic-offset: 4
  * fill-column: 78
  * End:
  */

Index: generic/tkText.c
==================================================================
--- generic/tkText.c
+++ generic/tkText.c
@@ -12,13 +12,13 @@
  *
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
 
-#include "default.h"
 #include "tkInt.h"
 #include "tkUndo.h"
+#include "default.h"
 
 #if defined(MAC_OSX_TK)
 #define Style TkStyle
 #define DInfo TkDInfo
 #endif
@@ -659,11 +659,11 @@
 	    |LeaveWindowMask|PointerMotionMask|VirtualEventMask,
 	    TkTextBindProc, textPtr);
     Tk_CreateSelHandler(textPtr->tkwin, XA_PRIMARY, XA_STRING,
 	    TextFetchSelection, textPtr, XA_STRING);
 
-    if (Tk_InitOptions(interp, (char *) textPtr, optionTable, textPtr->tkwin)
+    if (Tk_InitOptions(interp, textPtr, optionTable, textPtr->tkwin)
 	    != TCL_OK) {
 	Tk_DestroyWindow(textPtr->tkwin);
 	return TCL_ERROR;
     }
     if (ConfigureText(interp, textPtr, objc-2, objv+2) != TCL_OK) {
@@ -762,11 +762,11 @@
 	if (objc != 3) {
 	    Tcl_WrongNumArgs(interp, 2, objv, "option");
 	    result = TCL_ERROR;
 	    goto done;
 	} else {
-	    Tcl_Obj *objPtr = Tk_GetOptionValue(interp, (char *) textPtr,
+	    Tcl_Obj *objPtr = Tk_GetOptionValue(interp, textPtr,
 		    textPtr->optionTable, objv[2], textPtr->tkwin);
 
 	    if (objPtr == NULL) {
 		result = TCL_ERROR;
 		goto done;
@@ -825,11 +825,11 @@
 	result = TCL_ERROR;
 	goto done;
     }
     case TEXT_CONFIGURE:
 	if (objc <= 3) {
-	    Tcl_Obj *objPtr = Tk_GetOptionInfo(interp, (char *) textPtr,
+	    Tcl_Obj *objPtr = Tk_GetOptionInfo(interp, textPtr,
 		    textPtr->optionTable, ((objc == 3) ? objv[2] : NULL),
 		    textPtr->tkwin);
 
 	    if (objPtr == NULL) {
 		result = TCL_ERROR;
@@ -862,32 +862,32 @@
 	    result = TCL_ERROR;
 	    goto done;
 	}
 
 	for (i = 2; i < objc-2; i++) {
-	    int value, length;
-	    const char *option = Tcl_GetString(objv[i]);
+	    int value;
+	    size_t length;
+	    const char *option = TkGetStringFromObj(objv[i], &length);
 	    char c;
 
-	    length = objv[i]->length;
 	    if (length < 2 || option[0] != '-') {
 		goto badOption;
 	    }
 	    c = option[1];
-	    if (c == 'c' && !strncmp("-chars", option, (unsigned) length)) {
+	    if (c == 'c' && !strncmp("-chars", option, length)) {
 		value = CountIndices(textPtr, indexFromPtr, indexToPtr,
 			COUNT_CHARS);
 	    } else if (c == 'd' && (length > 8)
-		    && !strncmp("-displaychars", option, (unsigned) length)) {
+		    && !strncmp("-displaychars", option, length)) {
 		value = CountIndices(textPtr, indexFromPtr, indexToPtr,
 			COUNT_DISPLAY_CHARS);
 	    } else if (c == 'd' && (length > 8)
-		    && !strncmp("-displayindices", option,(unsigned)length)) {
+		    && !strncmp("-displayindices", option,length)) {
 		value = CountIndices(textPtr, indexFromPtr, indexToPtr,
 			COUNT_DISPLAY_INDICES);
 	    } else if (c == 'd' && (length > 8)
-		    && !strncmp("-displaylines", option, (unsigned) length)) {
+		    && !strncmp("-displaylines", option, length)) {
 		TkTextLine *fromPtr, *lastPtr;
 		TkTextIndex index, index2;
 
 		int compare = TkTextIndexCmp(indexFromPtr, indexToPtr);
 		value = 0;
@@ -981,33 +981,33 @@
 
 		if (compare > 0) {
 		    value = -value;
 		}
 	    } else if (c == 'i'
-		    && !strncmp("-indices", option, (unsigned) length)) {
+		    && !strncmp("-indices", option, length)) {
 		value = CountIndices(textPtr, indexFromPtr, indexToPtr,
 			COUNT_INDICES);
 	    } else if (c == 'l'
-		    && !strncmp("-lines", option, (unsigned) length)) {
+		    && !strncmp("-lines", option, length)) {
 		value = TkBTreeLinesTo(textPtr, indexToPtr->linePtr)
 			- TkBTreeLinesTo(textPtr, indexFromPtr->linePtr);
 	    } else if (c == 'u'
-		    && !strncmp("-update", option, (unsigned) length)) {
+		    && !strncmp("-update", option, length)) {
 		update = 1;
 		continue;
 	    } else if (c == 'x'
-		    && !strncmp("-xpixels", option, (unsigned) length)) {
+		    && !strncmp("-xpixels", option, length)) {
 		int x1, x2;
 		TkTextIndex index;
 
 		index = *indexFromPtr;
 		TkTextFindDisplayLineEnd(textPtr, &index, 0, &x1);
 		index = *indexToPtr;
 		TkTextFindDisplayLineEnd(textPtr, &index, 0, &x2);
 		value = x2 - x1;
 	    } else if (c == 'y'
-		    && !strncmp("-ypixels", option, (unsigned) length)) {
+		    && !strncmp("-ypixels", option, length)) {
 		if (update) {
 		    TkTextUpdateLineMetrics(textPtr,
 			    TkBTreeLinesTo(textPtr, indexFromPtr->linePtr),
 			    TkBTreeLinesTo(textPtr, indexToPtr->linePtr), -1);
 		}
@@ -1153,18 +1153,18 @@
 		    TkTextIndexForwChars(NULL, &indices[i], 1, &indices[i],
 			    COUNT_INDICES);
 		    objc++;
 		}
 		useIdx = ckalloc(objc);
-		memset(useIdx, 0, (unsigned) objc);
+		memset(useIdx, 0, objc);
 
 		/*
 		 * Do a decreasing order sort so that we delete the end ranges
 		 * first to maintain index consistency.
 		 */
 
-		qsort(indices, (unsigned) objc / 2,
+		qsort(indices, objc / 2,
 			2 * sizeof(TkTextIndex), TextIndexSortProc);
 		lastStart = NULL;
 
 		/*
 		 * Second pass will handle bogus ranges (end < start) and
@@ -1258,11 +1258,11 @@
 	break;
     case TEXT_GET: {
 	Tcl_Obj *objPtr = NULL;
 	int i, found = 0, visible = 0;
 	const char *name;
-	int length;
+	size_t length;
 
 	if (objc < 3) {
 	    Tcl_WrongNumArgs(interp, 2, objv,
 		    "?-displaychars? ?--? index1 ?index2 ...?");
 	    result = TCL_ERROR;
@@ -1274,18 +1274,16 @@
 	 * -displaychars (or any unique prefix).
 	 */
 
 	i = 2;
 	if (objc > 3) {
-	    name = Tcl_GetString(objv[i]);
-	    length = objv[i]->length;
+	    name = TkGetStringFromObj(objv[i], &length);
 	    if (length > 1 && name[0] == '-') {
-		if (strncmp("-displaychars", name, (unsigned) length) == 0) {
+		if (strncmp("-displaychars", name, length) == 0) {
 		    i++;
 		    visible = 1;
-		    name = Tcl_GetString(objv[i]);
-		    length = objv[i]->length;
+		    name = TkGetStringFromObj(objv[i], &length);
 		}
 		if ((i < objc-1) && (length == 2) && !strcmp("--", name)) {
 		    i++;
 		}
 	    }
@@ -1463,11 +1461,11 @@
 		 * The insertion point is inside the range to be replaced, so
 		 * we have to do some calculations to ensure it doesn't move
 		 * unnecessarily.
 		 */
 
-		int deleteInsertOffset, insertLength, j;
+		int deleteInsertOffset, insertLength, j, indexFromLine, indexFromByteOffset;
 
 		insertLength = 0;
 		for (j = 4; j < objc; j += 2) {
 		    insertLength += Tcl_GetCharLength(objv[j]);
 		}
@@ -1481,19 +1479,26 @@
 			&index, COUNT_CHARS);
 		if (deleteInsertOffset > insertLength) {
 		    deleteInsertOffset = insertLength;
 		}
 
+                indexFromLine = TkBTreeLinesTo(textPtr, indexFromPtr->linePtr);
+                indexFromByteOffset = indexFromPtr->byteIndex;
+
 		result = TextReplaceCmd(textPtr, interp, indexFromPtr,
 			indexToPtr, objc, objv, 0);
 
 		if (result == TCL_OK) {
 		    /*
 		     * Move the insertion position to the correct place.
 		     */
 
-		    TkTextIndexForwChars(NULL, indexFromPtr,
+                    TkTextIndex indexTmp;
+
+                    TkTextMakeByteIndex(textPtr->sharedTextPtr->tree, textPtr, indexFromLine,
+                            indexFromByteOffset, &indexTmp);
+                    TkTextIndexForwChars(NULL, &indexTmp,
 			    deleteInsertOffset, &index, COUNT_INDICES);
 		    TkBTreeUnlinkSegment(textPtr->insertMarkPtr,
 			    textPtr->insertMarkPtr->body.mark.linePtr);
 		    TkBTreeLinkSegment(textPtr->insertMarkPtr, &index);
 		}
@@ -1568,12 +1573,11 @@
 	result = TkTextYviewCmd(textPtr, interp, objc, objv);
 	break;
     }
 
   done:
-    textPtr->refCount--;
-    if (textPtr->refCount == 0) {
+    if (textPtr->refCount-- <= 1) {
 	ckfree(textPtr);
     }
     return result;
 }
 
@@ -1962,13 +1966,11 @@
      *
      * When the refCount reaches zero, it's time to clean up the shared
      * portion of the text widget.
      */
 
-    sharedTextPtr->refCount--;
-
-    if (sharedTextPtr->refCount > 0) {
+    if (sharedTextPtr->refCount-- > 1) {
 	TkBTreeRemoveClient(sharedTextPtr->tree, textPtr);
 
 	/*
 	 * Free up any embedded windows which belong to this widget.
 	 */
@@ -2040,17 +2042,16 @@
     if (textPtr->insertBlinkHandler != NULL) {
 	Tcl_DeleteTimerHandler(textPtr->insertBlinkHandler);
     }
 
     textPtr->tkwin = NULL;
-    textPtr->refCount--;
     Tcl_DeleteCommandFromToken(textPtr->interp, textPtr->widgetCmd);
     if (textPtr->afterSyncCmd){
 	Tcl_DecrRefCount(textPtr->afterSyncCmd);
 	textPtr->afterSyncCmd = NULL;
     }
-    if (textPtr->refCount == 0) {
+    if (textPtr->refCount-- <= 1) {
 	ckfree(textPtr);
     }
 }
 
 /*
@@ -2079,11 +2080,11 @@
 				 * already have values for some fields. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
     Tk_SavedOptions savedOptions;
-    int oldExport = textPtr->exportSelection;
+    int oldExport = (textPtr->exportSelection) && (!Tcl_IsSafe(textPtr->interp));
     int mask = 0;
 
     if (Tk_SetOptions(interp, (char *) textPtr, textPtr->optionTable,
 	    objc, objv, textPtr->tkwin, &savedOptions, &mask) != TCL_OK) {
 	return TCL_ERROR;
@@ -2308,11 +2309,11 @@
     /*
      * Claim the selection if we've suddenly started exporting it and there
      * are tagged characters.
      */
 
-    if (textPtr->exportSelection && (!oldExport)) {
+    if (textPtr->exportSelection && (!oldExport) && (!Tcl_IsSafe(textPtr->interp))) {
 	TkTextSearch search;
 	TkTextIndex first, last;
 
 	TkTextMakeByteIndex(textPtr->sharedTextPtr->tree, textPtr, 0, 0,
 		&first);
@@ -2628,18 +2629,18 @@
 				 * insertion (e.g. if at "end"). */
     Tcl_Obj *stringPtr,		/* Null-terminated string containing new
 				 * information to add to text. */
     int viewUpdate)		/* Update the view if set. */
 {
-    int lineIndex, length;
+    int lineIndex;
+    size_t length;
     TkText *tPtr;
     int *lineAndByteIndex;
     int resetViewCount;
     int pixels[2*PIXEL_CLIENTS];
-    const char *string = Tcl_GetString(stringPtr);
+    const char *string = TkGetStringFromObj(stringPtr, &length);
 
-    length = stringPtr->length;
     if (sharedTextPtr == NULL) {
 	sharedTextPtr = textPtr->sharedTextPtr;
     }
 
     /*
@@ -2727,14 +2728,18 @@
     if (sharedTextPtr->refCount > PIXEL_CLIENTS) {
 	ckfree(lineAndByteIndex);
     }
 
     /*
-     * Invalidate any selection retrievals in progress.
+     * Invalidate any selection retrievals in progress, and send an event
+     * that the selection changed if that is the case.
      */
 
     for (tPtr = sharedTextPtr->peers; tPtr != NULL ; tPtr = tPtr->next) {
+        if (TkBTreeCharTagged(indexPtr, tPtr->selTagPtr)) {
+            TkTextSelectionEvent(tPtr);
+        }
 	tPtr->abortSelections = 1;
     }
 
     /*
      * For convenience, return the length of the string.
@@ -2772,10 +2777,13 @@
     const TkTextIndex *index2Ptr)
 				/* Index describing second location. */
 {
     TkUndoSubAtom *iAtom, *dAtom;
     int canUndo, canRedo;
+    char lMarkName[20] = "tk::undoMarkL";
+    char rMarkName[20] = "tk::undoMarkR";
+    char stringUndoMarkId[7] = "";
 
     /*
      * Create the helpers.
      */
 
@@ -2782,10 +2790,14 @@
     Tcl_Obj *seeInsertObj = Tcl_NewObj();
     Tcl_Obj *markSet1InsertObj = Tcl_NewObj();
     Tcl_Obj *markSet2InsertObj = NULL;
     Tcl_Obj *insertCmdObj = Tcl_NewObj();
     Tcl_Obj *deleteCmdObj = Tcl_NewObj();
+    Tcl_Obj *markSetLUndoMarkCmdObj = Tcl_NewObj();
+    Tcl_Obj *markSetRUndoMarkCmdObj = NULL;
+    Tcl_Obj *markGravityLUndoMarkCmdObj = Tcl_NewObj();
+    Tcl_Obj *markGravityRUndoMarkCmdObj = NULL;
 
     /*
      * Get the index positions.
      */
 
@@ -2831,10 +2843,44 @@
     Tcl_ListObjAppendElement(NULL, deleteCmdObj,
 	    Tcl_NewStringObj("delete", 6));
     Tcl_ListObjAppendElement(NULL, deleteCmdObj, index1Obj);
     Tcl_ListObjAppendElement(NULL, deleteCmdObj, index2Obj);
 
+    Tcl_ListObjAppendElement(NULL, markSetLUndoMarkCmdObj,
+	    Tcl_NewStringObj(Tk_PathName(textPtr->tkwin), -1));
+    Tcl_ListObjAppendElement(NULL, markSetLUndoMarkCmdObj,
+	    Tcl_NewStringObj("mark", 4));
+    Tcl_ListObjAppendElement(NULL, markSetLUndoMarkCmdObj,
+	    Tcl_NewStringObj("set", 3));
+    markSetRUndoMarkCmdObj = Tcl_DuplicateObj(markSetLUndoMarkCmdObj);
+    textPtr->sharedTextPtr->undoMarkId++;
+    sprintf(stringUndoMarkId, "%d", textPtr->sharedTextPtr->undoMarkId);
+    strcat(lMarkName, stringUndoMarkId);
+    strcat(rMarkName, stringUndoMarkId);
+    Tcl_ListObjAppendElement(NULL, markSetLUndoMarkCmdObj,
+	    Tcl_NewStringObj(lMarkName, -1));
+    Tcl_ListObjAppendElement(NULL, markSetRUndoMarkCmdObj,
+	    Tcl_NewStringObj(rMarkName, -1));
+    Tcl_ListObjAppendElement(NULL, markSetLUndoMarkCmdObj, index1Obj);
+    Tcl_ListObjAppendElement(NULL, markSetRUndoMarkCmdObj, index2Obj);
+
+    Tcl_ListObjAppendElement(NULL, markGravityLUndoMarkCmdObj,
+	    Tcl_NewStringObj(Tk_PathName(textPtr->tkwin), -1));
+    Tcl_ListObjAppendElement(NULL, markGravityLUndoMarkCmdObj,
+	    Tcl_NewStringObj("mark", 4));
+    Tcl_ListObjAppendElement(NULL, markGravityLUndoMarkCmdObj,
+	    Tcl_NewStringObj("gravity", 7));
+    markGravityRUndoMarkCmdObj = Tcl_DuplicateObj(markGravityLUndoMarkCmdObj);
+    Tcl_ListObjAppendElement(NULL, markGravityLUndoMarkCmdObj,
+	    Tcl_NewStringObj(lMarkName, -1));
+    Tcl_ListObjAppendElement(NULL, markGravityRUndoMarkCmdObj,
+	    Tcl_NewStringObj(rMarkName, -1));
+    Tcl_ListObjAppendElement(NULL, markGravityLUndoMarkCmdObj,
+            Tcl_NewStringObj("left", 4));
+    Tcl_ListObjAppendElement(NULL, markGravityRUndoMarkCmdObj,
+            Tcl_NewStringObj("right", 5));
+
     /*
      * Note: we don't wish to use textPtr->widgetCmd in these callbacks
      * because if we delete the textPtr, but peers still exist, we will then
      * have references to a non-existent Tcl_Command in the undo stack, which
      * will lead to crashes later. Also, the behaviour of the widget w.r.t.
@@ -2848,15 +2894,23 @@
 
     iAtom = TkUndoMakeSubAtom(&TextUndoRedoCallback, textPtr->sharedTextPtr,
 	    insertCmdObj, NULL);
     TkUndoMakeCmdSubAtom(NULL, markSet2InsertObj, iAtom);
     TkUndoMakeCmdSubAtom(NULL, seeInsertObj, iAtom);
+    TkUndoMakeCmdSubAtom(NULL, markSetLUndoMarkCmdObj, iAtom);
+    TkUndoMakeCmdSubAtom(NULL, markSetRUndoMarkCmdObj, iAtom);
+    TkUndoMakeCmdSubAtom(NULL, markGravityLUndoMarkCmdObj, iAtom);
+    TkUndoMakeCmdSubAtom(NULL, markGravityRUndoMarkCmdObj, iAtom);
 
     dAtom = TkUndoMakeSubAtom(&TextUndoRedoCallback, textPtr->sharedTextPtr,
 	    deleteCmdObj, NULL);
     TkUndoMakeCmdSubAtom(NULL, markSet1InsertObj, dAtom);
     TkUndoMakeCmdSubAtom(NULL, seeInsertObj, dAtom);
+    TkUndoMakeCmdSubAtom(NULL, markSetLUndoMarkCmdObj, dAtom);
+    TkUndoMakeCmdSubAtom(NULL, markSetRUndoMarkCmdObj, dAtom);
+    TkUndoMakeCmdSubAtom(NULL, markGravityLUndoMarkCmdObj, dAtom);
+    TkUndoMakeCmdSubAtom(NULL, markGravityRUndoMarkCmdObj, dAtom);
 
     Tcl_DecrRefCount(seeInsertObj);
     Tcl_DecrRefCount(index1Obj);
     Tcl_DecrRefCount(index2Obj);
 
@@ -3070,10 +3124,13 @@
     TkTextIndex index1, index2;
     TkText *tPtr;
     int *lineAndByteIndex;
     int resetViewCount;
     int pixels[2*PIXEL_CLIENTS];
+    Tcl_HashSearch search;
+    Tcl_HashEntry *hPtr;
+    int i;
 
     if (sharedTextPtr == NULL) {
 	sharedTextPtr = textPtr->sharedTextPtr;
     }
 
@@ -3134,46 +3191,40 @@
 	    }
 	    ckfree(arrayPtr);
 	}
     }
 
-    if (line1 < line2) {
-	/*
-	 * We are deleting more than one line. For speed, we remove all tags
-	 * from the range first. If we don't do this, the code below can (when
-	 * there are many tags) grow non-linearly in execution time.
-	 */
-
-	Tcl_HashSearch search;
-	Tcl_HashEntry *hPtr;
-	int i;
-
-	for (i=0, hPtr=Tcl_FirstHashEntry(&sharedTextPtr->tagTable, &search);
-		hPtr != NULL; i++, hPtr = Tcl_NextHashEntry(&search)) {
-	    TkTextTag *tagPtr = Tcl_GetHashValue(hPtr);
-
-	    TkBTreeTag(&index1, &index2, tagPtr, 0);
-	}
-
-	/*
-	 * Special case for the sel tag which is not in the hash table. We
-	 * need to do this once for each peer text widget.
-	 */
-
-	for (tPtr = sharedTextPtr->peers; tPtr != NULL ;
-		tPtr = tPtr->next) {
-	    if (TkBTreeTag(&index1, &index2, tPtr->selTagPtr, 0)) {
-		/*
-		 * Send an event that the selection changed. This is
-		 * equivalent to:
-		 *	event generate $textWidget <<Selection>>
-		 */
-
-		TkTextSelectionEvent(textPtr);
-		tPtr->abortSelections = 1;
-	    }
-	}
+    /*
+     * For speed, we remove all tags from the range first. If we don't
+     * do this, the code below can (when there are many tags) grow
+     * non-linearly in execution time.
+     */
+
+    for (i=0, hPtr=Tcl_FirstHashEntry(&sharedTextPtr->tagTable, &search);
+	    hPtr != NULL; i++, hPtr = Tcl_NextHashEntry(&search)) {
+        TkTextTag *tagPtr = Tcl_GetHashValue(hPtr);
+
+        TkBTreeTag(&index1, &index2, tagPtr, 0);
+    }
+
+    /*
+     * Special case for the sel tag which is not in the hash table. We
+     * need to do this once for each peer text widget.
+     */
+
+    for (tPtr = sharedTextPtr->peers; tPtr != NULL ;
+	    tPtr = tPtr->next) {
+        if (TkBTreeTag(&index1, &index2, tPtr->selTagPtr, 0)) {
+	    /*
+	     * Send an event that the selection changed. This is
+	     * equivalent to:
+	     *	event generate $textWidget <<Selection>>
+	     */
+
+	    TkTextSelectionEvent(textPtr);
+	    tPtr->abortSelections = 1;
+        }
     }
 
     /*
      * Tell the display what's about to happen so it can discard obsolete
      * display information, then do the deletion. Also, if the deletion
@@ -3379,11 +3430,11 @@
     TkTextIndex eof;
     int count, chunkSize, offsetInSeg;
     TkTextSearch search;
     TkTextSegment *segPtr;
 
-    if (!textPtr->exportSelection) {
+    if ((!textPtr->exportSelection) || Tcl_IsSafe(textPtr->interp)) {
 	return -1;
     }
 
     /*
      * Find the beginning of the next range of selected text. Note: if the
@@ -3509,11 +3560,11 @@
     register TkText *textPtr = clientData;
 
     if (TkpAlwaysShowSelection(textPtr->tkwin)) {
 	TkTextIndex start, end;
 
-	if (!textPtr->exportSelection) {
+	if ((!textPtr->exportSelection) || Tcl_IsSafe(textPtr->interp)) {
 	    return;
 	}
 
 	/*
 	 * On Windows and Mac systems, we want to remember the selection for
@@ -3756,14 +3807,14 @@
 	"-hidden",
 	"--", "-all", "-backwards", "-count", "-elide", "-exact", "-forwards",
 	"-nocase", "-nolinestop", "-overlap", "-regexp", "-strictlimits", NULL
     };
     enum SearchSwitches {
-	SEARCH_HIDDEN,
-	SEARCH_END, SEARCH_ALL, SEARCH_BACK, SEARCH_COUNT, SEARCH_ELIDE,
-	SEARCH_EXACT, SEARCH_FWD, SEARCH_NOCASE,
-	SEARCH_NOLINESTOP, SEARCH_OVERLAP, SEARCH_REGEXP, SEARCH_STRICTLIMITS
+	TK_TEXT_SEARCH_HIDDEN,
+	TK_TEXT_SEARCH_END, TK_TEXT_SEARCH_ALL, TK_TEXT_SEARCH_BACK, TK_TEXT_SEARCH_COUNT, TK_TEXT_SEARCH_ELIDE,
+	TK_TEXT_SEARCH_EXACT, TK_TEXT_SEARCH_FWD, TK_TEXT_SEARCH_NOCASE,
+	TK_TEXT_SEARCH_NOLINESTOP, TK_TEXT_SEARCH_OVERLAP, TK_TEXT_SEARCH_REGEXP, TK_TEXT_SEARCH_STRICTLIMITS
     };
 
     /*
      * Set up the search specification, including the last 4 fields which are
      * text widget specific.
@@ -3809,20 +3860,20 @@
 		    sizeof(char *), "switch", 0, &index);
 	    return TCL_ERROR;
 	}
 
 	switch ((enum SearchSwitches) index) {
-	case SEARCH_END:
+	case TK_TEXT_SEARCH_END:
 	    i++;
 	    goto endOfSwitchProcessing;
-	case SEARCH_ALL:
+	case TK_TEXT_SEARCH_ALL:
 	    searchSpec.all = 1;
 	    break;
-	case SEARCH_BACK:
+	case TK_TEXT_SEARCH_BACK:
 	    searchSpec.backwards = 1;
 	    break;
-	case SEARCH_COUNT:
+	case TK_TEXT_SEARCH_COUNT:
 	    if (i >= objc-1) {
 		Tcl_SetObjResult(interp, Tcl_NewStringObj(
 			"no value given for \"-count\" option", -1));
 		Tcl_SetErrorCode(interp, "TK", "TEXT", "VALUE", NULL);
 		return TCL_ERROR;
@@ -3834,33 +3885,33 @@
 	     * function, which is fair.
 	     */
 
 	    searchSpec.varPtr = objv[i];
 	    break;
-	case SEARCH_ELIDE:
-	case SEARCH_HIDDEN:
+	case TK_TEXT_SEARCH_ELIDE:
+	case TK_TEXT_SEARCH_HIDDEN:
 	    searchSpec.searchElide = 1;
 	    break;
-	case SEARCH_EXACT:
+	case TK_TEXT_SEARCH_EXACT:
 	    searchSpec.exact = 1;
 	    break;
-	case SEARCH_FWD:
+	case TK_TEXT_SEARCH_FWD:
 	    searchSpec.backwards = 0;
 	    break;
-	case SEARCH_NOCASE:
+	case TK_TEXT_SEARCH_NOCASE:
 	    searchSpec.noCase = 1;
 	    break;
-	case SEARCH_NOLINESTOP:
+	case TK_TEXT_SEARCH_NOLINESTOP:
 	    searchSpec.noLineStop = 1;
 	    break;
-	case SEARCH_OVERLAP:
+	case TK_TEXT_SEARCH_OVERLAP:
 	    searchSpec.overlap = 1;
 	    break;
-	case SEARCH_STRICTLIMITS:
+	case TK_TEXT_SEARCH_STRICTLIMITS:
 	    searchSpec.strictLimits = 1;
 	    break;
-	case SEARCH_REGEXP:
+	case TK_TEXT_SEARCH_REGEXP:
 	    searchSpec.exact = 0;
 	    break;
 	default:
 	    Tcl_Panic("unexpected switch fallthrough");
 	}
@@ -4176,11 +4227,11 @@
 	Tcl_SetObjLength(theLine, Tcl_UtfToLower(Tcl_GetString(theLine)));
     }
 
     if (lenPtr != NULL) {
 	if (searchSpecPtr->exact) {
-	    (void)Tcl_GetString(theLine);
+	    Tcl_GetString(theLine);
 	    *lenPtr = theLine->length;
 	} else {
 	    *lenPtr = Tcl_GetCharLength(theLine);
 	}
     }
@@ -4457,11 +4508,11 @@
 {
     int objc, i, count;
     Tcl_Obj **objv;
     TkTextTabArray *tabArrayPtr;
     TkTextTab *tabPtr;
-    Tcl_UniChar ch;
+    int ch;
     double prevStop, lastStop;
     /*
      * Map these strings to TkTextTabAlign values.
      */
     static const char *const tabOptionStrings[] = {
@@ -4564,11 +4615,11 @@
 
 	/*
 	 * There may be a more efficient way of getting this.
 	 */
 
-	Tcl_UtfToUniChar(Tcl_GetString(objv[i+1]), &ch);
+	TkUtfToUniChar(Tcl_GetString(objv[i+1]), &ch);
 	if (!Tcl_UniCharIsAlpha(ch)) {
 	    continue;
 	}
 	i += 1;
 
@@ -4701,19 +4752,18 @@
     arg++;
     atEnd = 0;
     if (objc == arg) {
 	TkTextIndexForwChars(NULL, &index1, 1, &index2, COUNT_INDICES);
     } else {
-	int length;
+	size_t length;
 	const char *str;
 
 	if (TkTextGetObjIndex(interp, textPtr, objv[arg], &index2) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	str = Tcl_GetString(objv[arg]);
-	length = objv[arg]->length;
-	if (strncmp(str, "end", (unsigned) length) == 0) {
+	str = TkGetStringFromObj(objv[arg], &length);
+	if (strncmp(str, "end", length) == 0) {
 	    atEnd = 1;
 	}
     }
     if (TkTextIndexCmp(&index1, &index2) >= 0) {
 	return TCL_OK;
@@ -5024,11 +5074,11 @@
     if (command == NULL) {
 	Tcl_ListObjAppendList(NULL, Tcl_GetObjResult(interp), tuple);
 	Tcl_DecrRefCount(tuple);
 	return 0;
     } else {
-	int oldStateEpoch = TkBTreeEpoch(textPtr->sharedTextPtr->tree);
+	TkSizeT oldStateEpoch = TkBTreeEpoch(textPtr->sharedTextPtr->tree);
 	Tcl_DString buf;
 	int code;
 
 	Tcl_DStringInit(&buf);
 	Tcl_DStringAppend(&buf, Tcl_GetString(command), -1);
@@ -5067,10 +5117,12 @@
 static int
 TextEditUndo(
     TkText *textPtr)		/* Overall information about text widget. */
 {
     int status;
+    Tcl_Obj *cmdObj;
+    int code;
 
     if (!textPtr->sharedTextPtr->undo) {
 	return TCL_OK;
     }
 
@@ -5090,10 +5142,26 @@
     if (textPtr->sharedTextPtr->dirtyMode != TK_TEXT_DIRTY_FIXED) {
 	textPtr->sharedTextPtr->dirtyMode = TK_TEXT_DIRTY_NORMAL;
     }
     textPtr->sharedTextPtr->undo = 1;
 
+    /*
+     * Convert undo/redo temporary marks set by TkUndoRevert() into
+     * indices left in the interp result.
+     */
+
+    cmdObj = Tcl_ObjPrintf("::tk::TextUndoRedoProcessMarks %s",
+            Tk_PathName(textPtr->tkwin));
+    Tcl_IncrRefCount(cmdObj);
+    code = Tcl_EvalObjEx(textPtr->interp, cmdObj, TCL_EVAL_GLOBAL);
+    if (code != TCL_OK) {
+        Tcl_AddErrorInfo(textPtr->interp,
+                "\n    (on undoing)");
+        Tcl_BackgroundException(textPtr->interp, code);
+    }
+    Tcl_DecrRefCount(cmdObj);
+
     return status;
 }
 
 /*
  *----------------------------------------------------------------------
@@ -5115,10 +5183,12 @@
 static int
 TextEditRedo(
     TkText *textPtr)		/* Overall information about text widget. */
 {
     int status;
+    Tcl_Obj *cmdObj;
+    int code;
 
     if (!textPtr->sharedTextPtr->undo) {
 	return TCL_OK;
     }
 
@@ -5137,10 +5207,27 @@
 
     if (textPtr->sharedTextPtr->dirtyMode != TK_TEXT_DIRTY_FIXED) {
 	textPtr->sharedTextPtr->dirtyMode = TK_TEXT_DIRTY_NORMAL;
     }
     textPtr->sharedTextPtr->undo = 1;
+
+    /*
+     * Convert undo/redo temporary marks set by TkUndoApply() into
+     * indices left in the interp result.
+     */
+
+    cmdObj = Tcl_ObjPrintf("::tk::TextUndoRedoProcessMarks %s",
+            Tk_PathName(textPtr->tkwin));
+    Tcl_IncrRefCount(cmdObj);
+    code = Tcl_EvalObjEx(textPtr->interp, cmdObj, TCL_EVAL_GLOBAL);
+    if (code != TCL_OK) {
+        Tcl_AddErrorInfo(textPtr->interp,
+                "\n    (on undoing)");
+        Tcl_BackgroundException(textPtr->interp, code);
+    }
+    Tcl_DecrRefCount(cmdObj);
+
     return status;
 }
 
 /*
  *----------------------------------------------------------------------
@@ -5524,11 +5611,11 @@
     if ((textPtr->tkwin == NULL) || (textPtr->flags & DESTROYED)) {
 	/*
 	* The widget has been deleted. Don't do anything.
 	*/
 
-	if (--textPtr->refCount == 0) {
+	if (textPtr->refCount-- <= 1) {
 	    ckfree((char *) textPtr);
 	}
 	return;
     }
 
@@ -5744,12 +5831,11 @@
 	 * We only need to set the matchLength once for exact searches, and we
 	 * do it here. It is also used below as the actual pattern length, so
 	 * it has dual purpose.
 	 */
 
-	pattern = Tcl_GetString(patObj);
-	matchLength = patObj->length;
+	pattern = Tcl_GetStringFromObj(patObj, &matchLength);
 	nl = strchr(pattern, '\n');
 
 	/*
 	 * If there is no newline, or it is the very end of the string, then
 	 * we don't need any special treatment, since single-line matching
@@ -5815,11 +5901,11 @@
 	    firstOffset = searchSpecPtr->stopOffset;
 	} else {
 	    firstOffset = 0;
 	}
 
-	if (alreadySearchOffset != -1) {
+	if (alreadySearchOffset >= 0) {
 	    if (searchSpecPtr->backwards) {
 		if (alreadySearchOffset < lastOffset) {
 		    lastOffset = alreadySearchOffset;
 		}
 	    } else {
@@ -5878,11 +5964,11 @@
 	    int maxExtraLines = 0;
 	    const char *startOfLine = Tcl_GetString(theLine);
 
 	    CLANG_ASSERT(pattern);
 	    do {
-		Tcl_UniChar ch;
+		int ch;
 		const char *p;
 		int lastFullLine = lastOffset;
 
 		if (firstNewLine == -1) {
 		    if (searchSpecPtr->strictLimits
@@ -5904,21 +5990,21 @@
 			 * Search back either from the previous match or from
 			 * 'startOfLine + lastOffset - 1' until we find a
 			 * match.
 			 */
 
-			const char c = pattern[0];
+			const char c = matchLength ? pattern[0] : '\0';
 
-			if (alreadySearchOffset != -1) {
+			if (alreadySearchOffset >= 0) {
 			    p = startOfLine + alreadySearchOffset;
 			    alreadySearchOffset = -1;
 			} else {
 			    p = startOfLine + lastOffset -1;
 			}
 			while (p >= startOfLine + firstOffset) {
-			    if (p[0] == c && !strncmp(p, pattern,
-				    (unsigned) matchLength)) {
+			    if (matchLength == 0 || (p[0] == c && !strncmp(
+				     p, pattern, (size_t) matchLength))) {
 				goto backwardsMatch;
 			    }
 			    p--;
 			}
 			break;
@@ -6009,11 +6095,11 @@
 				 * We now have enough text to match, so we
 				 * make a final test and break whatever the
 				 * result.
 				 */
 
-				if (strncmp(p,pattern,(unsigned)matchLength)) {
+				if (strncmp(p,pattern,(size_t)matchLength)) {
 				    p = NULL;
 				}
 				break;
 			    } else {
 				/*
@@ -6077,14 +6163,18 @@
 		    if (searchSpecPtr->backwards) {
 			alreadySearchOffset = p - startOfLine;
 			if (firstNewLine != -1) {
 			    break;
 			} else {
-			    alreadySearchOffset -= matchLength;
+			    alreadySearchOffset -= (matchLength ? matchLength : 1);
+                            if (alreadySearchOffset < 0) {
+                                break;
+                            }
 			}
 		    } else {
-			firstOffset = p - startOfLine + matchLength;
+                        firstOffset = matchLength ? p - startOfLine + matchLength
+                                                  : p - startOfLine + 1;
 			if (firstOffset >= lastOffset) {
 			    /*
 			     * Now, we have to be careful not to find
 			     * overlapping matches either on the same or
 			     * following lines. Assume that if we did find
@@ -6108,11 +6198,11 @@
 			if (alreadySearchOffset < 0) {
 			    break;
 			}
 		    } else {
 			firstOffset = p - startOfLine +
-				Tcl_UtfToUniChar(startOfLine+matchOffset,&ch);
+				TkUtfToUniChar(startOfLine+matchOffset,&ch);
 		    }
 		}
 	    } while (searchSpecPtr->all);
 	} else {
 	    int maxExtraLines = 0;
@@ -6741,11 +6831,11 @@
     TkTextLine *linePtr = NULL;
     char *internalPtr;
     TkText *textPtr = (TkText *) recordPtr;
 
     if (internalOffset >= 0) {
-	internalPtr = recordPtr + internalOffset;
+	internalPtr = (char *)recordPtr + internalOffset;
     } else {
 	internalPtr = NULL;
     }
 
     if (flags & TK_OPTION_NULL_OK && ObjectIsEmpty(*value)) {
@@ -6816,14 +6906,13 @@
     Tcl_Obj *objPtr)		/* Object to test. May be NULL. */
 {
     if (objPtr == NULL) {
 	return 1;
     }
-    if (objPtr->bytes != NULL) {
-	return (objPtr->length == 0);
+    if (objPtr->bytes == NULL) {
+	Tcl_GetString(objPtr);
     }
-    (void)Tcl_GetString(objPtr);
     return (objPtr->length == 0);
 }
 
 /*
  *----------------------------------------------------------------------

Index: generic/tkText.h
==================================================================
--- generic/tkText.h
+++ generic/tkText.h
@@ -529,13 +529,21 @@
 
 /*
  * A data structure of the following type is shared between each text widget
  * that are peers.
  */
+
+#ifndef TkSizeT
+#   if TCL_MAJOR_VERSION > 8
+#	define TkSizeT size_t
+#   else
+#	define TkSizeT int
+#   endif
+#endif
 
 typedef struct TkSharedText {
-    int refCount;		/* Reference count this shared object. */
+    TkSizeT refCount;		/* Reference count this shared object. */
     TkTextBTree tree;		/* B-tree representation of text and tags for
 				 * widget. */
     Tcl_HashTable tagTable;	/* Hash table that maps from tag names to
 				 * pointers to TkTextTag structures. The "sel"
 				 * tag does not feature in this table, since
@@ -560,11 +568,11 @@
 				/* Table of all bindings currently defined for
 				 * this widget. NULL means that no bindings
 				 * exist, so the table hasn't been created.
 				 * Each "object" used for this table is the
 				 * name of a tag. */
-    int stateEpoch;		/* This is incremented each time the B-tree's
+    TkSizeT stateEpoch;	/* This is incremented each time the B-tree's
 				 * contents change structurally, or when the
 				 * start/end limits change, and means that any
 				 * cached TkTextIndex objects are no longer
 				 * valid. */
 
@@ -578,10 +586,12 @@
     int maxUndo;		/* The maximum depth of the undo stack
 				 * expressed as the maximum number of compound
 				 * statements. */
     int autoSeparators;		/* Non-zero means the separators will be
 				 * inserted automatically. */
+    int undoMarkId;             /* Counts undo marks temporarily used during
+                                   undo and redo operations. */
     int isDirty;		/* Flag indicating the 'dirtyness' of the
 				 * text widget. If the flag is not zero,
 				 * unsaved modifications have been applied to
 				 * the text widget. */
     TkTextDirtyMode dirtyMode;	/* The nature of the dirtyness characterized
@@ -779,11 +789,11 @@
 				 * vertical scrollbar when view changes. */
     int flags;			/* Miscellaneous flags; see below for
 				 * definitions. */
     Tk_OptionTable optionTable;	/* Token representing the configuration
 				 * specifications. */
-    int refCount;		/* Number of cached TkTextIndex objects
+    TkSizeT refCount;		/* Number of cached TkTextIndex objects
 				 * refering to us. */
     int insertCursorType;	/* 0 = standard insertion cursor, 1 = block
 				 * cursor. */
 
     /*
@@ -1005,11 +1015,11 @@
 MODULE_SCOPE void	TkBTreeRemoveClient(TkTextBTree tree,
 			    TkText *textPtr);
 MODULE_SCOPE void	TkBTreeDestroy(TkTextBTree tree);
 MODULE_SCOPE void	TkBTreeDeleteIndexRange(TkTextBTree tree,
 			    TkTextIndex *index1Ptr, TkTextIndex *index2Ptr);
-MODULE_SCOPE int	TkBTreeEpoch(TkTextBTree tree);
+MODULE_SCOPE TkSizeT	TkBTreeEpoch(TkTextBTree tree);
 MODULE_SCOPE TkTextLine *TkBTreeFindLine(TkTextBTree tree,
 			    const TkText *textPtr, int line);
 MODULE_SCOPE TkTextLine *TkBTreeFindPixelLine(TkTextBTree tree,
 			    const TkText *textPtr, int pixels,
 			    int *pixelOffset);

Index: generic/tkTextBTree.c
==================================================================
--- generic/tkTextBTree.c
+++ generic/tkTextBTree.c
@@ -103,11 +103,11 @@
 typedef struct BTree {
     Node *rootPtr;		/* Pointer to root of B-tree. */
     int clients;		/* Number of clients of this B-tree. */
     int pixelReferences;	/* Number of clients of this B-tree which care
 				 * about pixel heights. */
-    int stateEpoch;		/* Updated each time any aspect of the B-tree
+    TkSizeT stateEpoch;	 /* Updated each time any aspect of the B-tree
 				 * changes. */
     TkSharedText *sharedTextPtr;/* Used to find tagTable in consistency
 				 * checking code, and to access list of all
 				 * B-tree clients. */
     int startEndCount;
@@ -138,14 +138,14 @@
 
 /*
  * Macros that determine how much space to allocate for new segments:
  */
 
-#define CSEG_SIZE(chars) ((unsigned) (Tk_Offset(TkTextSegment, body) \
-	+ 1 + (chars)))
-#define TSEG_SIZE ((unsigned) (Tk_Offset(TkTextSegment, body) \
-	+ sizeof(TkTextToggle)))
+#define CSEG_SIZE(chars) (Tk_Offset(TkTextSegment, body) \
+	+ 1 + (chars))
+#define TSEG_SIZE (Tk_Offset(TkTextSegment, body) \
+	+ sizeof(TkTextToggle))
 
 /*
  * Forward declarations for functions defined in this file:
  */
 
@@ -499,11 +499,11 @@
  *	None.
  *
  *----------------------------------------------------------------------
  */
 
-int
+TkSizeT
 TkBTreeEpoch(
     TkTextBTree tree)		/* Tree to get epoch for. */
 {
     BTree *treePtr = (BTree *) tree;
     return treePtr->stateEpoch;
@@ -797,10 +797,11 @@
     if (overwriteWithLast != -1) {
 	nodePtr->numPixels[overwriteWithLast] =
 		nodePtr->numPixels[treePtr->pixelReferences-1];
     }
     if (treePtr->pixelReferences == 1) {
+	ckfree(nodePtr->numPixels);
 	nodePtr->numPixels = NULL;
     } else {
 	nodePtr->numPixels = ckrealloc(nodePtr->numPixels,
 		sizeof(int) * (treePtr->pixelReferences - 1));
     }
@@ -1018,11 +1019,11 @@
 				 * insert at beginning of line. */
     TkTextLine *linePtr;	/* Current line (new segments are added to
 				 * this line). */
     register TkTextSegment *segPtr;
     TkTextLine *newLinePtr;
-    int chunkSize;		/* # characters in current chunk. */
+    size_t chunkSize;		/* # characters in current chunk. */
     register const char *eol;	/* Pointer to character just after last one in
 				 * current chunk. */
     int changeToLineCount;	/* Counts change to total number of lines in
 				 * file. */
     int *changeToPixelCount;	/* Counts change to total number of pixels in
@@ -1067,11 +1068,11 @@
 	} else {
 	    segPtr->nextPtr = curPtr->nextPtr;
 	    curPtr->nextPtr = segPtr;
 	}
 	segPtr->size = chunkSize;
-	memcpy(segPtr->body.chars, string, (size_t) chunkSize);
+	memcpy(segPtr->body.chars, string, chunkSize);
 	segPtr->body.chars[chunkSize] = 0;
 
 	if (eol[-1] != '\n') {
 	    break;
 	}
@@ -1437,10 +1438,12 @@
 			prevNodePtr = prevNodePtr->nextPtr;
 		    }
 		    prevNodePtr->nextPtr = curNodePtr->nextPtr;
 		}
 		parentPtr->numChildren--;
+		DeleteSummaries(curNodePtr->summaryPtr);
+		ckfree(curNodePtr->numPixels);
 		ckfree(curNodePtr);
 		curNodePtr = parentPtr;
 	    }
 	    curNodePtr = curLinePtr->parentPtr;
 	    continue;
@@ -4183,10 +4186,11 @@
 	    if (nodePtr->parentPtr == NULL) {
 		if ((nodePtr->numChildren == 1) && (nodePtr->level > 0)) {
 		    treePtr->rootPtr = nodePtr->children.nodePtr;
 		    treePtr->rootPtr->parentPtr = NULL;
 		    DeleteSummaries(nodePtr->summaryPtr);
+		    ckfree(nodePtr->numPixels);
 		    ckfree(nodePtr);
 		}
 		return;
 	    }
 
@@ -4272,10 +4276,11 @@
 	    if (totalChildren <= MAX_CHILDREN) {
 		RecomputeNodeCounts(treePtr, nodePtr);
 		nodePtr->nextPtr = otherPtr->nextPtr;
 		nodePtr->parentPtr->numChildren--;
 		DeleteSummaries(otherPtr->summaryPtr);
+		ckfree(otherPtr->numPixels);
 		ckfree(otherPtr);
 		continue;
 	    }
 
 	    /*
@@ -4556,11 +4561,11 @@
     newPtr1 = ckalloc(CSEG_SIZE(index));
     newPtr2 = ckalloc(CSEG_SIZE(segPtr->size - index));
     newPtr1->typePtr = &tkTextCharType;
     newPtr1->nextPtr = newPtr2;
     newPtr1->size = index;
-    memcpy(newPtr1->body.chars, segPtr->body.chars, (size_t) index);
+    memcpy(newPtr1->body.chars, segPtr->body.chars, index);
     newPtr1->body.chars[index] = 0;
     newPtr2->typePtr = &tkTextCharType;
     newPtr2->nextPtr = segPtr->nextPtr;
     newPtr2->size = segPtr->size - index;
     memcpy(newPtr2->body.chars, segPtr->body.chars + index, newPtr2->size);

Index: generic/tkTextDisp.c
==================================================================
--- generic/tkTextDisp.c
+++ generic/tkTextDisp.c
@@ -14,16 +14,10 @@
  */
 
 #include "tkInt.h"
 #include "tkText.h"
 
-#ifdef _WIN32
-#include "tkWinInt.h"
-#elif defined(__CYGWIN__)
-#include "tkUnixInt.h"
-#endif
-
 #ifdef MAC_OSX_TK
 #include "tkMacOSXInt.h"
 #endif
 
 /*
@@ -166,11 +160,11 @@
  * graphics contexts used to actually draw the characters. The entries in
  * dInfoPtr->styleTable point to structures of this type.
  */
 
 typedef struct TextStyle {
-    int refCount;		/* Number of times this structure is
+    TkSizeT refCount;		/* Number of times this structure is
 				 * referenced in Chunks. */
     GC bgGC;			/* Graphics context for background. None means
 				 * use widget background. */
     GC fgGC;			/* Graphics context for foreground. */
     GC ulGC;			/* Graphics context for underline. */
@@ -404,11 +398,11 @@
 				 * into very many display lines, then this is
 				 * used to keep track of what index we've got
 				 * to so far... */
     int metricPixelHeight;	/* ...and this is for the height calculation
 				 * so far...*/
-    int metricEpoch;		/* ...and this for the epoch of the partial
+    TkSizeT metricEpoch;		/* ...and this for the epoch of the partial
 				 * calculation so it can be cancelled if
 				 * things change once more. This field will be
 				 * -1 if there is no long-line calculation in
 				 * progress, and take a non-negative value if
 				 * there is such a calculation in progress. */
@@ -608,11 +602,11 @@
 			    int *intPtr);
 static void		AsyncUpdateLineMetrics(ClientData clientData);
 static void		GenerateWidgetViewSyncEvent(TkText *textPtr, Bool InSync);
 static void		AsyncUpdateYScrollbar(ClientData clientData);
 static int              IsStartOfNotMergedLine(TkText *textPtr,
-                            CONST TkTextIndex *indexPtr);
+                            const TkTextIndex *indexPtr);
 
 /*
  * Result values returned by TextGetScrollInfoObj:
  */
 
@@ -1056,12 +1050,11 @@
 FreeStyle(
     TkText *textPtr,		/* Information about overall widget. */
     register TextStyle *stylePtr)
 				/* Information about style to free. */
 {
-    stylePtr->refCount--;
-    if (stylePtr->refCount == 0) {
+    if (stylePtr->refCount-- <= 1) {
 	if (stylePtr->bgGC != None) {
 	    Tk_FreeGC(textPtr->display, stylePtr->bgGC);
 	}
 	if (stylePtr->fgGC != None) {
 	    Tk_FreeGC(textPtr->display, stylePtr->fgGC);
@@ -3003,11 +2996,11 @@
             || !Tk_IsMapped(textPtr->tkwin)) {
 	/*
 	 * The widget has been deleted, or is not mapped. Don't do anything.
 	 */
 
-	if (--textPtr->refCount == 0) {
+	if (textPtr->refCount-- <= 1) {
 	    ckfree(textPtr);
 	}
 	return;
     }
 
@@ -3048,11 +3041,11 @@
     /*
      * If we're not in the middle of a long-line calculation (metricEpoch==-1)
      * and we've reached the last line, then we're done.
      */
 
-    if (dInfoPtr->metricEpoch == -1
+    if (dInfoPtr->metricEpoch == TCL_AUTO_LENGTH
 	    && lineNum == dInfoPtr->lastMetricUpdateLine) {
 	/*
 	 * We have looped over all lines, so we're done. We must release our
 	 * refCount on the widget (the timer token was already set to NULL
 	 * above). If there is a registered aftersync command, run that first.
@@ -3078,12 +3071,11 @@
          * through the event loop, because the widget redraws at idle-time).
          */
 
         GenerateWidgetViewSyncEvent(textPtr, 1);
 
-	textPtr->refCount--;
-	if (textPtr->refCount == 0) {
+	if (textPtr->refCount-- <= 1) {
 	    ckfree(textPtr);
 	}
 	return;
     }
 
@@ -3199,11 +3191,11 @@
 	    /*
 	     * If we're in the middle of a partial-line height calculation,
 	     * then we can't be done.
 	     */
 
-	    if (textPtr->dInfoPtr->metricEpoch == -1 && lineNum == endLine) {
+	    if (textPtr->dInfoPtr->metricEpoch == TCL_AUTO_LENGTH && lineNum == endLine) {
 		/*
 		 * We have looped over all lines, so we're done.
 		 */
 
 		break;
@@ -4119,12 +4111,12 @@
      */
     TkWindow *winPtr = (TkWindow *)(textPtr->tkwin);
     MacDrawable *macWin = winPtr->privatePtr;
     if (macWin && (macWin->flags & TK_DO_NOT_DRAW)){
 	dInfoPtr->flags &= ~REDRAW_PENDING;
-	return;
-    }
+    	return;
+     }
 #endif
 
     if ((textPtr->tkwin == NULL) || (textPtr->flags & DESTROYED)) {
 	/*
 	 * The widget has been deleted.	 Don't do anything.
@@ -4161,11 +4153,11 @@
 
     while (dInfoPtr->flags & REPICK_NEEDED) {
 	textPtr->refCount++;
 	dInfoPtr->flags &= ~REPICK_NEEDED;
 	TkTextPickCurrent(textPtr, &textPtr->pickEvent);
-	if (--textPtr->refCount == 0) {
+	if (textPtr->refCount-- <= 1) {
 	    ckfree(textPtr);
 	    goto end;
 	}
 	if ((textPtr->tkwin == NULL) || (textPtr->flags & DESTROYED)) {
 	    goto end;
@@ -4273,11 +4265,10 @@
 	    if (dlPtr->nextPtr == dlPtr2) {
 		break;
 	    }
 	    dlPtr = dlPtr->nextPtr;
 	}
-
 	/*
 	 * Scan through the lines following the copied ones to see if we are
 	 * going to overwrite them with the copy operation. If so, mark them
 	 * for redisplay.
 	 */
@@ -4298,11 +4289,10 @@
 	damageRgn = TkCreateRegion();
 	if (TkScrollWindow(textPtr->tkwin, dInfoPtr->scrollGC, dInfoPtr->x,
 		oldY, dInfoPtr->maxX-dInfoPtr->x, height, 0, y-oldY,
 		damageRgn)) {
 	    TextInvalidateRegion(textPtr, damageRgn);
-
 	}
 	numCopies++;
 	TkDestroyRegion(damageRgn);
     }
 
@@ -4440,15 +4430,42 @@
 #endif /* TK_NO_DOUBLE_BUFFERING */
 		    return;
 		}
 		dlPtr->oldY = dlPtr->y;
 		dlPtr->flags &= ~(NEW_LAYOUT | OLD_Y_INVALID);
+#ifdef MAC_OSX_TK
+	    } else if (dlPtr->chunkPtr != NULL) {
+		/*
+		 * On macOS we need to redisplay all embedded windows which
+		 * were moved by the call to TkScrollWindows above.  This is
+		 * not necessary on Unix or Windows because XScrollWindow will
+		 * have included the bounding rectangles of all of these
+		 * windows in the damage region.  The macosx implementation of
+		 * TkScrollWindow does not do this.  It simply generates a
+		 * damage region which is the scroll source rectangle minus
+		 * the scroll destination rectangle.  This is because there is
+		 * no efficient process available for iterating through the
+		 * subwindows which meet the scrolled area.  (On Unix this is
+		 * handled by GraphicsExpose events generated by XCopyArea and
+		 * on Windows by ScrollWindowEx.  On macOS the low level
+		 * scrolling is accomplished by calling [view scrollRect:by:].
+		 * This method does not provide any damage information and, in
+		 * any case, could not be aware of Tk windows which were not
+		 * based on NSView objects.
+		 *
+		 * On the other hand, this loop is already iterating through
+		 * all embedded windows which could possibly have been moved
+		 * by the scrolling.  So it is as efficient to redisplay them
+		 * here as it would have been if they had been redisplayed by
+		 * the call to TextInvalidateRegion above.
+		 */
+#else
 	    } else if (dlPtr->chunkPtr != NULL && ((dlPtr->y < 0)
 		    || (dlPtr->y + dlPtr->height > dInfoPtr->maxY))) {
-		register TkTextDispChunk *chunkPtr;
-
 		/*
+		 * On platforms other than the Mac:
+		 *
 		 * It's the first or last DLine which are also overlapping the
 		 * top or bottom of the window, but we decided above it wasn't
 		 * necessary to display them (we were able to update them by
 		 * scrolling). This is fine, except that if the lines contain
 		 * any embedded windows, we must still call the display proc
@@ -4458,10 +4475,12 @@
 		 * doesn't!
 		 *
 		 * So, we loop through all the chunks, calling the display
 		 * proc of embedded windows only.
 		 */
+#endif
+		register TkTextDispChunk *chunkPtr;
 
 		for (chunkPtr = dlPtr->chunkPtr; (chunkPtr != NULL);
 			chunkPtr = chunkPtr->nextPtr) {
 		    int x;
 		    if (chunkPtr->displayProc != TkTextEmbWinDisplayProc) {
@@ -4480,17 +4499,22 @@
 			 * right).
 			 */
 
 			x = -chunkPtr->width;
 		    }
+		    if (tkTextDebug) {
+			char string[TK_POS_CHARS];
+
+			TkTextPrintIndex(textPtr, &dlPtr->index, string);
+			LOG("tk_textEmbWinDisplay", string);
+		    }
 		    TkTextEmbWinDisplayProc(textPtr, chunkPtr, x,
 			    dlPtr->spaceAbove,
 			    dlPtr->height-dlPtr->spaceAbove-dlPtr->spaceBelow,
 			    dlPtr->baseline - dlPtr->spaceAbove, NULL,
 			    (Drawable) None, dlPtr->y + dlPtr->spaceAbove);
 		}
-
 	    }
 	}
 #ifndef TK_NO_DOUBLE_BUFFERING
 	Tk_FreePixmap(Tk_Display(textPtr->tkwin), pixmap);
 #endif /* TK_NO_DOUBLE_BUFFERING */
@@ -6056,11 +6080,11 @@
 				 * objv[1] is "yview". */
 {
     TextDInfo *dInfoPtr = textPtr->dInfoPtr;
     int pickPlace, type;
     int pixels, count;
-    int switchLength;
+    size_t switchLength;
     double fraction;
     TkTextIndex index;
 
     if (dInfoPtr->flags & DINFO_OUT_OF_DATE) {
 	UpdateDisplayInfo(textPtr);
@@ -6076,11 +6100,11 @@
      */
 
     pickPlace = 0;
     if (Tcl_GetString(objv[2])[0] == '-') {
 	register const char *switchStr =
-		Tcl_GetStringFromObj(objv[2], &switchLength);
+		TkGetStringFromObj(objv[2], &switchLength);
 
 	if ((switchLength >= 2) && (strncmp(switchStr, "-pickplace",
 		(unsigned) switchLength) == 0)) {
 	    pickPlace = 1;
 	    if (objc != 4) {
@@ -6231,11 +6255,11 @@
     TkText *textPtr)		/* Information about text widget. */
 {
     TextDInfo *dInfoPtr = textPtr->dInfoPtr;
 
     return (
-        ((dInfoPtr->metricEpoch == -1) &&
+        ((dInfoPtr->metricEpoch == TCL_AUTO_LENGTH) &&
          (dInfoPtr->lastMetricUpdateLine == dInfoPtr->currentMetricUpdateLine)) ?
         0 : 1);
 }
 
 /*
@@ -6750,11 +6774,11 @@
 
     if (!(textPtr->flags & DESTROYED)) {
 	GetYView(textPtr->interp, textPtr, 1);
     }
 
-    if (--textPtr->refCount == 0) {
+    if (textPtr->refCount-- <= 1) {
 	ckfree(textPtr);
     }
 }
 
 /*
@@ -6888,11 +6912,11 @@
  */
 
 static int
 IsStartOfNotMergedLine(
       TkText *textPtr,              /* Widget record for text widget. */
-      CONST TkTextIndex *indexPtr)  /* Index to check. */
+      const TkTextIndex *indexPtr)  /* Index to check. */
 {
     TkTextIndex indexPtr2;
 
     if (indexPtr->byteIndex != 0) {
         /*
@@ -7540,10 +7564,13 @@
      *	     characters yet (i.e. the line isn't wide enough to hold even a
      *	     single character).
      *	 (b) at least one pixel of the character is visible, we have not
      *	     already exceeded the character limit, and the next character is a
      *	     white space character.
+     * In the specific case of 'word' wrapping mode however, include all space
+     * characters following the characters that fit in the space we've got,
+     * even if no pixel of them is visible.
      */
 
     p = segPtr->body.chars + byteOffset;
     tkfont = chunkPtr->stylePtr->sValuePtr->tkfont;
 
@@ -7579,12 +7606,12 @@
 	    chunkPtr->x, maxX, TK_ISOLATE_END, &nextX);
 #endif /* TK_LAYOUT_WITH_BASE_CHUNKS */
 
     if (bytesThatFit < maxBytes) {
 	if ((bytesThatFit == 0) && noCharsYet) {
-	    Tcl_UniChar ch;
-	    int chLen = Tcl_UtfToUniChar(p, &ch);
+	    int ch;
+	    int chLen = TkUtfToUniChar(p, &ch);
 
 #if TK_LAYOUT_WITH_BASE_CHUNKS
 	    bytesThatFit = CharChunkMeasureChars(chunkPtr, line,
 		    lineOffset+chLen, lineOffset, -1, chunkPtr->x, -1, 0,
 		    &nextX);
@@ -7602,10 +7629,25 @@
 	     */
 
 	    nextX = maxX;
 	    bytesThatFit++;
 	}
+        if (wrapMode == TEXT_WRAPMODE_WORD) {
+            while (p[bytesThatFit] == ' ') {
+                /*
+                 * Space characters that would go at the beginning of the
+                 * next line are allocated to the current line. This gives
+                 * the effect of trimming white spaces that would otherwise
+                 * be seen at the beginning of wrapped lines.
+                 * Note that testing for '\t' is useless here because the
+                 * chunk always includes at most one trailing \t, see
+                 * LayoutDLine.
+                 */
+
+                bytesThatFit++;
+            }
+        }
 	if (p[bytesThatFit] == '\n') {
 	    /*
 	     * A newline character takes up no space, so if the previous
 	     * character fits then so does the newline.
 	     */
@@ -7645,11 +7687,11 @@
     chunkPtr->minHeight = 0;
     chunkPtr->width = nextX - chunkPtr->x;
     chunkPtr->breakIndex = -1;
 
 #if !TK_LAYOUT_WITH_BASE_CHUNKS
-    ciPtr = ckalloc((Tk_Offset(CharInfo, chars) + 1) + bytesThatFit);
+    ciPtr = ckalloc(Tk_Offset(CharInfo, chars) + 1 + bytesThatFit);
     chunkPtr->clientData = ciPtr;
     memcpy(ciPtr->chars, p, (unsigned) bytesThatFit);
 #endif /* TK_LAYOUT_WITH_BASE_CHUNKS */
 
     ciPtr->numBytes = bytesThatFit;
@@ -7799,11 +7841,11 @@
 	} else {
 	    int widthUntilStart = 0;
 
 	    MeasureChars(tkfont, chars, charsLen, 0, bstart,
 		    0, -1, 0, &widthUntilStart);
-	    xDisplacement = startX - widthUntilStart - chunkPtr->x;
+	    xDisplacement = startX - widthUntilStart - ciPtr->baseChunkPtr->x;
 	}
 
 	fit = MeasureChars(tkfont, chars, charsLen, 0, bend,
 		ciPtr->baseChunkPtr->x + xDisplacement, maxX, flags, nextXPtr);
 
@@ -8773,11 +8815,11 @@
 	ciPtr->chars = baseChars + ciPtr->baseOffset;
 
 #if TK_DRAW_IN_CONTEXT
 	newwidth = 0;
 	CharChunkMeasureChars(chunkPtr, NULL, 0, 0, -1, 0, -1, 0, &newwidth);
-	if (newwidth != chunkPtr->width) {
+	if (newwidth < chunkPtr->width) {
 	    widthAdjust += newwidth - chunkPtr->width;
 	    chunkPtr->width = newwidth;
 	}
 #endif /* TK_DRAW_IN_CONTEXT */
     }
@@ -8961,17 +9003,17 @@
      * Remove the chunk data from the base chunk data.
      */
 
     bciPtr = baseCharChunkPtr->clientData;
 
+#ifdef DEBUG_LAYOUT_WITH_BASE_CHUNKS
     if ((ciPtr->baseOffset + ciPtr->numBytes)
 	    != Tcl_DStringLength(&bciPtr->baseChars)) {
-#ifdef DEBUG_LAYOUT_WITH_BASE_CHUNKS
 	fprintf(stderr,"RemoveFromBaseChunk called with wrong chunk "
 		"(not last)\n");
-#endif
     }
+#endif
 
     Tcl_DStringSetLength(&bciPtr->baseChars, ciPtr->baseOffset);
 
     /*
      * Invalidate the stored pixel width of the base chunk.

Index: generic/tkTextImage.c
==================================================================
--- generic/tkTextImage.c
+++ generic/tkTextImage.c
@@ -16,11 +16,11 @@
 /*
  * Macro that determines the size of an embedded image segment:
  */
 
 #define EI_SEG_SIZE \
-	((unsigned) (Tk_Offset(TkTextSegment, body) + sizeof(TkTextEmbImage)))
+	(Tk_Offset(TkTextSegment, body) + sizeof(TkTextEmbImage))
 
 /*
  * Prototypes for functions defined in this file:
  */
 
@@ -159,11 +159,11 @@
 		    "no embedded image at index \"%s\"",
 		    Tcl_GetString(objv[3])));
 	    Tcl_SetErrorCode(interp, "TK", "TEXT", "NO_IMAGE", NULL);
 	    return TCL_ERROR;
 	}
-	objPtr = Tk_GetOptionValue(interp, (char *) &eiPtr->body.ei,
+	objPtr = Tk_GetOptionValue(interp, &eiPtr->body.ei,
 		eiPtr->body.ei.optionTable, objv[4], textPtr->tkwin);
 	if (objPtr == NULL) {
 	    return TCL_ERROR;
 	} else {
 	    Tcl_SetObjResult(interp, objPtr);
@@ -186,11 +186,11 @@
 	    Tcl_SetErrorCode(interp, "TK", "TEXT", "NO_IMAGE", NULL);
 	    return TCL_ERROR;
 	}
 	if (objc <= 5) {
 	    Tcl_Obj *objPtr = Tk_GetOptionInfo(interp,
-		    (char *) &eiPtr->body.ei, eiPtr->body.ei.optionTable,
+		    &eiPtr->body.ei, eiPtr->body.ei.optionTable,
 		    (objc == 5) ? objv[4] : NULL, textPtr->tkwin);
 
 	    if (objPtr == NULL) {
 		return TCL_ERROR;
 	    } else {
@@ -335,11 +335,11 @@
     int dummy;
     int count = 0;		/* The counter for picking a unique name */
     int conflict = 0;		/* True if we have a name conflict */
     size_t len;			/* length of image name */
 
-    if (Tk_SetOptions(textPtr->interp, (char *) &eiPtr->body.ei,
+    if (Tk_SetOptions(textPtr->interp, &eiPtr->body.ei,
 	    eiPtr->body.ei.optionTable,
 	    objc, objv, textPtr->tkwin, NULL, NULL) != TCL_OK) {
 	return TCL_ERROR;
     }
 

Index: generic/tkTextIndex.c
==================================================================
--- generic/tkTextIndex.c
+++ generic/tkTextIndex.c
@@ -9,13 +9,13 @@
  *
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
 
-#include "default.h"
 #include "tkInt.h"
 #include "tkText.h"
+#include "default.h"
 
 /*
  * Index to use to select last character in line (very large integer):
  */
 
@@ -38,13 +38,13 @@
 static const char *	StartEnd(TkText *textPtr, const char *string,
 			    TkTextIndex *indexPtr);
 static int		GetIndex(Tcl_Interp *interp, TkSharedText *sharedPtr,
 			    TkText *textPtr, const char *string,
 			    TkTextIndex *indexPtr, int *canCachePtr);
-static int              IndexCountBytesOrdered(CONST TkText *textPtr,
-                            CONST TkTextIndex *indexPtr1,
-                            CONST TkTextIndex *indexPtr2);
+static int              IndexCountBytesOrdered(const TkText *textPtr,
+                            const TkTextIndex *indexPtr1,
+                            const TkTextIndex *indexPtr2);
 
 /*
  * The "textindex" Tcl_Obj definition:
  */
 
@@ -62,11 +62,11 @@
 #define GET_INDEXEPOCH(objPtr) \
 	(PTR2INT((objPtr)->internalRep.twoPtrValue.ptr2))
 #define SET_TEXTINDEX(objPtr, indexPtr) \
 	((objPtr)->internalRep.twoPtrValue.ptr1 = (void *) (indexPtr))
 #define SET_INDEXEPOCH(objPtr, epoch) \
-	((objPtr)->internalRep.twoPtrValue.ptr2 = INT2PTR(epoch))
+	((objPtr)->internalRep.twoPtrValue.ptr2 = (void *) (size_t) (epoch))
 
 /*
  * Define the 'textindex' object type, which Tk uses to represent indices in
  * text widgets internally.
  */
@@ -85,11 +85,11 @@
 				 * free. */
 {
     TkTextIndex *indexPtr = GET_TEXTINDEX(indexObjPtr);
 
     if (indexPtr->textPtr != NULL) {
-	if (--indexPtr->textPtr->refCount == 0) {
+	if (indexPtr->textPtr->refCount-- <= 1) {
 	    /*
 	     * The text widget has been deleted and we need to free it now.
 	     */
 
 	    ckfree(indexPtr->textPtr);
@@ -102,11 +102,11 @@
 static void
 DupTextIndexInternalRep(
     Tcl_Obj *srcPtr,		/* TextIndex obj with internal rep to copy. */
     Tcl_Obj *copyPtr)		/* TextIndex obj with internal rep to set. */
 {
-    int epoch;
+    TkSizeT epoch;
     TkTextIndex *dupIndexPtr, *indexPtr;
 
     dupIndexPtr = ckalloc(sizeof(TkTextIndex));
     indexPtr = GET_TEXTINDEX(srcPtr);
     epoch = GET_INDEXEPOCH(srcPtr);
@@ -132,11 +132,11 @@
 static void
 UpdateStringOfTextIndex(
     Tcl_Obj *objPtr)
 {
     char buffer[TK_POS_CHARS];
-    register int len;
+    size_t len;
     const TkTextIndex *indexPtr = GET_TEXTINDEX(objPtr);
 
     len = TkTextPrintIndex(indexPtr->textPtr, indexPtr, buffer);
 
     objPtr->bytes = ckalloc(len + 1);
@@ -204,11 +204,11 @@
     TkTextIndex index;
     TkTextIndex *indexPtr = NULL;
     int cache;
 
     if (objPtr->typePtr == &tkTextIndexType) {
-	int epoch;
+	TkSizeT epoch;
 
 	indexPtr = GET_TEXTINDEX(objPtr);
 	epoch = GET_INDEXEPOCH(objPtr);
 
 	if (epoch == textPtr->sharedTextPtr->stateEpoch) {
@@ -385,11 +385,11 @@
     TkTextIndex *indexPtr)	/* Structure to fill in. */
 {
     TkTextSegment *segPtr;
     int index;
     const char *p, *start;
-    Tcl_UniChar ch;
+    int ch;
 
     indexPtr->tree = tree;
     if (lineIndex < 0) {
 	lineIndex = 0;
 	byteIndex = 0;
@@ -435,11 +435,11 @@
 		 * adjusted to the end of that UTF-8 character.
 		 */
 
 		start = segPtr->body.chars + (byteIndex - index);
 		p = Tcl_UtfPrev(start, segPtr->body.chars);
-		p += Tcl_UtfToUniChar(p, &ch);
+		p += TkUtfToUniChar(p, &ch);
 		indexPtr->byteIndex += p - start;
 	    }
 	    break;
 	}
 	index += segPtr->size;
@@ -478,11 +478,11 @@
     TkTextIndex *indexPtr)	/* Structure to fill in. */
 {
     register TkTextSegment *segPtr;
     char *p, *start, *end;
     int index, offset;
-    Tcl_UniChar ch;
+    int ch;
 
     indexPtr->tree = tree;
     if (lineIndex < 0) {
 	lineIndex = 0;
 	charIndex = 0;
@@ -525,11 +525,11 @@
 		if (charIndex == 0) {
 		    indexPtr->byteIndex = index;
 		    return indexPtr;
 		}
 		charIndex--;
-		offset = Tcl_UtfToUniChar(p, &ch);
+		offset = TkUtfToUniChar(p, &ch);
 		index += offset;
 	    }
 	} else {
 	    if (charIndex < segPtr->size) {
 		indexPtr->byteIndex = index;
@@ -921,11 +921,11 @@
 	    goto gotBase;
 	}
     }
     if ((string[0] == 'e')
 	    && (strncmp(string, "end",
-	    (size_t) (endOfBase-Tcl_DStringValue(&copy))) == 0)) {
+	    endOfBase-Tcl_DStringValue(&copy)) == 0)) {
 	/*
 	 * Base position is end of text.
 	 */
 
 	TkTextMakeByteIndex(sharedPtr->tree, textPtr,
@@ -1473,11 +1473,11 @@
     TkTextLine *linePtr;
     TkTextSegment *segPtr;
     TkTextElideInfo *infoPtr = NULL;
     int byteOffset;
     char *start, *end, *p;
-    Tcl_UniChar ch;
+    int ch;
     int elide = 0;
     int checkElided = (type & COUNT_DISPLAY);
 
     if (charCount < 0) {
 	TkTextIndexBackChars(textPtr, srcPtr, -charCount, dstPtr, type);
@@ -1572,11 +1572,11 @@
 
 	    if (!elide) {
 		if (segPtr->typePtr == &tkTextCharType) {
 		    start = segPtr->body.chars + byteOffset;
 		    end = segPtr->body.chars + segPtr->size;
-		    for (p = start; p < end; p += Tcl_UtfToUniChar(p, &ch)) {
+		    for (p = start; p < end; p += TkUtfToUniChar(p, &ch)) {
 			if (charCount == 0) {
 			    dstPtr->byteIndex += (p - start);
 			    goto forwardCharDone;
 			}
 			charCount--;
@@ -1634,13 +1634,13 @@
  *---------------------------------------------------------------------------
  */
 
 int
 TkTextIndexCountBytes(
-    CONST TkText *textPtr,
-    CONST TkTextIndex *indexPtr1, /* Index describing one location. */
-    CONST TkTextIndex *indexPtr2) /* Index describing second location. */
+    const TkText *textPtr,
+    const TkTextIndex *indexPtr1, /* Index describing one location. */
+    const TkTextIndex *indexPtr2) /* Index describing second location. */
 {
     int compare = TkTextIndexCmp(indexPtr1, indexPtr2);
 
     if (compare == 0) {
 	return 0;
@@ -1651,15 +1651,15 @@
     }
 }
 
 static int
 IndexCountBytesOrdered(
-    CONST TkText *textPtr,
-    CONST TkTextIndex *indexPtr1,
+    const TkText *textPtr,
+    const TkTextIndex *indexPtr1,
 				/* Index describing location of character from
 				 * which to count. */
-    CONST TkTextIndex *indexPtr2)
+    const TkTextIndex *indexPtr2)
 				/* Index describing location of last character
 				 * at which to stop the count. */
 {
     int byteCount, offset;
     TkTextSegment *segPtr, *segPtr1;
@@ -2296,13 +2296,13 @@
 	segPtr = TkTextIndexToSeg(indexPtr, &offset);
 	while (1) {
 	    int chSize = 1;
 
 	    if (segPtr->typePtr == &tkTextCharType) {
-		Tcl_UniChar ch;
+		int ch;
 
-		chSize = Tcl_UtfToUniChar(segPtr->body.chars + offset, &ch);
+		chSize = TkUtfToUniChar(segPtr->body.chars + offset, &ch);
 		if (!Tcl_UniCharIsWordChar(ch)) {
 		    break;
 		}
 		firstChar = 0;
 	    }
@@ -2341,13 +2341,13 @@
 	segPtr = TkTextIndexToSeg(indexPtr, &offset);
 	while (1) {
 	    int chSize = 1;
 
 	    if (segPtr->typePtr == &tkTextCharType) {
-		Tcl_UniChar ch;
 
-		Tcl_UtfToUniChar(segPtr->body.chars + offset, &ch);
+		int ch;
+		TkUtfToUniChar(segPtr->body.chars + offset, &ch);
 		if (!Tcl_UniCharIsWordChar(ch)) {
 		    break;
 		}
 		if (offset > 0) {
 		    chSize = (segPtr->body.chars + offset

Index: generic/tkTextMark.c
==================================================================
--- generic/tkTextMark.c
+++ generic/tkTextMark.c
@@ -17,12 +17,12 @@
 
 /*
  * Macro that determines the size of a mark segment:
  */
 
-#define MSEG_SIZE ((unsigned) (Tk_Offset(TkTextSegment, body) \
-	+ sizeof(TkTextMark)))
+#define MSEG_SIZE (Tk_Offset(TkTextSegment, body) \
+	+ sizeof(TkTextMark))
 
 /*
  * Forward references for functions defined in this file:
  */
 
@@ -124,18 +124,18 @@
     }
 
     switch ((enum markOptions) optionIndex) {
     case MARK_GRAVITY: {
 	char c;
-	int length;
+	size_t length;
 	const char *str;
 
 	if (objc < 4 || objc > 5) {
 	    Tcl_WrongNumArgs(interp, 3, objv, "markName ?gravity?");
 	    return TCL_ERROR;
 	}
-	str = Tcl_GetStringFromObj(objv[3], &length);
+	str = TkGetStringFromObj(objv[3], &length);
 	if (length == 6 && !strcmp(str, "insert")) {
 	    markPtr = textPtr->insertMarkPtr;
 	} else if (length == 7 && !strcmp(str, "current")) {
 	    markPtr = textPtr->currentMarkPtr;
 	} else {
@@ -158,11 +158,11 @@
 		typeStr = "left";
 	    }
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(typeStr, -1));
 	    return TCL_OK;
 	}
-	str = Tcl_GetStringFromObj(objv[4],&length);
+	str = TkGetStringFromObj(objv[4],&length);
 	c = str[0];
 	if ((c == 'l') && (strncmp(str, "left", (unsigned) length) == 0)) {
 	    newTypePtr = &tkTextLeftMarkType;
 	} else if ((c == 'r') &&
 		(strncmp(str, "right", (unsigned) length) == 0)) {

Index: generic/tkTextTag.c
==================================================================
--- generic/tkTextTag.c
+++ generic/tkTextTag.c
@@ -10,13 +10,13 @@
  *
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
 
-#include "default.h"
 #include "tkInt.h"
 #include "tkText.h"
+#include "default.h"
 
 /*
  * The 'TkWrapMode' enum in tkText.h is used to define a type for the -wrap
  * option of tags in a Text widget. These values are used as indices into the
  * string table below. Tags are allowed an empty wrap value, but the widget as
@@ -28,11 +28,11 @@
 };
 
 /*
  * The 'TkTextTabStyle' enum in tkText.h is used to define a type for the
  * -tabstyle option of the Text widget. These values are used as indices into
- * the string table below. Tags are allowed an empty wrap value, but the
+ * the string table below. Tags are allowed an empty tabstyle value, but the
  * widget as a whole is not.
  */
 
 static const char *const tabStyleStrings[] = {
     "tabular", "wordprocessor", "", NULL
@@ -241,10 +241,11 @@
 		     */
 
 		    TkTextSelectionEvent(textPtr);
 
 		    if (addTag && textPtr->exportSelection
+			    && (!Tcl_IsSafe(textPtr->interp))
 			    && !(textPtr->flags & GOT_SELECTION)) {
 			Tk_OwnSelection(textPtr->tkwin, XA_PRIMARY,
 				TkTextLostSelection, textPtr);
 			textPtr->flags |= GOT_SELECTION;
 		    }
@@ -340,11 +341,11 @@
 
 	    tagPtr = FindTag(interp, textPtr, objv[3]);
 	    if (tagPtr == NULL) {
 		return TCL_ERROR;
 	    }
-	    objPtr = Tk_GetOptionValue(interp, (char *) tagPtr,
+	    objPtr = Tk_GetOptionValue(interp, tagPtr,
 		    tagPtr->optionTable, objv[4], textPtr->tkwin);
 	    if (objPtr == NULL) {
 		return TCL_ERROR;
 	    }
 	    Tcl_SetObjResult(interp, objPtr);
@@ -359,11 +360,11 @@
 		    "tagName ?-option? ?value? ?-option value ...?");
 	    return TCL_ERROR;
 	}
 	tagPtr = TkTextCreateTag(textPtr, Tcl_GetString(objv[3]), &newTag);
 	if (objc <= 5) {
-	    Tcl_Obj *objPtr = Tk_GetOptionInfo(interp, (char *) tagPtr,
+	    Tcl_Obj *objPtr = Tk_GetOptionInfo(interp, tagPtr,
 		    tagPtr->optionTable,
 		    (objc == 5) ? objv[4] : NULL, textPtr->tkwin);
 
 	    if (objPtr == NULL) {
 		return TCL_ERROR;
@@ -371,11 +372,11 @@
 	    Tcl_SetObjResult(interp, objPtr);
 	    return TCL_OK;
 	} else {
 	    int result = TCL_OK;
 
-	    if (Tk_SetOptions(interp, (char *) tagPtr, tagPtr->optionTable,
+	    if (Tk_SetOptions(interp, tagPtr, tagPtr->optionTable,
 		    objc-4, objv+4, textPtr->tkwin, NULL, NULL) != TCL_OK) {
 		return TCL_ERROR;
 	    }
 
 	    /*
@@ -1105,14 +1106,14 @@
 				 * message. */
     TkText *textPtr,		/* Widget in which tag is being used. */
     Tcl_Obj *tagName)		/* Name of desired tag. */
 {
     Tcl_HashEntry *hPtr;
-    int len;
+    size_t len;
     const char *str;
 
-    str = Tcl_GetStringFromObj(tagName, &len);
+    str = TkGetStringFromObj(tagName, &len);
     if (len == 3 && !strcmp(str, "sel")) {
 	return textPtr->selTagPtr;
     }
     hPtr = Tcl_FindHashEntry(&textPtr->sharedTextPtr->tagTable,
 	    Tcl_GetString(tagName));
@@ -1256,12 +1257,11 @@
 
     if (tagPtr->textPtr != NULL) {
 	if (textPtr != tagPtr->textPtr) {
 	    Tcl_Panic("Tag being deleted from wrong widget");
 	}
-	textPtr->refCount--;
-	if (textPtr->refCount == 0) {
+	if (textPtr->refCount-- <= 1) {
 	    ckfree(textPtr);
 	}
 	tagPtr->textPtr = NULL;
     }
 
@@ -1520,11 +1520,11 @@
 	}
 	eventPtr->xbutton.state = oldState;
     }
 
   done:
-    if (--textPtr->refCount == 0) {
+    if (textPtr->refCount-- <= 1) {
 	ckfree(textPtr);
     }
 }
 
 /*
@@ -1561,11 +1561,12 @@
     TkTextIndex index;
     TkTextTag **oldArrayPtr, **newArrayPtr;
     TkTextTag **copyArrayPtr = NULL;
 				/* Initialization needed to prevent compiler
 				 * warning. */
-    int numOldTags, numNewTags, i, j, size, nearby;
+    int numOldTags, numNewTags, i, j, nearby;
+    size_t size;
     XEvent event;
 
     /*
      * If a button is down, then don't do anything at all; we'll be called
      * again when all buttons are up, and we can repick then. This implements
@@ -1654,11 +1655,11 @@
 
     SortTags(textPtr->numCurTags, textPtr->curTagArrayPtr);
     if (numNewTags > 0) {
 	size = numNewTags * sizeof(TkTextTag *);
 	copyArrayPtr = ckalloc(size);
-	memcpy(copyArrayPtr, newArrayPtr, (size_t) size);
+	memcpy(copyArrayPtr, newArrayPtr, size);
 	for (i = 0; i < textPtr->numCurTags; i++) {
 	    for (j = 0; j < numNewTags; j++) {
 		if (textPtr->curTagArrayPtr[i] == copyArrayPtr[j]) {
 		    textPtr->curTagArrayPtr[i] = NULL;
 		    copyArrayPtr[j] = NULL;

Index: generic/tkTextWind.c
==================================================================
--- generic/tkTextWind.c
+++ generic/tkTextWind.c
@@ -33,12 +33,12 @@
 
 /*
  * Macro that determines the size of an embedded window segment:
  */
 
-#define EW_SEG_SIZE ((unsigned) (Tk_Offset(TkTextSegment, body) \
-	+ sizeof(TkTextEmbWindow)))
+#define EW_SEG_SIZE (Tk_Offset(TkTextSegment, body) \
+	+ sizeof(TkTextEmbWindow))
 
 /*
  * Prototypes for functions defined in this file:
  */
 
@@ -189,11 +189,11 @@
 	    ewPtr->body.ew.tkwin = client->tkwin;
 	} else {
 	    ewPtr->body.ew.tkwin = NULL;
 	}
 
-	objPtr = Tk_GetOptionValue(interp, (char *) &ewPtr->body.ew,
+	objPtr = Tk_GetOptionValue(interp, &ewPtr->body.ew,
 		ewPtr->body.ew.optionTable, objv[4], textPtr->tkwin);
 	if (objPtr == NULL) {
 	    return TCL_ERROR;
 	}
 	Tcl_SetObjResult(interp, objPtr);
@@ -231,11 +231,11 @@
 		ewPtr->body.ew.tkwin = client->tkwin;
 	    } else {
 		ewPtr->body.ew.tkwin = NULL;
 	    }
 
-	    objPtr = Tk_GetOptionInfo(interp, (char *) &ewPtr->body.ew,
+	    objPtr = Tk_GetOptionInfo(interp, &ewPtr->body.ew,
 		    ewPtr->body.ew.optionTable, (objc == 5) ? objv[4] : NULL,
 		    textPtr->tkwin);
 	    if (objPtr == NULL) {
 		return TCL_ERROR;
 	    }
@@ -401,11 +401,11 @@
     } else {
 	ewPtr->body.ew.tkwin = NULL;
     }
 
     oldWindow = ewPtr->body.ew.tkwin;
-    if (Tk_SetOptions(textPtr->interp, (char *) &ewPtr->body.ew,
+    if (Tk_SetOptions(textPtr->interp, &ewPtr->body.ew,
 	    ewPtr->body.ew.optionTable, objc, objv, textPtr->tkwin, NULL,
 	    NULL) != TCL_OK) {
 	return TCL_ERROR;
     }
 

Index: generic/tkUtil.c
==================================================================
--- generic/tkUtil.c
+++ generic/tkUtil.c
@@ -727,15 +727,15 @@
     double *dblPtr,		/* Filled in with argument "moveto" option, if
 				 * any. */
     int *intPtr)		/* Filled in with number of pages or lines to
 				 * scroll, if any. */
 {
-    const char *arg = Tcl_GetString(objv[2]);
-    size_t length = objv[2]->length;
+    size_t length;
+    const char *arg = TkGetStringFromObj(objv[2], &length);
 
 #define ArgPfxEq(str) \
-	((arg[0] == str[0]) && !strncmp(arg, str, (unsigned)length))
+	((arg[0] == str[0]) && !strncmp(arg, str, length))
 
     if (ArgPfxEq("moveto")) {
 	if (objc != 4) {
 	    Tcl_WrongNumArgs(interp, 2, objv, "moveto fraction");
 	    return TK_SCROLL_ERROR;
@@ -751,12 +751,11 @@
 	}
 	if (Tcl_GetIntFromObj(interp, objv[3], intPtr) != TCL_OK) {
 	    return TK_SCROLL_ERROR;
 	}
 
-	arg = Tcl_GetString(objv[4]);
-	length = objv[4]->length;
+	arg = TkGetStringFromObj(objv[4], &length);
 	if (ArgPfxEq("pages")) {
 	    return TK_SCROLL_PAGES;
 	} else if (ArgPfxEq("units")) {
 	    return TK_SCROLL_UNITS;
 	}
@@ -1185,17 +1184,117 @@
     event.general.xany.send_event = False;
     event.general.xany.window = Tk_WindowId(target);
     event.general.xany.display = Tk_Display(target);
     event.virtual.name = Tk_GetUid(eventName);
     if (detail != NULL) {
-        event.virtual.user_data = detail;
+	event.virtual.user_data = detail;
     }
 
     Tk_QueueWindowEvent(&event.general, TCL_QUEUE_TAIL);
 }
+
+#if TCL_UTF_MAX <= 4
+/*
+ *---------------------------------------------------------------------------
+ *
+ * TkUtfToUniChar --
+ *
+ *	Almost the same as Tcl_UtfToUniChar but using int instead of Tcl_UniChar.
+ *	This function is capable of collapsing a upper/lower surrogate pair to a
+ *	single unicode character. So, up to 6 bytes might be consumed.
+ *
+ * Results:
+ *	*chPtr is filled with the Tcl_UniChar, and the return value is the
+ *	number of bytes from the UTF-8 string that were consumed.
+ *
+ * Side effects:
+ *	None.
+ *
+ *---------------------------------------------------------------------------
+ */
+
+size_t
+TkUtfToUniChar(
+    const char *src,	/* The UTF-8 string. */
+    int *chPtr)		/* Filled with the Tcl_UniChar represented by
+			 * the UTF-8 string. */
+{
+    Tcl_UniChar uniChar = 0;
+
+    size_t len = Tcl_UtfToUniChar(src, &uniChar);
+    if ((uniChar & 0xfc00) == 0xd800) {
+	Tcl_UniChar high = uniChar;
+	/* This can only happen if Tcl is compiled with TCL_UTF_MAX=4,
+	 * or when a high surrogate character is detected in UTF-8 form */
+	size_t len2 = Tcl_UtfToUniChar(src+len, &uniChar);
+	if ((uniChar & 0xfc00) == 0xdc00) {
+	    *chPtr = (((high & 0x3ff) << 10) | (uniChar & 0x3ff)) + 0x10000;
+	    len += len2;
+	} else {
+	    *chPtr = high;
+	}
+    } else {
+	*chPtr = uniChar;
+    }
+    return len;
+}
+
+/*
+ *---------------------------------------------------------------------------
+ *
+ * TkUniCharToUtf --
+ *
+ *	Almost the same as Tcl_UniCharToUtf but producing surrogates if
+ *	TCL_UTF_MAX==3. So, up to 6 bytes might be produced.
+ *
+ * Results:
+ *	*buf is filled with the UTF-8 string, and the return value is the
+ *	number of bytes produced.
+ *
+ * Side effects:
+ *	None.
+ *
+ *---------------------------------------------------------------------------
+ */
+
+size_t TkUniCharToUtf(int ch, char *buf)
+{
+    size_t size = Tcl_UniCharToUtf(ch, buf);
+    if ((((unsigned)(ch - 0x10000) <= 0xFFFFF)) && (size < 4)) {
+	/* Hey, this is wrong, we must be running TCL_UTF_MAX==3
+	 * The best thing we can do is spit out 2 surrogates */
+	ch -= 0x10000;
+	size = Tcl_UniCharToUtf(((ch >> 10) | 0xd800), buf);
+	size += Tcl_UniCharToUtf(((ch & 0x3ff) | 0xdc00), buf+size);
+    }
+    return size;
+}
+
+
+#endif
+
+unsigned char *
+TkGetByteArrayFromObj(
+	Tcl_Obj *objPtr,
+	size_t *lengthPtr
+) {
+    int length;
+
+    unsigned char *result = Tcl_GetByteArrayFromObj(objPtr, &length);
+#if TCL_MAJOR_VERSION > 8
+    if (sizeof(TCL_HASH_TYPE) > sizeof(int)) {
+	/* 64-bit and TIP #494 situation: */
+	 *lengthPtr = *(TCL_HASH_TYPE *) objPtr->internalRep.twoPtrValue.ptr1;
+    } else
+#endif
+	/* 32-bit or without TIP #494 */
+    *lengthPtr = (size_t) (unsigned) length;
+    return result;
+}
+
 /*
  * Local Variables:
  * mode: c
  * c-basic-offset: 4
  * fill-column: 78
  * End:
  */

Index: generic/tkVisual.c
==================================================================
--- generic/tkVisual.c
+++ generic/tkVisual.c
@@ -19,13 +19,13 @@
  * associated X class symbols.
  */
 
 typedef struct VisualDictionary {
     const char *name;		/* Textual name of class. */
-    int minLength;		/* Minimum # characters that must be specified
+    unsigned short minLength;		/* Minimum # characters that must be specified
 				 * for an unambiguous match. */
-    int class;			/* X symbol for class. */
+    short class;			/* X symbol for class. */
 } VisualDictionary;
 static const VisualDictionary visualNames[] = {
     {"best",		1,	0},
     {"directcolor",	2,	DirectColor},
     {"grayscale",	1,	GrayScale},
@@ -44,11 +44,11 @@
  */
 
 struct TkColormap {
     Colormap colormap;		/* X's identifier for the colormap. */
     Visual *visual;		/* Visual for which colormap was allocated. */
-    int refCount;		/* How many uses of the colormap are still
+    size_t refCount;		/* How many uses of the colormap are still
 				 * outstanding (calls to Tk_GetColormap minus
 				 * calls to Tk_FreeColormap). */
     int shareable;		/* 0 means this colormap was allocated by a
 				 * call to Tk_GetColormap with "new", implying
 				 * that the window wants it all for itself.  1
@@ -97,11 +97,11 @@
 {
     Tk_Window tkwin2;
     XVisualInfo template, *visInfoList, *bestPtr;
     long mask;
     Visual *visual;
-    ptrdiff_t length;
+    size_t length;
     int c, numVisuals, prio, bestPrio, i;
     const char *p;
     const VisualDictionary *dictPtr;
     TkColormap *cmapPtr;
     TkDisplay *dispPtr = ((TkWindow *) tkwin)->dispPtr;
@@ -135,11 +135,11 @@
 
 		*colormapPtr = Tk_Colormap(tkwin2);
 		for (cmapPtr = dispPtr->cmapPtr; cmapPtr != NULL;
 			cmapPtr = cmapPtr->nextPtr) {
 		    if (cmapPtr->colormap == *colormapPtr) {
-			cmapPtr->refCount += 1;
+			cmapPtr->refCount++;
 			break;
 		    }
 		}
 	    }
 	    return visual;
@@ -193,12 +193,11 @@
 	}
 	length = p - string;
 	template.class = -1;
 	for (dictPtr = visualNames; dictPtr->name != NULL; dictPtr++) {
 	    if ((dictPtr->name[0] == c) && (length >= dictPtr->minLength)
-		    && (strncmp(string, dictPtr->name,
-		    (size_t) length) == 0)) {
+		    && (strncmp(string, dictPtr->name, length) == 0)) {
 		template.class = dictPtr->class;
 		break;
 	    }
 	}
 	if (template.class == -1) {
@@ -322,11 +321,11 @@
 	} else {
 	    for (cmapPtr = dispPtr->cmapPtr; cmapPtr != NULL;
 		    cmapPtr = cmapPtr->nextPtr) {
 		if (cmapPtr->shareable && (cmapPtr->visual == visual)) {
 		    *colormapPtr = cmapPtr->colormap;
-		    cmapPtr->refCount += 1;
+		    cmapPtr->refCount++;
 		    goto done;
 		}
 	    }
 	    cmapPtr = ckalloc(sizeof(TkColormap));
 	    cmapPtr->colormap = XCreateColormap(Tk_Display(tkwin),
@@ -425,11 +424,11 @@
      */
 
     for (cmapPtr = dispPtr->cmapPtr; cmapPtr != NULL;
 	    cmapPtr = cmapPtr->nextPtr) {
 	if (cmapPtr->colormap == colormap) {
-	    cmapPtr->refCount += 1;
+	    cmapPtr->refCount++;
 	}
     }
     return colormap;
 }
 
@@ -474,12 +473,11 @@
 	Tcl_Panic("unknown display passed to Tk_FreeColormap");
     }
     for (prevPtr = NULL, cmapPtr = dispPtr->cmapPtr; cmapPtr != NULL;
 	    prevPtr = cmapPtr, cmapPtr = cmapPtr->nextPtr) {
 	if (cmapPtr->colormap == colormap) {
-	    cmapPtr->refCount -= 1;
-	    if (cmapPtr->refCount == 0) {
+	    if (cmapPtr->refCount-- <= 1) {
 		XFreeColormap(display, colormap);
 		if (prevPtr == NULL) {
 		    dispPtr->cmapPtr = cmapPtr->nextPtr;
 		} else {
 		    prevPtr->nextPtr = cmapPtr->nextPtr;
@@ -532,11 +530,11 @@
 	Tcl_Panic("unknown display passed to Tk_PreserveColormap");
     }
     for (cmapPtr = dispPtr->cmapPtr; cmapPtr != NULL;
 	    cmapPtr = cmapPtr->nextPtr) {
 	if (cmapPtr->colormap == colormap) {
-	    cmapPtr->refCount += 1;
+	    cmapPtr->refCount++;
 	    return;
 	}
     }
 }
 

Index: generic/tkWindow.c
==================================================================
--- generic/tkWindow.c
+++ generic/tkWindow.c
@@ -236,10 +236,12 @@
 static void
 TkCloseDisplay(
     TkDisplay *dispPtr)
 {
     TkClipCleanup(dispPtr);
+
+    TkpCancelWarp(dispPtr);
 
     if (dispPtr->name != NULL) {
 	ckfree(dispPtr->name);
     }
 
@@ -332,10 +334,11 @@
 
 	/*
 	 * Create built-in photo image formats.
 	 */
 
+        Tk_CreatePhotoImageFormat(&tkImgFmtDefault);
 	Tk_CreatePhotoImageFormat(&tkImgFmtGIF);
 	Tk_CreatePhotoImageFormat(&tkImgFmtPNG);
 	Tk_CreatePhotoImageFormat(&tkImgFmtPPM);
     }
 
@@ -353,10 +356,13 @@
 
     /*
      * Set the flags specified in the call.
      */
 
+#ifdef TK_USE_INPUT_METHODS
+    winPtr->ximGeneration = 0;
+#endif /*TK_USE_INPUT_METHODS*/
     winPtr->flags |= flags;
 
     /*
      * Force the window to use a border pixel instead of border pixmap. This
      * is needed for the case where the window doesn't use the default visual.
@@ -648,10 +654,11 @@
     }
     winPtr->dirtyAtts = CWEventMask|CWColormap|CWBitGravity;
     winPtr->flags = 0;
     winPtr->handlerList = NULL;
 #ifdef TK_USE_INPUT_METHODS
+    winPtr->ximGeneration = 0;
     winPtr->inputContext = NULL;
 #endif /* TK_USE_INPUT_METHODS */
     winPtr->tagPtr = NULL;
     winPtr->numTags = 0;
     winPtr->optionLevel = -1;
@@ -941,11 +948,11 @@
 	    Tcl_HideCommand(interp, cmdPtr->name, cmdPtr->name);
 	}
     }
 
     /*
-     * Set variables for the intepreter.
+     * Set variables for the interpreter.
      */
 
     Tcl_SetVar2(interp, "tk_patchLevel", NULL, TK_PATCH_LEVEL, TCL_GLOBAL_ONLY);
     Tcl_SetVar2(interp, "tk_version",    NULL, TK_VERSION,     TCL_GLOBAL_ONLY);
 
@@ -1127,11 +1134,11 @@
 {
 #define FIXED_SPACE 5
     char fixedSpace[FIXED_SPACE+1];
     char *p;
     Tk_Window parent;
-    int numChars;
+    size_t numChars;
 
     /*
      * Strip the parent's name out of pathName (it's everything up to the last
      * dot). There are two tricky parts: (a) must copy the parent's name
      * somewhere else to avoid modifying the pathName string (for large names,
@@ -1144,21 +1151,21 @@
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		"bad window path name \"%s\"", pathName));
 	Tcl_SetErrorCode(interp, "TK", "VALUE", "WINDOW_PATH", NULL);
 	return NULL;
     }
-    numChars = (int) (p-pathName);
+    numChars = p-pathName;
     if (numChars > FIXED_SPACE) {
 	p = ckalloc(numChars + 1);
     } else {
 	p = fixedSpace;
     }
     if (numChars == 0) {
 	*p = '.';
 	p[1] = '\0';
     } else {
-	strncpy(p, pathName, (size_t) numChars);
+	strncpy(p, pathName, numChars);
 	p[numChars] = '\0';
     }
 
     /*
      * Find the parent window.
@@ -1440,14 +1447,15 @@
 	winPtr->window = None;
     }
     UnlinkWindow(winPtr);
     TkEventDeadWindow(winPtr);
 #ifdef TK_USE_INPUT_METHODS
-    if (winPtr->inputContext != NULL) {
+    if (winPtr->inputContext != NULL &&
+	    winPtr->ximGeneration == winPtr->dispPtr->ximGeneration) {
 	XDestroyIC(winPtr->inputContext);
-	winPtr->inputContext = NULL;
     }
+    winPtr->inputContext = NULL;
 #endif /* TK_USE_INPUT_METHODS */
     if (winPtr->tagPtr != NULL) {
 	TkFreeBindingTags(winPtr);
     }
     TkOptionDeadWindow(winPtr);
@@ -1477,12 +1485,11 @@
 	     * window.
 	     */
 
 	    winPtr->mainPtr->deletionEpoch++;
 	}
-	winPtr->mainPtr->refCount--;
-	if (winPtr->mainPtr->refCount == 0) {
+	if (winPtr->mainPtr->refCount-- <= 1) {
 	    register const TkCmd *cmdPtr;
 
 	    /*
 	     * We just deleted the last window in the application. Delete the
 	     * TkMainInfo structure too and replace all of Tk's commands with
@@ -2776,10 +2783,22 @@
 	interp = tsdPtr->mainWindowList->interp;
 	Tcl_Preserve(interp);
 	Tk_DestroyWindow((Tk_Window) tsdPtr->mainWindowList->winPtr);
 	Tcl_Release(interp);
     }
+
+    /*
+     * Let error handlers catch up before actual close of displays.
+     * Must be done before tsdPtr->displayList is cleared, otherwise
+     * ErrorProc() in tkError.c cannot associate the pending X errors
+     * to the remaining error handlers.
+     */
+
+    for (dispPtr = tsdPtr->displayList; dispPtr != NULL;
+           dispPtr = dispPtr->nextPtr) {
+       XSync(dispPtr->display, False);
+    }
 
     /*
      * Iterate destroying the displays until no more displays remain. It is
      * possible for displays to get recreated during exit by any code that
      * calls GetScreen, so we must destroy these new displays as well as the
@@ -3039,11 +3058,11 @@
 
     /*
      * Ensure that we are getting a compatible version of Tcl.
      */
 
-    if (Tcl_InitStubs(interp, "8.6", 0) == NULL) {
+    if (Tcl_InitStubs(interp, "8.6-", 0) == NULL) {
 	return TCL_ERROR;
     }
 
     /*
      * Ensure that our obj-types are registered with the Tcl runtime.
@@ -3099,11 +3118,11 @@
 
 	cmd = Tcl_NewListObj(2, NULL);
 	Tcl_ListObjAppendElement(NULL, cmd,
 		Tcl_NewStringObj("::safe::TkInit", -1));
 	Tcl_ListObjAppendElement(NULL, cmd, Tcl_GetObjResult(master));
-	
+
 	/*
 	 * Step 2 : Eval in the master. The argument is the *reversed* interp
 	 * path of the slave.
 	 */
 
@@ -3181,12 +3200,12 @@
     /*
      * The -class argument is always the ToTitle of the -name
      */
 
     {
-	int numBytes;
-	const char *bytes = Tcl_GetStringFromObj(nameObj, &numBytes);
+	size_t numBytes;
+	const char *bytes = TkGetStringFromObj(nameObj, &numBytes);
 
 	classObj = Tcl_NewStringObj(bytes, numBytes);
 
 	numBytes = Tcl_UtfToTitle(Tcl_GetString(classObj));
 	Tcl_SetObjLength(classObj, numBytes);

Index: generic/ttk/ttkBlink.c
==================================================================
--- generic/ttk/ttkBlink.c
+++ generic/ttk/ttkBlink.c
@@ -12,11 +12,11 @@
  *
  * TODO:
  * 	Add script-level access to configure application-wide blink rate.
  */
 
-#include <tk.h>
+#include "tkInt.h"
 #include "ttkTheme.h"
 #include "ttkWidget.h"
 
 #define DEF_CURSOR_ON_TIME	600		/* milliseconds */
 #define DEF_CURSOR_OFF_TIME	300		/* milliseconds */

Index: generic/ttk/ttkButton.c
==================================================================
--- generic/ttk/ttkButton.c
+++ generic/ttk/ttkButton.c
@@ -2,12 +2,11 @@
  * Copyright (c) 2003, Joe English
  *
  * label, button, checkbutton, radiobutton, and menubutton widgets.
  */
 
-#include <string.h>
-#include <tk.h>
+#include "tkInt.h"
 #include "ttkTheme.h"
 #include "ttkWidget.h"
 
 /* Bit fields for OptionSpec mask field:
  */
@@ -21,10 +20,11 @@
 {
     /*
      * Text element resources:
      */
     Tcl_Obj *textObj;
+    Tcl_Obj *justifyObj;
     Tcl_Obj *textVariableObj;
     Tcl_Obj *underlineObj;
     Tcl_Obj *widthObj;
 
     Ttk_TraceHandle	*textVariableTrace;
@@ -54,10 +54,13 @@
     BasePart	base;
 } Base;
 
 static Tk_OptionSpec BaseOptionSpecs[] =
 {
+    {TK_OPTION_JUSTIFY, "-justify", "justify", "Justify",
+        "left", Tk_Offset(Base,base.justifyObj), -1,
+        TK_OPTION_NULL_OK,0,GEOMETRY_CHANGED },
     {TK_OPTION_STRING, "-text", "text", "Text", "",
 	Tk_Offset(Base,base.textObj), -1,
 	0,0,GEOMETRY_CHANGED },
     {TK_OPTION_STRING, "-textvariable", "textVariable", "Variable", "",
 	Tk_Offset(Base,base.textVariableObj), -1,
@@ -133,10 +136,19 @@
     if (basePtr->base.textVariableTrace)
 	Ttk_UntraceVariable(basePtr->base.textVariableTrace);
     if (basePtr->base.imageSpec)
     	TtkFreeImageSpec(basePtr->base.imageSpec);
 }
+
+static void
+BaseImageChanged(
+	ClientData clientData, int x, int y, int width, int height,
+	int imageWidth, int imageHeight)
+{
+    Base *basePtr = (Base *)clientData;
+    TtkResizeWidget(&basePtr->core);
+}
 
 static int BaseConfigure(Tcl_Interp *interp, void *recordPtr, int mask)
 {
     Base *basePtr = recordPtr;
     Tcl_Obj *textVarName = basePtr->base.textVariableObj;
@@ -147,12 +159,12 @@
 	vt = Ttk_TraceVariable(interp,textVarName,TextVariableChanged,basePtr);
 	if (!vt) return TCL_ERROR;
     }
 
     if (basePtr->base.imageObj) {
-	imageSpec = TtkGetImageSpec(
-	    interp, basePtr->core.tkwin, basePtr->base.imageObj);
+	imageSpec = TtkGetImageSpecEx(
+	    interp, basePtr->core.tkwin, basePtr->base.imageObj, BaseImageChanged, basePtr);
 	if (!imageSpec) {
 	    goto error;
 	}
     }
 
@@ -478,24 +490,29 @@
 
 static int
 CheckbuttonConfigure(Tcl_Interp *interp, void *recordPtr, int mask)
 {
     Checkbutton *checkPtr = recordPtr;
-    Ttk_TraceHandle *vt = Ttk_TraceVariable(
-	interp, checkPtr->checkbutton.variableObj,
-	CheckbuttonVariableChanged, checkPtr);
+    Tcl_Obj *varName = checkPtr->checkbutton.variableObj;
+    Ttk_TraceHandle *vt = NULL;
 
-    if (!vt) {
-	return TCL_ERROR;
+    if (varName != NULL && *Tcl_GetString(varName) != '\0') {
+        vt = Ttk_TraceVariable(interp, varName,
+	    CheckbuttonVariableChanged, checkPtr);
+        if (!vt) {
+	    return TCL_ERROR;
+        }
     }
 
     if (BaseConfigure(interp, recordPtr, mask) != TCL_OK){
 	Ttk_UntraceVariable(vt);
 	return TCL_ERROR;
     }
 
-    Ttk_UntraceVariable(checkPtr->checkbutton.variableTrace);
+    if (checkPtr->checkbutton.variableTrace) {
+        Ttk_UntraceVariable(checkPtr->checkbutton.variableTrace);
+    }
     checkPtr->checkbutton.variableTrace = vt;
 
     return TCL_OK;
 }
 
@@ -537,14 +554,17 @@
     if (corePtr->state & TTK_STATE_SELECTED)
 	newValue = checkPtr->checkbutton.offValueObj;
     else
 	newValue = checkPtr->checkbutton.onValueObj;
 
-    if (Tcl_ObjSetVar2(interp,
-	    checkPtr->checkbutton.variableObj, NULL, newValue,
-	    TCL_GLOBAL_ONLY|TCL_LEAVE_ERR_MSG)
-	== NULL)
+    if (checkPtr->checkbutton.variableObj == NULL ||
+        *Tcl_GetString(checkPtr->checkbutton.variableObj) == '\0')
+        CheckbuttonVariableChanged(checkPtr, Tcl_GetString(newValue));
+    else if (Tcl_ObjSetVar2(interp,
+	        checkPtr->checkbutton.variableObj, NULL, newValue,
+	        TCL_GLOBAL_ONLY|TCL_LEAVE_ERR_MSG)
+	    == NULL)
 	return TCL_ERROR;
 
     if (WidgetDestroyed(corePtr))
 	return TCL_ERROR;
 

Index: generic/ttk/ttkCache.c
==================================================================
--- generic/ttk/ttkCache.c
+++ generic/ttk/ttkCache.c
@@ -26,12 +26,11 @@
  *
  * @@@ Colormap flashing on PseudoColor visuals is still possible,
  * but this will be a transient effect.
  */
 
-#include <stdio.h>	/* for sprintf */
-#include <tk.h>
+#include "tkInt.h"
 #include "ttkTheme.h"
 
 struct Ttk_ResourceCache_ {
     Tcl_Interp	  *interp;	/* Interpreter for error reporting */
     Tk_Window	  tkwin;	/* Cache window. */

Index: generic/ttk/ttkClamTheme.c
==================================================================
--- generic/ttk/ttkClamTheme.c
+++ generic/ttk/ttkClamTheme.c
@@ -2,15 +2,15 @@
  * Copyright (C) 2004 Joe English
  *
  * "clam" theme; inspired by the XFCE family of Gnome themes.
  */
 
-#include <tk.h>
+#include "tkInt.h"
 #include "ttkTheme.h"
 
-/* 
- * Under windows, the Tk-provided XDrawLine and XDrawArc have an 
+/*
+ * Under windows, the Tk-provided XDrawLine and XDrawArc have an
  * off-by-one error in the end point. This is especially apparent with this
  * theme. Defining this macro as true handles this case.
  */
 #if defined(_WIN32) && !defined(WIN32_XDRAWLINE_HACK)
 #	define WIN32_XDRAWLINE_HACK 1
@@ -121,12 +121,12 @@
 };
 
 /*
  * <<NOTE-BORDERWIDTH>>: -borderwidth is only partially supported:
  * in this theme, borders are always exactly 2 pixels thick.
- * With -borderwidth 0, border is not drawn at all; 
- * otherwise a 2-pixel border is used.  For -borderwidth > 2, 
+ * With -borderwidth 0, border is not drawn at all;
+ * otherwise a 2-pixel border is used.  For -borderwidth > 2,
  * the excess is used as padding.
  */
 
 static void BorderElementSize(
     void *clientData, void *elementRecord, Tk_Window tkwin,
@@ -400,11 +400,11 @@
 } MenuIndicatorElement;
 
 static Ttk_ElementOptionSpec MenuIndicatorElementOptions[] =
 {
     { "-arrowsize", TK_OPTION_PIXELS,
-	Tk_Offset(MenuIndicatorElement,sizeObj), 
+	Tk_Offset(MenuIndicatorElement,sizeObj),
 	STR(MENUBUTTON_ARROW_SIZE)},
     { "-arrowcolor",TK_OPTION_COLOR,
 	Tk_Offset(MenuIndicatorElement,colorObj),
 	"black" },
     { "-arrowpadding",TK_OPTION_STRING,
@@ -628,11 +628,11 @@
      */
     Ttk_GetOrientFromObj(NULL, sb->orientObj, &orient);
     Tcl_GetIntFromObj(NULL, sb->gripCountObj, &gripCount);
     lightGC = Ttk_GCForColor(tkwin,sb->lightColorObj,d);
     darkGC = Ttk_GCForColor(tkwin,sb->borderColorObj,d);
-    
+
     if (orient == TTK_ORIENT_HORIZONTAL) {
 	dx = 1; dy = 0;
 	x1 = x2 = b.x + b.width / 2 - gripCount;
 	y1 = b.y + 2;
 	y2 = b.y + b.height - 3 + w;
@@ -708,16 +708,16 @@
 static void PbarElementDraw(
     void *clientData, void *elementRecord, Tk_Window tkwin,
     Drawable d, Ttk_Box b, unsigned state)
 {
     ScrollbarElement *sb = elementRecord;
-    
+
     b = Ttk_PadBox(b, Ttk_UniformPadding(2));
     if (b.width > 4 && b.height > 4) {
 	DrawSmoothBorder(tkwin, d, b,
 	    sb->borderColorObj, sb->lightColorObj, sb->darkColorObj);
-	XFillRectangle(Tk_Display(tkwin), d, 
+	XFillRectangle(Tk_Display(tkwin), d,
 	    BackgroundGC(tkwin, sb->backgroundObj),
 	    b.x+2, b.y+2, b.width-4, b.height-4);
     }
 }
 
@@ -778,12 +778,12 @@
 };
 
 
 /*------------------------------------------------------------------------
  * +++ Notebook elements.
- * 	
- * Note: Tabs, except for the rightmost, overlap the neighbor to 
+ *
+ * Note: Tabs, except for the rightmost, overlap the neighbor to
  * their right by one pixel.
  */
 
 typedef struct {
     Tcl_Obj *backgroundObj;

Index: generic/ttk/ttkClassicTheme.c
==================================================================
--- generic/ttk/ttkClassicTheme.c
+++ generic/ttk/ttkClassicTheme.c
@@ -3,11 +3,11 @@
  *
  * "classic" theme; implements the classic Motif-like Tk look.
  *
  */
 
-#include <tk.h>
+#include "tkInt.h"
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include "ttkTheme.h"
 
 #define DEFAULT_BORDERWIDTH "2"
@@ -66,11 +66,11 @@
     HighlightElementDraw
 };
 
 /*------------------------------------------------------------------------
  * +++ Button Border element:
- * 
+ *
  * The Motif-style button border on X11 consists of (from outside-in):
  *
  * + focus indicator (controlled by -highlightcolor and -highlightthickness),
  * + default ring (if -default active; blank if -default normal)
  * + shaded border (controlled by -background, -borderwidth, and -relief)
@@ -83,17 +83,17 @@
     Tcl_Obj	*defaultStateObj;
 } ButtonBorderElement;
 
 static Ttk_ElementOptionSpec ButtonBorderElementOptions[] =
 {
-    { "-background", TK_OPTION_BORDER, 
+    { "-background", TK_OPTION_BORDER,
 	Tk_Offset(ButtonBorderElement,borderObj), DEFAULT_BACKGROUND },
-    { "-borderwidth", TK_OPTION_PIXELS, 
+    { "-borderwidth", TK_OPTION_PIXELS,
 	Tk_Offset(ButtonBorderElement,borderWidthObj), DEFAULT_BORDERWIDTH },
-    { "-relief", TK_OPTION_RELIEF, 
+    { "-relief", TK_OPTION_RELIEF,
 	Tk_Offset(ButtonBorderElement,reliefObj), "flat" },
-    { "-default", TK_OPTION_ANY, 
+    { "-default", TK_OPTION_ANY,
 	Tk_Offset(ButtonBorderElement,defaultStateObj), "disabled" },
     { NULL, 0, 0, NULL }
 };
 
 static void ButtonBorderElementSize(
@@ -113,11 +113,11 @@
     *paddingPtr = Ttk_UniformPadding((short)borderWidth);
 }
 
 /*
  * (@@@ Note: ButtonBorderElement still still still buggy:
- * padding for default ring is drawn in the wrong color 
+ * padding for default ring is drawn in the wrong color
  * when the button is active.)
  */
 static void ButtonBorderElementDraw(
     void *clientData, void *elementRecord, Tk_Window tkwin,
     Drawable d, Ttk_Box b, unsigned int state)
@@ -279,23 +279,23 @@
 
 
 /*------------------------------------------------------------------------
  * +++ Sash element (for ttk::panedwindow)
  *
- * NOTES: 
+ * NOTES:
  *
  * panedwindows with -orient horizontal use vertical sashes, and vice versa.
  *
  * Interpretation of -sashrelief 'groove' and 'ridge' are
  * swapped wrt. the core panedwindow, which (I think) has them backwards.
  *
- * Default -sashrelief is sunken; the core panedwindow has default 
+ * Default -sashrelief is sunken; the core panedwindow has default
  * -sashrelief raised, but that looks wrong to me.
  */
 
 static Ttk_Orient SashClientData[] = {
-    TTK_ORIENT_HORIZONTAL, TTK_ORIENT_VERTICAL 
+    TTK_ORIENT_HORIZONTAL, TTK_ORIENT_VERTICAL
 };
 
 typedef struct {
     Tcl_Obj *borderObj; 	/* background color */
     Tcl_Obj *sashReliefObj;	/* sash relief */
@@ -304,17 +304,17 @@
     Tcl_Obj *handleSizeObj;	/* handle width and height */
     Tcl_Obj *handlePadObj;	/* handle's distance from edge */
 } SashElement;
 
 static Ttk_ElementOptionSpec SashOptions[] = {
-    { "-background", TK_OPTION_BORDER, 
+    { "-background", TK_OPTION_BORDER,
 	Tk_Offset(SashElement,borderObj), DEFAULT_BACKGROUND },
-    { "-sashrelief", TK_OPTION_RELIEF, 
+    { "-sashrelief", TK_OPTION_RELIEF,
 	Tk_Offset(SashElement,sashReliefObj), "sunken" },
     { "-sashthickness", TK_OPTION_PIXELS,
 	Tk_Offset(SashElement,sashThicknessObj), "6" },
-    { "-sashpad", TK_OPTION_PIXELS, 
+    { "-sashpad", TK_OPTION_PIXELS,
 	Tk_Offset(SashElement,sashPadObj), "2" },
     { "-handlesize", TK_OPTION_PIXELS,
 	Tk_Offset(SashElement,handleSizeObj), "8" },
     { "-handlepad", TK_OPTION_PIXELS,
 	Tk_Offset(SashElement,handlePadObj), "8" },
@@ -365,14 +365,14 @@
 	    break;
 	case TK_RELIEF_SUNKEN: case TK_RELIEF_GROOVE:
 	    gc1 = Tk_3DBorderGC(tkwin, border, TK_3D_DARK_GC);
 	    gc2 = Tk_3DBorderGC(tkwin, border, TK_3D_LIGHT_GC);
 	    break;
-	case TK_RELIEF_SOLID: 
+	case TK_RELIEF_SOLID:
 	    gc1 = gc2 = Tk_3DBorderGC(tkwin, border, TK_3D_DARK_GC);
 	    break;
-	case TK_RELIEF_FLAT: 
+	case TK_RELIEF_FLAT:
 	default:
 	    gc1 = gc2 = Tk_3DBorderGC(tkwin, border, TK_3D_FLAT_GC);
 	    break;
     }
 
@@ -396,11 +396,11 @@
 	    hb.x += handlePad;
 	} else {
 	    hb = Ttk_StickBox(b, handleSize, handleSize, TTK_STICK_N);
 	    hb.y += handlePad;
 	}
-	Tk_Fill3DRectangle(tkwin, d, border, 
+	Tk_Fill3DRectangle(tkwin, d, border,
 	    hb.x, hb.y, hb.width, hb.height, 1, TK_RELIEF_RAISED);
     }
 }
 
 static Ttk_ElementSpec SashElementSpec = {
@@ -493,11 +493,11 @@
     Ttk_RegisterElement(interp, theme, "rightarrow",
 	    &ArrowElementSpec, &ArrowElements[3]);
     Ttk_RegisterElement(interp, theme, "arrow",
 	    &ArrowElementSpec, &ArrowElements[0]);
 
-    Ttk_RegisterElement(interp, theme, "hsash", 
+    Ttk_RegisterElement(interp, theme, "hsash",
 	    &SashElementSpec, &SashClientData[0]);
     Ttk_RegisterElement(interp, theme, "vsash",
 	    &SashElementSpec, &SashClientData[1]);
 
     /*

Index: generic/ttk/ttkDefaultTheme.c
==================================================================
--- generic/ttk/ttkDefaultTheme.c
+++ generic/ttk/ttkDefaultTheme.c
@@ -2,14 +2,11 @@
  * Copyright (c) 2003, Joe English
  *
  * Tk alternate theme, intended to match the MSUE and Gtk's (old) default theme
  */
 
-#include <math.h>
-#include <string.h>
-
-#include <tkInt.h>
+#include "tkInt.h"
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include "ttkTheme.h"
 
 #if defined(_WIN32)
@@ -207,19 +204,25 @@
 {
     XPoint points[4];
     ArrowPoints(b, dir, points);
     XFillPolygon(display, d, gc, points, 3, Convex, CoordModeOrigin);
     XDrawLines(display, d, gc, points, 4, CoordModeOrigin);
+
+    /* Work around bug [77527326e5] - ttk artifacts on Ubuntu */
+    XDrawPoint(display, d, gc, points[2].x, points[2].y);
 }
 
 /*public*/
 void TtkDrawArrow(
     Display *display, Drawable d, GC gc, Ttk_Box b, ArrowDirection dir)
 {
     XPoint points[4];
     ArrowPoints(b, dir, points);
     XDrawLines(display, d, gc, points, 4, CoordModeOrigin);
+
+    /* Work around bug [77527326e5] - ttk artifacts on Ubuntu */
+    XDrawPoint(display, d, gc, points[2].x, points[2].y);
 }
 
 /*
  *----------------------------------------------------------------------
  * +++ Border element implementation.
@@ -678,11 +681,11 @@
     Tcl_Obj *directionObj;
     Tcl_Obj *sizeObj;
     Tcl_Obj *colorObj;
 } MenubuttonArrowElement;
 
-static const char *directionStrings[] = {	/* See also: button.c */
+static const char *const directionStrings[] = {	/* See also: button.c */
     "above", "below", "left", "right", "flush", NULL
 };
 enum { POST_ABOVE, POST_BELOW, POST_LEFT, POST_RIGHT, POST_FLUSH };
 
 static Ttk_ElementOptionSpec MenubuttonArrowElementOptions[] = {

Index: generic/ttk/ttkElements.c
==================================================================
--- generic/ttk/ttkElements.c
+++ generic/ttk/ttkElements.c
@@ -3,13 +3,11 @@
  *
  * Default implementation for themed elements.
  *
  */
 
-#include <tcl.h>
-#include <tk.h>
-#include <string.h>
+#include "tkInt.h"
 #include "ttkTheme.h"
 #include "ttkWidget.h"
 
 #define DEFAULT_BORDERWIDTH "2"
 #define DEFAULT_ARROW_SIZE "15"

Index: generic/ttk/ttkEntry.c
==================================================================
--- generic/ttk/ttkEntry.c
+++ generic/ttk/ttkEntry.c
@@ -6,13 +6,11 @@
  * Copyright (c) 2000 Ajuba Solutions.
  * Copyright (c) 2002 ActiveState Corporation.
  * Copyright (c) 2004 Joe English
  */
 
-#include <string.h>
-#include <stdio.h>
-#include <tkInt.h>
+#include "tkInt.h"
 #include <X11/Xatom.h>
 
 #include "ttkTheme.h"
 #include "ttkWidget.h"
 
@@ -71,10 +69,11 @@
  */
 
 /* Style parameters:
  */
 typedef struct {
+    Tcl_Obj *placeholderForegroundObj;/* Foreground color for placeholder text */
     Tcl_Obj *foregroundObj;	/* Foreground color for normal text */
     Tcl_Obj *backgroundObj;	/* Entry widget background color */
     Tcl_Obj *selBorderObj;	/* Border and background for selection */
     Tcl_Obj *selBorderWidthObj;	/* Width of selection border */
     Tcl_Obj *selForegroundObj;	/* Foreground color for selected text */
@@ -116,10 +115,12 @@
     EntryStyleData styleData;	/* Display style data (widget options) */
     EntryStyleData styleDefaults;/* Style defaults (fallback values) */
 
     Tcl_Obj *stateObj;		/* Compatibility option -- see CheckStateObj */
 
+    Tcl_Obj *placeholderObj;	/* Text to display for placeholder text */
+
     /*
      * Derived resources:
      */
     Ttk_TraceHandle *textVariableTrace;
 
@@ -145,16 +146,17 @@
 #define SCROLLCMD_CHANGED	(0x400)	/* -xscrollcommand option changed */
 
 /*
  * Default option values:
  */
-#define DEF_SELECT_BG	"#000000"
-#define DEF_SELECT_FG	"#ffffff"
-#define DEF_INSERT_BG	"black"
-#define DEF_ENTRY_WIDTH	"20"
-#define DEF_ENTRY_FONT	"TkTextFont"
-#define DEF_LIST_HEIGHT	"10"
+#define DEF_SELECT_BG		"#000000"
+#define DEF_SELECT_FG		"#ffffff"
+#define DEF_PLACEHOLDER_FG	"#b3b3b3"
+#define DEF_INSERT_BG		"black"
+#define DEF_ENTRY_WIDTH		"20"
+#define DEF_ENTRY_FONT		"TkTextFont"
+#define DEF_LIST_HEIGHT		"10"
 
 static Tk_OptionSpec EntryOptionSpecs[] = {
     {TK_OPTION_BOOLEAN, "-exportselection", "exportSelection",
         "ExportSelection", "1", -1, Tk_Offset(Entry, entry.exportSelection),
 	0,0,0 },
@@ -165,10 +167,13 @@
 	NULL, -1, Tk_Offset(Entry, entry.invalidCmd),
 	TK_OPTION_NULL_OK, 0, 0},
     {TK_OPTION_JUSTIFY, "-justify", "justify", "Justify",
 	"left", -1, Tk_Offset(Entry, entry.justify),
 	0, 0, GEOMETRY_CHANGED},
+    {TK_OPTION_STRING, "-placeholder", "placeHolder", "PlaceHolder",
+	NULL, Tk_Offset(Entry, entry.placeholderObj), -1,
+	TK_OPTION_NULL_OK, 0, 0},
     {TK_OPTION_STRING, "-show", "show", "Show",
         NULL, -1, Tk_Offset(Entry, entry.showChar),
 	TK_OPTION_NULL_OK, 0, 0},
     {TK_OPTION_STRING, "-state", "state", "State",
 	"normal", Tk_Offset(Entry, entry.stateObj), -1,
@@ -189,15 +194,19 @@
 	NULL, -1, Tk_Offset(Entry, entry.xscroll.scrollCmd),
 	TK_OPTION_NULL_OK, 0, SCROLLCMD_CHANGED},
 
     /* EntryStyleData options:
      */
+    {TK_OPTION_COLOR, "-background", "windowColor", "WindowColor",
+	NULL, Tk_Offset(Entry, entry.styleData.backgroundObj), -1,
+	TK_OPTION_NULL_OK,0,0},
     {TK_OPTION_COLOR, "-foreground", "textColor", "TextColor",
 	NULL, Tk_Offset(Entry, entry.styleData.foregroundObj), -1,
 	TK_OPTION_NULL_OK,0,0},
-    {TK_OPTION_COLOR, "-background", "windowColor", "WindowColor",
-	NULL, Tk_Offset(Entry, entry.styleData.backgroundObj), -1,
+    {TK_OPTION_COLOR, "-placeholderforeground", "placeholderForeground",
+        "PlaceholderForeground", NULL,
+        Tk_Offset(Entry, entry.styleData.placeholderForegroundObj), -1,
 	TK_OPTION_NULL_OK,0,0},
 
     WIDGET_TAKEFOCUS_TRUE,
     WIDGET_INHERIT_OPTIONS(ttkCoreOptionSpecs)
 };
@@ -214,10 +223,11 @@
 static void EntryInitStyleDefaults(EntryStyleData *es)
 {
 #define INIT(member, value) \
 	es->member = Tcl_NewStringObj(value, -1); \
 	Tcl_IncrRefCount(es->member);
+    INIT(placeholderForegroundObj, DEF_PLACEHOLDER_FG)
     INIT(foregroundObj, DEFAULT_FOREGROUND)
     INIT(selBorderObj, DEF_SELECT_BG)
     INIT(selForegroundObj, DEF_SELECT_FG)
     INIT(insertColorObj, DEFAULT_FOREGROUND)
     INIT(selBorderWidthObj, "0")
@@ -225,10 +235,11 @@
 #undef INIT
 }
 
 static void EntryFreeStyleDefaults(EntryStyleData *es)
 {
+    Tcl_DecrRefCount(es->placeholderForegroundObj);
     Tcl_DecrRefCount(es->foregroundObj);
     Tcl_DecrRefCount(es->selBorderObj);
     Tcl_DecrRefCount(es->selForegroundObj);
     Tcl_DecrRefCount(es->insertColorObj);
     Tcl_DecrRefCount(es->selBorderWidthObj);
@@ -251,10 +262,11 @@
     *es = entryPtr->entry.styleDefaults;
 
 #   define INIT(member, name) \
     if ((tmp=Ttk_QueryOption(entryPtr->core.layout,name,state))) \
     	es->member=tmp;
+    INIT(placeholderForegroundObj, "-placeholderforeground");
     INIT(foregroundObj, "-foreground");
     INIT(selBorderObj, "-selectbackground")
     INIT(selBorderWidthObj, "-selectborderwidth")
     INIT(selForegroundObj, "-selectforeground")
     INIT(insertColorObj, "-insertcolor")
@@ -261,10 +273,11 @@
     INIT(insertWidthObj, "-insertwidth")
 #undef INIT
 
     /* Reacquire color & border resources from resource cache.
      */
+    es->placeholderForegroundObj = Ttk_UseColor(cache, tkwin, es->placeholderForegroundObj);
     es->foregroundObj = Ttk_UseColor(cache, tkwin, es->foregroundObj);
     es->selForegroundObj = Ttk_UseColor(cache, tkwin, es->selForegroundObj);
     es->insertColorObj = Ttk_UseColor(cache, tkwin, es->insertColorObj);
     es->selBorderObj = Ttk_UseBorder(cache, tkwin, es->selBorderObj);
 }
@@ -280,15 +293,15 @@
  */
 static char *EntryDisplayString(const char *showChar, int numChars)
 {
     char *displayString, *p;
     int size;
-    Tcl_UniChar ch;
-    char buf[TCL_UTF_MAX];
+    int ch;
+    char buf[6];
 
-    Tcl_UtfToUniChar(showChar, &ch);
-    size = Tcl_UniCharToUtf(ch, buf);
+    TkUtfToUniChar(showChar, &ch);
+    size = TkUniCharToUtf(ch, buf);
     p = displayString = ckalloc(numChars * size + 1);
 
     while (numChars--) {
 	memcpy(p, buf, size);
 	p += size;
@@ -302,16 +315,27 @@
  * 	Recompute textLayout, layoutWidth, and layoutHeight
  * 	from displayString and fontObj.
  */
 static void EntryUpdateTextLayout(Entry *entryPtr)
 {
+    size_t length;
+    char *text;
     Tk_FreeTextLayout(entryPtr->entry.textLayout);
-    entryPtr->entry.textLayout = Tk_ComputeTextLayout(
+    if ((entryPtr->entry.numChars != 0) || (entryPtr->entry.placeholderObj == NULL)) {
+        entryPtr->entry.textLayout = Tk_ComputeTextLayout(
 	    Tk_GetFontFromObj(entryPtr->core.tkwin, entryPtr->entry.fontObj),
 	    entryPtr->entry.displayString, entryPtr->entry.numChars,
 	    0/*wraplength*/, entryPtr->entry.justify, TK_IGNORE_NEWLINES,
 	    &entryPtr->entry.layoutWidth, &entryPtr->entry.layoutHeight);
+    } else {
+        text = TkGetStringFromObj(entryPtr->entry.placeholderObj, &length);
+        entryPtr->entry.textLayout = Tk_ComputeTextLayout(
+	    Tk_GetFontFromObj(entryPtr->core.tkwin, entryPtr->entry.fontObj),
+	    text, length,
+	    0/*wraplength*/, entryPtr->entry.justify, TK_IGNORE_NEWLINES,
+	    &entryPtr->entry.layoutWidth, &entryPtr->entry.layoutHeight);
+    }
 }
 
 /* EntryEditable --
  * 	Returns 1 if the entry widget accepts user changes, 0 otherwise
  */
@@ -335,11 +359,12 @@
     Entry *entryPtr = (Entry *) clientData;
     size_t byteCount;
     const char *string;
     const char *selStart, *selEnd;
 
-    if (entryPtr->entry.selectFirst < 0 || !entryPtr->entry.exportSelection) {
+    if (entryPtr->entry.selectFirst < 0 || (!entryPtr->entry.exportSelection)
+	    || Tcl_IsSafe(entryPtr->core.interp)) {
 	return -1;
     }
     string = entryPtr->entry.displayString;
 
     selStart = Tcl_UtfAtIndex(string, entryPtr->entry.selectFirst);
@@ -370,15 +395,16 @@
     TtkRedisplayWidget(&entryPtr->core);
 }
 
 /* EntryOwnSelection --
  * 	Assert ownership of the PRIMARY selection,
- * 	if -exportselection set and selection is present.
+ * 	if -exportselection set and selection is present and interp is unsafe.
  */
 static void EntryOwnSelection(Entry *entryPtr)
 {
     if (entryPtr->entry.exportSelection
+	&& (!Tcl_IsSafe(entryPtr->core.interp))
 	&& !(entryPtr->core.flags & GOT_SELECTION)) {
 	Tk_OwnSelection(entryPtr->core.tkwin, XA_PRIMARY, EntryLostSelection,
 		(ClientData) entryPtr);
 	entryPtr->core.flags |= GOT_SELECTION;
     }
@@ -404,11 +430,11 @@
 {
     int spaceNeeded, cvtFlags;
     int number, length;
     const char *string;
     int stringLength;
-    Tcl_UniChar ch;
+    int ch;
     char numStorage[2*TCL_INTEGER_SPACE];
 
     while (*template) {
 	/* Find everything up to the next % character and append it
 	 * to the result string.
@@ -428,11 +454,11 @@
 
 	/* There's a percent sequence here.  Process it.
 	 */
 	++template; /* skip over % */
 	if (*template != '\0') {
-	    template += Tcl_UtfToUniChar(template, &ch);
+	    template += TkUtfToUniChar(template, &ch);
 	} else {
 	    ch = '%';
 	}
 
 	stringLength = -1;
@@ -478,11 +504,11 @@
 		break;
 	    case 'W': /* widget name */
 		string = Tk_PathName(entryPtr->core.tkwin);
 		break;
 	    default:
-		length = Tcl_UniCharToUtf(ch, numStorage);
+		length = TkUniCharToUtf(ch, numStorage);
 		numStorage[length] = '\0';
 		string = numStorage;
 		break;
 	}
 
@@ -557,11 +583,11 @@
  *	Call the -invalidcommand if validation fails.
  *
  * Returns:
  *	TCL_OK if the change is accepted
  *	TCL_BREAK if the change is rejected
- *      TCL_ERROR if any errors occured
+ *      TCL_ERROR if any errors occurred
  *
  * The change will be rejected if -validatecommand returns 0,
  * or if -validatecommand or -invalidcommand modifies the value.
  */
 static int
@@ -997,11 +1023,12 @@
 	entryPtr->entry.textVariableTrace = vt;
     }
 
     /* Claim the selection, in case we've suddenly started exporting it.
      */
-    if (entryPtr->entry.exportSelection && entryPtr->entry.selectFirst != -1) {
+    if (entryPtr->entry.exportSelection && (entryPtr->entry.selectFirst != -1)
+	    && (!Tcl_IsSafe(entryPtr->core.interp))) {
 	EntryOwnSelection(entryPtr);
     }
 
     /* Handle -state compatibility option:
      */
@@ -1173,10 +1200,11 @@
     GC gc;
     int showSelection, showCursor;
     Ttk_Box textarea;
     TkRegion clipRegion;
     XRectangle rect;
+    Tcl_Obj *foregroundObj;
 
     EntryInitStyleData(entryPtr, &es);
 
     textarea = Ttk_ClientRegion(entryPtr->core.layout, "textarea");
     showCursor =
@@ -1239,10 +1267,11 @@
 #endif
 
     /* Draw cursor:
      */
     if (showCursor) {
+        Ttk_Box field = Ttk_ClientRegion(entryPtr->core.layout, "field");
 	int cursorX = EntryCharPosition(entryPtr, entryPtr->entry.insertPos),
 	    cursorY = entryPtr->entry.layoutY,
 	    cursorHeight = entryPtr->entry.layoutHeight,
 	    cursorWidth = 1;
 
@@ -1252,20 +1281,40 @@
 	}
 
 	/* @@@ should: maybe: SetCaretPos even when blinked off */
 	Tk_SetCaretPos(tkwin, cursorX, cursorY, cursorHeight);
 
-	gc = EntryGetGC(entryPtr, es.insertColorObj, clipRegion);
+	cursorX -= cursorWidth/2;
+	if (cursorX < field.x) {
+	    cursorX = field.x;
+	} else if (cursorX + cursorWidth > field.x + field.width) {
+	    cursorX = field.x + field.width - cursorWidth;
+	}
+
+	gc = EntryGetGC(entryPtr, es.insertColorObj, None);
 	XFillRectangle(Tk_Display(tkwin), d, gc,
-	    cursorX-cursorWidth/2, cursorY, cursorWidth, cursorHeight);
-	XSetClipMask(Tk_Display(tkwin), gc, None);
+	    cursorX, cursorY, cursorWidth, cursorHeight);
 	Tk_FreeGC(Tk_Display(tkwin), gc);
     }
 
     /* Draw the text:
      */
-    gc = EntryGetGC(entryPtr, es.foregroundObj, clipRegion);
+    if ((*(entryPtr->entry.displayString) == '\0')
+		&& (entryPtr->entry.placeholderObj != NULL)) {
+	/* No text displayed, but -placeholder is given */
+	if (Tcl_GetCharLength(es.placeholderForegroundObj) > 0) {
+	    foregroundObj = es.placeholderForegroundObj;
+	} else {
+            foregroundObj = es.foregroundObj;
+	}
+	/* Use placeholder text width */
+	leftIndex = 0;
+	Tcl_GetStringFromObj(entryPtr->entry.placeholderObj,&rightIndex);
+    } else {
+	foregroundObj = es.foregroundObj;
+    }
+    gc = EntryGetGC(entryPtr, foregroundObj, clipRegion);
     Tk_DrawTextLayout(
 	Tk_Display(tkwin), d, gc, entryPtr->entry.textLayout,
 	entryPtr->entry.layoutX, entryPtr->entry.layoutY,
 	leftIndex, rightIndex);
     XSetClipMask(Tk_Display(tkwin), gc, None);
@@ -1313,12 +1362,12 @@
     Entry *entryPtr,		/* Entry widget to query */
     Tcl_Obj *indexObj,		/* Symbolic index name */
     int *indexPtr)		/* Return value */
 {
 #   define EntryWidth(e) (Tk_Width(entryPtr->core.tkwin)) /* Not Right */
-    const char *string = Tcl_GetString(indexObj);
-    size_t length = indexObj->length;
+    size_t length;
+    const char *string = TkGetStringFromObj(indexObj, &length);
 
     if (strncmp(string, "end", length) == 0) {
 	*indexPtr = entryPtr->entry.numChars;
     } else if (strncmp(string, "insert", length) == 0) {
 	*indexPtr = entryPtr->entry.insertPos;

Index: generic/ttk/ttkFrame.c
==================================================================
--- generic/ttk/ttkFrame.c
+++ generic/ttk/ttkFrame.c
@@ -2,12 +2,11 @@
  * Copyright (c) 2004, Joe English
  *
  * ttk::frame and ttk::labelframe widgets.
  */
 
-#include <tk.h>
-
+#include "tkInt.h"
 #include "ttkTheme.h"
 #include "ttkWidget.h"
 #include "ttkManager.h"
 
 /* ======================================================================

DELETED generic/ttk/ttkGenStubs.tcl
Index: generic/ttk/ttkGenStubs.tcl
==================================================================
--- generic/ttk/ttkGenStubs.tcl
+++ /dev/null
@@ -1,963 +0,0 @@
-# ttkGenStubs.tcl --
-#
-#	This script generates a set of stub files for a given
-#	interface.
-#
-#
-# Copyright (c) 1998-1999 by Scriptics Corporation.
-# Copyright (c) 2007 Daniel A. Steffen <das@users.sourceforge.net>
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# SOURCE: tcl/tools/genStubs.tcl, revision 1.44
-#
-# CHANGES:
-#	+ Second argument to "declare" is used as a status guard
-#	  instead of a platform guard.
-#	+ Allow trailing semicolon in function declarations
-#
-
-namespace eval genStubs {
-    # libraryName --
-    #
-    #	The name of the entire library.  This value is used to compute
-    #	the USE_*_STUBS macro and the name of the init file.
-
-    variable libraryName "UNKNOWN"
-
-    # interfaces --
-    #
-    #	An array indexed by interface name that is used to maintain
-    #   the set of valid interfaces.  The value is empty.
-
-    array set interfaces {}
-
-    # curName --
-    #
-    #	The name of the interface currently being defined.
-
-    variable curName "UNKNOWN"
-
-    # scspec --
-    #
-    #	Storage class specifier for external function declarations.
-    #	Normally "EXTERN", may be set to something like XYZAPI
-    #
-    variable scspec "EXTERN"
-
-    # epoch, revision --
-    #
-    #	The epoch and revision numbers of the interface currently being defined.
-    #   (@@@TODO: should be an array mapping interface names -> numbers)
-    #
-
-    variable epoch {}
-    variable revision 0
-
-    # hooks --
-    #
-    #	An array indexed by interface name that contains the set of
-    #	subinterfaces that should be defined for a given interface.
-
-    array set hooks {}
-
-    # stubs --
-    #
-    #	This three dimensional array is indexed first by interface name,
-    #	second by field name, and third by a numeric offset or the
-    #	constant "lastNum".  The lastNum entry contains the largest
-    #	numeric offset used for a given interface.
-    #
-    #	Field "decl,$i" contains the C function specification that
-    #	should be used for the given entry in the stub table.  The spec
-    #	consists of a list in the form returned by parseDecl.
-    #   Other fields TBD later.
-
-    array set stubs {}
-
-    # outDir --
-    #
-    #	The directory where the generated files should be placed.
-
-    variable outDir .
-}
-
-# genStubs::library --
-#
-#	This function is used in the declarations file to set the name
-#	of the library that the interfaces are associated with (e.g. "tcl").
-#	This value will be used to define the inline conditional macro.
-#
-# Arguments:
-#	name	The library name.
-#
-# Results:
-#	None.
-
-proc genStubs::library {name} {
-    variable libraryName $name
-}
-
-# genStubs::interface --
-#
-#	This function is used in the declarations file to set the name
-#	of the interface currently being defined.
-#
-# Arguments:
-#	name	The name of the interface.
-#
-# Results:
-#	None.
-
-proc genStubs::interface {name} {
-    variable curName $name
-    variable interfaces
-    variable stubs
-
-    set interfaces($name) {}
-    set stubs($name,lastNum) 0
-    return
-}
-
-# genStubs::scspec --
-#
-#	Define the storage class macro used for external function declarations.
-#	Typically, this will be a macro like XYZAPI or EXTERN that
-#	expands to either DLLIMPORT or DLLEXPORT, depending on whether
-#	-DBUILD_XYZ has been set.
-#
-proc genStubs::scspec {value} {
-    variable scspec $value
-}
-
-# genStubs::epoch --
-#
-#	Define the epoch number for this library.  The epoch
-#	should be incrememented when a release is made that
-#	contains incompatible changes to the public API.
-#
-proc genStubs::epoch {value} {
-    variable epoch $value
-}
-
-# genStubs::hooks --
-#
-#	This function defines the subinterface hooks for the current
-#	interface.
-#
-# Arguments:
-#	names	The ordered list of interfaces that are reachable through the
-#		hook vector.
-#
-# Results:
-#	None.
-
-proc genStubs::hooks {names} {
-    variable curName
-    variable hooks
-
-    set hooks($curName) $names
-    return
-}
-
-# genStubs::declare --
-#
-#	This function is used in the declarations file to declare a new
-#	interface entry.
-#
-# Arguments:
-#	index		The index number of the interface.
-#	status  	Status of the interface: one of "current",
-#		  	"deprecated", or "obsolete".
-#	decl		The C function declaration, or {} for an undefined
-#			entry.
-#
-# Results:
-#	None.
-
-proc genStubs::declare {args} {
-    variable stubs
-    variable curName
-    variable revision
-
-    incr revision
-    if {[llength $args] == 2} {
-	lassign $args index decl
-	set status current
-    } elseif {[llength $args] == 3} {
-	lassign $args index status decl
-    } else {
-	puts stderr "wrong # args: declare $args"
-	return
-    }
-
-    # Check for duplicate declarations, then add the declaration and
-    # bump the lastNum counter if necessary.
-
-    if {[info exists stubs($curName,decl,$index)]} {
-	puts stderr "Duplicate entry: $index"
-    }
-    regsub -all "\[ \t\n\]+" [string trim $decl] " " decl
-    set decl [parseDecl $decl]
-
-    set stubs($curName,status,$index) $status
-    set stubs($curName,decl,$index) $decl
-
-    if {$index > $stubs($curName,lastNum)} {
-	set stubs($curName,lastNum) $index
-    }
-    return
-}
-
-# genStubs::export --
-#
-#	This function is used in the declarations file to declare a symbol
-#	that is exported from the library but is not in the stubs table.
-#
-# Arguments:
-#	decl		The C function declaration, or {} for an undefined
-#			entry.
-#
-# Results:
-#	None.
-
-proc genStubs::export {args} {
-    if {[llength $args] != 1} {
-	puts stderr "wrong # args: export $args"
-    }
-    return
-}
-
-# genStubs::rewriteFile --
-#
-#	This function replaces the machine generated portion of the
-#	specified file with new contents.  It looks for the !BEGIN! and
-#	!END! comments to determine where to place the new text.
-#
-# Arguments:
-#	file	The name of the file to modify.
-#	text	The new text to place in the file.
-#
-# Results:
-#	None.
-
-proc genStubs::rewriteFile {file text} {
-    if {![file exists $file]} {
-	puts stderr "Cannot find file: $file"
-	return
-    }
-    set in [open ${file} r]
-    set out [open ${file}.new w]
-    fconfigure $out -translation lf
-
-    while {![eof $in]} {
-	set line [gets $in]
-	if {[string match "*!BEGIN!*" $line]} {
-	    break
-	}
-	puts $out $line
-    }
-    puts $out "/* !BEGIN!: Do not edit below this line. */"
-    puts $out $text
-    while {![eof $in]} {
-	set line [gets $in]
-	if {[string match "*!END!*" $line]} {
-	    break
-	}
-    }
-    puts $out "/* !END!: Do not edit above this line. */"
-    puts -nonewline $out [read $in]
-    close $in
-    close $out
-    file rename -force ${file}.new ${file}
-    return
-}
-
-# genStubs::addPlatformGuard --
-#
-#	Wrap a string inside a platform #ifdef.
-#
-# Arguments:
-#	plat	Platform to test.
-#
-# Results:
-#	Returns the original text inside an appropriate #ifdef.
-
-proc genStubs::addPlatformGuard {plat iftxt {eltxt {}}} {
-    set text ""
-    switch $plat {
-	win {
-	    append text "#ifdef _WIN32 /* WIN */\n${iftxt}"
-	    if {$eltxt ne ""} {
-		append text "#else /* WIN */\n${eltxt}"
-	    }
-	    append text "#endif /* WIN */\n"
-	}
-	unix {
-	    append text "#if !defined(_WIN32) && !defined(MAC_OSX_TCL)\
-		    /* UNIX */\n${iftxt}"
-	    if {$eltxt ne ""} {
-		append text "#else /* UNIX */\n${eltxt}"
-	    }
-	    append text "#endif /* UNIX */\n"
-	}
-	macosx {
-	    append text "#ifdef MAC_OSX_TCL /* MACOSX */\n${iftxt}"
-	    if {$eltxt ne ""} {
-		append text "#else /* MACOSX */\n${eltxt}"
-	    }
-	    append text "#endif /* MACOSX */\n"
-	}
-	aqua {
-	    append text "#ifdef MAC_OSX_TK /* AQUA */\n${iftxt}"
-	    if {$eltxt ne ""} {
-		append text "#else /* AQUA */\n${eltxt}"
-	    }
-	    append text "#endif /* AQUA */\n"
-	}
-	x11 {
-	    append text "#if !(defined(_WIN32) || defined(MAC_OSX_TK))\
-		    /* X11 */\n${iftxt}"
-	    if {$eltxt ne ""} {
-		append text "#else /* X11 */\n${eltxt}"
-	    }
-	    append text "#endif /* X11 */\n"
-	}
-	default {
-	    append text "${iftxt}${eltxt}"
-	}
-    }
-    return $text
-}
-
-# genStubs::emitSlots --
-#
-#	Generate the stub table slots for the given interface.  If there
-#	are no generic slots, then one table is generated for each
-#	platform, otherwise one table is generated for all platforms.
-#
-# Arguments:
-#	name	The name of the interface being emitted.
-#	textVar	The variable to use for output.
-#
-# Results:
-#	None.
-
-proc genStubs::emitSlots {name textVar} {
-    upvar $textVar text
-
-    forAllStubs $name makeSlot noGuard text {"    void (*reserved$i)(void);\n"}
-    return
-}
-
-# genStubs::parseDecl --
-#
-#	Parse a C function declaration into its component parts.
-#
-# Arguments:
-#	decl	The function declaration.
-#
-# Results:
-#	Returns a list of the form {returnType name args}.  The args
-#	element consists of a list of type/name pairs, or a single
-#	element "void".  If the function declaration is malformed
-#	then an error is displayed and the return value is {}.
-
-proc genStubs::parseDecl {decl} {
-    if {![regexp {^(.*)\((.*)\);?$} $decl all prefix args]} {
-	set prefix $decl
-	set args {}
-    }
-    set prefix [string trim $prefix]
-    if {![regexp {^(.+[ ][*]*)([^ *]+)$} $prefix all rtype fname]} {
-	puts stderr "Bad return type: $decl"
-	return
-    }
-    set rtype [string trim $rtype]
-    if {$args eq ""} {
-	return [list $rtype $fname {}]
-    }
-    foreach arg [split $args ,] {
-	lappend argList [string trim $arg]
-    }
-    if {![string compare [lindex $argList end] "..."]} {
-	set args TCL_VARARGS
-	foreach arg [lrange $argList 0 end-1] {
-	    set argInfo [parseArg $arg]
-	    if {[llength $argInfo] == 2 || [llength $argInfo] == 3} {
-		lappend args $argInfo
-	    } else {
-		puts stderr "Bad argument: '$arg' in '$decl'"
-		return
-	    }
-	}
-    } else {
-	set args {}
-	foreach arg $argList {
-	    set argInfo [parseArg $arg]
-	    if {![string compare $argInfo "void"]} {
-		lappend args "void"
-		break
-	    } elseif {[llength $argInfo] == 2 || [llength $argInfo] == 3} {
-		lappend args $argInfo
-	    } else {
-		puts stderr "Bad argument: '$arg' in '$decl'"
-		return
-	    }
-	}
-    }
-    return [list $rtype $fname $args]
-}
-
-# genStubs::parseArg --
-#
-#	This function parses a function argument into a type and name.
-#
-# Arguments:
-#	arg	The argument to parse.
-#
-# Results:
-#	Returns a list of type and name with an optional third array
-#	indicator.  If the argument is malformed, returns "".
-
-proc genStubs::parseArg {arg} {
-    if {![regexp {^(.+[ ][*]*)([^][ *]+)(\[\])?$} $arg all type name array]} {
-	if {$arg eq "void"} {
-	    return $arg
-	} else {
-	    return
-	}
-    }
-    set result [list [string trim $type] $name]
-    if {$array ne ""} {
-	lappend result $array
-    }
-    return $result
-}
-
-# genStubs::makeDecl --
-#
-#	Generate the prototype for a function.
-#
-# Arguments:
-#	name	The interface name.
-#	decl	The function declaration.
-#	index	The slot index for this function.
-#
-# Results:
-#	Returns the formatted declaration string.
-
-proc genStubs::makeDecl {name decl index} {
-    variable scspec
-    lassign $decl rtype fname args
-
-    append text "/* $index */\n"
-    set line "$scspec $rtype"
-    set count [expr {2 - ([string length $line] / 8)}]
-    append line [string range "\t\t\t" 0 $count]
-    set pad [expr {24 - [string length $line]}]
-    if {$pad <= 0} {
-	append line " "
-	set pad 0
-    }
-    if {$args eq ""} {
-	append line $fname
-	append text $line
-	append text ";\n"
-	return $text
-    }
-    append line $fname
-
-    set arg1 [lindex $args 0]
-    switch -exact $arg1 {
-	void {
-	    append line "(void)"
-	}
-	TCL_VARARGS {
-	    set sep "("
-	    foreach arg [lrange $args 1 end] {
-		append line $sep
-		set next {}
-		append next [lindex $arg 0]
-		if {[string index $next end] ne "*"} {
-		    append next " "
-		}
-		append next [lindex $arg 1] [lindex $arg 2]
-		if {[string length $line] + [string length $next] \
-			+ $pad > 76} {
-		    append text [string trimright $line] \n
-		    set line "\t\t\t\t"
-		    set pad 28
-		}
-		append line $next
-		set sep ", "
-	    }
-	    append line ", ...)"
-	}
-	default {
-	    set sep "("
-	    foreach arg $args {
-		append line $sep
-		set next {}
-		append next [lindex $arg 0]
-		if {[string index $next end] ne "*"} {
-		    append next " "
-		}
-		append next [lindex $arg 1] [lindex $arg 2]
-		if {[string length $line] + [string length $next] \
-			+ $pad > 76} {
-		    append text [string trimright $line] \n
-		    set line "\t\t\t\t"
-		    set pad 28
-		}
-		append line $next
-		set sep ", "
-	    }
-	    append line ")"
-	}
-    }
-    return "$text$line;\n"
-}
-
-# genStubs::makeMacro --
-#
-#	Generate the inline macro for a function.
-#
-# Arguments:
-#	name	The interface name.
-#	decl	The function declaration.
-#	index	The slot index for this function.
-#
-# Results:
-#	Returns the formatted macro definition.
-
-proc genStubs::makeMacro {name decl index} {
-    lassign $decl rtype fname args
-
-    set lfname [string tolower [string index $fname 0]]
-    append lfname [string range $fname 1 end]
-
-    set text "#define $fname \\\n\t("
-    if {$args eq ""} {
-	append text "*"
-    }
-    append text "${name}StubsPtr->$lfname)"
-    append text " /* $index */\n"
-    return $text
-}
-
-# genStubs::makeSlot --
-#
-#	Generate the stub table entry for a function.
-#
-# Arguments:
-#	name	The interface name.
-#	decl	The function declaration.
-#	index	The slot index for this function.
-#
-# Results:
-#	Returns the formatted table entry.
-
-proc genStubs::makeSlot {name decl index} {
-    lassign $decl rtype fname args
-
-    set lfname [string tolower [string index $fname 0]]
-    append lfname [string range $fname 1 end]
-
-    set text "    "
-    if {$args eq ""} {
-	append text $rtype " *" $lfname "; /* $index */\n"
-	return $text
-    }
-    if {[string range $rtype end-8 end] eq "__stdcall"} {
-	append text [string trim [string range $rtype 0 end-9]] " (__stdcall *" $lfname ") "
-    } else {
-	append text $rtype " (*" $lfname ") "
-    }
-    set arg1 [lindex $args 0]
-    switch -exact $arg1 {
-	void {
-	    append text "(void)"
-	}
-	TCL_VARARGS {
-	    set sep "("
-	    foreach arg [lrange $args 1 end] {
-		append text $sep [lindex $arg 0]
-		if {[string index $text end] ne "*"} {
-		    append text " "
-		}
-		append text [lindex $arg 1] [lindex $arg 2]
-		set sep ", "
-	    }
-	    append text ", ...)"
-	}
-	default {
-	    set sep "("
-	    foreach arg $args {
-		append text $sep [lindex $arg 0]
-		if {[string index $text end] ne "*"} {
-		    append text " "
-		}
-		append text [lindex $arg 1] [lindex $arg 2]
-		set sep ", "
-	    }
-	    append text ")"
-	}
-    }
-
-    append text "; /* $index */\n"
-    return $text
-}
-
-# genStubs::makeInit --
-#
-#	Generate the prototype for a function.
-#
-# Arguments:
-#	name	The interface name.
-#	decl	The function declaration.
-#	index	The slot index for this function.
-#
-# Results:
-#	Returns the formatted declaration string.
-
-proc genStubs::makeInit {name decl index} {
-    if {[lindex $decl 2] eq ""} {
-	append text "    &" [lindex $decl 1] ", /* " $index " */\n"
-    } else {
-	append text "    " [lindex $decl 1] ", /* " $index " */\n"
-    }
-    return $text
-}
-
-# genStubs::forAllStubs --
-#
-#	This function iterates over all of the slots and invokes
-#	a callback for each slot.  The result of the callback is then
-#	placed inside appropriate guards.
-#
-# Arguments:
-#	name		The interface name.
-#	slotProc	The proc to invoke to handle the slot.  It will
-#			have the interface name, the declaration,  and
-#			the index appended.
-#	guardProc	The proc to invoke to add guards.  It will have
-#		        the slot status and text appended.
-#	textVar		The variable to use for output.
-#	skipString	The string to emit if a slot is skipped.  This
-#			string will be subst'ed in the loop so "$i" can
-#			be used to substitute the index value.
-#
-# Results:
-#	None.
-
-proc genStubs::forAllStubs {name slotProc guardProc textVar
-	{skipString {"/* Slot $i is reserved */\n"}}} {
-    variable stubs
-    upvar $textVar text
-
-    set lastNum $stubs($name,lastNum)
-
-    for {set i 0} {$i <= $lastNum} {incr i} {
-	if {[info exists stubs($name,decl,$i)]} {
-	    append text [$guardProc $stubs($name,status,$i) \
-	    			[$slotProc $name $stubs($name,decl,$i) $i]]
-	} else {
-	    eval {append text} $skipString
-	}
-    }
-}
-
-proc genStubs::noGuard  {status text} { return $text }
-
-proc genStubs::addGuard {status text} {
-    variable libraryName
-    set upName [string toupper $libraryName]
-
-    switch -- $status {
-	current	{
-	    # No change
-	}
-	deprecated {
-	    set text [ifdeffed "${upName}_DEPRECATED" $text]
-	}
-	obsolete {
-	    set text ""
-	}
-	default {
-	    puts stderr "Unrecognized status code $status"
-	}
-    }
-    return $text
-}
-
-proc genStubs::ifdeffed {macro text} {
-    join [list "#ifdef $macro" $text "#endif" ""] \n
-}
-
-# genStubs::emitDeclarations --
-#
-#	This function emits the function declarations for this interface.
-#
-# Arguments:
-#	name	The interface name.
-#	textVar	The variable to use for output.
-#
-# Results:
-#	None.
-
-proc genStubs::emitDeclarations {name textVar} {
-    upvar $textVar text
-
-    append text "\n/*\n * Exported function declarations:\n */\n\n"
-    forAllStubs $name makeDecl noGuard text
-    return
-}
-
-# genStubs::emitMacros --
-#
-#	This function emits the inline macros for an interface.
-#
-# Arguments:
-#	name	The name of the interface being emitted.
-#	textVar	The variable to use for output.
-#
-# Results:
-#	None.
-
-proc genStubs::emitMacros {name textVar} {
-    variable libraryName
-    upvar $textVar text
-
-    set upName [string toupper $libraryName]
-    append text "\n#if defined(USE_${upName}_STUBS)\n"
-    append text "\n/*\n * Inline function declarations:\n */\n\n"
-
-    forAllStubs $name makeMacro addGuard text
-
-    append text "\n#endif /* defined(USE_${upName}_STUBS) */\n"
-    return
-}
-
-# genStubs::emitHeader --
-#
-#	This function emits the body of the <name>Decls.h file for
-#	the specified interface.
-#
-# Arguments:
-#	name	The name of the interface being emitted.
-#
-# Results:
-#	None.
-
-proc genStubs::emitHeader {name} {
-    variable outDir
-    variable hooks
-    variable epoch
-    variable revision
-
-    set capName [string toupper [string index $name 0]]
-    append capName [string range $name 1 end]
-
-    if {$epoch ne ""} {
-	set CAPName [string toupper $name]
-	append text "\n"
-	append text "#define ${CAPName}_STUBS_EPOCH $epoch\n"
-	append text "#define ${CAPName}_STUBS_REVISION $revision\n"
-    }
-
-    append text "\n#ifdef __cplusplus\nextern \"C\" {\n#endif\n"
-
-    emitDeclarations $name text
-
-    if {[info exists hooks($name)]} {
-	append text "\ntypedef struct {\n"
-	foreach hook $hooks($name) {
-	    set capHook [string toupper [string index $hook 0]]
-	    append capHook [string range $hook 1 end]
-	    append text "    const struct ${capHook}Stubs *${hook}Stubs;\n"
-	}
-	append text "} ${capName}StubHooks;\n"
-    }
-    append text "\ntypedef struct ${capName}Stubs {\n"
-    append text "    int magic;\n"
-    if {$epoch ne ""} {
-	append text "    int epoch;\n"
-	append text "    int revision;\n"
-    }
-    if {[info exists hooks($name)]} {
-	append text "    const ${capName}StubHooks *hooks;\n\n"
-    } else {
-	append text "    void *hooks;\n\n"
-    }
-
-    emitSlots $name text
-
-    append text "} ${capName}Stubs;\n\n"
-
-    append text "extern const ${capName}Stubs *${name}StubsPtr;\n\n"
-    append text "#ifdef __cplusplus\n}\n#endif\n"
-
-    emitMacros $name text
-
-    rewriteFile [file join $outDir ${name}Decls.h] $text
-    return
-}
-
-# genStubs::emitInit --
-#
-#	Generate the table initializers for an interface.
-#
-# Arguments:
-#	name		The name of the interface to initialize.
-#	textVar		The variable to use for output.
-#
-# Results:
-#	Returns the formatted output.
-
-proc genStubs::emitInit {name textVar} {
-    variable hooks
-    variable interfaces
-    variable epoch
-    upvar $textVar text
-    set root 1
-
-    set capName [string toupper [string index $name 0]]
-    append capName [string range $name 1 end]
-
-    if {[info exists hooks($name)]} {
-	append text "\nstatic const ${capName}StubHooks ${name}StubHooks = \{\n"
-	set sep "    "
-	foreach sub $hooks($name) {
-	    append text $sep "&${sub}Stubs"
-	    set sep ",\n    "
-	}
-	append text "\n\};\n"
-    }
-    foreach intf [array names interfaces] {
-	if {[info exists hooks($intf)]} {
-	    if {[lsearch -exact $hooks($intf) $name] >= 0} {
-		set root 0
-		break
-	    }
-	}
-    }
-
-    append text "\n"
-    if {!$root} {
-	append text "static "
-    }
-    append text "const ${capName}Stubs ${name}Stubs = \{\n    TCL_STUB_MAGIC,\n"
-    if {$epoch ne ""} {
-	set CAPName [string toupper $name]
-	append text "    ${CAPName}_STUBS_EPOCH,\n"
-	append text "    ${CAPName}_STUBS_REVISION,\n"
-    }
-    if {[info exists hooks($name)]} {
-	append text "    &${name}StubHooks,\n"
-    } else {
-	append text "    0,\n"
-    }
-
-    forAllStubs $name makeInit noGuard text {"    0, /* $i */\n"}
-
-    append text "\};\n"
-    return
-}
-
-# genStubs::emitInits --
-#
-#	This function emits the body of the <name>StubInit.c file for
-#	the specified interface.
-#
-# Arguments:
-#	name	The name of the interface being emitted.
-#
-# Results:
-#	None.
-
-proc genStubs::emitInits {} {
-    variable hooks
-    variable outDir
-    variable libraryName
-    variable interfaces
-
-    # Assuming that dependencies only go one level deep, we need to emit
-    # all of the leaves first to avoid needing forward declarations.
-
-    set leaves {}
-    set roots {}
-    foreach name [lsort [array names interfaces]] {
-	if {[info exists hooks($name)]} {
-	    lappend roots $name
-	} else {
-	    lappend leaves $name
-	}
-    }
-    foreach name $leaves {
-	emitInit $name text
-    }
-    foreach name $roots {
-	emitInit $name text
-    }
-
-    rewriteFile [file join $outDir ${libraryName}StubInit.c] $text
-}
-
-# genStubs::init --
-#
-#	This is the main entry point.
-#
-# Arguments:
-#	None.
-#
-# Results:
-#	None.
-
-proc genStubs::init {} {
-    global argv argv0
-    variable outDir
-    variable interfaces
-
-    if {[llength $argv] < 2} {
-	puts stderr "usage: $argv0 outDir declFile ?declFile...?"
-	exit 1
-    }
-
-    set outDir [lindex $argv 0]
-
-    foreach file [lrange $argv 1 end] {
-	source $file
-    }
-
-    foreach name [lsort [array names interfaces]] {
-	puts "Emitting $name"
-	emitHeader $name
-    }
-
-    emitInits
-}
-
-# lassign --
-#
-#	This function emulates the TclX lassign command.
-#
-# Arguments:
-#	valueList	A list containing the values to be assigned.
-#	args		The list of variables to be assigned.
-#
-# Results:
-#	Returns any values that were not assigned to variables.
-
-if {[string length [namespace which lassign]] == 0} {
-    proc lassign {valueList args} {
-	if {[llength $args] == 0} {
-	    error "wrong # args: should be \"lassign list varName ?varName ...?\""
-	}
-	uplevel [list foreach $args $valueList {break}]
-	return [lrange $valueList [llength $args] end]
-    }
-}
-
-genStubs::init

Index: generic/ttk/ttkImage.c
==================================================================
--- generic/ttk/ttkImage.c
+++ generic/ttk/ttkImage.c
@@ -8,12 +8,11 @@
  * is the name of the default image to use, the remainder of the
  * list is a sequence of statespec/imagename options as per
  * [style map].
  */
 
-#include <string.h>
-#include <tk.h>
+#include "tkInt.h"
 #include "ttkTheme.h"
 
 #define MIN(a,b) ((a) < (b) ? (a) : (b))
 
 /*------------------------------------------------------------------------
@@ -23,37 +22,67 @@
 struct TtkImageSpec {
     Tk_Image 		baseImage;	/* Base image to use */
     int 		mapCount;	/* #state-specific overrides */
     Ttk_StateSpec	*states;	/* array[mapCount] of states ... */
     Tk_Image		*images;	/* ... per-state images to use */
+    Tk_ImageChangedProc *imageChanged;
+    ClientData		imageChangedClientData;
 };
 
 /* NullImageChanged --
  * 	Do-nothing Tk_ImageChangedProc.
  */
 static void NullImageChanged(ClientData clientData,
     int x, int y, int width, int height, int imageWidth, int imageHeight)
 { /* No-op */ }
+
+/* ImageSpecImageChanged --
+ *     Image changes should trigger a repaint.
+ */
+static void ImageSpecImageChanged(ClientData clientData,
+    int x, int y, int width, int height, int imageWidth, int imageHeight)
+{
+    Ttk_ImageSpec *imageSpec = (Ttk_ImageSpec *)clientData;
+    if (imageSpec->imageChanged != NULL) {
+	imageSpec->imageChanged(imageSpec->imageChangedClientData,
+		x, y, width, height,
+		imageWidth, imageHeight);
+    }
+}
 
 /* TtkGetImageSpec --
  * 	Constructs a Ttk_ImageSpec * from a Tcl_Obj *.
  * 	Result must be released using TtkFreeImageSpec.
  *
- * TODO: Need a variant of this that takes a user-specified ImageChanged proc
  */
 Ttk_ImageSpec *
 TtkGetImageSpec(Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr)
 {
+    return TtkGetImageSpecEx(interp, tkwin, objPtr, NULL, NULL);
+}
+
+/* TtkGetImageSpecEx --
+ * 	Constructs a Ttk_ImageSpec * from a Tcl_Obj *.
+ * 	Result must be released using TtkFreeImageSpec.
+ * 	imageChangedProc will be called when not NULL when
+ * 	the image changes to allow widgets to repaint.
+ */
+Ttk_ImageSpec *
+TtkGetImageSpecEx(Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr,
+    Tk_ImageChangedProc *imageChangedProc, ClientData imageChangedClientData)
+{
     Ttk_ImageSpec *imageSpec = 0;
     int i = 0, n = 0, objc;
     Tcl_Obj **objv;
 
     imageSpec = ckalloc(sizeof(*imageSpec));
     imageSpec->baseImage = 0;
     imageSpec->mapCount = 0;
     imageSpec->states = 0;
     imageSpec->images = 0;
+    imageSpec->imageChanged = imageChangedProc;
+    imageSpec->imageChangedClientData = imageChangedClientData;
 
     if (Tcl_ListObjGetElements(interp, objPtr, &objc, &objv) != TCL_OK) {
 	goto error;
     }
 
@@ -72,11 +101,11 @@
     imageSpec->images = ckalloc(n * sizeof(Tk_Image *));
 
     /* Get base image:
     */
     imageSpec->baseImage = Tk_GetImage(
-	    interp, tkwin, Tcl_GetString(objv[0]), NullImageChanged, NULL);
+	    interp, tkwin, Tcl_GetString(objv[0]), ImageSpecImageChanged, imageSpec);
     if (!imageSpec->baseImage) {
     	goto error;
     }
 
     /* Extract state and image specifications:
@@ -313,11 +342,11 @@
     void *clientData,
     Ttk_Theme theme,
     const char *elementName,
     int objc, Tcl_Obj *const objv[])
 {
-    static const char *optionStrings[] =
+    static const char *const optionStrings[] =
 	 { "-border","-height","-padding","-sticky","-width",NULL };
     enum { O_BORDER, O_HEIGHT, O_PADDING, O_STICKY, O_WIDTH };
 
     Ttk_ImageSpec *imageSpec = 0;
     ImageData *imageData = 0;

Index: generic/ttk/ttkInit.c
==================================================================
--- generic/ttk/ttkInit.c
+++ generic/ttk/ttkInit.c
@@ -2,12 +2,11 @@
  * Copyright (c) 2003, Joe English
  *
  * Ttk package: initialization routine and miscellaneous utilities.
  */
 
-#include <string.h>
-#include <tk.h>
+#include "tkInt.h"
 #include "ttkTheme.h"
 #include "ttkWidget.h"
 
 /*
  * Legal values for the button -default option.
@@ -60,11 +59,11 @@
 
 /*
  * Recognized values for the -state compatibility option.
  * Other options are accepted and interpreted as synonyms for "normal".
  */
-static const char *ttkStateStrings[] = {
+static const char *const ttkStateStrings[] = {
     "normal", "readonly", "disabled", "active", NULL
 };
 enum {
     TTK_COMPAT_STATE_NORMAL,
     TTK_COMPAT_STATE_READONLY,

Index: generic/ttk/ttkLabel.c
==================================================================
--- generic/ttk/ttkLabel.c
+++ generic/ttk/ttkLabel.c
@@ -4,12 +4,11 @@
  * The label element combines text and image elements,
  * with layout determined by the "-compound" option.
  *
  */
 
-#include <tcl.h>
-#include <tkInt.h>
+#include "tkInt.h"
 #include "ttkTheme.h"
 
 /*----------------------------------------------------------------------
  * +++ Text element.
  *
@@ -137,11 +136,11 @@
     gcValues.foreground = color->pixel;
     gc1 = Tk_GetGC(tkwin, GCFont | GCForeground, &gcValues);
     gcValues.foreground = WhitePixelOfScreen(Tk_Screen(tkwin));
     gc2 = Tk_GetGC(tkwin, GCFont | GCForeground, &gcValues);
 
-    /* 
+    /*
      * Place text according to -anchor:
      */
     Tk_GetAnchorFromObj(NULL, text->anchorObj, &anchor);
     b = Ttk_AnchorBox(b, text->width, text->height, anchor);
 
@@ -340,19 +339,19 @@
 	return;
     }
 
     Tk_RedrawImage(image->tkimg, 0,0, width, height, d, b.x, b.y);
 
-    /* If we're disabled there's no state-specific 'disabled' image, 
+    /* If we're disabled there's no state-specific 'disabled' image,
      * stipple the image.
      * @@@ Possibly: Don't do disabled-stippling at all;
      * @@@ it's ugly and out of fashion.
-     * Do not stipple at all under Aqua, just draw the image: it shows up 
+     * Do not stipple at all under Aqua, just draw the image: it shows up
      * as a white rectangle otherwise.
      */
 
-    
+
     if (state & TTK_STATE_DISABLED) {
 	if (TtkSelectImage(image->imageSpec, 0ul) == image->tkimg) {
 #ifndef MAC_OSX_TK
 	    StippleOver(image, tkwin, d, b.x,b.y);
 #endif
@@ -575,11 +574,11 @@
     /* Requested width based on -width option, not actual text width:
      */
     if (label->compound != TTK_COMPOUND_IMAGE)
 	textReqWidth = TextReqWidth(&label->text);
 
-    switch (label->compound) 
+    switch (label->compound)
     {
 	case TTK_COMPOUND_TEXT:
 	    *widthPtr = textReqWidth;
 	    break;
 	case TTK_COMPOUND_IMAGE:
@@ -586,15 +585,15 @@
 	    *widthPtr = label->image.width;
 	    break;
 	case TTK_COMPOUND_TOP:
 	case TTK_COMPOUND_BOTTOM:
 	case TTK_COMPOUND_CENTER:
-	    *widthPtr = MAX(label->image.width, textReqWidth); 
+	    *widthPtr = MAX(label->image.width, textReqWidth);
 	    break;
 	case TTK_COMPOUND_LEFT:
 	case TTK_COMPOUND_RIGHT:
-	    *widthPtr = label->image.width + textReqWidth + label->space; 
+	    *widthPtr = label->image.width + textReqWidth + label->space;
 	    break;
 	case TTK_COMPOUND_NONE:
 	    break; /* Can't happen */
     }
 

Index: generic/ttk/ttkLayout.c
==================================================================
--- generic/ttk/ttkLayout.c
+++ generic/ttk/ttkLayout.c
@@ -4,12 +4,11 @@
  * Generic layout processing.
  *
  * Copyright (c) 2003 Joe English.  Freely redistributable.
  */
 
-#include <string.h>
-#include <tk.h>
+#include "tkInt.h"
 #include "ttkThemeInt.h"
 
 #define MAX(a,b) (a > b ? a : b)
 #define MIN(a,b) (a < b ? a : b)
 
@@ -602,17 +601,17 @@
  * Syntax:
  * 	layoutSpec ::= { elementName ?-option value ...? }+
  */
 
 /* NB: This must match bit definitions TTK_PACK_LEFT etc. */
-static const char *packSideStrings[] =
+static const char *const packSideStrings[] =
     { "left", "right", "top", "bottom", NULL };
 
 Ttk_LayoutTemplate Ttk_ParseLayoutTemplate(Tcl_Interp *interp, Tcl_Obj *objPtr)
 {
     enum {  OP_SIDE, OP_STICKY, OP_EXPAND, OP_BORDER, OP_UNIT, OP_CHILDREN };
-    static const char *optStrings[] = {
+    static const char *const optStrings[] = {
 	"-side", "-sticky", "-expand", "-border", "-unit", "-children", 0 };
 
     int i = 0, objc;
     Tcl_Obj **objv;
     Ttk_TemplateNode *head = 0, *tail = 0;
@@ -700,10 +699,12 @@
 	    head = tail = Ttk_NewTemplateNode(elementName, flags | sticky);
 	}
 	if (childSpec) {
 	    tail->child = Ttk_ParseLayoutTemplate(interp, childSpec);
 	    if (!tail->child) {
+                Tcl_SetObjResult(interp, Tcl_ObjPrintf("Invalid -children value"));
+                Tcl_SetErrorCode(interp, "TTK", "VALUE", "CHILDREN", NULL);
 		goto error;
 	    }
 	}
     }
 

Index: generic/ttk/ttkManager.c
==================================================================
--- generic/ttk/ttkManager.c
+++ generic/ttk/ttkManager.c
@@ -2,12 +2,11 @@
  * Copyright 2005, Joe English.  Freely redistributable.
  *
  * Support routines for geometry managers.
  */
 
-#include <string.h>
-#include <tk.h>
+#include "tkInt.h"
 #include "ttkManager.h"
 
 /*------------------------------------------------------------------------
  * +++ The Geometry Propagation Dance.
  *
@@ -318,11 +317,11 @@
     int slaveIndex = Ttk_SlaveIndex(mgr, slaveWindow);
     int reqWidth = Tk_ReqWidth(slaveWindow);
     int reqHeight= Tk_ReqHeight(slaveWindow);
 
     if (mgr->managerSpec->SlaveRequest(
-		mgr->managerData, slaveIndex, reqWidth, reqHeight)) 
+		mgr->managerData, slaveIndex, reqWidth, reqHeight))
     {
 	ScheduleUpdate(mgr, MGR_RESIZE_REQUIRED);
     }
 }
 

Index: generic/ttk/ttkManager.h
==================================================================
--- generic/ttk/ttkManager.h
+++ generic/ttk/ttkManager.h
@@ -20,11 +20,11 @@
  * by calling Ttk_PlaceSlave().
  *
  * SlaveRemoved() is called immediately before a slave is removed.
  * NB: the associated slave window may have been destroyed when this
  * routine is called.
- * 
+ *
  * SlaveRequest() is called when a slave requests a size change.
  * It should return 1 if the request should propagate, 0 otherwise.
  */
 typedef struct {			/* Manager hooks */
     Tk_GeomMgr tkGeomMgr;		/* "real" Tk Geometry Manager */

Index: generic/ttk/ttkNotebook.c
==================================================================
--- generic/ttk/ttkNotebook.c
+++ generic/ttk/ttkNotebook.c
@@ -1,14 +1,10 @@
 /*
  * Copyright (c) 2004, Joe English
  */
 
-#include <string.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <tk.h>
-
+#include "tkInt.h"
 #include "ttkTheme.h"
 #include "ttkWidget.h"
 #include "ttkManager.h"
 
 #define MIN(a,b) ((a) < (b) ? (a) : (b))
@@ -219,11 +215,11 @@
     Ttk_Sticky sticky = tab->sticky;
     Ttk_Padding padding = tab->padding;
     Tk_SavedOptions savedOptions;
     int mask = 0;
 
-    if (Tk_SetOptions(interp, (ClientData)tab, nb->notebook.paneOptionTable,
+    if (Tk_SetOptions(interp, tab, nb->notebook.paneOptionTable,
 	    objc, objv, slaveWindow, &savedOptions, &mask) != TCL_OK)
     {
 	return TCL_ERROR;
     }
 
@@ -286,17 +282,18 @@
 
 /*
  * TabState --
  * 	Return the state of the specified tab, based on
  * 	notebook state, currentIndex, activeIndex, and user-specified tab state.
- *	The USER1 bit is set for the leftmost tab, and USER2
- * 	is set for the rightmost tab.
+ *	The USER1 bit is set for the leftmost visible tab, and USER2
+ * 	is set for the rightmost visible tab.
  */
 static Ttk_State TabState(Notebook *nb, int index)
 {
     Ttk_State state = nb->core.state;
     Tab *tab = Ttk_SlaveData(nb->notebook.mgr, index);
+    int i = 0;
 
     if (index == nb->notebook.currentIndex) {
 	state |= TTK_STATE_SELECTED;
     } else {
 	state &= ~TTK_STATE_FOCUS;
@@ -303,15 +300,29 @@
     }
 
     if (index == nb->notebook.activeIndex) {
 	state |= TTK_STATE_ACTIVE;
     }
-    if (index == 0) {
-    	state |= TTK_STATE_USER1;
+    for (i = 0; i < Ttk_NumberSlaves(nb->notebook.mgr); ++i) {
+	Tab *tab = Ttk_SlaveData(nb->notebook.mgr, i);
+	if (tab->state == TAB_STATE_HIDDEN) {
+	    continue;
+	}
+	if (index == i) {
+	    state |= TTK_STATE_USER1;
+	}
+	break;
     }
-    if (index == Ttk_NumberSlaves(nb->notebook.mgr) - 1) {
-    	state |= TTK_STATE_USER2;
+    for (i = Ttk_NumberSlaves(nb->notebook.mgr) - 1; i >= 0; --i) {
+	Tab *tab = Ttk_SlaveData(nb->notebook.mgr, i);
+	if (tab->state == TAB_STATE_HIDDEN) {
+	    continue;
+	}
+	if (index == i) {
+	    state |= TTK_STATE_USER2;
+	}
+	break;
     }
     if (tab->state == TAB_STATE_DISABLED) {
 	state |= TTK_STATE_DISABLED;
     }
 
@@ -323,20 +334,22 @@
  */
 
 /* TabrowSize --
  *	Compute max height and total width of all tabs (horizontal layouts)
  *	or total height and max width (vertical layouts).
+ *	The -mintabwidth style option is taken into account (for the width
+ *	only).
  *
  * Side effects:
  * 	Sets width and height fields for all tabs.
  *
  * Notes:
  * 	Hidden tabs are included in the perpendicular computation
  * 	(max height/width) but not parallel (total width/height).
  */
 static void TabrowSize(
-    Notebook *nb, Ttk_Orient orient, int *widthPtr, int *heightPtr)
+    Notebook *nb, Ttk_Orient orient, int minTabWidth, int *widthPtr, int *heightPtr)
 {
     Ttk_Layout tabLayout = nb->notebook.tabLayout;
     int tabrowWidth = 0, tabrowHeight = 0;
     int i;
 
@@ -344,10 +357,11 @@
 	Tab *tab = Ttk_SlaveData(nb->notebook.mgr, i);
 	Ttk_State tabState = TabState(nb,i);
 
 	Ttk_RebindSublayout(tabLayout, tab);
 	Ttk_LayoutSize(tabLayout,tabState,&tab->width,&tab->height);
+        tab->width = MAX(tab->width, minTabWidth);
 
 	if (orient == TTK_ORIENT_HORIZONTAL) {
 	    tabrowHeight = MAX(tabrowHeight, tab->height);
 	    if (tab->state != TAB_STATE_HIDDEN) { tabrowWidth += tab->width; }
 	} else {
@@ -404,11 +418,11 @@
     if (reqHeight > 0)
 	clientHeight = reqHeight;
 
     /* Tab row:
      */
-    TabrowSize(nb, nbstyle.tabOrient, &tabrowWidth, &tabrowHeight);
+    TabrowSize(nb, nbstyle.tabOrient, nbstyle.minTabWidth, &tabrowWidth, &tabrowHeight);
     tabrowHeight += Ttk_PaddingHeight(nbstyle.tabMargins);
     tabrowWidth += Ttk_PaddingWidth(nbstyle.tabMargins);
 
     /* Account for exterior and interior padding:
      */
@@ -434,51 +448,34 @@
  * +++ Geometry management - layout.
  */
 
 /* SqueezeTabs --
  *	Squeeze or stretch tabs to fit within the tab area parcel.
- *
- *	All tabs are adjusted by an equal amount, but will not be made
- *	smaller than the minimum width.  (If all the tabs still do
- *	not fit in the available space, the rightmost ones will
- *	be further squozen by PlaceTabs()).
- *
- *	The algorithm does not always yield an optimal layout, but does
- *	have the important property that decreasing the available width
- *	by one pixel will cause at most one tab to shrink by one pixel;
- *	this means that tabs resize "smoothly" when the window shrinks
- *	and grows.
+ *	This happens independently of the -mintabwidth style option.
+ *
+ *	All tabs are adjusted by an equal amount.
  *
  * @@@ <<NOTE-TABPOSITION>> bug: only works for horizontal orientations
  * @@@ <<NOTE-SQUEEZE-HIDDEN>> does not account for hidden tabs.
  */
 
 static void SqueezeTabs(
-    Notebook *nb, int needed, int available, int minTabWidth)
+    Notebook *nb, int needed, int available)
 {
     int nTabs = Ttk_NumberSlaves(nb->notebook.mgr);
 
     if (nTabs > 0) {
-	int difference = available - needed,
-	    delta = difference / nTabs,
-	    remainder = difference % nTabs,
-	    slack = 0;
+	int difference = available - needed;
+	double delta = (double)difference / needed;
+	double slack = 0;
 	int i;
 
-	if (remainder < 0) { remainder += nTabs; --delta; }
-
 	for (i = 0; i < nTabs; ++i) {
 	    Tab *tab = Ttk_SlaveData(nb->notebook.mgr,i);
-	    int adj = delta + (i < remainder) + slack;
-
-	    if (tab->width + adj >= minTabWidth) {
-		tab->width += adj;
-		slack = 0;
-	    } else {
-		slack = adj - (minTabWidth - tab->width);
-		tab->width = minTabWidth;
-	    }
+	    double ad = slack + tab->width * delta;
+	    tab->width += (int)ad;
+	    slack = ad - (int)ad;
 	}
     }
 }
 
 /* PlaceTabs --
@@ -537,20 +534,25 @@
     /* Layout for notebook background (base layout):
      */
     Ttk_PlaceLayout(nb->core.layout, nb->core.state, Ttk_WinBox(nbwin));
 
     /* Place tabs:
+     * Note: TabrowSize() takes into account -mintabwidth, but the tabs will
+     * actually have this minimum size when displayed only if there is enough
+     * space to draw the tabs with this width. Otherwise some of the tabs can
+     * be squeezed to a size smaller than -mintabwidth because we prefer
+     * displaying all tabs than than honoring -mintabwidth for all of them.
      */
-    TabrowSize(nb, nbstyle.tabOrient, &tabrowWidth, &tabrowHeight);
+    TabrowSize(nb, nbstyle.tabOrient, nbstyle.minTabWidth, &tabrowWidth, &tabrowHeight);
     tabrowBox = Ttk_PadBox(
 		    Ttk_PositionBox(&cavity,
 			tabrowWidth + Ttk_PaddingWidth(nbstyle.tabMargins),
 			tabrowHeight + Ttk_PaddingHeight(nbstyle.tabMargins),
 			nbstyle.tabPosition),
 		    nbstyle.tabMargins);
 
-    SqueezeTabs(nb, tabrowWidth, tabrowBox.width, nbstyle.minTabWidth);
+    SqueezeTabs(nb, tabrowWidth, tabrowBox.width);
     PlaceTabs(nb, tabrowBox, nbstyle.tabPlacement);
 
     /* Layout for client area frame:
      */
     if (clientNode) {
@@ -619,13 +621,16 @@
 
     if (currentIndex >= 0) {
 	Ttk_UnmapSlave(nb->notebook.mgr, currentIndex);
     }
 
-    NotebookPlaceSlave(nb, index);
-
+    /* Must be set before calling NotebookPlaceSlave(), otherwise it may
+     * happen that NotebookPlaceSlaves(), triggered by an interveaning
+     * geometry request, will swap to old index. */
     nb->notebook.currentIndex = index;
+
+    NotebookPlaceSlave(nb, index);
     TtkRedisplayWidget(&nb->core);
 
     TtkSendVirtualEvent(nb->core.tkwin, "NotebookTabChanged");
 }
 
@@ -1042,11 +1047,11 @@
  * 	Returns name of tab element at $x,$y; empty string if none.
  */
 static int NotebookIdentifyCommand(
     void *recordPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
-    static const char *whatTable[] = { "element", "tab", NULL };
+    static const char *const whatTable[] = { "element", "tab", NULL };
     enum { IDENTIFY_ELEMENT, IDENTIFY_TAB };
     int what = IDENTIFY_ELEMENT;
     Notebook *nb = recordPtr;
     Ttk_Element element = NULL;
     int x, y, tabIndex;

Index: generic/ttk/ttkPanedwindow.c
==================================================================
--- generic/ttk/ttkPanedwindow.c
+++ generic/ttk/ttkPanedwindow.c
@@ -4,12 +4,11 @@
  * ttk::panedwindow widget implementation.
  *
  * TODO: track active/pressed sash.
  */
 
-#include <string.h>
-#include <tk.h>
+#include "tkInt.h"
 #include "ttkManager.h"
 #include "ttkTheme.h"
 #include "ttkWidget.h"
 
 /*------------------------------------------------------------------------
@@ -146,11 +145,11 @@
 {
     Ttk_Manager *mgr = pw->paned.mgr;
     Tk_SavedOptions savedOptions;
     int mask = 0;
 
-    if (Tk_SetOptions(interp, (void*)pane, pw->paned.paneOptionTable,
+    if (Tk_SetOptions(interp, pane, pw->paned.paneOptionTable,
 	    objc, objv, slaveWindow, &savedOptions, &mask) != TCL_OK)
     {
 	return TCL_ERROR;
     }
 
@@ -713,11 +712,11 @@
  * 	Return index of sash at $x,$y
  */
 static int PanedIdentifyCommand(
     void *recordPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
-    static const char *whatTable[] = { "element", "sash", NULL };
+    static const char *const whatTable[] = { "element", "sash", NULL };
     enum { IDENTIFY_ELEMENT, IDENTIFY_SASH };
     int what = IDENTIFY_SASH;
     Paned *pw = recordPtr;
     int sashThickness = pw->paned.sashThickness;
     int nSashes = Ttk_NumberSlaves(pw->paned.mgr) - 1;

Index: generic/ttk/ttkProgress.c
==================================================================
--- generic/ttk/ttkProgress.c
+++ generic/ttk/ttkProgress.c
@@ -2,13 +2,11 @@
  * Copyright (c) Joe English, Pat Thoyts, Michael Kirkham
  *
  * ttk::progressbar widget.
  */
 
-#include <math.h>
-#include <tk.h>
-
+#include "tkInt.h"
 #include "ttkTheme.h"
 #include "ttkWidget.h"
 
 /*------------------------------------------------------------------------
  * +++ Widget record:
@@ -21,17 +19,23 @@
 static const char *const ProgressbarModeStrings[] = {
     "determinate", "indeterminate", NULL
 };
 
 typedef struct {
-    Tcl_Obj 	*orientObj;
+    Tcl_Obj 	*anchorObj;
+    Tcl_Obj 	*fontObj;
+    Tcl_Obj 	*foregroundObj;
+    Tcl_Obj 	*justifyObj;
     Tcl_Obj 	*lengthObj;
-    Tcl_Obj 	*modeObj;
-    Tcl_Obj 	*variableObj;
     Tcl_Obj 	*maximumObj;
-    Tcl_Obj 	*valueObj;
+    Tcl_Obj 	*modeObj;
+    Tcl_Obj 	*orientObj;
     Tcl_Obj 	*phaseObj;
+    Tcl_Obj 	*textObj;
+    Tcl_Obj 	*valueObj;
+    Tcl_Obj 	*variableObj;
+    Tcl_Obj 	*wrapLengthObj;
 
     int 	mode;
     Ttk_TraceHandle *variableTrace;	/* Trace handle for -variable option */
     int 	period;			/* Animation period */
     int 	maxPhase;		/* Max animation phase */
@@ -44,32 +48,50 @@
     ProgressbarPart	progress;
 } Progressbar;
 
 static Tk_OptionSpec ProgressbarOptionSpecs[] =
 {
-    {TK_OPTION_STRING_TABLE, "-orient", "orient", "Orient",
-	"horizontal", Tk_Offset(Progressbar,progress.orientObj), -1,
-	0, (ClientData)ttkOrientStrings, STYLE_CHANGED },
+    {TK_OPTION_ANCHOR, "-anchor", "anchor", "Anchor",
+	"w", Tk_Offset(Progressbar,progress.anchorObj), -1,
+	TK_OPTION_NULL_OK, 0, GEOMETRY_CHANGED},
+    {TK_OPTION_FONT, "-font", "font", "Font",
+	DEFAULT_FONT, Tk_Offset(Progressbar,progress.fontObj), -1,
+	TK_OPTION_NULL_OK,0,GEOMETRY_CHANGED },
+    {TK_OPTION_COLOR, "-foreground", "textColor", "TextColor",
+	"black", Tk_Offset(Progressbar,progress.foregroundObj), -1,
+	TK_OPTION_NULL_OK,0,0 },
+    {TK_OPTION_JUSTIFY, "-justify", "justify", "Justify",
+	"left", Tk_Offset(Progressbar,progress.justifyObj), -1,
+	TK_OPTION_NULL_OK,0,GEOMETRY_CHANGED },
     {TK_OPTION_PIXELS, "-length", "length", "Length",
         DEF_PROGRESSBAR_LENGTH, Tk_Offset(Progressbar,progress.lengthObj), -1,
 	0, 0, GEOMETRY_CHANGED },
+    {TK_OPTION_DOUBLE, "-maximum", "maximum", "Maximum",
+	"100", Tk_Offset(Progressbar,progress.maximumObj), -1,
+	0, 0, 0 },
     {TK_OPTION_STRING_TABLE, "-mode", "mode", "ProgressMode", "determinate",
 	Tk_Offset(Progressbar,progress.modeObj),
 	Tk_Offset(Progressbar,progress.mode),
 	0, (ClientData)ProgressbarModeStrings, 0 },
-    {TK_OPTION_DOUBLE, "-maximum", "maximum", "Maximum",
-	"100", Tk_Offset(Progressbar,progress.maximumObj), -1,
+    {TK_OPTION_STRING_TABLE, "-orient", "orient", "Orient",
+	"horizontal", Tk_Offset(Progressbar,progress.orientObj), -1,
+	0, (ClientData)ttkOrientStrings, STYLE_CHANGED },
+    {TK_OPTION_INT, "-phase", "phase", "Phase",
+	"0", Tk_Offset(Progressbar,progress.phaseObj), -1,
+	0, 0, 0 },
+    {TK_OPTION_STRING, "-text", "text", "Text", "",
+	Tk_Offset(Progressbar,progress.textObj), -1,
+	0,0,GEOMETRY_CHANGED },
+    {TK_OPTION_DOUBLE, "-value", "value", "Value",
+	"0.0", Tk_Offset(Progressbar,progress.valueObj), -1,
 	0, 0, 0 },
     {TK_OPTION_STRING, "-variable", "variable", "Variable",
 	NULL, Tk_Offset(Progressbar,progress.variableObj), -1,
 	TK_OPTION_NULL_OK, 0, 0 },
-    {TK_OPTION_DOUBLE, "-value", "value", "Value",
-	"0.0", Tk_Offset(Progressbar,progress.valueObj), -1,
-	0, 0, 0 },
-    {TK_OPTION_INT, "-phase", "phase", "Phase",
-	"0", Tk_Offset(Progressbar,progress.phaseObj), -1,
-	0, 0, 0 },
+    {TK_OPTION_PIXELS, "-wraplength", "wrapLength", "WrapLength",
+	"0", Tk_Offset(Progressbar, progress.wrapLengthObj), -1,
+	TK_OPTION_NULL_OK,0,GEOMETRY_CHANGED},
 
     WIDGET_TAKEFOCUS_FALSE,
     WIDGET_INHERIT_OPTIONS(ttkCoreOptionSpecs)
 };
 
@@ -396,11 +418,11 @@
 static int ProgressbarStepCommand(
     void *recordPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
     Progressbar *pb = recordPtr;
     double value = 0.0, stepAmount = 1.0;
-    Tcl_Obj *newValueObj; 
+    Tcl_Obj *newValueObj;
 
     if (objc == 3) {
 	if (Tcl_GetDoubleFromObj(interp, objv[2], &stepAmount) != TCL_OK) {
 	    return TCL_ERROR;
 	}
@@ -419,34 +441,36 @@
 	(void)Tcl_GetDoubleFromObj(NULL, pb->progress.maximumObj, &maximum);
 	value = fmod(value, maximum);
     }
 
     newValueObj = Tcl_NewDoubleObj(value);
+    Tcl_IncrRefCount(newValueObj);
 
     TtkRedisplayWidget(&pb->core);
 
-    /* Update value by setting the linked -variable, if there is one: 
+    /* Update value by setting the linked -variable, if there is one:
      */
     if (pb->progress.variableTrace) {
-	return Tcl_ObjSetVar2(
-		    interp, pb->progress.variableObj, 0, newValueObj,
-		    TCL_GLOBAL_ONLY | TCL_LEAVE_ERR_MSG)
-	    ? TCL_OK : TCL_ERROR;
+	int result = Tcl_ObjSetVar2(
+		        interp, pb->progress.variableObj, 0, newValueObj,
+		        TCL_GLOBAL_ONLY | TCL_LEAVE_ERR_MSG)
+	        ? TCL_OK : TCL_ERROR;
+        Tcl_DecrRefCount(newValueObj);
+        return result;
     }
 
     /* Otherwise, change the -value directly:
      */
-    Tcl_IncrRefCount(newValueObj);
     Tcl_DecrRefCount(pb->progress.valueObj);
     pb->progress.valueObj = newValueObj;
     CheckAnimation(pb);
 
     return TCL_OK;
 }
 
 /* $sb start|stop ?args? --
- * Change [$sb $cmd ...] to [ttk::progressbar::$cmd ...] 
+ * Change [$sb $cmd ...] to [ttk::progressbar::$cmd ...]
  * and pass to interpreter.
  */
 static int ProgressbarStartStopCommand(
     Tcl_Interp *interp, const char *cmdName, int objc, Tcl_Obj *const objv[])
 {
@@ -520,11 +544,12 @@
 	TTK_NODE("Vertical.Progressbar.pbar", TTK_PACK_BOTTOM|TTK_FILL_X))
 TTK_END_LAYOUT
 
 TTK_BEGIN_LAYOUT(HorizontalProgressbarLayout)
     TTK_GROUP("Horizontal.Progressbar.trough", TTK_FILL_BOTH,
-	TTK_NODE("Horizontal.Progressbar.pbar", TTK_PACK_LEFT|TTK_FILL_Y))
+	TTK_NODE("Horizontal.Progressbar.pbar", TTK_PACK_LEFT|TTK_FILL_Y)
+	TTK_NODE("Horizontal.Progressbar.text", TTK_PACK_LEFT))
 TTK_END_LAYOUT
 
 /*
  * Initialization:
  */

Index: generic/ttk/ttkScale.c
==================================================================
--- generic/ttk/ttkScale.c
+++ generic/ttk/ttkScale.c
@@ -2,21 +2,23 @@
  * Copyright (C) 2004 Pat Thoyts <patthoyts@users.sourceforge.net>
  *
  * ttk::scale widget.
  */
 
-#include <tk.h>
-#include <string.h>
-#include <stdio.h>
+#include "tkInt.h"
 #include "ttkTheme.h"
 #include "ttkWidget.h"
 
 #define DEF_SCALE_LENGTH "100"
 
 #define MAX(a,b) ((a) > (b) ? (a) : (b))
 #define MIN(a,b) ((a) < (b) ? (a) : (b))
 
+/* Bit fields for OptionSpec mask field:
+ */
+#define STATE_CHANGED	 	(0x100)		/* -state option changed */
+
 /*
  * Scale widget record
  */
 typedef struct
 {
@@ -33,10 +35,15 @@
     Tcl_Obj *variableObj;
 
     /* internal state */
     Ttk_TraceHandle *variableTrace;
 
+    /*
+     * Compatibility/legacy options:
+     */
+    Tcl_Obj *stateObj;
+
 } ScalePart;
 
 typedef struct
 {
     WidgetCore core;
@@ -44,29 +51,33 @@
 } Scale;
 
 static Tk_OptionSpec ScaleOptionSpecs[] =
 {
     {TK_OPTION_STRING, "-command", "command", "Command", "",
-	Tk_Offset(Scale,scale.commandObj), -1, 
+	Tk_Offset(Scale,scale.commandObj), -1,
 	TK_OPTION_NULL_OK,0,0},
     {TK_OPTION_STRING, "-variable", "variable", "Variable", "",
-	Tk_Offset(Scale,scale.variableObj), -1, 
+	Tk_Offset(Scale,scale.variableObj), -1,
 	0,0,0},
     {TK_OPTION_STRING_TABLE, "-orient", "orient", "Orient", "horizontal",
 	Tk_Offset(Scale,scale.orientObj),
-	Tk_Offset(Scale,scale.orient), 0, 
+	Tk_Offset(Scale,scale.orient), 0,
 	(ClientData)ttkOrientStrings, STYLE_CHANGED },
 
     {TK_OPTION_DOUBLE, "-from", "from", "From", "0",
 	Tk_Offset(Scale,scale.fromObj), -1, 0, 0, 0},
     {TK_OPTION_DOUBLE, "-to", "to", "To", "1.0",
 	Tk_Offset(Scale,scale.toObj), -1, 0, 0, 0},
     {TK_OPTION_DOUBLE, "-value", "value", "Value", "0",
 	Tk_Offset(Scale,scale.valueObj), -1, 0, 0, 0},
     {TK_OPTION_PIXELS, "-length", "length", "Length",
-	DEF_SCALE_LENGTH, Tk_Offset(Scale,scale.lengthObj), -1, 0, 0, 
+	DEF_SCALE_LENGTH, Tk_Offset(Scale,scale.lengthObj), -1, 0, 0,
     	GEOMETRY_CHANGED},
+
+    {TK_OPTION_STRING, "-state", "state", "State",
+	"normal", Tk_Offset(Scale,scale.stateObj), -1,
+        0,0,STATE_CHANGED},
 
     WIDGET_TAKEFOCUS_TRUE,
     WIDGET_INHERIT_OPTIONS(ttkCoreOptionSpecs)
 };
 
@@ -74,11 +85,11 @@
 static double PointToValue(Scale *scalePtr, int x, int y);
 
 /* ScaleVariableChanged --
  * 	Variable trace procedure for scale -variable;
  * 	Updates the scale's value.
- * 	If the linked variable is not a valid double, 
+ * 	If the linked variable is not a valid double,
  * 	sets the 'invalid' state.
  */
 static void ScaleVariableChanged(void *recordPtr, const char *value)
 {
     Scale *scale = recordPtr;
@@ -136,10 +147,14 @@
 
     if (scale->scale.variableTrace) {
 	Ttk_UntraceVariable(scale->scale.variableTrace);
     }
     scale->scale.variableTrace = vt;
+
+    if (mask & STATE_CHANGED) {
+	TtkCheckStateOption(&scale->core, scale->scale.stateObj);
+    }
 
     return TCL_OK;
 }
 
 /* ScalePostConfigure --
@@ -170,11 +185,11 @@
 }
 
 /* ScaleGetLayout --
  *	getLayout hook.
  */
-static Ttk_Layout 
+static Ttk_Layout
 ScaleGetLayout(Tcl_Interp *interp, Ttk_Theme theme, void *recordPtr)
 {
     Scale *scalePtr = recordPtr;
     return TtkWidgetGetOrientedLayout(
 	interp, theme, recordPtr, scalePtr->scale.orientObj);
@@ -234,11 +249,11 @@
 
     return fraction < 0 ? 0 : fraction > 1 ? 1 : fraction;
 }
 
 /* $scale get ?x y? --
- * 	Returns the current value of the scale widget, or if $x and 
+ * 	Returns the current value of the scale widget, or if $x and
  * 	$y are specified, the value represented by point @x,y.
  */
 static int
 ScaleGetCommand(
     void *recordPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])

Index: generic/ttk/ttkScroll.c
==================================================================
--- generic/ttk/ttkScroll.c
+++ generic/ttk/ttkScroll.c
@@ -32,11 +32,11 @@
  *
  * If the scrollee's -[xy]scrollcommand changes, it should call
  * TtkScrollbarUpdateRequired, which will invoke step (5) (@@@ Fix this)
  */
 
-#include <tkInt.h>
+#include "tkInt.h"
 #include "ttkTheme.h"
 #include "ttkWidget.h"
 
 /* Private data:
  */

Index: generic/ttk/ttkScrollbar.c
==================================================================
--- generic/ttk/ttkScrollbar.c
+++ generic/ttk/ttkScrollbar.c
@@ -2,12 +2,11 @@
  * Copyright (c) 2003, Joe English
  *
  * ttk::scrollbar widget.
  */
 
-#include <tk.h>
-
+#include "tkInt.h"
 #include "ttkTheme.h"
 #include "ttkWidget.h"
 
 /*------------------------------------------------------------------------
  * +++ Scrollbar widget record.
@@ -20,11 +19,11 @@
     Tcl_Obj	*orientObj;
 
     double	first;			/* top fraction */
     double	last;			/* bottom fraction */
 
-    Ttk_Box	troughBox;		/* trough parcel */ 
+    Ttk_Box	troughBox;		/* trough parcel */
     int 	minSize;		/* minimum size of thumb */
 } ScrollbarPart;
 
 typedef struct
 {
@@ -48,11 +47,11 @@
 
 /*------------------------------------------------------------------------
  * +++ Widget hooks.
  */
 
-static void 
+static void
 ScrollbarInitialize(Tcl_Interp *interp, void *recordPtr)
 {
     Scrollbar *sb = recordPtr;
     sb->scrollbar.first = 0.0;
     sb->scrollbar.last = 1.0;
@@ -239,11 +238,11 @@
     return TCL_OK;
 }
 
 /* $sb fraction $x $y --
  * 	Returns a real number between 0 and 1 indicating  where  the
- * 	point given by x and y lies in the trough area of the scrollbar. 
+ * 	point given by x and y lies in the trough area of the scrollbar.
  */
 static int
 ScrollbarFractionCommand(
     void *recordPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {

Index: generic/ttk/ttkSeparator.c
==================================================================
--- generic/ttk/ttkSeparator.c
+++ generic/ttk/ttkSeparator.c
@@ -2,12 +2,11 @@
  * Copyright (c) 2004, Joe English
  *
  * ttk::separator and ttk::sizegrip widgets.
  */
 
-#include <tk.h>
-
+#include "tkInt.h"
 #include "ttkTheme.h"
 #include "ttkWidget.h"
 
 /* +++ Separator widget record:
  */

Index: generic/ttk/ttkSquare.c
==================================================================
--- generic/ttk/ttkSquare.c
+++ generic/ttk/ttkSquare.c
@@ -1,11 +1,11 @@
 /* square.c - Copyright (C) 2004 Pat Thoyts <patthoyts@users.sourceforge.net>
  *
  * Minimal sample ttk widget.
  */
 
-#include <tk.h>
+#include "tkInt.h"
 #include "ttkTheme.h"
 #include "ttkWidget.h"
 
 #if defined(TTK_SQUARE_WIDGET) || 1
 
@@ -54,28 +54,28 @@
      DEFAULT_BORDERWIDTH, Tk_Offset(Square,square.borderWidthObj), -1,
      0,0,GEOMETRY_CHANGED },
     {TK_OPTION_BORDER, "-foreground", "foreground", "Foreground",
      DEFAULT_BACKGROUND, Tk_Offset(Square,square.foregroundObj),
      -1, 0, 0, 0},
-    
+
     {TK_OPTION_PIXELS, "-width", "width", "Width",
      "50", Tk_Offset(Square,square.widthObj), -1, 0, 0,
      GEOMETRY_CHANGED},
     {TK_OPTION_PIXELS, "-height", "height", "Height",
      "50", Tk_Offset(Square,square.heightObj), -1, 0, 0,
      GEOMETRY_CHANGED},
-    
+
     {TK_OPTION_STRING, "-padding", "padding", "Pad", NULL,
-     Tk_Offset(Square,square.paddingObj), -1, 
+     Tk_Offset(Square,square.paddingObj), -1,
      TK_OPTION_NULL_OK,0,GEOMETRY_CHANGED },
-    
+
     {TK_OPTION_RELIEF, "-relief", "relief", "Relief",
      NULL, Tk_Offset(Square,square.reliefObj), -1, TK_OPTION_NULL_OK, 0, 0},
-    
+
     {TK_OPTION_ANCHOR, "-anchor", "anchor", "Anchor",
      NULL, Tk_Offset(Square,square.anchorObj), -1, TK_OPTION_NULL_OK, 0, 0},
-    
+
     WIDGET_TAKEFOCUS_TRUE,
     WIDGET_INHERIT_OPTIONS(ttkCoreOptionSpecs)
 };
 
 /*
@@ -136,11 +136,11 @@
     { "state",  	TtkWidgetStateCommand,0 },
     { 0,0,0 }
 };
 
 /*
- * The Widget specification structure holds all the implementation 
+ * The Widget specification structure holds all the implementation
  * information about this widget and this is what must be registered
  * with Tk in the package initialization code (see bottom).
  */
 
 static WidgetSpec SquareWidgetSpec =
@@ -157,11 +157,11 @@
     TtkWidgetSize, 		/* sizeProc */
     SquareDoLayout,		/* layoutProc */
     TtkWidgetDisplay		/* displayProc */
 };
 
-/* ---------------------------------------------------------------------- 
+/* ----------------------------------------------------------------------
  * Square element
  *
  * In this section we demonstrate what is required to create a new themed
  * element.
  */
@@ -174,11 +174,11 @@
     Tcl_Obj *reliefObj;
     Tcl_Obj *widthObj;
     Tcl_Obj *heightObj;
 } SquareElement;
 
-static Ttk_ElementOptionSpec SquareElementOptions[] = 
+static Ttk_ElementOptionSpec SquareElementOptions[] =
 {
     { "-background", TK_OPTION_BORDER, Tk_Offset(SquareElement,borderObj),
     	DEFAULT_BACKGROUND },
     { "-foreground", TK_OPTION_BORDER, Tk_Offset(SquareElement,foregroundObj),
     	DEFAULT_BACKGROUND },
@@ -246,25 +246,25 @@
  * Every widget class needs a layout style that specifies which elements
  * are part of the widget and how they should be placed. The element layout
  * engine is similar to the Tk pack geometry manager. Read the documentation
  * for the details. In this example we just need to have the square element
  * that has been defined for this widget placed on a background. We will
- * also need some padding to keep it away from the edges. 
+ * also need some padding to keep it away from the edges.
  */
 
 TTK_BEGIN_LAYOUT(SquareLayout)
      TTK_NODE("Square.background", TTK_FILL_BOTH)
      TTK_GROUP("Square.padding", TTK_FILL_BOTH,
 	 TTK_NODE("Square.square", 0))
 TTK_END_LAYOUT
 
-/* ---------------------------------------------------------------------- 
+/* ----------------------------------------------------------------------
  *
  * Widget initialization.
  *
  * This file defines a new element and a new widget. We need to register
- * the element with the themes that will need it. In this case we will 
+ * the element with the themes that will need it. In this case we will
  * register with the default theme that is the root of the theme inheritance
  * tree. This means all themes will find this element.
  * We then need to register the widget class style. This is the layout
  * specification. If a different theme requires an alternative layout, we
  * could register that here. For instance, in some themes the scrollbars have
@@ -285,17 +285,17 @@
 {
     Ttk_Theme theme = Ttk_GetDefaultTheme(interp);
 
     /* register the new elements for this theme engine */
     Ttk_RegisterElement(interp, theme, "square", &SquareElementSpec, NULL);
-    
+
     /* register the layout for this theme */
     Ttk_RegisterLayout(theme, "TSquare", SquareLayout);
-    
+
     /* register the widget */
     RegisterWidget(interp, "ttk::square", &SquareWidgetSpec);
 
     return TCL_OK;
 }
 
 #endif /* TTK_SQUARE_WIDGET */
 

Index: generic/ttk/ttkState.c
==================================================================
--- generic/ttk/ttkState.c
+++ generic/ttk/ttkState.c
@@ -3,13 +3,11 @@
  *
  * Copyright (c) 2003 Joe English.  Freely redistributable.
  *
  */
 
-#include <string.h>
-
-#include <tk.h>
+#include "tkInt.h"
 #include "ttkTheme.h"
 
 /*
  * Table of state names.  Must be kept in sync with TTK_STATE_*
  * #defines in ttkTheme.h.
@@ -128,11 +126,12 @@
 {
     unsigned int onbits = (objPtr->internalRep.longValue & 0xFFFF0000) >> 16;
     unsigned int offbits = objPtr->internalRep.longValue & 0x0000FFFF;
     unsigned int mask = onbits | offbits;
     Tcl_DString result;
-    int i, len;
+    int i;
+    size_t len;
 
     Tcl_DStringInit(&result);
 
     for (i=0; stateNames[i] != NULL; ++i) {
 	if (mask & (1<<i)) {
@@ -144,13 +143,13 @@
     }
 
     len = Tcl_DStringLength(&result);
     if (len) {
 	/* 'len' includes extra trailing ' ' */
-	objPtr->bytes = Tcl_Alloc((unsigned)len);
+	objPtr->bytes = Tcl_Alloc(len);
 	objPtr->length = len-1;
-	strncpy(objPtr->bytes, Tcl_DStringValue(&result), (size_t)len-1);
+	strncpy(objPtr->bytes, Tcl_DStringValue(&result), len-1);
 	objPtr->bytes[len-1] = '\0';
     } else {
 	/* empty string */
 	objPtr->length = 0;
 	objPtr->bytes = Tcl_Alloc(1);

Index: generic/ttk/ttkStubLib.c
==================================================================
--- generic/ttk/ttkStubLib.c
+++ generic/ttk/ttkStubLib.c
@@ -65,10 +65,10 @@
     Tcl_ResetResult(interp);
     Tcl_AppendResult(interp,
 	"Error loading ", packageName, " package",
 	" (requested version '", version,
 	"', loaded version '", actualVersion, "'): ",
-	errMsg, 
+	errMsg,
 	NULL);
     return NULL;
 }
 

Index: generic/ttk/ttkTagSet.c
==================================================================
--- generic/ttk/ttkTagSet.c
+++ generic/ttk/ttkTagSet.c
@@ -2,14 +2,11 @@
  * Tag tables.  3/4-baked, work in progress.
  *
  * Copyright (C) 2005, Joe English.  Freely redistributable.
  */
 
-#include <string.h>	/* for memset() */
-#include <tcl.h>
-#include <tk.h>
-
+#include "tkInt.h"
 #include "ttkTheme.h"
 #include "ttkWidget.h"
 
 /*------------------------------------------------------------------------
  * +++ Internal data structures.
@@ -186,11 +183,11 @@
     for (i = 0; i < tagset->nTags; ++i) {
 	if (tagset->tags[i] == tag) {
 	    return 0;
 	}
     }
-    tagset->tags = ckrealloc(tagset->tags, 
+    tagset->tags = ckrealloc(tagset->tags,
 	    (tagset->nTags+1)*sizeof(tagset->tags[0]));
     tagset->tags[tagset->nTags++] = tag;
     return 1;
 }
 

Index: generic/ttk/ttkTheme.c
==================================================================
--- generic/ttk/ttkTheme.c
+++ generic/ttk/ttkTheme.c
@@ -8,14 +8,11 @@
  *
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
 
-#include <stdlib.h>
-#include <string.h>
-#include <tk.h>
-#include <tkInt.h>
+#include "tkInt.h"
 #include "ttkThemeInt.h"
 
 #define PKG_ASSOC_KEY "Ttk"
 
 /*------------------------------------------------------------------------
@@ -143,11 +140,11 @@
     if (!optionSpec)
 	return 0;
 
     /* Make sure widget option has a Tcl_Obj* entry:
      */
-    if (optionSpec->objOffset < 0) {
+    if (optionSpec->objOffset == TCL_AUTO_LENGTH) {
 	return 0;
     }
 
     /* Grrr.  Ignore accidental mismatches caused by prefix-matching:
      */
@@ -971,33 +968,33 @@
 
 static
 int InitializeElementRecord(
     Ttk_ElementClass *eclass,	/* Element instance to initialize */
     Ttk_Style style,		/* Style table */
-    char *widgetRecord,		/* Source of widget option values */
+    void *widgetRecord,		/* Source of widget option values */
     Tk_OptionTable optionTable,	/* Option table describing widget record */
     Tk_Window tkwin,		/* Corresponding window */
     Ttk_State state)	/* Widget or element state */
 {
-    char *elementRecord = eclass->elementRecord;
+    void *elementRecord = eclass->elementRecord;
     OptionMap optionMap = GetOptionMap(eclass,optionTable);
     int nResources = eclass->nResources;
     Ttk_ResourceCache cache = style->cache;
     Ttk_ElementOptionSpec *elementOption = eclass->specPtr->options;
 
     int i;
     for (i=0; i<nResources; ++i, ++elementOption) {
 	Tcl_Obj **dest = (Tcl_Obj **)
-	    (elementRecord + elementOption->offset);
+	    ((char *)elementRecord + elementOption->offset);
 	const char *optionName = elementOption->optionName;
 	Tcl_Obj *dynamicSetting = Ttk_StyleMap(style, optionName, state);
 	Tcl_Obj *widgetValue = 0;
 	Tcl_Obj *elementDefault = eclass->defaultValues[i];
 
 	if (optionMap[i]) {
 	    widgetValue = *(Tcl_Obj **)
-		(widgetRecord + optionMap[i]->objOffset);
+		((char *)widgetRecord + optionMap[i]->objOffset);
 	}
 
 	if (widgetValue) {
 	    *dest = widgetValue;
 	} else if (dynamicSetting) {
@@ -1065,11 +1062,11 @@
 
 void
 Ttk_ElementSize(
     Ttk_ElementClass *eclass,		/* Element to query */
     Ttk_Style style,			/* Style settings */
-    char *recordPtr,			/* The widget record. */
+    void *recordPtr,			/* The widget record. */
     Tk_OptionTable optionTable,		/* Description of widget record */
     Tk_Window tkwin,			/* The widget window. */
     Ttk_State state,			/* Current widget state */
     int *widthPtr, 			/* Requested width */
     int *heightPtr,			/* Reqested height */
@@ -1095,11 +1092,11 @@
 
 void
 Ttk_DrawElement(
     Ttk_ElementClass *eclass,		/* Element instance */
     Ttk_Style style,			/* Style settings */
-    char *recordPtr,			/* The widget record. */
+    void *recordPtr,			/* The widget record. */
     Tk_OptionTable optionTable,		/* Description of option table */
     Tk_Window tkwin,			/* The widget window. */
     Drawable d,				/* Where to draw element. */
     Ttk_Box b,				/* Element area */
     Ttk_State state)			/* Widget or element state flags. */
@@ -1375,11 +1372,11 @@
  */
 static int StyleThemeCreateCmd(
     ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
     StylePackageData *pkgPtr = clientData;
-    static const char *optStrings[] =
+    static const char *const optStrings[] =
     	 { "-parent", "-settings", NULL };
     enum { OP_PARENT, OP_SETTINGS };
     Ttk_Theme parentTheme = pkgPtr->defaultTheme, newTheme;
     Tcl_Obj *settingsScript = NULL;
     const char *themeName;

Index: generic/ttk/ttkTheme.h
==================================================================
--- generic/ttk/ttkTheme.h
+++ generic/ttk/ttkTheme.h
@@ -231,16 +231,24 @@
 
 typedef void (Ttk_ElementSizeProc)(void *clientData, void *elementRecord,
         Tk_Window tkwin, int *widthPtr, int *heightPtr, Ttk_Padding*);
 typedef void (Ttk_ElementDrawProc)(void *clientData, void *elementRecord,
         Tk_Window tkwin, Drawable d, Ttk_Box b, Ttk_State state);
+
+#ifndef TkSizeT
+#   if TCL_MAJOR_VERSION > 8
+#	define TkSizeT size_t
+#   else
+#	define TkSizeT int
+#   endif
+#endif
 
 typedef struct Ttk_ElementOptionSpec
 {
     const char *optionName;		/* Command-line name of the widget option */
     Tk_OptionType type; 	/* Accepted option types */
-    int offset;			/* Offset of Tcl_Obj* field in element record */
+    TkSizeT offset;			/* Offset of Tcl_Obj* field in element record */
     const char *defaultValue;		/* Default value to used if resource missing */
 } Ttk_ElementOptionSpec;
 
 #define TK_OPTION_ANY TK_OPTION_STRING
 
@@ -370,10 +378,12 @@
  * +++ Image specifications.
  */
 
 typedef struct TtkImageSpec Ttk_ImageSpec;
 TTKAPI Ttk_ImageSpec *TtkGetImageSpec(Tcl_Interp *, Tk_Window, Tcl_Obj *);
+TTKAPI Ttk_ImageSpec *TtkGetImageSpecEx(Tcl_Interp *, Tk_Window, Tcl_Obj *,
+					Tk_ImageChangedProc *, ClientData);
 TTKAPI void TtkFreeImageSpec(Ttk_ImageSpec *);
 TTKAPI Tk_Image TtkSelectImage(Ttk_ImageSpec *, Ttk_State);
 
 /*------------------------------------------------------------------------
  * +++ Miscellaneous enumerations.

Index: generic/ttk/ttkThemeInt.h
==================================================================
--- generic/ttk/ttkThemeInt.h
+++ generic/ttk/ttkThemeInt.h
@@ -13,15 +13,15 @@
 
 MODULE_SCOPE Ttk_ElementClass *Ttk_GetElement(Ttk_Theme, const char *name);
 MODULE_SCOPE const char *Ttk_ElementClassName(Ttk_ElementClass *);
 
 MODULE_SCOPE void Ttk_ElementSize(
-	Ttk_ElementClass *, Ttk_Style, char *recordPtr, Tk_OptionTable,
+	Ttk_ElementClass *, Ttk_Style, void *recordPtr, Tk_OptionTable,
 	Tk_Window tkwin, Ttk_State state,
 	int *widthPtr, int *heightPtr, Ttk_Padding*);
 MODULE_SCOPE void Ttk_DrawElement(
-	Ttk_ElementClass *, Ttk_Style, char *recordPtr, Tk_OptionTable,
+	Ttk_ElementClass *, Ttk_Style, void *recordPtr, Tk_OptionTable,
 	Tk_Window tkwin, Drawable d, Ttk_Box b, Ttk_State state);
 
 MODULE_SCOPE Tcl_Obj *Ttk_QueryStyle(
     Ttk_Style, void *, Tk_OptionTable, const char *, Ttk_State state);
 

Index: generic/ttk/ttkTrace.c
==================================================================
--- generic/ttk/ttkTrace.c
+++ generic/ttk/ttkTrace.c
@@ -1,15 +1,15 @@
 /*
  * Copyright 2003, Joe English
  *
  * Simplified interface to Tcl_TraceVariable.
  *
- * PROBLEM: Can't distinguish "variable does not exist" (which is OK) 
+ * PROBLEM: Can't distinguish "variable does not exist" (which is OK)
  * from other errors (which are not).
  */
 
-#include <tk.h>
+#include "tkInt.h"
 #include "ttkTheme.h"
 #include "ttkWidget.h"
 
 struct TtkTraceHandle_
 {
@@ -24,21 +24,32 @@
  */
 static char *
 VarTraceProc(
     ClientData clientData,	/* Widget record pointer */
     Tcl_Interp *interp, 	/* Interpreter containing variable. */
-    const char *name1,		/* (unused) */
-    const char *name2,		/* (unused) */
+    const char *name1,		/* Name of variable. */
+    const char *name2,		/* Second part of variable name. */
     int flags)			/* Information about what happened. */
 {
     Ttk_TraceHandle *tracePtr = clientData;
     const char *name, *value;
     Tcl_Obj *valuePtr;
 
     if (flags & TCL_INTERP_DESTROYED) {
 	return NULL;
     }
+
+    /*
+     * See ticket [5d991b82].
+     */
+
+    if (tracePtr->varnameObj == NULL) {
+	Tcl_UntraceVar2(interp, name1, name2,
+		TCL_GLOBAL_ONLY|TCL_TRACE_WRITES|TCL_TRACE_UNSETS,
+		VarTraceProc, clientData);
+	return NULL;
+    }
 
     name = Tcl_GetString(tracePtr->varnameObj);
 
     /*
      * If the variable is being unset, then re-establish the trace:

Index: generic/ttk/ttkTrack.c
==================================================================
--- generic/ttk/ttkTrack.c
+++ generic/ttk/ttkTrack.c
@@ -21,11 +21,11 @@
  * <ButtonRelease> event.
  *
  * TODO: Handle "chords" properly (e.g., <B1-ButtonPress-2>)
  */
 
-#include <tk.h>
+#include "tkInt.h"
 #include "ttkTheme.h"
 #include "ttkWidget.h"
 
 typedef struct {
     WidgetCore		*corePtr;	/* widget to track */

Index: generic/ttk/ttkTreeview.c
==================================================================
--- generic/ttk/ttkTreeview.c
+++ generic/ttk/ttkTreeview.c
@@ -2,13 +2,11 @@
  * Copyright (c) 2004, Joe English
  *
  * ttk::treeview widget implementation.
  */
 
-#include <string.h>
-#include <stdio.h>
-#include <tk.h>
+#include "tkInt.h"
 #include "ttkTheme.h"
 #include "ttkWidget.h"
 
 #define DEF_TREE_ROWS		"10"
 #define DEF_COLWIDTH		"200"
@@ -319,18 +317,18 @@
 #define SHOW_TREE 	(0x1) 	/* Show tree column? */
 #define SHOW_HEADINGS	(0x2)	/* Show heading row? */
 
 #define DEFAULT_SHOW	"tree headings"
 
-static const char *showStrings[] = {
+static const char *const showStrings[] = {
     "tree", "headings", NULL
 };
 
 static int GetEnumSetFromObj(
     Tcl_Interp *interp,
     Tcl_Obj *objPtr,
-    const char *table[],
+    const char *const table[],
     unsigned *resultPtr)
 {
     unsigned result = 0;
     int i, objc;
     Tcl_Obj **objv;
@@ -433,11 +431,11 @@
 #define COLUMNS_CHANGED 	(USER_MASK)
 #define DCOLUMNS_CHANGED	(USER_MASK<<1)
 #define SCROLLCMD_CHANGED	(USER_MASK<<2)
 #define SHOW_CHANGED 		(USER_MASK<<3)
 
-static const char *SelectModeStrings[] = { "none", "browse", "extended", NULL };
+static const char *const SelectModeStrings[] = { "none", "browse", "extended", NULL };
 
 static Tk_OptionSpec TreeviewOptionSpecs[] = {
     {TK_OPTION_STRING, "-columns", "columns", "Columns",
 	"", Tk_Offset(Treeview,tree.columnsObj), -1,
 	0,0,COLUMNS_CHANGED | GEOMETRY_CHANGED /*| READONLY_OPTION*/ },
@@ -1129,11 +1127,11 @@
     Tk_SavedOptions savedOptions;
     int mask;
     Ttk_ImageSpec *newImageSpec = NULL;
     Ttk_TagSet newTagSet = NULL;
 
-    if (Tk_SetOptions(interp, (ClientData)item, tv->tree.itemOptionTable,
+    if (Tk_SetOptions(interp, item, tv->tree.itemOptionTable,
 		objc, objv, tv->core.tkwin, &savedOptions, &mask)
 		!= TCL_OK)
     {
 	return TCL_ERROR;
     }
@@ -1209,11 +1207,11 @@
     int objc, Tcl_Obj *const objv[])
 {
     Tk_SavedOptions savedOptions;
     int mask;
 
-    if (Tk_SetOptions(interp, (ClientData)column,
+    if (Tk_SetOptions(interp, column,
 	    tv->tree.columnOptionTable, objc, objv, tv->core.tkwin,
 	    &savedOptions,&mask) != TCL_OK)
     {
 	return TCL_ERROR;
     }
@@ -1255,11 +1253,11 @@
     int objc, Tcl_Obj *const objv[])
 {
     Tk_SavedOptions savedOptions;
     int mask;
 
-    if (Tk_SetOptions(interp, (ClientData)column,
+    if (Tk_SetOptions(interp, column,
 	    tv->tree.headingOptionTable, objc, objv, tv->core.tkwin,
 	    &savedOptions,&mask) != TCL_OK)
     {
 	return TCL_ERROR;
     }
@@ -1501,11 +1499,11 @@
     REGION_SEPARATOR,
     REGION_TREE,
     REGION_CELL
 } TreeRegion;
 
-static const char *regionStrings[] = {
+static const char *const regionStrings[] = {
     "nothing", "heading", "separator", "tree", "cell", 0
 };
 
 static TreeRegion IdentifyRegion(Treeview *tv, int x, int y)
 {
@@ -1823,11 +1821,11 @@
  * 	Row number of the last item drawn.
  */
 static int DrawForest(
     Treeview *tv, TreeItem *item, Drawable d, int depth, int row)
 {
-    while (item && row <= tv->tree.yscroll.last) {
+    while (item && row < tv->tree.yscroll.last) {
         row = DrawSubtree(tv, item, d, depth, row);
 	item = item->next;
     }
     return row;
 }
@@ -2264,11 +2262,11 @@
  */
 
 static int TreeviewIdentifyCommand(
     void *recordPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
-    static const char *submethodStrings[] =
+    static const char *const submethodStrings[] =
 	 { "region", "item", "column", "row", "element", NULL };
     enum { I_REGION, I_ITEM, I_COLUMN, I_ROW, I_ELEMENT };
 
     Treeview *tv = recordPtr;
     int submethod;
@@ -2930,11 +2928,11 @@
     void *recordPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
     enum {
 	SELECTION_SET, SELECTION_ADD, SELECTION_REMOVE, SELECTION_TOGGLE
     };
-    static const char *selopStrings[] = {
+    static const char *const selopStrings[] = {
 	"set", "add", "remove", "toggle", NULL
     };
 
     Treeview *tv = recordPtr;
     int selop, i;

Index: generic/ttk/ttkWidget.c
==================================================================
--- generic/ttk/ttkWidget.c
+++ generic/ttk/ttkWidget.c
@@ -2,12 +2,11 @@
  * Copyright (c) 2003, Joe English
  *
  * Core widget utilities.
  */
 
-#include <string.h>
-#include <tk.h>
+#include "tkInt.h"
 #include "ttkTheme.h"
 #include "ttkWidget.h"
 
 #ifdef MAC_OSX_TK
 #define TK_NO_DOUBLE_BUFFERING 1
@@ -755,11 +754,11 @@
 int TtkWidgetIdentifyCommand(
     void *recordPtr, Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
     WidgetCore *corePtr = recordPtr;
     Ttk_Element element;
-    static const char *whatTable[] = { "element", NULL };
+    static const char *const whatTable[] = { "element", NULL };
     int x, y, what;
 
     if (objc < 4 || objc > 5) {
 	Tcl_WrongNumArgs(interp, 2, objv, "?what? x y");
 	return TCL_ERROR;

Index: generic/ttk/ttkWidget.h
==================================================================
--- generic/ttk/ttkWidget.h
+++ generic/ttk/ttkWidget.h
@@ -109,12 +109,12 @@
     Tcl_CreateObjCommand(interp, name, \
 	TtkWidgetConstructorObjCmd, (ClientData)specPtr,NULL)
 
 /* WIDGET_TAKEFOCUS_TRUE --
  * WIDGET_TAKEFOCUS_FALSE --
- *	Add one or the other of these to each OptionSpecs table 
- *	to indicate whether the widget should take focus 
+ *	Add one or the other of these to each OptionSpecs table
+ *	to indicate whether the widget should take focus
  *	during keyboard traversal.
  */
 #define WIDGET_TAKEFOCUS_TRUE \
     {TK_OPTION_STRING, "-takefocus", "takeFocus", "TakeFocus", \
 	"ttk::takefocus", Tk_Offset(WidgetCore, takeFocusPtr), -1, 0,0,0 }

Index: library/console.tcl
==================================================================
--- library/console.tcl
+++ library/console.tcl
@@ -284,10 +284,11 @@
     	    	incr HistNum
     	    	return
     	    }
 	    .console delete promptEnd end
     	    .console insert promptEnd $cmd {input stdin}
+	    .console see end
     	}
     	next {
 	    incr HistNum
 	    if {$HistNum == 0} {
 		set cmd {history event [expr {[history nextid] -1}]}
@@ -300,10 +301,11 @@
 	    if {$cmd ne ""} {
 		catch {consoleinterp eval $cmd} cmd
 	    }
 	    .console delete promptEnd end
 	    .console insert promptEnd $cmd {input stdin}
+	    .console see end
     	}
     	reset {
     	    set HistNum 1
     	}
     }

Index: library/demos/combo.tcl
==================================================================
--- library/demos/combo.tcl
+++ library/demos/combo.tcl
@@ -41,11 +41,12 @@
 }
 set secondValue unchangable
 set ozCity Sydney
 
 ttk::labelframe $w.c1 -text "Fully Editable"
-ttk::combobox $w.c1.c -textvariable firstValue
+ttk::combobox $w.c1.c -textvariable firstValue -placeholder {Enter text here}
+ttk::style configure TEntry -placeholderforeground gray50
 ttk::labelframe $w.c2 -text Disabled
 ttk::combobox $w.c2.c -textvariable secondValue -state disabled
 ttk::labelframe $w.c3 -text "Defined List Only"
 ttk::combobox $w.c3.c -textvariable ozCity -state readonly \
 	-values $australianCities

Index: library/demos/en.msg
==================================================================
--- library/demos/en.msg
+++ library/demos/en.msg
@@ -16,11 +16,11 @@
 ::msgcat::mcset en "Dismiss"
 ::msgcat::mcset en "Rerun Demo"
 ::msgcat::mcset en "Demo code: %s"
 ::msgcat::mcset en "About Widget Demo"
 ::msgcat::mcset en "Tk widget demonstration application"
-::msgcat::mcset en "Copyright \u00a9 %s"
+::msgcat::mcset en "Copyright © %s"
 ::msgcat::mcset en "
     @@title
     Tk Widget Demonstrations
     @@newline
     @@normal

Index: library/demos/entry1.tcl
==================================================================
--- library/demos/entry1.tcl
+++ library/demos/entry1.tcl
@@ -23,11 +23,11 @@
 set btns [addSeeDismiss $w.buttons $w]
 pack $btns -side bottom -fill x
 
 entry $w.e1
 entry $w.e2
-entry $w.e3
+entry $w.e3 -placeholder {Enter text here} -placeholderforeground gray75
 pack $w.e1 $w.e2 $w.e3 -side top -pady 5 -padx 10 -fill x
 
 $w.e1 insert 0 "Initial value"
 $w.e2 insert end "This entry contains a long value, much too long "
 $w.e2 insert end "to fit in the window at one time, so long in fact "

Index: library/demos/entry2.tcl
==================================================================
--- library/demos/entry2.tcl
+++ library/demos/entry2.tcl
@@ -42,5 +42,6 @@
 
 $w.frame.e1 insert 0 "Initial value"
 $w.frame.e2 insert end "This entry contains a long value, much too long "
 $w.frame.e2 insert end "to fit in the window at one time, so long in fact "
 $w.frame.e2 insert end "that you'll have to scan or scroll to see the end."
+$w.frame.e3 configure -placeholder {Enter text here} -placeholderforeground gray75

ADDED   library/demos/images/earthmenu.png
Index: library/demos/images/earthmenu.png
==================================================================
--- /dev/null
+++ library/demos/images/earthmenu.png
cannot compute difference between binary files

Index: library/demos/menu.tcl
==================================================================
--- library/demos/menu.tcl
+++ library/demos/menu.tcl
@@ -112,14 +112,16 @@
 
 set m $w.menu.icon
 $w.menu add cascade -label "Icons" -menu $m -underline 0
 menu $m -tearoff 0
 # Main widget program sets variable tk_demoDirectory
-$m add command -bitmap @[file join $tk_demoDirectory images pattern.xbm] \
+image create photo lilearth -file [file join $tk_demoDirectory \
+images earthmenu.png]
+$m add command -image lilearth \
     -hidemargin 1 -command [list \
 	tk_dialog $w.pattern {Bitmap Menu Entry} \
-		"The menu entry you invoked displays a bitmap rather than\
+		"The menu entry you invoked displays a photoimage rather than\
 		a text string.  Other than this, it is just like any other\
 		menu entry." {} 0 OK ]
 foreach i {info questhead error} {
     $m add command -bitmap $i -hidemargin 1 -command [list \
 	    puts "You invoked the $i bitmap" ]
@@ -127,19 +129,26 @@
 $m entryconfigure 2 -columnbreak 1
 
 set m $w.menu.more
 $w.menu add cascade -label "More" -menu $m -underline 0
 menu $m -tearoff 0
-foreach i {{An entry} {Another entry} {Does nothing} {Does almost nothing} {Make life meaningful}} {
+foreach i {{An entry} {Another entry} {Does nothing} {Does almost nothing} {Does almost nothing also} {Make life meaningful}} {
     $m add command -label $i -command [list puts "You invoked \"$i\""]
 }
 $m entryconfigure "Does almost nothing" -bitmap questhead -compound left \
 	-command [list \
 	tk_dialog $w.compound {Compound Menu Entry} \
 		"The menu entry you invoked displays both a bitmap and a\
 		text string.  Other than this, it is just like any other\
 		menu entry." {} 0 OK ]
+
+$m entryconfigure "Does almost nothing also" -image lilearth -compound left \
+	-command [list \
+	tk_dialog $w.compound {Compound Menu Entry} \
+		"The menu entry you invoked displays both a image and a\
+		text string.  Other than this, it is just like any other\
+		menu entry." {} 0 OK ]
 
 set m $w.menu.colors
 $w.menu add cascade -label "Colors" -menu $m -underline 1
 menu $m -tearoff 1
 foreach i {red orange yellow green blue} {

Index: library/demos/nl.msg
==================================================================
--- library/demos/nl.msg
+++ library/demos/nl.msg
@@ -16,13 +16,13 @@
 ::msgcat::mcset nl "Run the \"%s\" sample program" "Start voorbeeld \"%s\""
 ::msgcat::mcset nl "Print Code" "Code Afdrukken"
 ::msgcat::mcset nl "Demo code: %s" "Code van Demo %s"
 ::msgcat::mcset nl "About Widget Demo" "Over deze demonstratie"
 ::msgcat::mcset nl "Tk widget demonstration" "Demonstratie van Tk widgets"
-::msgcat::mcset nl "Copyright \u00a9 %s"
+::msgcat::mcset nl "Copyright © %s"
 
-::msgcat::mcset nl "Tk Widget Demonstrations" "Demostratie van Tk widgets"
+::msgcat::mcset nl "Tk Widget Demonstrations" "Demonstratie van Tk widgets"
 ::msgcat::mcset nl "This application provides a front end for several short scripts" \
     "Dit programma is een schil rond enkele korte scripts waarmee"
 ::msgcat::mcset nl "that demonstrate what you can do with Tk widgets.  Each of the" \
     "gedemonstreerd wordt wat je kunt doen met Tk widgets.  Elk van de"
 ::msgcat::mcset nl "numbered lines below describes a demonstration;  you can click on" \

Index: library/demos/tree.tcl
==================================================================
--- library/demos/tree.tcl
+++ library/demos/tree.tcl
@@ -37,10 +37,11 @@
 	return
     }
     set path [$tree set $node fullpath]
     $tree delete [$tree children $node]
     foreach f [lsort -dictionary [glob -nocomplain -dir $path *]] {
+	set f [file normalize $f]
 	set type [file type $f]
 	set id [$tree insert $node end -text [file tail $f] \
 		-values [list $f $type]]
 
 	if {$type eq "directory"} {

Index: library/demos/twind.tcl
==================================================================
--- library/demos/twind.tcl
+++ library/demos/twind.tcl
@@ -81,16 +81,16 @@
 $t window create end \
   -create {button %W.peer -text "Make A Peer" -command "textMakePeer %W" \
   -cursor top_left_arrow} -padx 3
 $t insert end " widget.  Notice how peer widgets can have different "
 $t insert end "font settings, and by default contain all the images "
-$t insert end "of the 'parent', but many of the embedded windows, "
-$t insert end "such as buttons will not be there.  The easiest way "
-$t insert end "to ensure they are in all peers is to use '-create' "
-$t insert end "embedded window creation scripts "
-$t insert end "(the plot above and the 'Make A Peer' button are "
-$t insert end "designed to show up in all peers).  A good use of "
+$t insert end "of the 'parent', but that the embedded windows, "
+$t insert end "such as buttons may not appear in the peer.  To ensure "
+$t insert end "that embedded windows appear in all peers you can set the "
+$t insert end "'-create' option to a script or a string containing %W.  "
+$t insert end "(The plot above and the 'Make A Peer' button are "
+$t insert end "designed to show up in all peers.)  A good use of "
 $t insert end "peers is for "
 $t window create end \
   -create {button %W.split -text "Split Windows" -command "textSplitWindow %W" \
   -cursor top_left_arrow} -padx 3
 $t insert end " \n\n"
@@ -110,10 +110,11 @@
 $t insert end "\"Short\", it changes to a longer string so that "
 $t insert end "you can see how the text widget automatically "
 $t insert end "changes the layout.  Click on the button again "
 $t insert end "to restore the short string.\n"
 
+$t insert end "\nNOTE: these buttons will not appear in peers!\n" "peer_warning"
 button $t.default -text Default -command "embDefBg $t" \
 	-cursor top_left_arrow
 $t window create end -window $t.default -padx 3
 global embToggle
 set embToggle Short
@@ -161,11 +162,10 @@
 
 $t insert end "\n\nFinally, images fit comfortably in text widgets too:"
 
 $t image create end -image \
     [image create photo -file [file join $tk_demoDirectory images ouster.png]]
-
 
 proc textWindBigB w {
     $w configure -borderwidth 15
 }
 
@@ -300,10 +300,11 @@
     set w [toplevel .peer$n]
     wm title $w "Text Peer #$n"
     frame $w.f -highlightthickness 1 -borderwidth 1 -relief sunken
     set t [$parent peer create $w.f.text -yscrollcommand "$w.scroll set" \
 	       -borderwidth 0 -highlightthickness 0]
+    $t tag configure peer_warning -font boldFont
     pack $t -expand  yes -fill both
     ttk::scrollbar $w.scroll -command "$t yview"
     pack $w.scroll -side right -fill y
     pack $w.f -expand yes -fill both
 }
@@ -315,11 +316,12 @@
 	} else {
 	    set parent [winfo parent $textW]
 	    set w [winfo parent $parent]
 	    set t [$textW peer create $w.peer \
 	      -yscrollcommand "$w.scroll set"]
+	    $t tag configure peer_warning -font boldFont
 	    $w.pane add $t
 	}
     } else {
         return
     }
 }

Index: library/fontchooser.tcl
==================================================================
--- library/fontchooser.tcl
+++ library/fontchooser.tcl
@@ -63,10 +63,13 @@
     if {![winfo exists $S(W)]} {
         Create
         wm transient $S(W) [winfo toplevel $S(-parent)]
         tk::PlaceWindow $S(W) widget $S(-parent)
     }
+    set S(fonts) [lsort -dictionary [font families]]
+    set S(fonts,lcase) {}
+    foreach font $S(fonts) { lappend S(fonts,lcase) [string tolower $font]}
     wm deiconify $S(W)
 }
 
 proc ::tk::fontchooser::Hide {} {
     variable S

Index: library/images/logo.eps
==================================================================
--- library/images/logo.eps
+++ library/images/logo.eps
@@ -26,11 +26,11 @@
 %AI5_OpenViewLayers: 7
 %%EndComments
 %%BeginProlog
 %%BeginResource: procset Adobe_level2_AI5 1.0 0
 %%Title: (Adobe Illustrator (R) Version 5.0 Level 2 Emulation)
-%%Version: 1.0 
+%%Version: 1.0
 %%CreationDate: (04/10/93) ()
 %%Copyright: ((C) 1987-1993 Adobe Systems Incorporated All Rights Reserved)
 userdict /Adobe_level2_AI5 21 dict dup begin
 	put
 	/packedarray where not
@@ -75,11 +75,11 @@
 			5 -1 roll pop
 			setcmykcolor
 		}
 		def
 	} if
-	
+
 	/gt38? mark {version cvx exec} stopped {cleartomark true} {38 gt exch pop} ifelse def
 	userdict /deviceDPI 72 0 matrix defaultmatrix dtransform dup mul exch dup mul add sqrt put
 	userdict /level2?
 	systemdict /languagelevel known dup
 	{
@@ -176,11 +176,11 @@
 	} if
  end defaultpacking setpacking
 %%EndResource
 %%BeginResource: procset Adobe_IllustratorA_AI5 1.1 0
 %%Title: (Adobe Illustrator (R) Version 5.0 Abbreviated Prolog)
-%%Version: 1.1 
+%%Version: 1.1
 %%CreationDate: (3/7/1994) ()
 %%Copyright: ((C) 1987-1994 Adobe Systems Incorporated All Rights Reserved)
 currentpacking true setpacking
 userdict /Adobe_IllustratorA_AI5_vars 70 dict dup begin
 put
@@ -1060,11 +1060,11 @@
 		{
 			(%AI5_BeginLayer) 1 (%AI5_EndLayer--) discard
 		}
 		{
 			/clipForward? true def
-			
+
 			/Tx /pop load def
 			/Tj /pop load def
 			currentdict end clipRenderOff begin begin
 		} ifelse
 	}
@@ -1087,11 +1087,11 @@
 		{
 			currentdict
 		 end
 		 end
 		 begin
-			
+
 			/clipForward? false ddef
 		} if
 	} ifelse
 } bind def
 /Pb

Index: library/images/pwrdLogo.eps
==================================================================
--- library/images/pwrdLogo.eps
+++ library/images/pwrdLogo.eps
@@ -26,11 +26,11 @@
 %AI5_OpenViewLayers: 7
 %%EndComments
 %%BeginProlog
 %%BeginResource: procset Adobe_level2_AI5 1.0 0
 %%Title: (Adobe Illustrator (R) Version 5.0 Level 2 Emulation)
-%%Version: 1.0 
+%%Version: 1.0
 %%CreationDate: (04/10/93) ()
 %%Copyright: ((C) 1987-1993 Adobe Systems Incorporated All Rights Reserved)
 userdict /Adobe_level2_AI5 21 dict dup begin
 	put
 	/packedarray where not
@@ -75,11 +75,11 @@
 			5 -1 roll pop
 			setcmykcolor
 		}
 		def
 	} if
-	
+
 	/gt38? mark {version cvx exec} stopped {cleartomark true} {38 gt exch pop} ifelse def
 	userdict /deviceDPI 72 0 matrix defaultmatrix dtransform dup mul exch dup mul add sqrt put
 	userdict /level2?
 	systemdict /languagelevel known dup
 	{
@@ -176,11 +176,11 @@
 	} if
  end defaultpacking setpacking
 %%EndResource
 %%BeginResource: procset Adobe_IllustratorA_AI5 1.1 0
 %%Title: (Adobe Illustrator (R) Version 5.0 Abbreviated Prolog)
-%%Version: 1.1 
+%%Version: 1.1
 %%CreationDate: (3/7/1994) ()
 %%Copyright: ((C) 1987-1994 Adobe Systems Incorporated All Rights Reserved)
 currentpacking true setpacking
 userdict /Adobe_IllustratorA_AI5_vars 70 dict dup begin
 put
@@ -1060,11 +1060,11 @@
 		{
 			(%AI5_BeginLayer) 1 (%AI5_EndLayer--) discard
 		}
 		{
 			/clipForward? true def
-			
+
 			/Tx /pop load def
 			/Tj /pop load def
 			currentdict end clipRenderOff begin begin
 		} ifelse
 	}
@@ -1087,11 +1087,11 @@
 		{
 			currentdict
 		 end
 		 end
 		 begin
-			
+
 			/clipForward? false ddef
 		} if
 	} ifelse
 } bind def
 /Pb

Index: library/listbox.tcl
==================================================================
--- library/listbox.tcl
+++ library/listbox.tcl
@@ -12,11 +12,11 @@
 
 #--------------------------------------------------------------------------
 # tk::Priv elements used in this file:
 #
 # afterId -		Token returned by "after" for autoscanning.
-# listboxPrev -		The last element to be selected or deselected
+# listboxPrev -	The last element to be selected or deselected
 #			during a selection operation.
 # listboxSelection -	All of the items that were selected before the
 #			current selection operation (such as a mouse
 #			drag) started;  used to cancel an operation.
 #--------------------------------------------------------------------------
@@ -204,11 +204,11 @@
 
 if {"x11" eq [tk windowingsystem]} {
     # Support for mousewheels on Linux/Unix commonly comes through mapping
     # the wheel to the extended buttons.  If you have a mousewheel, find
     # Linux configuration info at:
-    #	http://www.inria.fr/koala/colas/mouse-wheel-scroll/
+    #	http://linuxreviews.org/howtos/xfree/mouse/
     bind Listbox <4> {
 	if {!$tk_strictMotif} {
 	    %W yview scroll -5 units
 	}
     }

Index: library/menu.tcl
==================================================================
--- library/menu.tcl
+++ library/menu.tcl
@@ -168,10 +168,11 @@
 bind Menu <<NextLine>> {
     tk::MenuDownArrow %W
 }
 bind Menu <KeyPress> {
     tk::TraverseWithinMenu %W %A
+    break
 }
 
 # The following bindings apply to all windows, and are used to
 # implement keyboard menu traversal.
 
@@ -606,11 +607,13 @@
 
     if {![winfo viewable $menu]} {
         return
     }
     if {[$menu index active] eq "none"} {
-        set Priv(window) {}
+        if {[$menu cget -type] ne "menubar" } {
+            set Priv(window) {}
+        }
         return
     }
     $menu postcascade active
     if {$Priv(postedMb) ne "" && [winfo viewable $Priv(postedMb)]} {
 	grab -global $Priv(postedMb)

Index: library/msgbox.tcl
==================================================================
--- library/msgbox.tcl
+++ library/msgbox.tcl
@@ -232,11 +232,12 @@
 	    break
 	}
     }
     if {!$valid} {
 	return -code error -errorcode {TK MSGBOX DEFAULT} \
-	    "invalid default button \"$data(-default)\""
+	    "bad -default value \"$data(-default)\": must be\
+	    abort, retry, ignore, ok, cancel, no, or yes"
     }
 
     # 2. Set the dialog to be a child window of $parent
     #
     #

Index: library/msgs/cs.msg
==================================================================
--- library/msgs/cs.msg
+++ library/msgs/cs.msg
@@ -1,77 +1,77 @@
 namespace eval ::tk {
-    ::msgcat::mcset cs "&Abort" "&P\u0159eru\u0161it"
+    ::msgcat::mcset cs "&Abort" "&Přerušit"
     ::msgcat::mcset cs "&About..." "&O programu..."
-    ::msgcat::mcset cs "All Files" "V\u0161echny soubory"
+    ::msgcat::mcset cs "All Files" "VÅ¡echny soubory"
     ::msgcat::mcset cs "Application Error" "Chyba programu"
     ::msgcat::mcset cs "Bold Italic"
-    ::msgcat::mcset cs "&Blue" "&Modr\341"
-    ::msgcat::mcset cs "Cancel" "Zru\u0161it"
-    ::msgcat::mcset cs "&Cancel" "&Zru\u0161it"
-    ::msgcat::mcset cs "Cannot change to the directory \"%1\$s\".\nPermission denied." "Nemohu zm\u011bnit atku\341ln\355 adres\341\u0159 na \"%1\$s\".\nP\u0159\355stup odm\355tnut."
-    ::msgcat::mcset cs "Choose Directory" "V\375b\u011br adres\341\u0159e"
+    ::msgcat::mcset cs "&Blue" "&Modá"
+    ::msgcat::mcset cs "Cancel" "Zrušit"
+    ::msgcat::mcset cs "&Cancel" "&Zrušit"
+    ::msgcat::mcset cs "Cannot change to the directory \"%1\$s\".\nPermission denied." "Nemohu změnit atkálí adreář na \"%1\$s\".\nPístup odítnut."
+    ::msgcat::mcset cs "Choose Directory" "ýběr adreáře"
     ::msgcat::mcset cs "Cl&ear" "Sma&zat"
     ::msgcat::mcset cs "&Clear Console" "&Smazat konzolu"
     ::msgcat::mcset cs "Color" "Barva"
     ::msgcat::mcset cs "Console" "Konzole"
-    ::msgcat::mcset cs "&Copy" "&Kop\355rovat"
-    ::msgcat::mcset cs "Cu&t" "V&y\u0159\355znout"
+    ::msgcat::mcset cs "&Copy" "&Koírovat"
+    ::msgcat::mcset cs "Cu&t" "V&yíznout"
     ::msgcat::mcset cs "&Delete" "&Smazat"
     ::msgcat::mcset cs "Details >>" "Detaily >>"
-    ::msgcat::mcset cs "Directory \"%1\$s\" does not exist." "Adres\341\u0159 \"%1\$s\" neexistuje."
-    ::msgcat::mcset cs "&Directory:" "&Adres\341\u0159:"
-    ::msgcat::mcset cs "&Edit" "&\332pravy"
+    ::msgcat::mcset cs "Directory \"%1\$s\" does not exist." "Adreář \"%1\$s\" neexistuje."
+    ::msgcat::mcset cs "&Directory:" "&Adreář:"
+    ::msgcat::mcset cs "&Edit" "Úpravy"
     ::msgcat::mcset cs "Error: %1\$s" "Chyba: %1\$s"
     ::msgcat::mcset cs "E&xit" "&Konec"
     ::msgcat::mcset cs "&File" "&Soubor"
-    ::msgcat::mcset cs "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "Soubor \"%1\$s\" ji\u017e existuje.\nChcete jej p\u0159epsat?"
-    ::msgcat::mcset cs "File \"%1\$s\" already exists.\n\n" "Soubor \"%1\$s\" ji\u017e existuje.\n\n"
+    ::msgcat::mcset cs "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "Soubor \"%1\$s\" již existuje.\nChcete jej přepsat?"
+    ::msgcat::mcset cs "File \"%1\$s\" already exists.\n\n" "Soubor \"%1\$s\" již existuje.\n\n"
     ::msgcat::mcset cs "File \"%1\$s\" does not exist." "Soubor \"%1\$s\" neexistuje."
-    ::msgcat::mcset cs "File &name:" "&Jm\351no souboru:"
-    ::msgcat::mcset cs "File &names:" "&Jm\351na soubor\u016f:"
-    ::msgcat::mcset cs "Files of &type:" "&Typy soubor\u016f:"
+    ::msgcat::mcset cs "File &name:" "&Jéno souboru:"
+    ::msgcat::mcset cs "File &names:" "&Jéna souborů:"
+    ::msgcat::mcset cs "Files of &type:" "&Typy souborů:"
     ::msgcat::mcset cs "Fi&les:" "Sou&bory:"
     ::msgcat::mcset cs "&Filter" "&Filtr"
     ::msgcat::mcset cs "Fil&ter:" "Fil&tr:"
     ::msgcat::mcset cs "Font st&yle:"
-    ::msgcat::mcset cs "&Green" "Ze&len\341"
-    ::msgcat::mcset cs "&Help" "&N\341pov\u011bda"
+    ::msgcat::mcset cs "&Green" "Ze&leá"
+    ::msgcat::mcset cs "&Help" "&ápověda"
     ::msgcat::mcset cs "Hi" "Ahoj"
     ::msgcat::mcset cs "&Hide Console" "&Schovat Konzolu"
     ::msgcat::mcset cs "&Ignore" "&Ignorovat"
-    ::msgcat::mcset cs "Invalid file name \"%1\$s\"." "\u0160patn\351 jm\351no souboru \"%1\$s\"."
+    ::msgcat::mcset cs "Invalid file name \"%1\$s\"." "Špaté jéno souboru \"%1\$s\"."
     ::msgcat::mcset cs "Log Files" "Log soubory"
     ::msgcat::mcset cs "&No" "&Ne"
     ::msgcat::mcset cs "&OK"
     ::msgcat::mcset cs "OK"
     ::msgcat::mcset cs "Ok"
-    ::msgcat::mcset cs "Open" "Otev\u0159\355t"
-    ::msgcat::mcset cs "&Open" "&Otev\u0159\355t"
-    ::msgcat::mcset cs "Open Multiple Files" "Otev\u0159\355t v\355ce soubor\u016f"
-    ::msgcat::mcset cs "P&aste" "&Vlo\u017eit"
-    ::msgcat::mcset cs "&Quit" "&Ukon\u010dit"
-    ::msgcat::mcset cs "&Red" "\u010ce&rven\341"
-    ::msgcat::mcset cs "Replace existing file?" "Nahradit st\341vaj\355c\355 soubor?"
+    ::msgcat::mcset cs "Open" "Otevít"
+    ::msgcat::mcset cs "&Open" "&Otevít"
+    ::msgcat::mcset cs "Open Multiple Files" "Otevít íce souborů"
+    ::msgcat::mcset cs "P&aste" "&Vložit"
+    ::msgcat::mcset cs "&Quit" "&Ukon�it"
+    ::msgcat::mcset cs "&Red" "Če&rveá"
+    ::msgcat::mcset cs "Replace existing file?" "Nahradit sávaíí soubor?"
     ::msgcat::mcset cs "&Retry" "Z&novu"
-    ::msgcat::mcset cs "&Save" "&Ulo\u017eit"
-    ::msgcat::mcset cs "Save As" "Ulo\u017eit jako"
-    ::msgcat::mcset cs "Save To Log" "Ulo\u017eit do logu"
+    ::msgcat::mcset cs "&Save" "&Uložit"
+    ::msgcat::mcset cs "Save As" "Uložit jako"
+    ::msgcat::mcset cs "Save To Log" "Uložit do logu"
     ::msgcat::mcset cs "Select Log File" "Vybrat log soubor"
-    ::msgcat::mcset cs "Select a file to source" "Vybrat soubor k nahr\341n\355"
-    ::msgcat::mcset cs "&Selection:" "&V\375b\u011br:"
-    ::msgcat::mcset cs "Skip Messages" "P\u0159esko\u010dit zpr\341vy"
+    ::msgcat::mcset cs "Select a file to source" "Vybrat soubor k naháí"
+    ::msgcat::mcset cs "&Selection:" "&ýběr:"
+    ::msgcat::mcset cs "Skip Messages" "Přesko�it zpávy"
     ::msgcat::mcset cs "&Source..." "&Zdroj..."
     ::msgcat::mcset cs "Tcl Scripts" "Tcl skripty"
     ::msgcat::mcset cs "Tcl for Windows" "Tcl pro Windows"
-    ::msgcat::mcset cs "Text Files" "Textov\351 soubory"
-    ::msgcat::mcset cs "abort" "p\u0159eru\u0161it"
-    ::msgcat::mcset cs "blue" "modr\341"
-    ::msgcat::mcset cs "cancel" "zru\u0161it"
-    ::msgcat::mcset cs "extension" "p\u0159\355pona"
-    ::msgcat::mcset cs "extensions" "p\u0159\355pony"
-    ::msgcat::mcset cs "green" "zelen\341"
+    ::msgcat::mcset cs "Text Files" "Textoé soubory"
+    ::msgcat::mcset cs "abort" "přerušit"
+    ::msgcat::mcset cs "blue" "modá"
+    ::msgcat::mcset cs "cancel" "zrušit"
+    ::msgcat::mcset cs "extension" "pípona"
+    ::msgcat::mcset cs "extensions" "pípony"
+    ::msgcat::mcset cs "green" "zeleá"
     ::msgcat::mcset cs "ignore" "ignorovat"
     ::msgcat::mcset cs "ok"
-    ::msgcat::mcset cs "red" "\u010derven\341"
+    ::msgcat::mcset cs "red" "�erveá"
     ::msgcat::mcset cs "retry" "znovu"
     ::msgcat::mcset cs "yes" "ano"
 }

Index: library/msgs/de.msg
==================================================================
--- library/msgs/de.msg
+++ library/msgs/de.msg
@@ -1,34 +1,34 @@
 namespace eval ::tk {
     ::msgcat::mcset de "&Abort" "&Abbruch"
-    ::msgcat::mcset de "&About..." "&\u00dcber..."
+    ::msgcat::mcset de "&About..." "&Ãœber..."
     ::msgcat::mcset de "All Files" "Alle Dateien"
     ::msgcat::mcset de "Application Error" "Applikationsfehler"
     ::msgcat::mcset de "&Apply" "&Anwenden"
     ::msgcat::mcset de "Bold" "Fett"
     ::msgcat::mcset de "Bold Italic" "Fett kursiv"
     ::msgcat::mcset de "&Blue" "&Blau"
     ::msgcat::mcset de "Cancel" "Abbruch"
     ::msgcat::mcset de "&Cancel" "&Abbruch"
     ::msgcat::mcset de "Cannot change to the directory \"%1\$s\".\nPermission denied." "Kann nicht in das Verzeichnis \"%1\$s\" wechseln.\nKeine Rechte vorhanden."
-    ::msgcat::mcset de "Choose Directory" "W\u00e4hle Verzeichnis"
-    ::msgcat::mcset de "Cl&ear" "&R\u00fccksetzen"
-    ::msgcat::mcset de "&Clear Console" "&Konsole l\u00f6schen"
+    ::msgcat::mcset de "Choose Directory" "Wähle Verzeichnis"
+    ::msgcat::mcset de "Cl&ear" "&Rücksetzen"
+    ::msgcat::mcset de "&Clear Console" "&Konsole löschen"
     ::msgcat::mcset de "Color" "Farbe"
     ::msgcat::mcset de "Console" "Konsole"
     ::msgcat::mcset de "&Copy" "&Kopieren"
     ::msgcat::mcset de "Cu&t" "Aus&schneiden"
-    ::msgcat::mcset de "&Delete" "&L\u00f6schen"
+    ::msgcat::mcset de "&Delete" "&Löschen"
     ::msgcat::mcset de "Details >>"
     ::msgcat::mcset de "Directory \"%1\$s\" does not exist." "Das Verzeichnis \"%1\$s\" existiert nicht."
     ::msgcat::mcset de "&Directory:" "&Verzeichnis:"
     ::msgcat::mcset de "&Edit" "&Bearbeiten"
     ::msgcat::mcset de "Effects" "Effekte"
     ::msgcat::mcset de "Error: %1\$s" "Fehler: %1\$s"
     ::msgcat::mcset de "E&xit" "&Ende"
     ::msgcat::mcset de "&File" "&Datei"
-    ::msgcat::mcset de "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "Die Datei \"%1\$s\" ist bereits vorhanden.\nWollen sie diese Datei \u00fcberschreiben ?"
+    ::msgcat::mcset de "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "Die Datei \"%1\$s\" ist bereits vorhanden.\nWollen sie diese Datei überschreiben ?"
     ::msgcat::mcset de "File \"%1\$s\" already exists.\n\n" "Die Datei \"%1\$s\" ist bereits vorhanden.\n\n"
     ::msgcat::mcset de "File \"%1\$s\" does not exist." "Die Datei \"%1\$s\" existiert nicht."
     ::msgcat::mcset de "File &name:" "Datei&name:"
     ::msgcat::mcset de "File &names:" "Datei&namen:"
     ::msgcat::mcset de "Files of &type:" "Dateien des &Typs:"
@@ -36,56 +36,56 @@
     ::msgcat::mcset de "&Filter"
     ::msgcat::mcset de "Fil&ter:"
     ::msgcat::mcset de "Font" "Schriftart"
     ::msgcat::mcset de "&Font:" "Schriftart:"
     ::msgcat::mcset de "Font st&yle:" "Schriftschnitt:"
-    ::msgcat::mcset de "&Green" "&Gr\u00fcn"
+    ::msgcat::mcset de "&Green" "&Grün"
     ::msgcat::mcset de "&Help" "&Hilfe"
     ::msgcat::mcset de "Hi" "Hallo"
     ::msgcat::mcset de "&Hide Console" "&Konsole unsichtbar machen"
     ::msgcat::mcset de "&Ignore" "&Ignorieren"
-    ::msgcat::mcset de "Invalid file name \"%1\$s\"." "Ung\u00fcltiger Dateiname \"%1\$s\"."
+    ::msgcat::mcset de "Invalid file name \"%1\$s\"." "Ungültiger Dateiname \"%1\$s\"."
     ::msgcat::mcset de "Italic" "Kursiv"
     ::msgcat::mcset de "Log Files" "Protokolldatei"
     ::msgcat::mcset de "&No" "&Nein"
     ::msgcat::mcset de "&OK"
     ::msgcat::mcset de "OK"
     ::msgcat::mcset de "Ok"
-    ::msgcat::mcset de "Open" "\u00d6ffnen"
-    ::msgcat::mcset de "&Open" "\u00d6&ffnen"
+    ::msgcat::mcset de "Open" "Öffnen"
+    ::msgcat::mcset de "&Open" "Ö&ffnen"
     ::msgcat::mcset de "Open Multiple Files" "Mehrere Dateien \u00F6ffnen"
-    ::msgcat::mcset de "P&aste" "E&inf\u00fcgen"
+    ::msgcat::mcset de "P&aste" "E&infügen"
     ::msgcat::mcset de "&Quit" "&Beenden"
     ::msgcat::mcset de "&Red" "&Rot"
     ::msgcat::mcset de "Regular" "Standard"
     ::msgcat::mcset de "Replace existing file?" "Existierende Datei ersetzen?"
     ::msgcat::mcset de "&Retry" "&Wiederholen"
     ::msgcat::mcset de "Sample" "Beispiel"
     ::msgcat::mcset de "&Save" "&Speichern"
     ::msgcat::mcset de "Save As" "Speichern unter"
     ::msgcat::mcset de "Save To Log" "In Protokoll speichern"
-    ::msgcat::mcset de "Select Log File" "Protokolldatei ausw\u00e4hlen"
-    ::msgcat::mcset de "Select a file to source" "Auszuf\u00fchrende Datei ausw\u00e4hlen"
+    ::msgcat::mcset de "Select Log File" "Protokolldatei auswählen"
+    ::msgcat::mcset de "Select a file to source" "Auszuführende Datei auswählen"
     ::msgcat::mcset de "&Selection:" "Auswah&l:"
     ::msgcat::mcset de "&Size:" "Schriftgrad:"
     ::msgcat::mcset de "Show &Hidden Directories" "Zeige versteckte Dateien"
     ::msgcat::mcset de "Show &Hidden Files and Directories" "Zeige versteckte Dateien und Verzeichnisse"
-    ::msgcat::mcset de "Skip Messages" "Weitere Nachrichten \u00fcberspringen"
-    ::msgcat::mcset de "&Source..." "&Ausf\u00fchren..."
+    ::msgcat::mcset de "Skip Messages" "Weitere Nachrichten überspringen"
+    ::msgcat::mcset de "&Source..." "&Ausführen..."
     ::msgcat::mcset de "Stri&keout" "&Durchgestrichen"
     ::msgcat::mcset de "Tcl Scripts" "Tcl-Skripte"
-    ::msgcat::mcset de "Tcl for Windows" "Tcl f\u00fcr Windows"
+    ::msgcat::mcset de "Tcl for Windows" "Tcl für Windows"
     ::msgcat::mcset de "Text Files" "Textdateien"
     ::msgcat::mcset de "&Underline" "&Unterstrichen"
     ::msgcat::mcset de "&Yes" "&Ja"
     ::msgcat::mcset de "abort" "abbrechen"
     ::msgcat::mcset de "blue" "blau"
     ::msgcat::mcset de "cancel" "abbrechen"
     ::msgcat::mcset de "extension" "Erweiterung"
     ::msgcat::mcset de "extensions" "Erweiterungen"
-    ::msgcat::mcset de "green" "gr\u00fcn"
+    ::msgcat::mcset de "green" "grün"
     ::msgcat::mcset de "ignore" "ignorieren"
     ::msgcat::mcset de "ok"
     ::msgcat::mcset de "red" "rot"
     ::msgcat::mcset de "retry" "wiederholen"
     ::msgcat::mcset de "yes" "ja"
 }

Index: library/msgs/el.msg
==================================================================
--- library/msgs/el.msg
+++ library/msgs/el.msg
@@ -1,86 +1,86 @@
 ## Messages for the Greek (Hellenic - "el") language.
 ## Please report any changes/suggestions to:
 ##    petasis@iit.demokritos.gr
 
 namespace eval ::tk {
-    ::msgcat::mcset el "&Abort"              "\u03a4\u03b5\u03c1\u03bc\u03b1\u03c4\u03b9\u03c3\u03bc\u03cc\u03c2"
-    ::msgcat::mcset el "About..."           "\u03a3\u03c7\u03b5\u03c4\u03b9\u03ba\u03ac..."
-    ::msgcat::mcset el "All Files"          "\u038c\u03bb\u03b1 \u03c4\u03b1 \u0391\u03c1\u03c7\u03b5\u03af\u03b1"
-    ::msgcat::mcset el "Application Error"  "\u039b\u03ac\u03b8\u03bf\u03c2 \u0395\u03c6\u03b1\u03c1\u03bc\u03bf\u03b3\u03ae\u03c2"
-    ::msgcat::mcset el "&Blue"               "\u039c\u03c0\u03bb\u03b5"
-    ::msgcat::mcset el "&Cancel"             "\u0391\u03ba\u03cd\u03c1\u03c9\u03c3\u03b7"
+    ::msgcat::mcset el "&Abort"              "Τε�ματισμός"
+    ::msgcat::mcset el "About..."           "Σχετικά..."
+    ::msgcat::mcset el "All Files"          "Όλα τα Α�χεία"
+    ::msgcat::mcset el "Application Error"  "Λάθος Εφα�μογής"
+    ::msgcat::mcset el "&Blue"               "Μπλε"
+    ::msgcat::mcset el "&Cancel"             "Ακ��ωση"
     ::msgcat::mcset el \
 "Cannot change to the directory \"%1\$s\".\nPermission denied." \
-"\u0394\u03b5\u03bd \u03b5\u03af\u03bd\u03b1\u03b9 \u03b4\u03c5\u03bd\u03b1\u03c4\u03ae \u03b7 \u03b1\u03bb\u03bb\u03b1\u03b3\u03ae \u03ba\u03b1\u03c4\u03b1\u03bb\u03cc\u03b3\u03bf\u03c5 \u03c3\u03b5 \"%1\$s\".\n\u0397 \u03c0\u03c1\u03cc\u03c3\u03b2\u03b1\u03c3\u03b7 \u03b4\u03b5\u03bd \u03b5\u03c0\u03b9\u03c4\u03c1\u03ad\u03c0\u03b5\u03c4\u03b1\u03b9."
-    ::msgcat::mcset el "Choose Directory"   "\u0395\u03c0\u03b9\u03bb\u03bf\u03b3\u03ae \u039a\u03b1\u03c4\u03b1\u03bb\u03cc\u03b3\u03bf\u03c5"
-    ::msgcat::mcset el "Clear"              "\u039a\u03b1\u03b8\u03b1\u03c1\u03b9\u03c3\u03bc\u03cc\u03c2"
-    ::msgcat::mcset el "Color"              "\u03a7\u03c1\u03ce\u03bc\u03b1"
-    ::msgcat::mcset el "Console"            "\u039a\u03bf\u03bd\u03c3\u03cc\u03bb\u03b1"
-    ::msgcat::mcset el "Copy"               "\u0391\u03bd\u03c4\u03b9\u03b3\u03c1\u03b1\u03c6\u03ae"
-    ::msgcat::mcset el "Cut"                "\u0391\u03c0\u03bf\u03ba\u03bf\u03c0\u03ae"
-    ::msgcat::mcset el "Delete"             "\u0394\u03b9\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae"
-    ::msgcat::mcset el "Details >>"         "\u039b\u03b5\u03c0\u03c4\u03bf\u03bc\u03ad\u03c1\u03b5\u03b9\u03b5\u03c2 >>"
+"Δεν είναι δυνατή η αλλαγή καταλόγου σε \"%1\$s\".\nΗ π�όσβαση δεν επιτ�έπεται."
+    ::msgcat::mcset el "Choose Directory"   "Επιλογή Καταλόγου"
+    ::msgcat::mcset el "Clear"              "Καθα�ισμός"
+    ::msgcat::mcset el "Color"              "Χ�ώμα"
+    ::msgcat::mcset el "Console"            "Κονσόλα"
+    ::msgcat::mcset el "Copy"               "Αντιγ�αφή"
+    ::msgcat::mcset el "Cut"                "Αποκοπή"
+    ::msgcat::mcset el "Delete"             "Διαγ�αφή"
+    ::msgcat::mcset el "Details >>"         "Λεπτομέ�ειες >>"
     ::msgcat::mcset el "Directory \"%1\$s\" does not exist." \
-                                        "\u039f \u03ba\u03b1\u03c4\u03ac\u03bb\u03bf\u03b3\u03bf\u03c2 \"%1\$s\" \u03b4\u03b5\u03bd \u03c5\u03c0\u03ac\u03c1\u03c7\u03b5\u03b9."
-    ::msgcat::mcset el "&Directory:"         "&\u039a\u03b1\u03c4\u03ac\u03bb\u03bf\u03b3\u03bf\u03c2:"
-    ::msgcat::mcset el "Error: %1\$s"       "\u039b\u03ac\u03b8\u03bf\u03c2: %1\$s"
-    ::msgcat::mcset el "Exit"               "\u0388\u03be\u03bf\u03b4\u03bf\u03c2"
+                                        "Ο κατάλογος \"%1\$s\" δεν υπά�χει."
+    ::msgcat::mcset el "&Directory:"         "&Κατάλογος:"
+    ::msgcat::mcset el "Error: %1\$s"       "Λάθος: %1\$s"
+    ::msgcat::mcset el "Exit"               "Έξοδος"
     ::msgcat::mcset el \
                "File \"%1\$s\" already exists.\nDo you want to overwrite it?" \
-               "\u03a4\u03bf \u03b1\u03c1\u03c7\u03b5\u03af\u03bf \"%1\$s\" \u03ae\u03b4\u03b7 \u03c5\u03c0\u03ac\u03c1\u03c7\u03b5\u03b9.\n\u0398\u03ad\u03bb\u03b5\u03c4\u03b5 \u03bd\u03b1 \u03b5\u03c0\u03b9\u03ba\u03b1\u03bb\u03c5\u03c6\u03b8\u03b5\u03af;"
+               "Το α�χείο \"%1\$s\" ήδη υπά�χει.\nΘέλετε να επικαλυφθεί;"
     ::msgcat::mcset el "File \"%1\$s\" already exists.\n\n" \
-                   "\u03a4\u03bf \u03b1\u03c1\u03c7\u03b5\u03af\u03bf \"%1\$s\" \u03ae\u03b4\u03b7 \u03c5\u03c0\u03ac\u03c1\u03c7\u03b5\u03b9.\n\n"
+                   "Το α�χείο \"%1\$s\" ήδη υπά�χει.\n\n"
     ::msgcat::mcset el "File \"%1\$s\" does not exist." \
-                   "\u03a4\u03bf \u03b1\u03c1\u03c7\u03b5\u03af\u03bf \"%1\$s\" \u03b4\u03b5\u03bd \u03c5\u03c0\u03ac\u03c1\u03c7\u03b5\u03b9."
-    ::msgcat::mcset el "File &name:"         "\u038c&\u03bd\u03bf\u03bc\u03b1 \u03b1\u03c1\u03c7\u03b5\u03af\u03bf\u03c5:"
-    ::msgcat::mcset el "File &names:"        "\u038c&\u03bd\u03bf\u03bc\u03b1 \u03b1\u03c1\u03c7\u03b5\u03af\u03c9\u03bd:"
-    ::msgcat::mcset el "Files of &type:"     "\u0391\u03c1\u03c7\u03b5\u03af\u03b1 \u03c4\u03bf\u03c5 &\u03c4\u03cd\u03c0\u03bf\u03c5:"
-    ::msgcat::mcset el "Fi&les:"             "\u0391\u03c1\u03c7\u03b5\u03af\u03b1:"
-    ::msgcat::mcset el "&Filter"             "\u03a6\u03af\u03bb\u03c4\u03c1\u03bf"
-    ::msgcat::mcset el "Fil&ter:"            "\u03a6\u03af\u03bb\u03c4\u03c1\u03bf:"
-    ::msgcat::mcset el "&Green"              "\u03a0\u03c1\u03ac\u03c3\u03b9\u03bd\u03bf"
-    ::msgcat::mcset el "Hi"                 "\u0393\u03b5\u03b9\u03b1"
-    ::msgcat::mcset el "Hide Console"       "\u0391\u03c0\u03cc\u03ba\u03c1\u03c5\u03c8\u03b7 \u03ba\u03bf\u03bd\u03c3\u03cc\u03bb\u03b1\u03c2"
-    ::msgcat::mcset el "&Ignore"             "\u0391\u03b3\u03bd\u03cc\u03b7\u03c3\u03b7"
+                   "Το α�χείο \"%1\$s\" δεν υπά�χει."
+    ::msgcat::mcset el "File &name:"         "Ό&νομα α�χείου:"
+    ::msgcat::mcset el "File &names:"        "Ό&νομα α�χείων:"
+    ::msgcat::mcset el "Files of &type:"     "Α�χεία του &τ�που:"
+    ::msgcat::mcset el "Fi&les:"             "Α�χεία:"
+    ::msgcat::mcset el "&Filter"             "Φίλτ�ο"
+    ::msgcat::mcset el "Fil&ter:"            "Φίλτ�ο:"
+    ::msgcat::mcset el "&Green"              "Π�άσινο"
+    ::msgcat::mcset el "Hi"                 "Γεια"
+    ::msgcat::mcset el "Hide Console"       "Απόκ�υψη κονσόλας"
+    ::msgcat::mcset el "&Ignore"             "Αγνόηση"
     ::msgcat::mcset el "Invalid file name \"%1\$s\"." \
-                   "\u0386\u03ba\u03c5\u03c1\u03bf \u03cc\u03bd\u03bf\u03bc\u03b1 \u03b1\u03c1\u03c7\u03b5\u03af\u03bf\u03c5 \"%1\$s\"."
-    ::msgcat::mcset el "Log Files"          "\u0391\u03c1\u03c7\u03b5\u03af\u03b1 \u039a\u03b1\u03c4\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae\u03c2"
-    ::msgcat::mcset el "&No"                 "\u038c\u03c7\u03b9"
-    ::msgcat::mcset el "&OK"                 "\u0395\u03bd\u03c4\u03ac\u03be\u03b5\u03b9"
-    ::msgcat::mcset el "OK"                 "\u0395\u03bd\u03c4\u03ac\u03be\u03b5\u03b9"
-    ::msgcat::mcset el "Ok"                 "\u0395\u03bd\u03c4\u03ac\u03be\u03b5\u03b9"
-    ::msgcat::mcset el "Open"               "\u0386\u03bd\u03bf\u03b9\u03b3\u03bc\u03b1"
-    ::msgcat::mcset el "&Open"               "\u0386\u03bd\u03bf\u03b9\u03b3\u03bc\u03b1"
+                   "Άκυ�ο όνομα α�χείου \"%1\$s\"."
+    ::msgcat::mcset el "Log Files"          "Α�χεία Καταγ�αφής"
+    ::msgcat::mcset el "&No"                 "Όχι"
+    ::msgcat::mcset el "&OK"                 "Εντάξει"
+    ::msgcat::mcset el "OK"                 "Εντάξει"
+    ::msgcat::mcset el "Ok"                 "Εντάξει"
+    ::msgcat::mcset el "Open"               "Άνοιγμα"
+    ::msgcat::mcset el "&Open"               "Άνοιγμα"
     ::msgcat::mcset el "Open Multiple Files" \
-                                        "\u0386\u03bd\u03bf\u03b9\u03b3\u03bc\u03b1 \u03c0\u03bf\u03bb\u03bb\u03b1\u03c0\u03bb\u03ce\u03bd \u03b1\u03c1\u03c7\u03b5\u03af\u03c9\u03bd"
-    ::msgcat::mcset el "P&aste"              "\u0395\u03c0\u03b9\u03ba\u03cc\u03bb\u03bb\u03b7\u03c3\u03b7"
-    ::msgcat::mcset el "Quit"               "\u0388\u03be\u03bf\u03b4\u03bf\u03c2"
-    ::msgcat::mcset el "&Red"                "\u039a\u03cc\u03ba\u03ba\u03b9\u03bd\u03bf"
+                                        "Άνοιγμα πολλαπλών α�χείων"
+    ::msgcat::mcset el "P&aste"              "Επικόλληση"
+    ::msgcat::mcset el "Quit"               "Έξοδος"
+    ::msgcat::mcset el "&Red"                "Κόκκινο"
     ::msgcat::mcset el "Replace existing file?" \
-                                        "\u0395\u03c0\u03b9\u03ba\u03ac\u03bb\u03c5\u03c8\u03b7 \u03c5\u03c0\u03ac\u03c1\u03c7\u03bf\u03bd\u03c4\u03bf\u03c2 \u03b1\u03c1\u03c7\u03b5\u03af\u03bf\u03c5;"
-    ::msgcat::mcset el "&Retry"              "\u03a0\u03c1\u03bf\u03c3\u03c0\u03ac\u03b8\u03b7\u03c3\u03b5 \u03be\u03b1\u03bd\u03ac"
-    ::msgcat::mcset el "&Save"               "\u0391\u03c0\u03bf\u03b8\u03ae\u03ba\u03b5\u03c5\u03c3\u03b7"
-    ::msgcat::mcset el "Save As"            "\u0391\u03c0\u03bf\u03b8\u03ae\u03ba\u03b5\u03c5\u03c3\u03b7 \u03c3\u03b1\u03bd"
-    ::msgcat::mcset el "Save To Log"        "\u0391\u03c0\u03bf\u03b8\u03ae\u03ba\u03b5\u03c5\u03c3\u03b7 \u03c3\u03c4\u03bf \u03b1\u03c1\u03c7\u03b5\u03af\u03bf \u03ba\u03b1\u03c4\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae\u03c2"
-    ::msgcat::mcset el "Select Log File"    "\u0395\u03c0\u03b9\u03bb\u03bf\u03b3\u03ae \u03b1\u03c1\u03c7\u03b5\u03af\u03bf\u03c5 \u03ba\u03b1\u03c4\u03b1\u03b3\u03c1\u03b1\u03c6\u03ae\u03c2"
+                                        "Επικάλυψη υπά�χοντος α�χείου;"
+    ::msgcat::mcset el "&Retry"              "Π�οσπάθησε ξανά"
+    ::msgcat::mcset el "&Save"               "Αποθήκευση"
+    ::msgcat::mcset el "Save As"            "Αποθήκευση σαν"
+    ::msgcat::mcset el "Save To Log"        "Αποθήκευση στο α�χείο καταγ�αφής"
+    ::msgcat::mcset el "Select Log File"    "Επιλογή α�χείου καταγ�αφής"
     ::msgcat::mcset el "Select a file to source" \
-                                        "\u0395\u03c0\u03b9\u03bb\u03ad\u03be\u03c4\u03b5 \u03b1\u03c1\u03c7\u03b5\u03af\u03bf \u03b3\u03b9\u03b1 \u03b5\u03ba\u03c4\u03ad\u03bb\u03b5\u03c3\u03b7"
-    ::msgcat::mcset el "&Selection:"         "\u0395\u03c0\u03b9\u03bb\u03bf\u03b3\u03ae:"
-    ::msgcat::mcset el "Skip Messages"      "\u0391\u03c0\u03bf\u03c6\u03c5\u03b3\u03ae\u03bc\u03b7\u03bd\u03c5\u03bc\u03ac\u03c4\u03c9\u03bd"
-    ::msgcat::mcset el "&Source..."          "\u0395\u03ba\u03c4\u03ad\u03bb\u03b5\u03c3\u03b7..."
+                                        "Επιλέξτε α�χείο για εκτέλεση"
+    ::msgcat::mcset el "&Selection:"         "Επιλογή:"
+    ::msgcat::mcset el "Skip Messages"      "Αποφυγήμηνυμάτων"
+    ::msgcat::mcset el "&Source..."          "Εκτέλεση..."
     ::msgcat::mcset el "Tcl Scripts"        "Tcl Scripts"
-    ::msgcat::mcset el "Tcl for Windows"    "Tcl \u03b3\u03b9\u03b1 Windows"
-    ::msgcat::mcset el "Text Files"         "\u0391\u03c1\u03c7\u03b5\u03af\u03b1 \u039a\u03b5\u03b9\u03bc\u03ad\u03bd\u03bf\u03c5"
-    ::msgcat::mcset el "&Yes"                "\u039d\u03b1\u03b9"
-    ::msgcat::mcset el "abort"              "\u03c4\u03b5\u03c1\u03bc\u03b1\u03c4\u03b9\u03c3\u03bc\u03cc\u03c2"
-    ::msgcat::mcset el "blue"               "\u03bc\u03c0\u03bb\u03b5"
-    ::msgcat::mcset el "cancel"             "\u03b1\u03ba\u03cd\u03c1\u03c9\u03c3\u03b7"
-    ::msgcat::mcset el "extension"          "\u03b5\u03c0\u03ad\u03ba\u03c4\u03b1\u03c3\u03b7"
-    ::msgcat::mcset el "extensions"         "\u03b5\u03c0\u03b5\u03ba\u03c4\u03ac\u03c3\u03b5\u03b9\u03c2"
-    ::msgcat::mcset el "green"              "\u03c0\u03c1\u03ac\u03c3\u03b9\u03bd\u03bf"
-    ::msgcat::mcset el "ignore"             "\u03b1\u03b3\u03bd\u03cc\u03b7\u03c3\u03b7"
-    ::msgcat::mcset el "ok"                 "\u03b5\u03bd\u03c4\u03ac\u03be\u03b5\u03b9"
-    ::msgcat::mcset el "red"                "\u03ba\u03cc\u03ba\u03ba\u03b9\u03bd\u03bf"
-    ::msgcat::mcset el "retry"              "\u03c0\u03c1\u03bf\u03c3\u03c0\u03ac\u03b8\u03b7\u03c3\u03b5 \u03be\u03b1\u03bd\u03ac"
-    ::msgcat::mcset el "yes"                "\u03bd\u03b1\u03b9"
+    ::msgcat::mcset el "Tcl for Windows"    "Tcl για Windows"
+    ::msgcat::mcset el "Text Files"         "Α�χεία Κειμένου"
+    ::msgcat::mcset el "&Yes"                "�αι"
+    ::msgcat::mcset el "abort"              "τε�ματισμός"
+    ::msgcat::mcset el "blue"               "μπλε"
+    ::msgcat::mcset el "cancel"             "ακ��ωση"
+    ::msgcat::mcset el "extension"          "επέκταση"
+    ::msgcat::mcset el "extensions"         "επεκτάσεις"
+    ::msgcat::mcset el "green"              "π�άσινο"
+    ::msgcat::mcset el "ignore"             "αγνόηση"
+    ::msgcat::mcset el "ok"                 "εντάξει"
+    ::msgcat::mcset el "red"                "κόκκινο"
+    ::msgcat::mcset el "retry"              "π�οσπάθησε ξανά"
+    ::msgcat::mcset el "yes"                "ναι"
 }

Index: library/msgs/eo.msg
==================================================================
--- library/msgs/eo.msg
+++ library/msgs/eo.msg
@@ -1,30 +1,30 @@
 namespace eval ::tk {
-    ::msgcat::mcset eo "&Abort" "&\u0108esigo"
+    ::msgcat::mcset eo "&Abort" "&Ĉesigo"
     ::msgcat::mcset eo "&About..." "Pri..."
-    ::msgcat::mcset eo "All Files" "\u0108ioj dosieroj"
+    ::msgcat::mcset eo "All Files" "Ĉioj dosieroj"
     ::msgcat::mcset eo "Application Error" "Aplikoerraro"
     ::msgcat::mcset eo "&Blue" "&Blua"
     ::msgcat::mcset eo "Cancel" "Rezignu"
     ::msgcat::mcset eo "&Cancel" "&Rezignu"
-    ::msgcat::mcset eo "Cannot change to the directory \"%1\$s\".\nPermission denied." "Neeble \u0109angi al dosierulon \"%1\$s\".\nVi ne rajtas tion."
+    ::msgcat::mcset eo "Cannot change to the directory \"%1\$s\".\nPermission denied." "Neeble ĉangi al dosierulon \"%1\$s\".\nVi ne rajtas tion."
     ::msgcat::mcset eo "Choose Directory" "Elektu Dosierujo"
     ::msgcat::mcset eo "Cl&ear" "&Klaru"
     ::msgcat::mcset eo "&Clear Console" "&Klaru konzolon"
     ::msgcat::mcset eo "Color" "Farbo"
     ::msgcat::mcset eo "Console" "Konzolo"
     ::msgcat::mcset eo "&Copy" "&Kopiu"
-    ::msgcat::mcset eo "Cu&t" "&Enpo\u015digu"
+    ::msgcat::mcset eo "Cu&t" "&Enpo�igu"
     ::msgcat::mcset eo "&Delete" "&Forprenu"
     ::msgcat::mcset eo "Details >>" "Detaloj >>"
     ::msgcat::mcset eo "Directory \"%1\$s\" does not exist." "La dosierujo \"%1\$s\" ne ekzistas."
     ::msgcat::mcset eo "&Directory:" "&Dosierujo:"
     ::msgcat::mcset eo "&Edit" "&Redaktu"
     ::msgcat::mcset eo "Error: %1\$s" "Eraro: %1\$s"
     ::msgcat::mcset eo "E&xit" "&Eliru"
     ::msgcat::mcset eo "&File" "&Dosiero"
-    ::msgcat::mcset eo "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "La dosiero \"%1\$s\" jam ekzistas.\n\u0108u vi volas anstata\u00fbigi la dosieron?"
+    ::msgcat::mcset eo "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "La dosiero \"%1\$s\" jam ekzistas.\nĈu vi volas anstataûigi la dosieron?"
     ::msgcat::mcset eo "File \"%1\$s\" already exists.\n\n" "La dosiero \"%1\$s\" jam egzistas. \n\n"
     ::msgcat::mcset eo "File \"%1\$s\" does not exist." "La dosierp \"%1\$s\" ne estas."
     ::msgcat::mcset eo "File &name:" "Dosiero&nomo:"
     ::msgcat::mcset eo "File &names:" "Dosiero&nomoj:"
     ::msgcat::mcset eo "Files of &type:" "Dosieroj de &Typo:"
@@ -32,11 +32,11 @@
     ::msgcat::mcset eo "&Filter" "&Filtrilo"
     ::msgcat::mcset eo "Fil&ter:" "&Filtrilo:"
     ::msgcat::mcset eo "&Green" "&Verda"
     ::msgcat::mcset eo "&Help" "&Helpu"
     ::msgcat::mcset eo "Hi" "Saluton"
-    ::msgcat::mcset eo "&Hide Console" "&Ka\u015du konzolon"
+    ::msgcat::mcset eo "&Hide Console" "&Ka�u konzolon"
     ::msgcat::mcset eo "&Ignore" "&Ignoru"
     ::msgcat::mcset eo "Invalid file name \"%1\$s\"." "Malvalida dosieronomo \"%1\$s\"."
     ::msgcat::mcset eo "Log Files" "Protokolo"
     ::msgcat::mcset eo "&No" "&Ne"
     ::msgcat::mcset eo "&OK"
@@ -43,33 +43,33 @@
     ::msgcat::mcset eo "OK"
     ::msgcat::mcset eo "Ok"
     ::msgcat::mcset eo "Open" "Malfermu"
     ::msgcat::mcset eo "&Open" "&Malfermu"
     ::msgcat::mcset eo "Open Multiple Files" "Melfermu multan dosierojn"
-    ::msgcat::mcset eo "P&aste" "&Elpo\u015digi"
+    ::msgcat::mcset eo "P&aste" "&Elpo�igi"
     ::msgcat::mcset eo "&Quit" "&Finigu"
     ::msgcat::mcset eo "&Red" "&Rosa"
-    ::msgcat::mcset eo "Replace existing file?" "\u0108u anstata\u00fbu ekzistantan dosieron?"
+    ::msgcat::mcset eo "Replace existing file?" "Ĉu anstataûu ekzistantan dosieron?"
     ::msgcat::mcset eo "&Retry" "&Ripetu"
     ::msgcat::mcset eo "&Save" "&Savu"
     ::msgcat::mcset eo "Save As" "Savu kiel"
     ::msgcat::mcset eo "Save To Log" "Savu en protokolon"
     ::msgcat::mcset eo "Select Log File" "Elektu prokolodosieron"
     ::msgcat::mcset eo "Select a file to source" "Elektu dosieron por interpreti"
     ::msgcat::mcset eo "&Selection:" "&Elekto:"
-    ::msgcat::mcset eo "Skip Messages" "transsaltu pluajn mesa\u011dojn"
+    ::msgcat::mcset eo "Skip Messages" "transsaltu pluajn mesa�ojn"
     ::msgcat::mcset eo "&Source..." "&Fontoprogramo..."
     ::msgcat::mcset eo "Tcl Scripts" "Tcl-skriptoj"
     ::msgcat::mcset eo "Tcl for Windows" "Tcl por vindoso"
     ::msgcat::mcset eo "Text Files" "Tekstodosierojn"
     ::msgcat::mcset eo "&Yes" "&Jes"
-    ::msgcat::mcset eo "abort" "\u0109esigo"
+    ::msgcat::mcset eo "abort" "ĉesigo"
     ::msgcat::mcset eo "blue" "blua"
     ::msgcat::mcset eo "cancel" "rezignu"
     ::msgcat::mcset eo "extension" "ekspansio"
     ::msgcat::mcset eo "extensions" "ekspansioj"
     ::msgcat::mcset eo "green" "verda"
     ::msgcat::mcset eo "ignore" "ignorieren"
-    ::msgcat::mcset eo "red" "ru\u011da"
+    ::msgcat::mcset eo "red" "ru�a"
     ::msgcat::mcset eo "retry" "ripetu"
     ::msgcat::mcset eo "yes" "jes"
 }

Index: library/msgs/es.msg
==================================================================
--- library/msgs/es.msg
+++ library/msgs/es.msg
@@ -1,10 +1,10 @@
 namespace eval ::tk {
     ::msgcat::mcset es "&Abort" "&Abortar"
     ::msgcat::mcset es "&About..." "&Acerca de ..."
     ::msgcat::mcset es "All Files" "Todos los archivos"
-    ::msgcat::mcset es "Application Error" "Error de la aplicaci\u00f3n"
+    ::msgcat::mcset es "Application Error" "Error de la aplicación"
     ::msgcat::mcset es "&Blue" "&Azul"
     ::msgcat::mcset es "Cancel" "Cancelar"
     ::msgcat::mcset es "&Cancel" "&Cancelar"
     ::msgcat::mcset es "Cannot change to the directory \"%1\$s\".\nPermission denied." "No es posible acceder al directorio \"%1\$s\".\nPermiso denegado."
     ::msgcat::mcset es "Choose Directory" "Elegir directorio"
@@ -20,11 +20,11 @@
     ::msgcat::mcset es "&Directory:" "&Directorio:"
     ::msgcat::mcset es "&Edit" "&Editar"
     ::msgcat::mcset es "Error: %1\$s"
     ::msgcat::mcset es "E&xit" "Salir"
     ::msgcat::mcset es "&File" "&Archivo"
-    ::msgcat::mcset es "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "El archivo \"%1\$s\" ya existe.\n\u00bfDesea sobreescribirlo?"
+    ::msgcat::mcset es "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "El archivo \"%1\$s\" ya existe.\n¿Desea sobreescribirlo?"
     ::msgcat::mcset es "File \"%1\$s\" already exists.\n\n" "El archivo \"%1\$s\" ya existe.\n\n"
     ::msgcat::mcset es "File \"%1\$s\" does not exist." "El archivo \"%1\$s\" no existe."
     ::msgcat::mcset es "File &name:" "&Nombre de archivo:"
     ::msgcat::mcset es "File &names:" "&Nombres de archivo:"
     ::msgcat::mcset es "Files of &type:" "Archivos de &tipo:"
@@ -34,43 +34,43 @@
     ::msgcat::mcset es "&Green" "&Verde"
     ::msgcat::mcset es "&Help" "&Ayuda"
     ::msgcat::mcset es "Hi"  "Hola"
     ::msgcat::mcset es "&Hide Console" "&Esconder la consola"
     ::msgcat::mcset es "&Ignore" "&Ignorar"
-    ::msgcat::mcset es "Invalid file name \"%1\$s\"." "Nombre de archivo inv\u00e1lido \"%1\$s\"."
+    ::msgcat::mcset es "Invalid file name \"%1\$s\"." "Nombre de archivo inválido \"%1\$s\"."
     ::msgcat::mcset es "Log Files"  "Ficheros de traza"
     ::msgcat::mcset es "&No"
     ::msgcat::mcset es "&OK"
     ::msgcat::mcset es "OK"
     ::msgcat::mcset es "Ok"
     ::msgcat::mcset es "Open" "Abrir"
     ::msgcat::mcset es "&Open" "&Abrir"
-    ::msgcat::mcset es "Open Multiple Files" "Abrir m\u00faltiples archivos"
+    ::msgcat::mcset es "Open Multiple Files" "Abrir múltiples archivos"
     ::msgcat::mcset es "P&aste" "Peg&ar"
     ::msgcat::mcset es "&Quit" "&Abandonar"
     ::msgcat::mcset es "&Red" "&Rojo"
-    ::msgcat::mcset es "Replace existing file?" "\u00bfReemplazar el archivo existente?"
+    ::msgcat::mcset es "Replace existing file?" "¿Reemplazar el archivo existente?"
     ::msgcat::mcset es "&Retry" "&Reintentar"
     ::msgcat::mcset es "&Save" "&Guardar"
     ::msgcat::mcset es "Save As" "Guardar como"
     ::msgcat::mcset es "Save To Log" "Guardar al archivo de traza"
     ::msgcat::mcset es "Select Log File"  "Elegir un archivo de traza"
     ::msgcat::mcset es "Select a file to source" "Seleccionar un archivo a evaluar"
-    ::msgcat::mcset es "&Selection:" "&Selecci\u00f3n:"
+    ::msgcat::mcset es "&Selection:" "&Selección:"
     ::msgcat::mcset es "Skip Messages" "Omitir los mensajes"
     ::msgcat::mcset es "&Source..." "E&valuar..."
     ::msgcat::mcset es "Tcl Scripts" "Scripts Tcl"
     ::msgcat::mcset es "Tcl for Windows" "Tcl para Windows"
     ::msgcat::mcset es "Text Files" "Archivos de texto"
-    ::msgcat::mcset es "&Yes" "&S\u00ed"
+    ::msgcat::mcset es "&Yes" "&Sí"
     ::msgcat::mcset es "abort" "abortar"
     ::msgcat::mcset es "blue" "azul"
     ::msgcat::mcset es "cancel" "cancelar"
-    ::msgcat::mcset es "extension"  "extensi\u00f3n"
+    ::msgcat::mcset es "extension"  "extensión"
     ::msgcat::mcset es "extensions" "extensiones"
     ::msgcat::mcset es "green" "verde"
     ::msgcat::mcset es "ignore" "ignorar"
     ::msgcat::mcset es "ok"
     ::msgcat::mcset es "red" "rojo"
     ::msgcat::mcset es "retry" "reintentar"
-    ::msgcat::mcset es "yes" "s\u00ed"
+    ::msgcat::mcset es "yes" "sí"
 }

Index: library/msgs/fr.msg
==================================================================
--- library/msgs/fr.msg
+++ library/msgs/fr.msg
@@ -1,28 +1,28 @@
 namespace eval ::tk {
     ::msgcat::mcset fr "&Abort" "&Annuler"
-    ::msgcat::mcset fr "About..." "\u00c0 propos..."
+    ::msgcat::mcset fr "About..." "À propos..."
     ::msgcat::mcset fr "All Files" "Tous les fichiers"
     ::msgcat::mcset fr "Application Error" "Erreur d'application"
     ::msgcat::mcset fr "&Blue" "&Bleu"
     ::msgcat::mcset fr "Cancel" "Annuler"
     ::msgcat::mcset fr "&Cancel" "&Annuler"
-    ::msgcat::mcset fr "Cannot change to the directory \"%1\$s\".\nPermission denied." "Impossible d'acc\u00e9der au r\u00e9pertoire \"%1\$s\".\nPermission refus\u00e9e."
-    ::msgcat::mcset fr "Choose Directory" "Choisir r\u00e9pertoire"
+    ::msgcat::mcset fr "Cannot change to the directory \"%1\$s\".\nPermission denied." "Impossible d'accéder au répertoire \"%1\$s\".\nPermission refusée."
+    ::msgcat::mcset fr "Choose Directory" "Choisir répertoire"
     ::msgcat::mcset fr "Cl&ear" "Effacer"
     ::msgcat::mcset fr "Color" "Couleur"
     ::msgcat::mcset fr "Console"
     ::msgcat::mcset fr "Copy" "Copier"
     ::msgcat::mcset fr "Cu&t" "Couper"
     ::msgcat::mcset fr "Delete" "Effacer"
-    ::msgcat::mcset fr "Details >>" "D\u00e9tails >>"
-    ::msgcat::mcset fr "Directory \"%1\$s\" does not exist." "Le r\u00e9pertoire \"%1\$s\" n'existe pas."
-    ::msgcat::mcset fr "&Directory:" "&R\u00e9pertoire:"
+    ::msgcat::mcset fr "Details >>" "Détails >>"
+    ::msgcat::mcset fr "Directory \"%1\$s\" does not exist." "Le répertoire \"%1\$s\" n'existe pas."
+    ::msgcat::mcset fr "&Directory:" "&Répertoire:"
     ::msgcat::mcset fr "Error: %1\$s" "Erreur: %1\$s"
     ::msgcat::mcset fr "E&xit" "Quitter"
-    ::msgcat::mcset fr "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "Le fichier \"%1\$s\" existe d\u00e9j\u00e0.\nVoulez-vous l'\u00e9craser?"
-    ::msgcat::mcset fr "File \"%1\$s\" already exists.\n\n" "Le fichier \"%1\$s\" existe d\u00e9j\u00e0.\n\n"
+    ::msgcat::mcset fr "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "Le fichier \"%1\$s\" existe déjà.\nVoulez-vous l'écraser?"
+    ::msgcat::mcset fr "File \"%1\$s\" already exists.\n\n" "Le fichier \"%1\$s\" existe déjà.\n\n"
     ::msgcat::mcset fr "File \"%1\$s\" does not exist." "Le fichier \"%1\$s\" n'existe pas."
     ::msgcat::mcset fr "File &name:" "&Nom de fichier:"
     ::msgcat::mcset fr "File &names:" "&Noms de fichiers:"
     ::msgcat::mcset fr "Files of &type:" "&Type de fichiers:"
     ::msgcat::mcset fr "Fi&les:" "Fich&iers:"
@@ -43,19 +43,19 @@
     ::msgcat::mcset fr "Open Multiple Files" "Ouvrir plusieurs fichiers"
     ::msgcat::mcset fr "P&aste" "Coller"
     ::msgcat::mcset fr "&Quit" "&Quitter"
     ::msgcat::mcset fr "&Red" "&Rouge"
     ::msgcat::mcset fr "Replace existing file?" "Remplacer le fichier existant?"
-    ::msgcat::mcset fr "&Retry" "&R\u00e9-essayer"
+    ::msgcat::mcset fr "&Retry" "&Ré-essayer"
     ::msgcat::mcset fr "&Save" "&Sauvegarder"
     ::msgcat::mcset fr "Save As" "Sauvegarder sous"
     ::msgcat::mcset fr "Save To Log" "Sauvegarde au fichier de trace"
     ::msgcat::mcset fr "Select Log File" "Choisir un fichier de trace"
-    ::msgcat::mcset fr "Select a file to source" "Choisir un fichier \u00e0 \u00e9valuer"
-    ::msgcat::mcset fr "&Selection:" "&S\u00e9lection:"
+    ::msgcat::mcset fr "Select a file to source" "Choisir un fichier à évaluer"
+    ::msgcat::mcset fr "&Selection:" "&Sélection:"
     ::msgcat::mcset fr "Skip Messages" "Omettre les messages"
-    ::msgcat::mcset fr "&Source..." "\u00c9valuer..."
+    ::msgcat::mcset fr "&Source..." "Évaluer..."
     ::msgcat::mcset fr "Tcl Scripts" "Scripts Tcl"
     ::msgcat::mcset fr "Tcl for Windows" "Tcl pour Windows"
     ::msgcat::mcset fr "Text Files" "Fichiers texte"
     ::msgcat::mcset fr "&Yes" "&Oui"
     ::msgcat::mcset fr "abort" "abandonner"
@@ -65,8 +65,8 @@
     ::msgcat::mcset fr "extensions"
     ::msgcat::mcset fr "green" "vert"
     ::msgcat::mcset fr "ignore" "ignorer"
     ::msgcat::mcset fr "ok"
     ::msgcat::mcset fr "red" "rouge"
-    ::msgcat::mcset fr "retry" "r\u00e9essayer"
+    ::msgcat::mcset fr "retry" "réessayer"
     ::msgcat::mcset fr "yes" "oui"
 }

Index: library/msgs/hu.msg
==================================================================
--- library/msgs/hu.msg
+++ library/msgs/hu.msg
@@ -1,78 +1,78 @@
 namespace eval ::tk {
-    ::msgcat::mcset hu "&Abort" "&Megszak\u00edt\u00e1s"
-    ::msgcat::mcset hu "&About..." "N\u00e9vjegy..."
-    ::msgcat::mcset hu "All Files" "Minden f\u00e1jl"
-    ::msgcat::mcset hu "Application Error" "Alkalmaz\u00e1s hiba"
-    ::msgcat::mcset hu "&Blue" "&K\u00e9k"
-    ::msgcat::mcset hu "Cancel" "M\u00e9gsem"
-    ::msgcat::mcset hu "&Cancel" "M\u00e9g&sem"
-    ::msgcat::mcset hu "Cannot change to the directory \"%1\$s\".\nPermission denied." "A k\u00f6nyvt\u00e1rv\u00e1lt\u00e1s nem siker\u00fclt: \"%1\$s\".\nHozz\u00e1f\u00e9r\u00e9s megtagadva."
-    ::msgcat::mcset hu "Choose Directory" "K\u00f6nyvt\u00e1r kiv\u00e1laszt\u00e1sa"
-    ::msgcat::mcset hu "Cl&ear" "T\u00f6rl\u00e9s"
-    ::msgcat::mcset hu "&Clear Console" "&T\u00f6rl\u00e9s Konzol"
-    ::msgcat::mcset hu "Color" "Sz\u00edn"
+    ::msgcat::mcset hu "&Abort" "&Megszakítás"
+    ::msgcat::mcset hu "&About..." "Névjegy..."
+    ::msgcat::mcset hu "All Files" "Minden fájl"
+    ::msgcat::mcset hu "Application Error" "Alkalmazás hiba"
+    ::msgcat::mcset hu "&Blue" "&Kék"
+    ::msgcat::mcset hu "Cancel" "Mégsem"
+    ::msgcat::mcset hu "&Cancel" "Még&sem"
+    ::msgcat::mcset hu "Cannot change to the directory \"%1\$s\".\nPermission denied." "A könyvtárváltás nem sikerült: \"%1\$s\".\nHozzáférés megtagadva."
+    ::msgcat::mcset hu "Choose Directory" "Könyvtár kiválasztása"
+    ::msgcat::mcset hu "Cl&ear" "Törlés"
+    ::msgcat::mcset hu "&Clear Console" "&Törlés Konzol"
+    ::msgcat::mcset hu "Color" "Szín"
     ::msgcat::mcset hu "Console" "Konzol"
-    ::msgcat::mcset hu "&Copy" "&M\u00e1sol\u00e1s"
-    ::msgcat::mcset hu "Cu&t" "&Kiv\u00e1g\u00e1s"
-    ::msgcat::mcset hu "&Delete" "&T\u00f6rl\u00e9s"
-    ::msgcat::mcset hu "Details >>" "R\u00e9szletek >>"
-    ::msgcat::mcset hu "Directory \"%1\$s\" does not exist." "\"%1\$s\" k\u00f6nyvt\u00e1r nem l\u00e9tezik."
-    ::msgcat::mcset hu "&Directory:" "&K\u00f6nyvt\u00e1r:"
+    ::msgcat::mcset hu "&Copy" "&Másolás"
+    ::msgcat::mcset hu "Cu&t" "&Kivágás"
+    ::msgcat::mcset hu "&Delete" "&Törlés"
+    ::msgcat::mcset hu "Details >>" "Részletek >>"
+    ::msgcat::mcset hu "Directory \"%1\$s\" does not exist." "\"%1\$s\" könyvtár nem létezik."
+    ::msgcat::mcset hu "&Directory:" "&Könyvtár:"
     #::msgcat::mcset hu "&Edit"
     ::msgcat::mcset hu "Error: %1\$s" "Hiba: %1\$s"
-    ::msgcat::mcset hu "E&xit" "Kil\u00e9p\u00e9s"
-    ::msgcat::mcset hu "&File" "&F\u00e1jl"
-    ::msgcat::mcset hu "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "\"%1\$s\" f\u00e1jl m\u00e1r l\u00e9tezik.\nFel\u00fcl\u00edrjam?"
-    ::msgcat::mcset hu "File \"%1\$s\" already exists.\n\n" "\"%1\$s\" f\u00e1jl m\u00e1r l\u00e9tezik.\n\n"
-    ::msgcat::mcset hu "File \"%1\$s\" does not exist." "\"%1\$s\" f\u00e1jl nem l\u00e9tezik."
-    ::msgcat::mcset hu "File &name:" "F\u00e1jl &neve:"
-    ::msgcat::mcset hu "File &names:" "F\u00e1jlok &nevei:"
-    ::msgcat::mcset hu "Files of &type:" "F\u00e1jlok &t\u00edpusa:"
-    ::msgcat::mcset hu "Fi&les:" "F\u00e1j&lok:"
-    ::msgcat::mcset hu "&Filter" "&Sz\u0171r\u0151"
-    ::msgcat::mcset hu "Fil&ter:" "S&z\u0171r\u0151:"
-    ::msgcat::mcset hu "&Green" "&Z\u00f6ld"
+    ::msgcat::mcset hu "E&xit" "Kilépés"
+    ::msgcat::mcset hu "&File" "&Fájl"
+    ::msgcat::mcset hu "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "\"%1\$s\" fájl már létezik.\nFelülírjam?"
+    ::msgcat::mcset hu "File \"%1\$s\" already exists.\n\n" "\"%1\$s\" fájl már létezik.\n\n"
+    ::msgcat::mcset hu "File \"%1\$s\" does not exist." "\"%1\$s\" fájl nem létezik."
+    ::msgcat::mcset hu "File &name:" "Fájl &neve:"
+    ::msgcat::mcset hu "File &names:" "Fájlok &nevei:"
+    ::msgcat::mcset hu "Files of &type:" "Fájlok &típusa:"
+    ::msgcat::mcset hu "Fi&les:" "Fáj&lok:"
+    ::msgcat::mcset hu "&Filter" "&Szűrő"
+    ::msgcat::mcset hu "Fil&ter:" "S&zűrő:"
+    ::msgcat::mcset hu "&Green" "&Zöld"
     #::msgcat::mcset hu "&Help"
-    ::msgcat::mcset hu "Hi" "\u00dcdv"
-    ::msgcat::mcset hu "&Hide Console" "Konzol &elrejt\u00e9se"
-    ::msgcat::mcset hu "&Ignore" "K&ihagy\u00e1s"
-    ::msgcat::mcset hu "Invalid file name \"%1\$s\"." "\u00c9rv\u00e9nytelen f\u00e1jln\u00e9v: \"%1\$s\"."
-    ::msgcat::mcset hu "Log Files" "Log f\u00e1jlok"
+    ::msgcat::mcset hu "Hi" "Ãœdv"
+    ::msgcat::mcset hu "&Hide Console" "Konzol &elrejtése"
+    ::msgcat::mcset hu "&Ignore" "K&ihagyás"
+    ::msgcat::mcset hu "Invalid file name \"%1\$s\"." "Érvénytelen fájlnév: \"%1\$s\"."
+    ::msgcat::mcset hu "Log Files" "Log fájlok"
     ::msgcat::mcset hu "&No" "&Nem"
     ::msgcat::mcset hu "&OK"
     ::msgcat::mcset hu "OK"
     ::msgcat::mcset hu "Ok"
-    ::msgcat::mcset hu "Open" "Megnyit\u00e1s"
-    ::msgcat::mcset hu "&Open" "&Megnyit\u00e1s"
-    ::msgcat::mcset hu "Open Multiple Files" "T\u00f6bb f\u00e1jl megnyit\u00e1sa"
-    ::msgcat::mcset hu "P&aste" "&Beilleszt\u00e9s"
-    ::msgcat::mcset hu "&Quit" "&Kil\u00e9p\u00e9s"
-    ::msgcat::mcset hu "&Red" "&V\u00f6r\u00f6s"
-    ::msgcat::mcset hu "Replace existing file?" "Megl\u00e9v\u0151 f\u00e1jl cser\u00e9je?"
-    ::msgcat::mcset hu "&Retry" "\u00daj&ra"
-    ::msgcat::mcset hu "&Save" "&Ment\u00e9s"
-    ::msgcat::mcset hu "Save As" "Ment\u00e9s m\u00e1sk\u00e9nt"
-    ::msgcat::mcset hu "Save To Log" "Ment\u00e9s log f\u00e1jlba"
-    ::msgcat::mcset hu "Select Log File" "Log f\u00e1jl kiv\u00e1laszt\u00e1sa"
-    ::msgcat::mcset hu "Select a file to source" "Forr\u00e1sf\u00e1jl kiv\u00e1laszt\u00e1sa"
-    ::msgcat::mcset hu "&Selection:" "&Kijel\u00f6l\u00e9s:"
-    ::msgcat::mcset hu "Show &Hidden Directories" "&Rejtett k\u00f6nyvt\u00e1rak megjelen\u00edt\u00e9se"
-    ::msgcat::mcset hu "Show &Hidden Files and Directories" "&Rejtett f\u00e1jlok \u00e9s k\u00f6nyvt\u00e1rak megjelen\u00edt\u00e9se"
-    ::msgcat::mcset hu "Skip Messages" "\u00dczenetek kihagy\u00e1sa"
-    ::msgcat::mcset hu "&Source..." "&Forr\u00e1s..."
+    ::msgcat::mcset hu "Open" "Megnyitás"
+    ::msgcat::mcset hu "&Open" "&Megnyitás"
+    ::msgcat::mcset hu "Open Multiple Files" "Több fájl megnyitása"
+    ::msgcat::mcset hu "P&aste" "&Beillesztés"
+    ::msgcat::mcset hu "&Quit" "&Kilépés"
+    ::msgcat::mcset hu "&Red" "&Vörös"
+    ::msgcat::mcset hu "Replace existing file?" "Meglévő fájl cseréje?"
+    ::msgcat::mcset hu "&Retry" "Új&ra"
+    ::msgcat::mcset hu "&Save" "&Mentés"
+    ::msgcat::mcset hu "Save As" "Mentés másként"
+    ::msgcat::mcset hu "Save To Log" "Mentés log fájlba"
+    ::msgcat::mcset hu "Select Log File" "Log fájl kiválasztása"
+    ::msgcat::mcset hu "Select a file to source" "Forrásfájl kiválasztása"
+    ::msgcat::mcset hu "&Selection:" "&Kijelölés:"
+    ::msgcat::mcset hu "Show &Hidden Directories" "&Rejtett könyvtárak megjelenítése"
+    ::msgcat::mcset hu "Show &Hidden Files and Directories" "&Rejtett fájlok és könyvtárak megjelenítése"
+    ::msgcat::mcset hu "Skip Messages" "Üzenetek kihagyása"
+    ::msgcat::mcset hu "&Source..." "&Forrás..."
     ::msgcat::mcset hu "Tcl Scripts" "Tcl scriptek"
     ::msgcat::mcset hu "Tcl for Windows" "Tcl Windows-hoz"
-    ::msgcat::mcset hu "Text Files" "Sz\u00f6vegf\u00e1jlok"
+    ::msgcat::mcset hu "Text Files" "Szövegfájlok"
     ::msgcat::mcset hu "&Yes" "&Igen"
-    ::msgcat::mcset hu "abort" "megszak\u00edt\u00e1s"
-    ::msgcat::mcset hu "blue" "k\u00e9k"
-    ::msgcat::mcset hu "cancel" "m\u00e9gsem"
-    ::msgcat::mcset hu "extension" "kiterjeszt\u00e9s"
-    ::msgcat::mcset hu "extensions" "kiterjeszt\u00e9sek"
-    ::msgcat::mcset hu "green" "z\u00f6ld"
+    ::msgcat::mcset hu "abort" "megszakítás"
+    ::msgcat::mcset hu "blue" "kék"
+    ::msgcat::mcset hu "cancel" "mégsem"
+    ::msgcat::mcset hu "extension" "kiterjesztés"
+    ::msgcat::mcset hu "extensions" "kiterjesztések"
+    ::msgcat::mcset hu "green" "zöld"
     ::msgcat::mcset hu "ignore" "ignorer"
     ::msgcat::mcset hu "ok"
-    ::msgcat::mcset hu "red" "v\u00f6r\u00f6s"
-    ::msgcat::mcset hu "retry" "\u00fajra"
+    ::msgcat::mcset hu "red" "vörös"
+    ::msgcat::mcset hu "retry" "újra"
     ::msgcat::mcset hu "yes" "igen"
 }

Index: library/msgs/it.msg
==================================================================
--- library/msgs/it.msg
+++ library/msgs/it.msg
@@ -18,12 +18,12 @@
     ::msgcat::mcset it "Details >>" "Dettagli >>"
     ::msgcat::mcset it "Directory \"%1\$s\" does not exist." "La directory \"%1\$s\" non esiste."
     ::msgcat::mcset it "&Directory:"
     ::msgcat::mcset it "Error: %1\$s" "Errore: %1\$s"
     ::msgcat::mcset it "E&xit" "Esci"
-    ::msgcat::mcset it "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "Il file \"%1\$s\" esiste gi\u00e0.\nVuoi sovrascriverlo?"
-    ::msgcat::mcset it "File \"%1\$s\" already exists.\n\n" "Il file \"%1\$s\" esiste gi\u00e0.\n\n"
+    ::msgcat::mcset it "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "Il file \"%1\$s\" esiste già.\nVuoi sovrascriverlo?"
+    ::msgcat::mcset it "File \"%1\$s\" already exists.\n\n" "Il file \"%1\$s\" esiste già.\n\n"
     ::msgcat::mcset it "File \"%1\$s\" does not exist." "Il file \"%1\$s\" non esiste."
     ::msgcat::mcset it "File &name:" "&Nome del file:"
     ::msgcat::mcset it "File &names:" "&Nomi dei file:"
     ::msgcat::mcset it "Files of &type:" "File di &tipo:"
     ::msgcat::mcset it "Fi&les:" "Fi&le:"
@@ -56,11 +56,11 @@
     ::msgcat::mcset it "Skip Messages" "Salta i messaggi"
     ::msgcat::mcset it "Source..." "Esegui..."
     ::msgcat::mcset it "Tcl Scripts" "Script Tcl"
     ::msgcat::mcset it "Tcl for Windows" "Tcl per Windows"
     ::msgcat::mcset it "Text Files" "File di testo"
-    ::msgcat::mcset it "&Yes" "&S\u00ec"
+    ::msgcat::mcset it "&Yes" "&Sì"
     ::msgcat::mcset it "abort" "interrompi"
     ::msgcat::mcset it "blue" "blu"
     ::msgcat::mcset it "cancel" "annulla"
     ::msgcat::mcset it "extension" "estensione"
     ::msgcat::mcset it "extensions" "estensioni"
@@ -67,7 +67,7 @@
     ::msgcat::mcset it "green" "verde"
     ::msgcat::mcset it "ignore" "ignora"
     ::msgcat::mcset it "ok"
     ::msgcat::mcset it "red" "rosso"
     ::msgcat::mcset it "retry" "riprova"
-    ::msgcat::mcset it "yes" "s\u00ec"
+    ::msgcat::mcset it "yes" "sì"
 }

Index: library/msgs/nl.msg
==================================================================
--- library/msgs/nl.msg
+++ library/msgs/nl.msg
@@ -13,20 +13,20 @@
     ::msgcat::mcset nl "Choose Directory" "Kies map"
     ::msgcat::mcset nl "Cl&ear" "Wissen"
     ::msgcat::mcset nl "&Clear Console" "&Wis Console"
     ::msgcat::mcset nl "Color" "Kleur"
     ::msgcat::mcset nl "Console"
-    ::msgcat::mcset nl "&Copy" "Kopi\u00ebren"
+    ::msgcat::mcset nl "&Copy" "Kopiëren"
     ::msgcat::mcset nl "Cu&t" "Knippen"
     ::msgcat::mcset nl "&Delete" "Wissen"
     ::msgcat::mcset nl "Details >>"
     ::msgcat::mcset nl "Directory \"%1\$s\" does not exist." "Map \"%1\$s\" bestaat niet."
     ::msgcat::mcset nl "&Directory:" "&Map:"
     ::msgcat::mcset nl "&Edit" "Bewerken"
     ::msgcat::mcset nl "Effects" "Effecten"
     ::msgcat::mcset nl "Error: %1\$s" "Fout: %1\$s"
-    ::msgcat::mcset nl "E&xit" "Be\u00ebindigen"
+    ::msgcat::mcset nl "E&xit" "Beëindigen"
     ::msgcat::mcset nl "&File" "Bestand"
     ::msgcat::mcset nl "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "Bestand \"%1\$s\" bestaat al.\nWilt u het overschrijven?"
     ::msgcat::mcset nl "File \"%1\$s\" already exists.\n\n" "Bestand \"%1\$s\" bestaat al.\n\n"
     ::msgcat::mcset nl "File \"%1\$s\" does not exist." "Bestand \"%1\$s\" bestaat niet."
     ::msgcat::mcset nl "File &name:" "Bestands&naam:"
@@ -38,11 +38,11 @@
     ::msgcat::mcset nl "Font"
     ::msgcat::mcset nl "&Font:"
     ::msgcat::mcset nl "Font st&yle:" "Font stijl:"
     ::msgcat::mcset nl "&Green" "&Groen"
     ::msgcat::mcset nl "&Help"
-    ::msgcat::mcset nl "Hi" "H\u00e9"
+    ::msgcat::mcset nl "Hi" "Hé"
     ::msgcat::mcset nl "&Hide Console" "Verberg Console"
     ::msgcat::mcset nl "&Ignore" "&Negeren"
     ::msgcat::mcset nl "Invalid file name \"%1\$s\"." "Ongeldige bestandsnaam \"%1\$s\"."
     ::msgcat::mcset nl "Italic" "Cursief"
     ::msgcat::mcset nl "Log Files" "Log Bestanden"

Index: library/msgs/pl.msg
==================================================================
--- library/msgs/pl.msg
+++ library/msgs/pl.msg
@@ -1,38 +1,38 @@
 namespace eval ::tk {
     ::msgcat::mcset pl "&Abort" "&Przerwij"
     ::msgcat::mcset pl "&About..." "O programie..."
     ::msgcat::mcset pl "All Files" "Wszystkie pliki"
-    ::msgcat::mcset pl "Application Error" "B\u0142\u0105d w programie"
+    ::msgcat::mcset pl "Application Error" "BÅ‚Ä…d w programie"
     ::msgcat::mcset pl "&Apply" "Zastosuj"
     ::msgcat::mcset pl "Bold" "Pogrubienie"
     ::msgcat::mcset pl "Bold Italic" "Pogrubiona kursywa"
     ::msgcat::mcset pl "&Blue" "&Niebieski"
     ::msgcat::mcset pl "Cancel" "Anuluj"
     ::msgcat::mcset pl "&Cancel" "&Anuluj"
-    ::msgcat::mcset pl "Cannot change to the directory \"%1\$s\".\nPermission denied." "Nie mo\u017cna otworzy\u0107 katalogu \"%1\$s\".\nOdmowa dost\u0119pu."
+    ::msgcat::mcset pl "Cannot change to the directory \"%1\$s\".\nPermission denied." "Nie można otworzyć katalogu \"%1\$s\".\nOdmowa dostępu."
     ::msgcat::mcset pl "Choose Directory" "Wybierz katalog"
-    ::msgcat::mcset pl "Cl&ear" "&Wyczy\u015b\u0107"
-    ::msgcat::mcset pl "&Clear Console" "&Wyczy\u015b\u0107 konsol\u0119"
+    ::msgcat::mcset pl "Cl&ear" "&Wyczyść"
+    ::msgcat::mcset pl "&Clear Console" "&Wyczyść konsolę"
     ::msgcat::mcset pl "Color" "Kolor"
     ::msgcat::mcset pl "Console" "Konsola"
     ::msgcat::mcset pl "&Copy" "&Kopiuj"
     ::msgcat::mcset pl "Cu&t" "&Wytnij"
-    ::msgcat::mcset pl "&Delete" "&Usu\u0144"
-    ::msgcat::mcset pl "Details >>" "Szczeg\u00f3\u0142y >>"
+    ::msgcat::mcset pl "&Delete" "&Usuń"
+    ::msgcat::mcset pl "Details >>" "Szczegóły >>"
     ::msgcat::mcset pl "Directory \"%1\$s\" does not exist." "Katalog \"%1\$s\" nie istnieje."
     ::msgcat::mcset pl "&Directory:" "&Katalog:"
     ::msgcat::mcset pl "&Edit" "&Edytuj"
     ::msgcat::mcset pl "Effects" "Efekty"
-    ::msgcat::mcset pl "Error: %1\$s" "B\u0142\u0105d: %1\$s"
-    ::msgcat::mcset pl "E&xit" "&Wyjd\u017a"
+    ::msgcat::mcset pl "Error: %1\$s" "BÅ‚Ä…d: %1\$s"
+    ::msgcat::mcset pl "E&xit" "&Wyjdź"
     ::msgcat::mcset pl "&File" "&Plik"
-    ::msgcat::mcset pl "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "Plik \"%1\$s\" ju\u017c istnieje.\nCzy chcesz go nadpisa\u0107?"
-    ::msgcat::mcset pl "File \"%1\$s\" already exists.\n\n" "Plik \"%1\$s\" ju\u017c istnieje.\n\n"
+    ::msgcat::mcset pl "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "Plik \"%1\$s\" już istnieje.\nCzy chcesz go nadpisać?"
+    ::msgcat::mcset pl "File \"%1\$s\" already exists.\n\n" "Plik \"%1\$s\" już istnieje.\n\n"
     ::msgcat::mcset pl "File \"%1\$s\" does not exist." "Plik \"%1\$s\" nie istnieje."
     ::msgcat::mcset pl "File &name:" "Nazwa &pliku:"
-    ::msgcat::mcset pl "File &names:" "Nazwy &plik\u00f3w:"
+    ::msgcat::mcset pl "File &names:" "Nazwy &plików:"
     ::msgcat::mcset pl "Files of &type:" "Pliki &typu:"
     ::msgcat::mcset pl "Fi&les:" "Pli&ki:"
     ::msgcat::mcset pl "&Filter" "&Filtr"
     ::msgcat::mcset pl "Fil&ter:" "&Filtr:"
     ::msgcat::mcset pl "Font" "Czcionka"
@@ -39,45 +39,45 @@
     ::msgcat::mcset pl "&Font:" "Czcio&nka:"
     ::msgcat::mcset pl "Font st&yle:" "&Styl czcionki:"
     ::msgcat::mcset pl "&Green" "&Zielony"
     ::msgcat::mcset pl "&Help" "&Pomoc"
     ::msgcat::mcset pl "Hi" "Witaj"
-    ::msgcat::mcset pl "&Hide Console" "&Ukryj konsol\u0119"
+    ::msgcat::mcset pl "&Hide Console" "&Ukryj konsolÄ™"
     ::msgcat::mcset pl "&Ignore" "&Ignoruj"
-    ::msgcat::mcset pl "Invalid file name \"%1\$s\"." "Niew\u0142a\u015bciwa nazwa pliku \"%1\$s\"."
+    ::msgcat::mcset pl "Invalid file name \"%1\$s\"." "Niewłaściwa nazwa pliku \"%1\$s\"."
     ::msgcat::mcset pl "Italic" "Kursywa"
     ::msgcat::mcset pl "Log Files" "Pliki dziennika"
     ::msgcat::mcset pl "&No" "&Nie"
     ::msgcat::mcset pl "&OK"
     ::msgcat::mcset pl "OK"
     ::msgcat::mcset pl "Ok"
-    ::msgcat::mcset pl "Open" "Otw\u00f3rz"
-    ::msgcat::mcset pl "&Open" "&Otw\u00f3rz"
-    ::msgcat::mcset pl "Open Multiple Files" "Otw\u00f3rz wiele plik\u00f3w"
+    ::msgcat::mcset pl "Open" "Otwórz"
+    ::msgcat::mcset pl "&Open" "&Otwórz"
+    ::msgcat::mcset pl "Open Multiple Files" "Otwórz wiele plików"
     ::msgcat::mcset pl "P&aste" "&Wklej"
-    ::msgcat::mcset pl "&Quit" "&Zako\u0144cz"
+    ::msgcat::mcset pl "&Quit" "&Zakończ"
     ::msgcat::mcset pl "&Red" "&Czerwony"
     ::msgcat::mcset pl "Regular" "Regularne"
-    ::msgcat::mcset pl "Replace existing file?" "Czy zast\u0105pi\u0107 istniej\u0105cy plik?"
-    ::msgcat::mcset pl "&Retry" "&Pon\u00f3w"
-    ::msgcat::mcset pl "Sample" "Przyk\u0142ad"
+    ::msgcat::mcset pl "Replace existing file?" "Czy zastąpić istniejący plik?"
+    ::msgcat::mcset pl "&Retry" "&Ponów"
+    ::msgcat::mcset pl "Sample" "Przykład"
     ::msgcat::mcset pl "&Save" "&Zapisz"
     ::msgcat::mcset pl "Save As" "Zapisz jako"
     ::msgcat::mcset pl "Save To Log" "Wpisz do dziennika"
     ::msgcat::mcset pl "Select Log File" "Wybierz plik dziennika"
     ::msgcat::mcset pl "Select a file to source" "Wybierz plik do wykonania"
-    ::msgcat::mcset pl "&Selection:" "&Wyb\u00f3r:"
+    ::msgcat::mcset pl "&Selection:" "&Wybór:"
     ::msgcat::mcset pl "&Size:" "&Rozmiar:"
-    ::msgcat::mcset pl "Show &Hidden Directories" "Poka\u017c &ukryte katalogi"
-    ::msgcat::mcset pl "Show &Hidden Files and Directories" "Poka\u017c &ukryte pliki i katalogi"
-    ::msgcat::mcset pl "Skip Messages" "Pomi\u0144 pozosta\u0142e komunikaty"
-    ::msgcat::mcset pl "&Source..." "&Kod \u017ar\u00f3d\u0142owy..."
-    ::msgcat::mcset pl "Stri&keout" "&Przekre\u015blenie"
+    ::msgcat::mcset pl "Show &Hidden Directories" "Pokaż &ukryte katalogi"
+    ::msgcat::mcset pl "Show &Hidden Files and Directories" "Pokaż &ukryte pliki i katalogi"
+    ::msgcat::mcset pl "Skip Messages" "Pomiń pozostałe komunikaty"
+    ::msgcat::mcset pl "&Source..." "&Kod źródłowy..."
+    ::msgcat::mcset pl "Stri&keout" "&Przekreślenie"
     ::msgcat::mcset pl "Tcl Scripts" "Skrypty Tcl"
     ::msgcat::mcset pl "Tcl for Windows" "Tcl dla Windows"
     ::msgcat::mcset pl "Text Files" "Pliki tekstowe"
-    ::msgcat::mcset pl "&Underline" "Po&dkre\u015blenie"
+    ::msgcat::mcset pl "&Underline" "Po&dkreślenie"
     ::msgcat::mcset pl "&Yes" "&Tak"
     ::msgcat::mcset pl "abort" "przerwij"
     ::msgcat::mcset pl "blue" "niebieski"
     ::msgcat::mcset pl "cancel" "anuluj"
     ::msgcat::mcset pl "extension" "rozszerzenie"
@@ -84,8 +84,8 @@
     ::msgcat::mcset pl "extensions" "rozszerzenia"
     ::msgcat::mcset pl "green" "zielony"
     ::msgcat::mcset pl "ignore" "ignoruj"
     ::msgcat::mcset pl "ok"
     ::msgcat::mcset pl "red" "czerwony"
-    ::msgcat::mcset pl "retry" "pon\u00f3w"
+    ::msgcat::mcset pl "retry" "ponów"
     ::msgcat::mcset pl "yes" "tak"
 }

Index: library/msgs/pt.msg
==================================================================
--- library/msgs/pt.msg
+++ library/msgs/pt.msg
@@ -1,31 +1,31 @@
 namespace eval ::tk {
     ::msgcat::mcset pt "&Abort" "&Abortar"
     ::msgcat::mcset pt "About..." "Sobre ..."
     ::msgcat::mcset pt "All Files" "Todos os arquivos"
-    ::msgcat::mcset pt "Application Error" "Erro de aplica\u00e7\u00e3o"
+    ::msgcat::mcset pt "Application Error" "Erro de aplicação"
     ::msgcat::mcset pt "&Blue" "&Azul"
     ::msgcat::mcset pt "Cancel" "Cancelar"
     ::msgcat::mcset pt "&Cancel" "&Cancelar"
-    ::msgcat::mcset pt "Cannot change to the directory \"%1\$s\".\nPermission denied." "N\u00e3o foi poss\u00edvel mudar para o diret\u00f3rio \"%1\$s\".\nPermiss\u00e3o negada."
-    ::msgcat::mcset pt "Choose Directory" "Escolha um diret\u00f3rio"
+    ::msgcat::mcset pt "Cannot change to the directory \"%1\$s\".\nPermission denied." "Não foi possível mudar para o diretório \"%1\$s\".\nPermissão negada."
+    ::msgcat::mcset pt "Choose Directory" "Escolha um diretório"
     ::msgcat::mcset pt "Cl&ear" "Apagar"
     ::msgcat::mcset pt "&Clear Console" "Apagar Console"
     ::msgcat::mcset pt "Color" "Cor"
     ::msgcat::mcset pt "Console"
     ::msgcat::mcset pt "&Copy" "Copiar"
     ::msgcat::mcset pt "Cu&t" "Recortar"
     ::msgcat::mcset pt "&Delete" "Excluir"
     ::msgcat::mcset pt "Details >>" "Detalhes >>"
-    ::msgcat::mcset pt "Directory \"%1\$s\" does not exist." "O diret\u00f3rio \"%1\$s\" n\u00e3o existe."
-    ::msgcat::mcset pt "&Directory:" "&Diret\u00f3rio:"
+    ::msgcat::mcset pt "Directory \"%1\$s\" does not exist." "O diretório \"%1\$s\" não existe."
+    ::msgcat::mcset pt "&Directory:" "&Diretório:"
     ::msgcat::mcset pt "Error: %1\$s" "Erro: %1\$s"
     ::msgcat::mcset pt "E&xit" "Sair"
     ::msgcat::mcset pt "&File" "Arquivo"
-    ::msgcat::mcset pt "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "O arquivo \"%1\$s\" j\u00e1 existe.\nDeseja sobrescreve-lo?"
-    ::msgcat::mcset pt "File \"%1\$s\" already exists.\n\n" "O arquivo \"%1\$s\" j\u00e1 existe.\n\n"
-    ::msgcat::mcset pt "File \"%1\$s\" does not exist." "Arquivo \"%1\$s\" n\u00e3o existe."
+    ::msgcat::mcset pt "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "O arquivo \"%1\$s\" já existe.\nDeseja sobrescreve-lo?"
+    ::msgcat::mcset pt "File \"%1\$s\" already exists.\n\n" "O arquivo \"%1\$s\" já existe.\n\n"
+    ::msgcat::mcset pt "File \"%1\$s\" does not exist." "Arquivo \"%1\$s\" não existe."
     ::msgcat::mcset pt "File &name:" "&Nome do arquivo:"
     ::msgcat::mcset pt "File &names:" "&Nomes dos arquivos:"
     ::msgcat::mcset pt "Files of &type:" "Arquivos do &tipo:"
     ::msgcat::mcset pt "Fi&les:" "&Arquivos:"
     ::msgcat::mcset pt "&Filter" "&Filtro"
@@ -32,19 +32,19 @@
     ::msgcat::mcset pt "Fil&ter:" "Fil&tro:"
     ::msgcat::mcset pt "&Green" "&Verde"
     ::msgcat::mcset pt "Hi" "Oi"
     ::msgcat::mcset pt "&Hide Console" "Ocultar console"
     ::msgcat::mcset pt "&Ignore" "&Ignorar"
-    ::msgcat::mcset pt "Invalid file name \"%1\$s\"." "O nome do arquivo \u00e9 inv\u00e1lido \"%1\$s\"."
+    ::msgcat::mcset pt "Invalid file name \"%1\$s\"." "O nome do arquivo é inválido \"%1\$s\"."
     ::msgcat::mcset pt "Log Files" "Arquivos de log"
-    ::msgcat::mcset pt "&No" "&N\u00e3o"
+    ::msgcat::mcset pt "&No" "&Não"
     ::msgcat::mcset pt "&OK"
     ::msgcat::mcset pt "OK"
     ::msgcat::mcset pt "Ok"
     ::msgcat::mcset pt "Open" "Abrir"
     ::msgcat::mcset pt "&Open" "&Abrir"
-    ::msgcat::mcset pt "Open Multiple Files" "Abrir m\u00faltiplos arquivos"
+    ::msgcat::mcset pt "Open Multiple Files" "Abrir múltiplos arquivos"
     ::msgcat::mcset pt "P&aste" "Col&ar"
     ::msgcat::mcset pt "Quit" "Encerrar"
     ::msgcat::mcset pt "&Red" "&Vermelho"
     ::msgcat::mcset pt "Replace existing file?" "Substituir arquivo existente?"
     ::msgcat::mcset pt "&Retry" "Tenta&r novamente"
@@ -51,24 +51,24 @@
     ::msgcat::mcset pt "&Save" "&Salvar"
     ::msgcat::mcset pt "Save As" "Salvar como"
     ::msgcat::mcset pt "Save To Log" "Salvar arquivo de log"
     ::msgcat::mcset pt "Select Log File" "Selecionar arquivo de log"
     ::msgcat::mcset pt "Select a file to source" "Selecione um arquivo como fonte"
-    ::msgcat::mcset pt "&Selection:" "&Sele\u00e7\u00e3o:"
+    ::msgcat::mcset pt "&Selection:" "&Seleção:"
     ::msgcat::mcset pt "Skip Messages" "Omitir as mensagens"
     ::msgcat::mcset pt "&Source..." "&Fonte..."
     ::msgcat::mcset pt "Tcl Scripts" "Scripts Tcl"
     ::msgcat::mcset pt "Tcl for Windows" "Tcl para Windows"
     ::msgcat::mcset pt "Text Files" "Arquivos de texto"
     ::msgcat::mcset pt "&Yes" "&Sim"
     ::msgcat::mcset pt "abort" "abortar"
     ::msgcat::mcset pt "blue" "azul"
     ::msgcat::mcset pt "cancel" "cancelar"
-    ::msgcat::mcset pt "extension" "extens\u00e3o"
-    ::msgcat::mcset pt "extensions" "extens\u00f5es"
+    ::msgcat::mcset pt "extension" "extensão"
+    ::msgcat::mcset pt "extensions" "extensões"
     ::msgcat::mcset pt "green" "verde"
     ::msgcat::mcset pt "ignore" "ignorar"
     ::msgcat::mcset pt "ok"
     ::msgcat::mcset pt "red" "vermelho"
     ::msgcat::mcset pt "retry" "tentar novamente"
     ::msgcat::mcset pt "yes" "sim"
 }

Index: library/msgs/ru.msg
==================================================================
--- library/msgs/ru.msg
+++ library/msgs/ru.msg
@@ -1,75 +1,75 @@
 namespace eval ::tk {
-    ::msgcat::mcset ru "&Abort" "&\u041e\u0442\u043c\u0435\u043d\u0438\u0442\u044c"
-    ::msgcat::mcset ru "&About..." "\u041f\u0440\u043e..."
-    ::msgcat::mcset ru "All Files" "\u0412\u0441\u0435 \u0444\u0430\u0439\u043b\u044b"
-    ::msgcat::mcset ru "Application Error" "\u041e\u0448\u0438\u0431\u043a\u0430 \u0432 \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u0435"
-    ::msgcat::mcset ru "&Blue" " &\u0413\u043e\u043b\u0443\u0431\u043e\u0439"
-    ::msgcat::mcset ru "Cancel" "\u041e\u0442&\u043c\u0435\u043d\u0430"
-    ::msgcat::mcset ru "&Cancel" "\u041e\u0442&\u043c\u0435\u043d\u0430"
+    ::msgcat::mcset ru "&Abort" "&Отменить"
+    ::msgcat::mcset ru "&About..." "Про..."
+    ::msgcat::mcset ru "All Files" "В�е файлы"
+    ::msgcat::mcset ru "Application Error" "Ошибка в программе"
+    ::msgcat::mcset ru "&Blue" " &Голубой"
+    ::msgcat::mcset ru "Cancel" "От&мена"
+    ::msgcat::mcset ru "&Cancel" "От&мена"
     ::msgcat::mcset ru "Cannot change to the directory \"%1\$s\".\nPermission denied." \
-			"\u041d\u0435 \u043c\u043e\u0433\u0443 \u043f\u0435\u0440\u0435\u0439\u0442\u0438 \u0432 \u043a\u0430\u0442\u0430\u043b\u043e\u0433 \"%1\$s\".\n\u041d\u0435\u0434\u043e\u0441\u0442\u0430\u0442\u043e\u0447\u043d\u043e \u043f\u0440\u0430\u0432 \u0434\u043e\u0441\u0442\u0443\u043f\u0430"
-    ::msgcat::mcset ru "Choose Directory" "\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u043a\u0430\u0442\u0430\u043b\u043e\u0433"
-    ::msgcat::mcset ru "Cl&ear" "\u041e\u0447\u0438\u0441\u0442\u0438\u0442\u044c"
-    ::msgcat::mcset ru "Color" "\u0426\u0432\u0435\u0442"
-    ::msgcat::mcset ru "Console" "\u041a\u043e\u043d\u0441\u043e\u043b\u044c"
-    ::msgcat::mcset ru "&Copy" "\u041a\u043e\u043f\u0438\u0440\u043e\u0432\u0430\u0442\u044c"
-    ::msgcat::mcset ru "Cu&t" "\u0412\u044b\u0440\u0435\u0437\u0430\u0442\u044c"
-    ::msgcat::mcset ru "&Delete" "\u0423\u0434\u0430\u043b\u0438\u0442\u044c"
-    ::msgcat::mcset ru "Details >>" "\u041f\u043e\u0434\u0440\u043e\u0431\u043d\u0435\u0435 >>"
-    ::msgcat::mcset ru "Directory \"%1\$s\" does not exist." "\u041a\u0430\u0442\u0430\u043b\u043e\u0433\u0430 \"%1\$s\" \u043d\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442."
-    ::msgcat::mcset ru "&Directory:" "&\u041a\u0430\u0442\u0430\u043b\u043e\u0433:"
-    ::msgcat::mcset ru "Error: %1\$s" "\u041e\u0448\u0438\u0431\u043a\u0430: %1\$s"
-    ::msgcat::mcset ru "E&xit" "\u0412\u044b\u0445\u043e\u0434"
+			"�е могу перейти в каталог \"%1\$s\".\n�едо�таточно прав до�тупа"
+    ::msgcat::mcset ru "Choose Directory" "Выберите каталог"
+    ::msgcat::mcset ru "Cl&ear" "Очи�тить"
+    ::msgcat::mcset ru "Color" "Цвет"
+    ::msgcat::mcset ru "Console" "Кон�оль"
+    ::msgcat::mcset ru "&Copy" "Копировать"
+    ::msgcat::mcset ru "Cu&t" "Вырезать"
+    ::msgcat::mcset ru "&Delete" "Удалить"
+    ::msgcat::mcset ru "Details >>" "Подробнее >>"
+    ::msgcat::mcset ru "Directory \"%1\$s\" does not exist." "Каталога \"%1\$s\" не �уще�твует."
+    ::msgcat::mcset ru "&Directory:" "&Каталог:"
+    ::msgcat::mcset ru "Error: %1\$s" "Ошибка: %1\$s"
+    ::msgcat::mcset ru "E&xit" "Выход"
     ::msgcat::mcset ru "File \"%1\$s\" already exists.\nDo you want to overwrite it?" \
-			    "\u0424\u0430\u0439\u043b \"%1\$s\" \u0443\u0436\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442.\n\u0417\u0430\u043c\u0435\u043d\u0438\u0442\u044c \u0435\u0433\u043e?"
-    ::msgcat::mcset ru "File \"%1\$s\" already exists.\n\n" "\u0424\u0430\u0439\u043b \"%1\$s\" \u0443\u0436\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442.\n\n"
-    ::msgcat::mcset ru "File \"%1\$s\" does not exist." "\u0424\u0430\u0439\u043b \"%1\$s\" \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d."
-    ::msgcat::mcset ru "File &name:" "&\u0418\u043c\u044f \u0444\u0430\u0439\u043b\u0430:"
-    ::msgcat::mcset ru "File &names:" "&\u0418\u043c\u0435\u043d\u0430 \u0444\u0430\u0439\u043b\u043e\u0432:"
-    ::msgcat::mcset ru "Files of &type:" "&\u0422\u0438\u043f \u0444\u0430\u0439\u043b\u043e\u0432:"
-    ::msgcat::mcset ru "Fi&les:" "\u0424\u0430\u0439&\u043b\u044b:"
-    ::msgcat::mcset ru "&Filter" "&\u0424\u0438\u043b\u044c\u0442\u0440"
-    ::msgcat::mcset ru "Fil&ter:" "\u0424\u0438\u043b\u044c&\u0442\u0440:"
-    ::msgcat::mcset ru "&Green" " &\u0417\u0435\u043b\u0435\u043d\u044b\u0439"
-    ::msgcat::mcset ru "Hi" "\u041f\u0440\u0438\u0432\u0435\u0442"
-    ::msgcat::mcset ru "&Hide Console" "\u0421\u043f\u0440\u044f\u0442\u0430\u0442\u044c \u043a\u043e\u043d\u0441\u043e\u043b\u044c"
-    ::msgcat::mcset ru "&Ignore" "&\u0418\u0433\u043d\u043e\u0440\u0438\u0440\u043e\u0432\u0430\u0442\u044c"
-    ::msgcat::mcset ru "Invalid file name \"%1\$s\"." "\u041d\u0435\u0432\u0435\u0440\u043d\u043e\u0435 \u0438\u043c\u044f \u0444\u0430\u0439\u043b\u0430 \"%1\$s\"."
-    ::msgcat::mcset ru "Log Files" "\u0424\u0430\u0439\u043b\u044b \u0436\u0443\u0440\u043d\u0430\u043b\u0430"
-    ::msgcat::mcset ru "&No" "&\u041d\u0435\u0442"
-    ::msgcat::mcset ru "&OK" "&\u041e\u041a"
-    ::msgcat::mcset ru "OK" "\u041e\u041a"
-    ::msgcat::mcset ru "Ok" "\u0414\u0430"
-    ::msgcat::mcset ru "Open" "\u041e\u0442\u043a\u0440\u044b\u0442\u044c"
-    ::msgcat::mcset ru "&Open" "&\u041e\u0442\u043a\u0440\u044b\u0442\u044c"
-    ::msgcat::mcset ru "Open Multiple Files" "\u041e\u0442\u043a\u0440\u044b\u0442\u044c \u043d\u0435\u0441\u043a\u043e\u043b\u044c\u043a\u043e \u0444\u0430\u0439\u043b\u043e\u0432"
-    ::msgcat::mcset ru "P&aste" "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c"
-    ::msgcat::mcset ru "&Quit" "\u0412\u044b\u0445\u043e\u0434"
-    ::msgcat::mcset ru "&Red" " &\u041a\u0440\u0430\u0441\u043d\u044b\u0439"
-    ::msgcat::mcset ru "Replace existing file?" "\u0417\u0430\u043c\u0435\u043d\u0438\u0442\u044c \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u044e\u0449\u0438\u0439 \u0444\u0430\u0439\u043b?"
-    ::msgcat::mcset ru "&Retry" "&\u041f\u043e\u0432\u0442\u043e\u0440\u0438\u0442\u044c"
-    ::msgcat::mcset ru "&Save" "&\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c"
-    ::msgcat::mcset ru "Save As" "\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c \u043a\u0430\u043a"
-    ::msgcat::mcset ru "Save To Log" "\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c \u0432 \u0436\u0443\u0440\u043d\u0430\u043b"
-    ::msgcat::mcset ru "Select Log File" "\u0412\u044b\u0431\u0440\u0430\u0442\u044c \u0436\u0443\u0440\u043d\u0430\u043b"
-    ::msgcat::mcset ru "Select a file to source" "\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0444\u0430\u0439\u043b \u0434\u043b\u044f \u0438\u043d\u0442\u0435\u0440\u043f\u0440\u0435\u0442\u0430\u0446\u0438\u0438"
+			    "Файл \"%1\$s\" уже �уще�твует.\nЗаменить его?"
+    ::msgcat::mcset ru "File \"%1\$s\" already exists.\n\n" "Файл \"%1\$s\" уже �уще�твует.\n\n"
+    ::msgcat::mcset ru "File \"%1\$s\" does not exist." "Файл \"%1\$s\" не найден."
+    ::msgcat::mcset ru "File &name:" "&Им� файла:"
+    ::msgcat::mcset ru "File &names:" "&Имена файлов:"
+    ::msgcat::mcset ru "Files of &type:" "&Тип файлов:"
+    ::msgcat::mcset ru "Fi&les:" "Фай&лы:"
+    ::msgcat::mcset ru "&Filter" "&Фильтр"
+    ::msgcat::mcset ru "Fil&ter:" "Филь&тр:"
+    ::msgcat::mcset ru "&Green" " &Зеленый"
+    ::msgcat::mcset ru "Hi" "Привет"
+    ::msgcat::mcset ru "&Hide Console" "Спр�тать кон�оль"
+    ::msgcat::mcset ru "&Ignore" "&Игнорировать"
+    ::msgcat::mcset ru "Invalid file name \"%1\$s\"." "�еверное им� файла \"%1\$s\"."
+    ::msgcat::mcset ru "Log Files" "Файлы журнала"
+    ::msgcat::mcset ru "&No" "&�ет"
+    ::msgcat::mcset ru "&OK" "&ОК"
+    ::msgcat::mcset ru "OK" "ОК"
+    ::msgcat::mcset ru "Ok" "Да"
+    ::msgcat::mcset ru "Open" "Открыть"
+    ::msgcat::mcset ru "&Open" "&Открыть"
+    ::msgcat::mcset ru "Open Multiple Files" "Открыть не�колько файлов"
+    ::msgcat::mcset ru "P&aste" "В�тавить"
+    ::msgcat::mcset ru "&Quit" "Выход"
+    ::msgcat::mcset ru "&Red" " &Кра�ный"
+    ::msgcat::mcset ru "Replace existing file?" "Заменить �уще�твующий файл?"
+    ::msgcat::mcset ru "&Retry" "&Повторить"
+    ::msgcat::mcset ru "&Save" "&Сохранить"
+    ::msgcat::mcset ru "Save As" "Сохранить как"
+    ::msgcat::mcset ru "Save To Log" "Сохранить в журнал"
+    ::msgcat::mcset ru "Select Log File" "Выбрать журнал"
+    ::msgcat::mcset ru "Select a file to source" "Выберите файл дл� интерпретации"
     ::msgcat::mcset ru "&Selection:"
-    ::msgcat::mcset ru "Skip Messages" "\u041f\u0440\u043e\u043f\u0443\u0441\u0442\u0438\u0442\u044c \u0441\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u044f"
-    ::msgcat::mcset ru "&Source..." "\u0418\u043d\u0442\u0435\u0440\u043f\u0440\u0435\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0444\u0430\u0439\u043b..."
-    ::msgcat::mcset ru "Tcl Scripts" "\u041f\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u0430 \u043d\u0430 \u044f\u0437\u044b\u043a\u0435 TCL"
-    ::msgcat::mcset ru "Tcl for Windows" "TCL \u0434\u043b\u044f Windows"
-    ::msgcat::mcset ru "Text Files" "\u0422\u0435\u043a\u0441\u0442\u043e\u0432\u044b\u0435 \u0444\u0430\u0439\u043b\u044b"
-    ::msgcat::mcset ru "&Yes" "&\u0414\u0430"
-    ::msgcat::mcset ru "abort" "\u043e\u0442\u043c\u0435\u043d\u0430"
-    ::msgcat::mcset ru "blue" " \u0433\u043e\u043b\u0443\u0431\u043e\u0439"
-    ::msgcat::mcset ru "cancel" "\u043e\u0442\u043c\u0435\u043d\u0430"
-    ::msgcat::mcset ru "extension" "\u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u0438\u0435"
-    ::msgcat::mcset ru "extensions" "\u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u0438\u044f"
-    ::msgcat::mcset ru "green" " \u0437\u0435\u043b\u0435\u043d\u044b\u0439"
-    ::msgcat::mcset ru "ignore" "\u043f\u0440\u043e\u043f\u0443\u0441\u0442\u0438\u0442\u044c"
-    ::msgcat::mcset ru "ok" "\u043e\u043a"
-    ::msgcat::mcset ru "red" " \u043a\u0440\u0430\u0441\u043d\u044b\u0439"
-    ::msgcat::mcset ru "retry" "\u043f\u043e\u0432\u0442\u043e\u0440\u0438\u0442\u044c"
-    ::msgcat::mcset ru "yes" "\u0434\u0430"
+    ::msgcat::mcset ru "Skip Messages" "Пропу�тить �ообщени�"
+    ::msgcat::mcset ru "&Source..." "Интерпретировать файл..."
+    ::msgcat::mcset ru "Tcl Scripts" "Программа на �зыке TCL"
+    ::msgcat::mcset ru "Tcl for Windows" "TCL дл� Windows"
+    ::msgcat::mcset ru "Text Files" "Тек�товые файлы"
+    ::msgcat::mcset ru "&Yes" "&Да"
+    ::msgcat::mcset ru "abort" "отмена"
+    ::msgcat::mcset ru "blue" " голубой"
+    ::msgcat::mcset ru "cancel" "отмена"
+    ::msgcat::mcset ru "extension" "ра�ширение"
+    ::msgcat::mcset ru "extensions" "ра�ширени�"
+    ::msgcat::mcset ru "green" " зеленый"
+    ::msgcat::mcset ru "ignore" "пропу�тить"
+    ::msgcat::mcset ru "ok" "ок"
+    ::msgcat::mcset ru "red" " кра�ный"
+    ::msgcat::mcset ru "retry" "повторить"
+    ::msgcat::mcset ru "yes" "да"
 }
 

Index: library/msgs/sv.msg
==================================================================
--- library/msgs/sv.msg
+++ library/msgs/sv.msg
@@ -1,18 +1,18 @@
 namespace eval ::tk {
     ::msgcat::mcset sv "&Abort" "&Avsluta"
     ::msgcat::mcset sv "&About..." "&Om..."
     ::msgcat::mcset sv "All Files" "Samtliga filer"
     ::msgcat::mcset sv "Application Error" "Programfel"
-    ::msgcat::mcset sv "&Blue" "&Bl\u00e5"
+    ::msgcat::mcset sv "&Blue" "&Blå"
     ::msgcat::mcset sv "Cancel" "Avbryt"
     ::msgcat::mcset sv "&Cancel" "&Avbryt"
-    ::msgcat::mcset sv "Cannot change to the directory \"%1\$s\".\nPermission denied." "Kan ej n\u00e5 mappen \"%1\$s\".\nSaknar r\u00e4ttigheter."
-    ::msgcat::mcset sv "Choose Directory" "V\u00e4lj mapp"
+    ::msgcat::mcset sv "Cannot change to the directory \"%1\$s\".\nPermission denied." "Kan ej nå mappen \"%1\$s\".\nSaknar rättigheter."
+    ::msgcat::mcset sv "Choose Directory" "Välj mapp"
     ::msgcat::mcset sv "Cl&ear" "&Radera"
     ::msgcat::mcset sv "&Clear Console" "&Radera konsollen"
-    ::msgcat::mcset sv "Color" "F\u00e4rg"
+    ::msgcat::mcset sv "Color" "Färg"
     ::msgcat::mcset sv "Console" "Konsoll"
     ::msgcat::mcset sv "&Copy" "&Kopiera"
     ::msgcat::mcset sv "Cu&t" "Klipp u&t"
     ::msgcat::mcset sv "&Delete" "&Radera"
     ::msgcat::mcset sv "Details >>" "Detaljer >>"
@@ -20,57 +20,57 @@
     ::msgcat::mcset sv "&Directory:" "&Mapp:"
     ::msgcat::mcset sv "&Edit" "R&edigera"
     ::msgcat::mcset sv "Error: %1\$s" "Fel: %1\$s"
     ::msgcat::mcset sv "E&xit" "&Avsluta"
     ::msgcat::mcset sv "&File" "&Fil"
-    ::msgcat::mcset sv "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "Filen \"%1\$s\" finns redan.\nVill du skriva \u00f6ver den?"
+    ::msgcat::mcset sv "File \"%1\$s\" already exists.\nDo you want to overwrite it?" "Filen \"%1\$s\" finns redan.\nVill du skriva över den?"
     ::msgcat::mcset sv "File \"%1\$s\" already exists.\n\n" "Filen \"%1\$s\" finns redan.\n\n"
     ::msgcat::mcset sv "File \"%1\$s\" does not exist." "Filen \"%1\$s\" finns ej."
     ::msgcat::mcset sv "File &name:" "Fil&namn:"
     ::msgcat::mcset sv "File &names:" "Fil&namn:"
     ::msgcat::mcset sv "Files of &type:" "Filer av &typ:"
     ::msgcat::mcset sv "Fi&les:" "Fi&ler:"
     ::msgcat::mcset sv "&Filter"
     ::msgcat::mcset sv "Fil&ter:"
-    ::msgcat::mcset sv "&Green" "&Gr\u00f6n"
-    ::msgcat::mcset sv "&Help" "&Hj\u00e4lp"
+    ::msgcat::mcset sv "&Green" "&Grön"
+    ::msgcat::mcset sv "&Help" "&Hjälp"
     ::msgcat::mcset sv "Hi" "Hej"
-    ::msgcat::mcset sv "&Hide Console" "&G\u00f6m konsollen"
+    ::msgcat::mcset sv "&Hide Console" "&Göm konsollen"
     ::msgcat::mcset sv "&Ignore" "&Ignorera"
     ::msgcat::mcset sv "Invalid file name \"%1\$s\"." "Ogiltigt filnamn \"%1\$s\"."
     ::msgcat::mcset sv "Log Files" "Loggfiler"
     ::msgcat::mcset sv "&No" "&Nej"
     ::msgcat::mcset sv "&OK"
     ::msgcat::mcset sv "OK"
     ::msgcat::mcset sv "Ok"
-    ::msgcat::mcset sv "Open" "\u00d6ppna"
-    ::msgcat::mcset sv "&Open" "&\u00d6ppna"
-    ::msgcat::mcset sv "Open Multiple Files" "\u00d6ppna flera filer"
+    ::msgcat::mcset sv "Open" "Öppna"
+    ::msgcat::mcset sv "&Open" "&Öppna"
+    ::msgcat::mcset sv "Open Multiple Files" "Öppna flera filer"
     ::msgcat::mcset sv "P&aste" "&Klistra in"
     ::msgcat::mcset sv "&Quit" "&Avsluta"
-    ::msgcat::mcset sv "&Red" "&R\u00f6d"
-    ::msgcat::mcset sv "Replace existing file?" "Ers\u00e4tt existerande fil?"
-    ::msgcat::mcset sv "&Retry" "&F\u00f6rs\u00f6k igen"
+    ::msgcat::mcset sv "&Red" "&Röd"
+    ::msgcat::mcset sv "Replace existing file?" "Ersätt existerande fil?"
+    ::msgcat::mcset sv "&Retry" "&Försök igen"
     ::msgcat::mcset sv "&Save" "&Spara"
     ::msgcat::mcset sv "Save As" "Spara som"
     ::msgcat::mcset sv "Save To Log" "Spara till logg"
-    ::msgcat::mcset sv "Select Log File" "V\u00e4lj loggfil"
-    ::msgcat::mcset sv "Select a file to source" "V\u00e4lj k\u00e4llfil"
+    ::msgcat::mcset sv "Select Log File" "Välj loggfil"
+    ::msgcat::mcset sv "Select a file to source" "Välj källfil"
     ::msgcat::mcset sv "&Selection:" "&Val:"
-    ::msgcat::mcset sv "Skip Messages" "Hoppa \u00f6ver meddelanden"
-    ::msgcat::mcset sv "&Source..." "&K\u00e4lla..."
+    ::msgcat::mcset sv "Skip Messages" "Hoppa över meddelanden"
+    ::msgcat::mcset sv "&Source..." "&Källa..."
     ::msgcat::mcset sv "Tcl Scripts" "Tcl skript"
-    ::msgcat::mcset sv "Tcl for Windows" "Tcl f\u00f6r Windows"
+    ::msgcat::mcset sv "Tcl for Windows" "Tcl för Windows"
     ::msgcat::mcset sv "Text Files" "Textfiler"
     ::msgcat::mcset sv "&Yes" "&Ja"
     ::msgcat::mcset sv "abort" "avbryt"
-    ::msgcat::mcset sv "blue" "bl\u00e5"
+    ::msgcat::mcset sv "blue" "blå"
     ::msgcat::mcset sv "cancel" "avbryt"
     ::msgcat::mcset sv "extension" "utvidgning"
     ::msgcat::mcset sv "extensions" "utvidgningar"
-    ::msgcat::mcset sv "green" "gr\u00f6n"
+    ::msgcat::mcset sv "green" "grön"
     ::msgcat::mcset sv "ignore" "ignorera"
     ::msgcat::mcset sv "ok"
-    ::msgcat::mcset sv "red" "r\u00f6d"
-    ::msgcat::mcset sv "retry" "f\u00f6rs\u00f6k igen"
+    ::msgcat::mcset sv "red" "röd"
+    ::msgcat::mcset sv "retry" "försök igen"
     ::msgcat::mcset sv "yes" "ja"
 }

Index: library/palette.tcl
==================================================================
--- library/palette.tcl
+++ library/palette.tcl
@@ -203,31 +203,31 @@
 # Given a color name, computes a new color value that darkens (or
 # brightens) the given color by a given percent.
 #
 # Arguments:
 # color -	Name of starting color.
-# perecent -	Integer telling how much to brighten or darken as a
+# percent -	Integer telling how much to brighten or darken as a
 #		percent: 50 means darken by 50%, 110 means brighten
 #		by 10%.
 
 proc ::tk::Darken {color percent} {
-    foreach {red green blue} [winfo rgb . $color] {
-	set red [expr {($red/256)*$percent/100}]
-	set green [expr {($green/256)*$percent/100}]
-	set blue [expr {($blue/256)*$percent/100}]
-	break
-    }
-    if {$red > 255} {
-	set red 255
-    }
-    if {$green > 255} {
-	set green 255
-    }
-    if {$blue > 255} {
-	set blue 255
-    }
-    return [format "#%02x%02x%02x" $red $green $blue]
+    if {$percent < 0} {
+        return #000000
+    } elseif {$percent > 200} {
+        return #ffffff
+    } elseif {$percent <= 100} {
+        lassign [winfo rgb . $color] r g b
+        set r [expr {($r/256)*$percent/100}]
+        set g [expr {($g/256)*$percent/100}]
+        set b [expr {($b/256)*$percent/100}]
+    } elseif {$percent > 100} {
+        lassign [winfo rgb . $color] r g b
+        set r [expr {255 - ((65535-$r)/256)*(200-$percent)/100}]
+        set g [expr {255 - ((65535-$g)/256)*(200-$percent)/100}]
+        set b [expr {255 - ((65535-$b)/256)*(200-$percent)/100}]
+    }
+    return [format #%02x%02x%02x $r $g $b]
 }
 
 # ::tk_bisque --
 # Reset the Tk color palette to the old "bisque" colors.
 #

Index: library/tclIndex
==================================================================
--- library/tclIndex
+++ library/tclIndex
@@ -245,9 +245,8 @@
 set auto_index(::tk::ListBoxKeyAccel_Set) [list source [file join $dir xmfbox.tcl]]
 set auto_index(::tk::ListBoxKeyAccel_Unset) [list source [file join $dir xmfbox.tcl]]
 set auto_index(::tk::ListBoxKeyAccel_Key) [list source [file join $dir xmfbox.tcl]]
 set auto_index(::tk::ListBoxKeyAccel_Goto) [list source [file join $dir xmfbox.tcl]]
 set auto_index(::tk::ListBoxKeyAccel_Reset) [list source [file join $dir xmfbox.tcl]]
-set auto_index(tk_getFileType) [list source [file join $dir xmfbox.tcl]]
 set auto_index(::tk::unsupported::ExposePrivateCommand) [list source [file join $dir unsupported.tcl]]
 set auto_index(::tk::unsupported::ExposePrivateVariable) [list source [file join $dir unsupported.tcl]]
 set auto_index(::tk::fontchooser) [list source [file join $dir fontchooser.tcl]]

Index: library/text.tcl
==================================================================
--- library/text.tcl
+++ library/text.tcl
@@ -461,11 +461,11 @@
 
 if {"x11" eq [tk windowingsystem]} {
     # Support for mousewheels on Linux/Unix commonly comes through mapping
     # the wheel to the extended buttons.  If you have a mousewheel, find
     # Linux configuration info at:
-    #	http://www.inria.fr/koala/colas/mouse-wheel-scroll/
+    #	http://linuxreviews.org/howtos/xfree/mouse/
     bind Text <4> {
 	if {!$tk_strictMotif} {
 	    %W yview scroll -50 pixels
 	}
     }
@@ -766,10 +766,13 @@
 	} else {
 	    $w tag add sel insert $new
 	}
 	$w mark set $anchorname insert
     } else {
+        if {[catch {$w index $anchorname}]} {
+            $w mark set $anchorname insert
+        }
 	if {[$w compare $new < $anchorname]} {
 	    set first $new
 	    set last $anchorname
 	} else {
 	    set first $anchorname
@@ -1053,17 +1056,17 @@
 proc ::tk_textCut w {
     if {![catch {set data [$w get sel.first sel.last]}]} {
         # make <<Cut>> an atomic operation on the Undo stack,
         # i.e. separate it from other delete operations on either side
 	set oldSeparator [$w cget -autoseparators]
-	if {$oldSeparator} {
+	if {([$w cget -state] eq "normal") && $oldSeparator} {
 	    $w edit separator
 	}
 	clipboard clear -displayof $w
 	clipboard append -displayof $w $data
 	$w delete sel.first sel.last
-	if {$oldSeparator} {
+	if {([$w cget -state] eq "normal") && $oldSeparator} {
 	    $w edit separator
 	}
     }
 }
 
@@ -1200,5 +1203,101 @@
     }
     if {[info exists Priv(mouseMoved)] && $Priv(mouseMoved)} {
 	$w scan dragto $x $y
     }
 }
+
+# ::tk::TextUndoRedoProcessMarks --
+#
+# This proc is executed after an undo or redo action.
+# It processes the list of undo/redo marks temporarily set in the
+# text widget to positions delimiting where changes happened, and
+# returns a flat list of ranges. The temporary marks are removed
+# from the text widget.
+#
+# Arguments:
+# w -	The text widget
+
+proc ::tk::TextUndoRedoProcessMarks {w} {
+    set indices {}
+    set undoMarks {}
+
+    # only consider the temporary marks set by an undo/redo action
+    foreach mark [$w mark names] {
+        if {[string range $mark 0 11] eq "tk::undoMark"} {
+            lappend undoMarks $mark
+        }
+    }
+
+    # transform marks into indices
+    # the number of undo/redo marks is always even, each right mark
+    # completes a left mark to give a range
+    # this is true because:
+    #   - undo/redo only deals with insertions and deletions of text
+    #   - insertions may move marks but not delete them
+    #   - when deleting text, marks located inside the deleted range
+    #     are not erased but moved to the start of the deletion range
+    #         . this is done in TkBTreeDeleteIndexRange ("This segment
+    #           refuses to die...")
+    #         . because MarkDeleteProc does nothing else than returning
+    #           a value indicating that marks are not deleted by this
+    #           deleteProc
+    #         . mark deletion rather happen through [.text mark unset xxx]
+    #           which was not used _up to this point of the code_ (it
+    #           is a bit later just before exiting the present proc)
+    set nUndoMarks [llength $undoMarks]
+    set n [expr {$nUndoMarks / 2}]
+    set undoMarks [lsort -dictionary $undoMarks]
+    set Lmarks [lrange $undoMarks 0 [expr {$n - 1}]]
+    set Rmarks [lrange $undoMarks $n [llength $undoMarks]]
+    foreach Lmark $Lmarks Rmark $Rmarks {
+        lappend indices [$w index $Lmark] [$w index $Rmark]
+        $w mark unset $Lmark $Rmark
+    }
+
+    # process ranges to:
+    #   - remove those already fully included in another range
+    #   - merge overlapping ranges
+    set ind [lsort -dictionary -stride 2 $indices]
+    set indices {}
+
+    for {set i 0} {$i < $nUndoMarks} {incr i 2} {
+        set il1 [lindex $ind $i]
+        set ir1 [lindex $ind [expr {$i + 1}]]
+        lappend indices $il1 $ir1
+
+        for {set j [expr {$i + 2}]} {$j < $nUndoMarks} {incr j 2} {
+            set il2 [lindex $ind $j]
+            set ir2 [lindex $ind [expr {$j + 1}]]
+
+            if {[$w compare $il2 > $ir1]} {
+                # second range starts after the end of first range
+                # -> further second ranges do not need to be considered
+                #    because ranges were sorted by increasing first index
+                set j $nUndoMarks
+
+            } else {
+                if {[$w compare $ir2 > $ir1]} {
+                    # second range overlaps first range
+                    # -> merge them into a single range
+                    set indices [lreplace $indices end-1 end]
+                    lappend indices $il1 $ir2
+
+                } else {
+                    # second range is fully included in first range
+                    # -> ignore it
+
+                }
+                # in both cases above, the second range shall be
+                # trimmed out from the list of ranges
+                set ind [lreplace $ind $j [expr {$j + 1}]]
+                incr j -2
+                incr nUndoMarks -2
+
+            }
+
+        }
+
+    }
+
+    return $indices
+}

Index: library/tk.tcl
==================================================================
--- library/tk.tcl
+++ library/tk.tcl
@@ -9,11 +9,11 @@
 #
 # See the file "license.terms" for information on usage and redistribution of
 # this file, and for a DISCLAIMER OF ALL WARRANTIES.
 
 # Verify that we have Tk binary and script components from the same release
-package require -exact Tk  8.6.6
+package require -exact Tk  8.7a2
 
 # Create a ::tk namespace
 namespace eval ::tk {
     # Set up the msgcat commands
     namespace eval msgcat {
@@ -598,22 +598,23 @@
 }
 
 # ::tk::AmpMenuArgs --
 #	Processes arguments for a menu entry, turning -label option into
 #	-label and -underline options, returned by ::tk::UnderlineAmpersand.
+#      The cmd argument is supposed to be either "add" or "entryconfigure"
 #
-proc ::tk::AmpMenuArgs {widget add type args} {
+proc ::tk::AmpMenuArgs {widget cmd type args} {
     set options {}
     foreach {opt val} $args {
 	if {$opt eq "-label"} {
 	    lassign [UnderlineAmpersand $val] newlabel under
 	    lappend options -label $newlabel -underline $under
 	} else {
 	    lappend options $opt $val
 	}
     }
-    $widget add $type {*}$options
+    $widget $cmd $type {*}$options
 }
 
 # ::tk::FindAltKeyTarget --
 #	Search recursively through the hierarchy of visible widgets to find
 #	button or label which has $char as underlined character.

Index: library/tkfbox.tcl
==================================================================
--- library/tkfbox.tcl
+++ library/tkfbox.tcl
@@ -308,10 +308,11 @@
     }
     set data(selectFile) $data(-initialfile)
 
     # 5. Parse the -filetypes option
     #
+    set data(origfiletypes) $data(-filetypes)
     set data(-filetypes) [::tk::FDGetFileTypes $data(-filetypes)]
 
     if {![winfo exists $data(-parent)]} {
 	return -code error -errorcode [list TK LOOKUP WINDOW $data(-parent)] \
 	    "bad window path name \"$data(-parent)\""
@@ -1117,11 +1118,13 @@
 	    [info exists data(-typevariable)] && $data(-typevariable) ne ""
 	    && [info exists data(-filetypes)] && [llength $data(-filetypes)]
 	    && [info exists data(filterType)] && $data(filterType) ne ""
 	} then {
 	    upvar #0 $data(-typevariable) typeVariable
-	    set typeVariable [lindex $data(filterType) 0]
+	    set typeVariable [lindex $data(origfiletypes) \
+	            [lsearch -exact $data(-filetypes) $data(filterType)] 0]
+
 	}
     }
     bind $data(okBtn) <Destroy> {}
     set Priv(selectFilePath) $selectFilePath
 }

Index: library/ttk/altTheme.tcl
==================================================================
--- library/ttk/altTheme.tcl
+++ library/ttk/altTheme.tcl
@@ -12,10 +12,11 @@
 	-border		"#414141"
 	-activebg 	"#ececec"
 	-disabledfg	"#a3a3a3"
 	-selectbg	"#4a6984"
 	-selectfg	"#ffffff"
+	-altindicator	"#aaaaaa"
     }
 
     ttk::style theme settings alt {
 
 	ttk::style configure "." \
@@ -44,23 +45,28 @@
 	} -highlightcolor {alternate black}
 
 	ttk::style configure TCheckbutton -indicatorcolor "#ffffff" -padding 2
 	ttk::style configure TRadiobutton -indicatorcolor "#ffffff" -padding 2
 	ttk::style map TCheckbutton -indicatorcolor \
-	    [list  disabled $colors(-frame)  pressed $colors(-frame)]
+	    [list  pressed $colors(-frame) \
+	           alternate $colors(-altindicator) \
+	           disabled $colors(-frame)]
 	ttk::style map TRadiobutton -indicatorcolor \
-	    [list  disabled $colors(-frame)  pressed $colors(-frame)]
+	    [list  pressed $colors(-frame) \
+	           alternate $colors(-altindicator) \
+	           disabled $colors(-frame)]
 
 	ttk::style configure TMenubutton \
 	    -width -11 -padding "3 3" -relief raised
 
 	ttk::style configure TEntry -padding 1
 	ttk::style map TEntry -fieldbackground \
 		[list readonly $colors(-frame) disabled $colors(-frame)]
 	ttk::style configure TCombobox -padding 1
 	ttk::style map TCombobox -fieldbackground \
-		[list readonly $colors(-frame) disabled $colors(-frame)]
+		[list readonly $colors(-frame) disabled $colors(-frame)] \
+		-arrowcolor [list disabled $colors(-disabledfg)]
 	ttk::style configure ComboboxPopdownFrame \
 	    -relief solid -borderwidth 1
 
 	ttk::style configure TSpinbox -arrowsize 10 -padding {2 0 10 0}
 	ttk::style map TSpinbox -fieldbackground \
@@ -87,15 +93,19 @@
 
 	# Treeview:
 	ttk::style configure Heading -font TkHeadingFont -relief raised
 	ttk::style configure Treeview -background $colors(-window)
 	ttk::style map Treeview \
-	    -background [list selected $colors(-selectbg)] \
-	    -foreground [list selected $colors(-selectfg)] ;
+	    -background [list disabled $colors(-frame)\
+				{!disabled !selected} $colors(-window) \
+				selected $colors(-selectbg)] \
+	    -foreground [list disabled $colors(-disabledfg) \
+				{!disabled !selected} black \
+				selected $colors(-selectfg)]
 
 	ttk::style configure TScale \
 	    -groovewidth 4 -troughrelief sunken \
 	    -sliderwidth raised -borderwidth 2
 	ttk::style configure TProgressbar \
 	    -background $colors(-selectbg) -borderwidth 0
     }
 }

Index: library/ttk/aquaTheme.tcl
==================================================================
--- library/ttk/aquaTheme.tcl
+++ library/ttk/aquaTheme.tcl
@@ -39,12 +39,17 @@
 
 	# Treeview:
 	ttk::style configure Heading -font TkHeadingFont
 	ttk::style configure Treeview -rowheight 18 -background White
 	ttk::style map Treeview \
-	    -background {{selected background} systemHighlightSecondary
-		    selected systemHighlight}
+	    -background [list disabled systemDialogBackgroundInactive \
+				{!disabled !selected} systemWindowBody \
+				{selected background} systemHighlightSecondary \
+				selected systemHighlight] \
+	    -foreground [list disabled systemModelessDialogInactiveText \
+				{!disabled !selected} black \
+				selected systemModelessDialogActiveText]
 
 	# Enable animation for ttk::progressbar widget:
 	ttk::style configure TProgressbar -period 100 -maxphase 255
 
 	# For Aqua, labelframe labels should appear outside the border,

Index: library/ttk/button.tcl
==================================================================
--- library/ttk/button.tcl
+++ library/ttk/button.tcl
@@ -6,11 +6,11 @@
 # This doesn't seem to be conventional, but it's a nice way
 # to provide extra feedback while the grab is active.
 # (If the button is released off the widget, the grab deactivates and
 # we get a <Leave> event then, which turns off the "active" state)
 #
-# Normally, <ButtonRelease> and <ButtonN-Enter/Leave> events are 
+# Normally, <ButtonRelease> and <ButtonN-Enter/Leave> events are
 # delivered to the widget which received the initial <ButtonPress>
 # event.  However, Tk [grab]s (#1223103) and menu interactions
 # (#1222605) can interfere with this.  To guard against spurious
 # <Button1-Enter> events, the <Button1-Enter> binding only sets
 # the pressed state if the button is currently active.

Index: library/ttk/clamTheme.tcl
==================================================================
--- library/ttk/clamTheme.tcl
+++ library/ttk/clamTheme.tcl
@@ -3,22 +3,24 @@
 #
 # Inspired by the XFCE family of Gnome themes.
 #
 
 namespace eval ttk::theme::clam {
-    variable colors 
+    variable colors
     array set colors {
-	-disabledfg	"#999999"
-	-frame  	"#dcdad5"
-	-window  	"#ffffff"
-	-dark		"#cfcdc8"
-	-darker 	"#bab5ab"
-	-darkest	"#9e9a91"
-	-lighter	"#eeebe7"
-	-lightest 	"#ffffff"
-	-selectbg	"#4a6984"
-	-selectfg	"#ffffff"
+	-disabledfg		"#999999"
+	-frame  		"#dcdad5"
+	-window  		"#ffffff"
+	-dark			"#cfcdc8"
+	-darker 		"#bab5ab"
+	-darkest		"#9e9a91"
+	-lighter		"#eeebe7"
+	-lightest 		"#ffffff"
+	-selectbg		"#4a6984"
+	-selectfg		"#ffffff"
+	-altindicator		"#5895bc"
+	-disabledaltindicator	"#a0a0a0"
     }
 
     ttk::style theme settings clam {
 
 	ttk::style configure "." \
@@ -78,13 +80,19 @@
 	ttk::style configure TRadiobutton \
 	    -indicatorbackground "#ffffff" \
 	    -indicatormargin {1 1 4 1} \
 	    -padding 2 ;
 	ttk::style map TCheckbutton -indicatorbackground \
-	    [list  disabled $colors(-frame)  pressed $colors(-frame)]
+	    [list  pressed $colors(-frame) \
+			{!disabled alternate} $colors(-altindicator) \
+			{disabled alternate} $colors(-disabledaltindicator) \
+			disabled $colors(-frame)]
 	ttk::style map TRadiobutton -indicatorbackground \
-	    [list  disabled $colors(-frame)  pressed $colors(-frame)]
+	    [list  pressed $colors(-frame) \
+			{!disabled alternate} $colors(-altindicator) \
+			{disabled alternate} $colors(-disabledaltindicator) \
+			disabled $colors(-frame)]
 
 	ttk::style configure TMenubutton \
 	    -width -11 -padding 5 -relief raised
 
 	ttk::style configure TEntry -padding 1 -insertwidth 1
@@ -100,11 +108,11 @@
 	    -background [list active $colors(-lighter) \
 			     pressed $colors(-lighter)] \
 	    -fieldbackground [list {readonly focus} $colors(-selectbg) \
 				  readonly $colors(-frame)] \
 	    -foreground [list {readonly focus} $colors(-selectfg)] \
-	    ;
+	    -arrowcolor [list disabled $colors(-disabledfg)]
 	ttk::style configure ComboboxPopdownFrame \
 	    -relief solid -borderwidth 1
 
 	ttk::style configure TSpinbox -arrowsize 10 -padding {2 0 10 0}
 	ttk::style map TSpinbox \
@@ -121,12 +129,16 @@
 	# Treeview:
 	ttk::style configure Heading \
 	    -font TkHeadingFont -relief raised -padding {3}
 	ttk::style configure Treeview -background $colors(-window)
 	ttk::style map Treeview \
-	    -background [list selected $colors(-selectbg)] \
-	    -foreground [list selected $colors(-selectfg)] ;
+	    -background [list disabled $colors(-frame)\
+				{!disabled !selected} $colors(-window) \
+				selected $colors(-selectbg)] \
+	    -foreground [list disabled $colors(-disabledfg) \
+				{!disabled !selected} black \
+				selected $colors(-selectfg)]
 
     	ttk::style configure TLabelframe \
 	    -labeloutside true -labelmargins {0 0 0 4} \
 	    -borderwidth 2 -relief raised
 

Index: library/ttk/classicTheme.tcl
==================================================================
--- library/ttk/classicTheme.tcl
+++ library/ttk/classicTheme.tcl
@@ -13,10 +13,11 @@
 	-troughbg	"#c3c3c3"
 	-selectbg	"#c3c3c3"
 	-selectfg	"#000000"
 	-disabledfg	"#a3a3a3"
 	-indicator	"#b03060"
+	-altindicator	"#b05e5e"
     }
 
     ttk::style theme settings classic {
 	ttk::style configure "." \
 	    -font		TkDefaultFont \
@@ -47,19 +48,23 @@
 	ttk::style map TButton -relief [list {!disabled pressed} sunken]
 
 	ttk::style configure TCheckbutton -indicatorrelief raised
 	ttk::style map TCheckbutton \
 	    -indicatorcolor [list \
-		pressed $colors(-frame)  selected $colors(-indicator)] \
-	    -indicatorrelief {selected sunken  pressed sunken} \
+		    pressed $colors(-frame) \
+		    alternate $colors(-altindicator) \
+		    selected $colors(-indicator)] \
+	    -indicatorrelief {alternate raised  selected sunken  pressed sunken} \
 	    ;
 
 	ttk::style configure TRadiobutton -indicatorrelief raised
 	ttk::style map TRadiobutton \
 	    -indicatorcolor [list \
-		pressed $colors(-frame)  selected $colors(-indicator)] \
-	    -indicatorrelief {selected sunken  pressed sunken} \
+		    pressed $colors(-frame) \
+		    alternate $colors(-altindicator) \
+		    selected $colors(-indicator)] \
+	    -indicatorrelief {alternate raised  selected sunken  pressed sunken} \
 	    ;
 
 	ttk::style configure TMenubutton -relief raised -padding "3m 1m"
 
 	ttk::style configure TEntry -relief sunken -padding 1 -font TkTextFont
@@ -91,12 +96,16 @@
 
 	# Treeview:
 	ttk::style configure Heading -font TkHeadingFont -relief raised
 	ttk::style configure Treeview -background $colors(-window)
 	ttk::style map Treeview \
-	    -background [list selected $colors(-selectbg)] \
-	    -foreground [list selected $colors(-selectfg)] ;
+	    -background [list disabled $colors(-frame)\
+				{!disabled !selected} $colors(-window) \
+				selected $colors(-selectbg)] \
+	    -foreground [list disabled $colors(-disabledfg) \
+				{!disabled !selected} black \
+				selected $colors(-selectfg)]
 
 	#
 	# Toolbar buttons:
 	#
 	ttk::style configure Toolbutton -padding 2 -relief flat -shiftrelief 2

Index: library/ttk/combobox.tcl
==================================================================
--- library/ttk/combobox.tcl
+++ library/ttk/combobox.tcl
@@ -86,22 +86,22 @@
 			{ ttk::combobox::Unpost [winfo parent %W] }
 
 ### Option database settings.
 #
 
-option add *TCombobox*Listbox.font TkTextFont
-option add *TCombobox*Listbox.relief flat
-option add *TCombobox*Listbox.highlightThickness 0
+option add *TCombobox*Listbox.font TkTextFont widgetDefault
+option add *TCombobox*Listbox.relief flat widgetDefault
+option add *TCombobox*Listbox.highlightThickness 0 widgetDefault
 
 ## Platform-specific settings.
 #
 switch -- [tk windowingsystem] {
     x11 {
-	option add *TCombobox*Listbox.background white
+	option add *TCombobox*Listbox.background white widgetDefault
     }
     aqua {
-	option add *TCombobox*Listbox.borderWidth 0
+	option add *TCombobox*Listbox.borderWidth 0 widgetDefault
     }
 }
 
 ### Binding procedures.
 #
@@ -366,11 +366,12 @@
 proc ttk::combobox::PlacePopdown {cb popdown} {
     set x [winfo rootx $cb]
     set y [winfo rooty $cb]
     set w [winfo width $cb]
     set h [winfo height $cb]
-    set postoffset [ttk::style lookup TCombobox -postoffset {} {0 0 0 0}]
+    set style [$cb cget -style]
+    set postoffset [ttk::style lookup $style -postoffset {} {0 0 0 0}]
     foreach var {x y w h} delta $postoffset {
     	incr $var $delta
     }
 
     set H [winfo reqheight $popdown]

Index: library/ttk/defaults.tcl
==================================================================
--- library/ttk/defaults.tcl
+++ library/ttk/defaults.tcl
@@ -3,20 +3,23 @@
 #
 
 namespace eval ttk::theme::default {
     variable colors
     array set colors {
-	-frame		"#d9d9d9"
-	-foreground	"#000000"
-	-window		"#ffffff"
-	-text   	"#000000"
-	-activebg	"#ececec"
-	-selectbg	"#4a6984"
-	-selectfg	"#ffffff"
-	-darker 	"#c3c3c3"
-	-disabledfg	"#a3a3a3"
-	-indicator	"#4a6984"
+	-frame			"#d9d9d9"
+	-foreground		"#000000"
+	-window			"#ffffff"
+	-text   		"#000000"
+	-activebg		"#ececec"
+	-selectbg		"#4a6984"
+	-selectfg		"#ffffff"
+	-darker 		"#c3c3c3"
+	-disabledfg		"#a3a3a3"
+	-indicator		"#4a6984"
+	-disabledindicator	"#a3a3a3"
+	-altindicator		"#9fbdd8"
+	-disabledaltindicator	"#c0c0c0"
     }
 
     ttk::style theme settings default {
 
 	ttk::style configure "." \
@@ -38,21 +41,33 @@
 	    [list disabled $colors(-disabledfg)]
 
 	ttk::style configure TButton \
 	    -anchor center -padding "3 3" -width -9 \
 	    -relief raised -shiftrelief 1
-	ttk::style map TButton -relief [list {!disabled pressed} sunken] 
+	ttk::style map TButton -relief [list {!disabled pressed} sunken]
 
 	ttk::style configure TCheckbutton \
 	    -indicatorcolor "#ffffff" -indicatorrelief sunken -padding 1
 	ttk::style map TCheckbutton -indicatorcolor \
-	    [list pressed $colors(-activebg)  selected $colors(-indicator)]
+	    [list pressed $colors(-activebg)  \
+			{!disabled alternate} $colors(-altindicator) \
+			{disabled alternate} $colors(-disabledaltindicator) \
+			{!disabled selected} $colors(-indicator) \
+			{disabled selected} $colors(-disabledindicator)]
+	ttk::style map TCheckbutton -indicatorrelief \
+	    [list alternate raised]
 
 	ttk::style configure TRadiobutton \
 	    -indicatorcolor "#ffffff" -indicatorrelief sunken -padding 1
 	ttk::style map TRadiobutton -indicatorcolor \
-	    [list pressed $colors(-activebg)  selected $colors(-indicator)]
+	    [list pressed $colors(-activebg)  \
+			{!disabled alternate} $colors(-altindicator) \
+			{disabled alternate} $colors(-disabledaltindicator) \
+			{!disabled selected} $colors(-indicator) \
+			{disabled selected} $colors(-disabledindicator)]
+	ttk::style map TRadiobutton -indicatorrelief \
+	    [list alternate raised]
 
 	ttk::style configure TMenubutton \
 	    -relief raised -padding "10 3"
 
 	ttk::style configure TEntry \
@@ -60,11 +75,12 @@
 	ttk::style map TEntry -fieldbackground \
 	    [list readonly $colors(-frame) disabled $colors(-frame)]
 
 	ttk::style configure TCombobox -arrowsize 12 -padding 1
 	ttk::style map TCombobox -fieldbackground \
-	    [list readonly $colors(-frame) disabled $colors(-frame)]
+	    [list readonly $colors(-frame) disabled $colors(-frame)] \
+	    -arrowcolor [list disabled $colors(-disabledfg)]
 
 	ttk::style configure TSpinbox -arrowsize 10 -padding {2 0 10 0}
 	ttk::style map TSpinbox -fieldbackground \
 	    [list readonly $colors(-frame) disabled $colors(-frame)] \
 	    -arrowcolor [list disabled $colors(-disabledfg)]
@@ -92,12 +108,16 @@
 	ttk::style configure Heading -font TkHeadingFont -relief raised
 	ttk::style configure Treeview \
 	    -background $colors(-window) \
 	    -foreground $colors(-text) ;
 	ttk::style map Treeview \
-	    -background [list selected $colors(-selectbg)] \
-	    -foreground [list selected $colors(-selectfg)] ;
+	    -background [list disabled $colors(-frame)\
+				{!disabled !selected} $colors(-window) \
+				selected $colors(-selectbg)] \
+	    -foreground [list disabled $colors(-disabledfg) \
+				{!disabled !selected} black \
+				selected $colors(-selectfg)]
 
 	# Combobox popdown frame
 	ttk::style layout ComboboxPopdownFrame {
 	    ComboboxPopdownFrame.border -sticky nswe
 	}

Index: library/ttk/entry.tcl
==================================================================
--- library/ttk/entry.tcl
+++ library/ttk/entry.tcl
@@ -32,11 +32,11 @@
     }
 }
 
 ### Option database settings.
 #
-option add *TEntry.cursor [ttk::cursor text]
+option add *TEntry.cursor [ttk::cursor text] widgetDefault
 
 ### Bindings.
 #
 # Removed the following standard Tk bindings:
 #
@@ -416,11 +416,11 @@
 
 ## <B1-Enter> binding
 # 	Suspend autoscroll.
 #
 proc ttk::entry::DragIn {w} {
-    ttk::CancelRepeat 
+    ttk::CancelRepeat
 }
 
 ## <ButtonRelease-1> binding
 #
 proc ttk::entry::Release {w} {
@@ -430,11 +430,11 @@
 }
 
 ## AutoScroll
 #	Called repeatedly when the mouse is outside an entry window
 #	with Button 1 down.  Scroll the window left or right,
-#	depending on where the mouse left the window, and extend 
+#	depending on where the mouse left the window, and extend
 #	the selection according to the current selection mode.
 #
 # TODO: AutoScroll should repeat faster (50ms) than normal autorepeat.
 # TODO: Need a way for Repeat scripts to cancel themselves.
 #

Index: library/ttk/menubutton.tcl
==================================================================
--- library/ttk/menubutton.tcl
+++ library/ttk/menubutton.tcl
@@ -8,11 +8,11 @@
 # Keyboard: <Key-space> or accelerator key to post menu
 #
 # (In addition, when menu system is active, "dropdown" -- menu posts
 # on mouse-over.  Ttk menubuttons don't implement this).
 #
-# For keyboard and popdown mode, we hand off to tk_popup and let 
+# For keyboard and popdown mode, we hand off to tk_popup and let
 # the built-in Tk bindings handle the rest of the interaction.
 #
 # ON X11:
 #
 # Standard Tk menubuttons use a global grab on the menubutton.
@@ -20,17 +20,17 @@
 # since we need to process the final <ButtonRelease> event,
 # and this might be delivered to the menu.  So instead we
 # rely on the passive grab that occurs on <ButtonPress> events,
 # and transition to popdown mode when the mouse is released
 # or dragged outside the menubutton.
-# 
+#
 # ON WINDOWS:
 #
-# I'm not sure what the hell is going on here.  [$menu post] apparently 
+# I'm not sure what the hell is going on here.  [$menu post] apparently
 # sets up some kind of internal grab for native menus.
 # On this platform, just use [tk_popup] for all menu actions.
-# 
+#
 # ON MACOS:
 #
 # Same probably applies here.
 #
 
@@ -59,11 +59,11 @@
     bind TMenubutton <ButtonRelease-1>  \
 	{ if {[winfo exists %W]} { %W state !pressed } }
 }
 
 # PostPosition --
-#	Returns the x and y coordinates where the menu 
+#	Returns the x and y coordinates where the menu
 #	should be posted, based on the menubutton and menu size
 #	and -direction option.
 #
 # TODO: adjust menu width to be at least as wide as the button
 #	for -direction above, below.
@@ -83,11 +83,11 @@
     switch -- $dir {
 	above { if {$y >= $mh} { incr y -$mh } { incr y  $bh } }
 	below { if {$y <= $sh} { incr y  $bh } { incr y -$mh } }
 	left  { if {$x >= $mw} { incr x -$mw } { incr x  $bw } }
 	right { if {$x <= $sw} { incr x  $bw } { incr x -$mw } }
-	flush { 
+	flush {
 	    # post menu atop menubutton.
 	    # If there's a menu entry whose label matches the
 	    # menubutton -text, assume this is an optionmenu
 	    # and place that entry over the menubutton.
 	    set index [FindMenuEntry $menu [$mb cget -text]]
@@ -111,11 +111,11 @@
     tk_popup $menu $x $y
 }
 
 # Pulldown (X11 only) --
 #	Called when Button1 is pressed on a menubutton.
-#	Posts the menu; a subsequent ButtonRelease 
+#	Posts the menu; a subsequent ButtonRelease
 #	or Leave event will set a grab on the menu.
 #
 proc ttk::menubutton::Pulldown {mb} {
     variable State
     if {[$mb instate disabled] || [set menu [$mb cget -menu]] eq ""} {

Index: library/ttk/notebook.tcl
==================================================================
--- library/ttk/notebook.tcl
+++ library/ttk/notebook.tcl
@@ -68,11 +68,11 @@
 	}
     }
 }
 
 # MnemonicTab $nb $key --
-#	Scan all tabs in the specified notebook for one with the 
+#	Scan all tabs in the specified notebook for one with the
 #	specified mnemonic. If found, returns path name of tab;
 #	otherwise returns ""
 #
 proc ttk::notebook::MnemonicTab {nb key} {
     set key [string toupper $key]
@@ -92,12 +92,12 @@
 
 # enableTraversal --
 #	Enable keyboard traversal for a notebook widget
 #	by adding bindings to the containing toplevel window.
 #
-#	TLNotebooks($top) keeps track of the list of all traversal-enabled 
-#	notebooks contained in the toplevel 
+#	TLNotebooks($top) keeps track of the list of all traversal-enabled
+#	notebooks contained in the toplevel
 #
 proc ttk::notebook::enableTraversal {nb} {
     variable TLNotebooks
 
     set top [winfo toplevel $nb]
@@ -143,11 +143,11 @@
 	set index [lsearch -exact $TLNotebooks($top) $nb]
         set TLNotebooks($top) [lreplace $TLNotebooks($top) $index $index]
     }
 }
 
-# EnclosingNotebook $w -- 
+# EnclosingNotebook $w --
 #	Return the nearest traversal-enabled notebook widget
 #	that contains $w.
 #
 # BUGS: this only works properly for tabs that are direct children
 #	of the notebook widget.  This routine should follow the
@@ -169,11 +169,11 @@
     return ""
 }
 
 # TLCycleTab --
 #	toplevel binding procedure for Control-Tab / Control-Shift-Tab
-#	Select the next/previous tab in the nearest ancestor notebook. 
+#	Select the next/previous tab in the nearest ancestor notebook.
 #
 proc ttk::notebook::TLCycleTab {w dir} {
     set nb [EnclosingNotebook $w]
     if {$nb ne ""} {
 	CycleTab $nb $dir

Index: library/ttk/scrollbar.tcl
==================================================================
--- library/ttk/scrollbar.tcl
+++ library/ttk/scrollbar.tcl
@@ -84,11 +84,11 @@
 }
 
 proc ttk::scrollbar::Drag {w x y} {
     variable State
     if {![info exists State(first)]} {
-    	# Initial buttonpress was not on the thumb, 
+    	# Initial buttonpress was not on the thumb,
 	# or something screwy has happened.  In either case, ignore:
 	return;
     }
     set xDelta [expr {$x - $State(xPress)}]
     set yDelta [expr {$y - $State(yPress)}]

Index: library/ttk/sizegrip.tcl
==================================================================
--- library/ttk/sizegrip.tcl
+++ library/ttk/sizegrip.tcl
@@ -7,11 +7,11 @@
 #
 
 switch -- [tk windowingsystem] {
     x11 -
     win32 {
-	option add *TSizegrip.cursor [ttk::cursor seresize]
+	option add *TSizegrip.cursor [ttk::cursor seresize] widgetDefault
     }
     aqua {
     	# Aqua sizegrips use default Arrow cursor.
     }
 }

Index: library/ttk/treeview.tcl
==================================================================
--- library/ttk/treeview.tcl
+++ library/ttk/treeview.tcl
@@ -44,11 +44,11 @@
 bind Treeview	<Shift-ButtonPress-1> \
 		{ ttk::treeview::Select %W %x %y extend }
 bind Treeview	<<ToggleSelection>> \
 		{ ttk::treeview::Select %W %x %y toggle }
 
-ttk::copyBindings TtkScrollable Treeview 
+ttk::copyBindings TtkScrollable Treeview
 
 ### Binding procedures.
 #
 
 ## Keynav -- Keyboard navigation

Index: library/ttk/ttk.tcl
==================================================================
--- library/ttk/ttk.tcl
+++ library/ttk/ttk.tcl
@@ -120,11 +120,11 @@
 #
 proc ttk::LoadThemes {} {
     variable library
 
     # "default" always present:
-    uplevel #0 [list source [file join $library defaults.tcl]] 
+    uplevel #0 [list source [file join $library defaults.tcl]]
 
     set builtinThemes [style theme names]
     foreach {theme scripts} {
 	classic 	classicTheme.tcl
 	alt 		altTheme.tcl

Index: library/ttk/vistaTheme.tcl
==================================================================
--- library/ttk/vistaTheme.tcl
+++ library/ttk/vistaTheme.tcl
@@ -1,11 +1,11 @@
 #
 # Settings for Microsoft Windows Vista and Server 2008
 #
 
 # The Vista theme can only be defined on Windows Vista and above. The theme
-# is created in C due to the need to assign a theme-enabled function for 
+# is created in C due to the need to assign a theme-enabled function for
 # detecting when themeing is disabled. On systems that cannot support the
 # Vista theme, there will be no such theme created and we must not
 # evaluate this script.
 
 if {"vista" ni [ttk::style theme names]} {
@@ -19,10 +19,11 @@
  	ttk::style configure . \
 	    -background SystemButtonFace \
 	    -foreground SystemWindowText \
 	    -selectforeground SystemHighlightText \
 	    -selectbackground SystemHighlight \
+	    -insertcolor SystemWindowText \
 	    -font TkDefaultFont \
 	    ;
 
 	ttk::style map "." \
 	    -foreground [list disabled SystemGrayText] \
@@ -44,33 +45,39 @@
 
 	# Treeview:
 	ttk::style configure Heading -font TkHeadingFont
 	ttk::style configure Treeview -background SystemWindow
 	ttk::style map Treeview \
-	    -background [list selected SystemHighlight] \
-	    -foreground [list selected SystemHighlightText] ;
+	    -background [list   disabled SystemButtonFace \
+				{!disabled !selected} SystemWindow \
+				selected SystemHighlight] \
+	    -foreground [list   disabled SystemGrayText \
+				{!disabled !selected} SystemWindowText \
+				selected SystemHighlightText]
 
         # Label and Toolbutton
-	ttk::style configure TLabelframe.Label -foreground "#0046d5"
+	ttk::style configure TLabelframe.Label -foreground SystemButtonText
 
 	ttk::style configure Toolbutton -padding {4 4}
 
         # Combobox
 	ttk::style configure TCombobox -padding 2
-        ttk::style element create Combobox.field vsapi \
-            COMBOBOX 2 {{} 1}
         ttk::style element create Combobox.border vsapi \
             COMBOBOX 4 {disabled 4 focus 3 active 2 hover 2 {} 1}
+        ttk::style element create Combobox.background vsapi \
+            EDIT 3 {disabled 3 readonly 5 focus 4 hover 2 {} 1}
         ttk::style element create Combobox.rightdownarrow vsapi \
             COMBOBOX 6 {disabled 4 pressed 3 active 2 {} 1} \
             -syssize {SM_CXVSCROLL SM_CYVSCROLL}
         ttk::style layout TCombobox {
             Combobox.border -sticky nswe -border 0 -children {
                 Combobox.rightdownarrow -side right -sticky ns
                 Combobox.padding -expand 1 -sticky nswe -children {
-                    Combobox.focus -expand 1 -sticky nswe -children {
-                        Combobox.textarea -sticky nswe
+                    Combobox.background -sticky nswe -children {
+                        Combobox.focus -expand 1 -sticky nswe -children {
+                            Combobox.textarea -sticky nswe
+                        }
                     }
                 }
             }
         }
         # Vista.Combobox droplist frame
@@ -131,11 +138,11 @@
         ttk::style layout TSpinbox {
             Spinbox.field -sticky nswe -children {
                 Spinbox.background -sticky news -children {
                     Spinbox.padding -sticky news -children {
                         Spinbox.innerbg -sticky news -children {
-                            Spinbox.textarea -expand 1 -sticky {}
+                            Spinbox.textarea -expand 1
                         }
                     }
                     Spinbox.uparrow -side top -sticky ens
                     Spinbox.downarrow -side bottom -sticky ens
                 }
@@ -144,11 +151,11 @@
 	ttk::style map TSpinbox \
 	    -selectbackground [list !focus SystemWindow] \
 	    -selectforeground [list !focus SystemWindowText] \
 	    ;
 
-        
+
         # SCROLLBAR elements (Vista includes a state for 'hover')
         ttk::style element create Vertical.Scrollbar.uparrow vsapi \
             SCROLLBAR 1 {disabled 4 pressed 3 active 2 hover 17 {} 1} \
             -syssize {SM_CXVSCROLL SM_CYVSCROLL}
         ttk::style element create Vertical.Scrollbar.downarrow vsapi \
@@ -180,20 +187,21 @@
         ttk::style element create Horizontal.Progressbar.pbar vsapi \
             PROGRESS 3 {{} 1} -padding 8
         ttk::style layout Horizontal.TProgressbar {
             Horizontal.Progressbar.trough -sticky nswe -children {
                 Horizontal.Progressbar.pbar -side left -sticky ns
+                Horizontal.Progressbar.text -sticky nesw
             }
         }
         ttk::style element create Vertical.Progressbar.pbar vsapi \
             PROGRESS 3 {{} 1} -padding 8
         ttk::style layout Vertical.TProgressbar {
             Vertical.Progressbar.trough -sticky nswe -children {
                 Vertical.Progressbar.pbar -side bottom -sticky we
             }
         }
-        
+
         # Scale
         ttk::style element create Horizontal.Scale.slider vsapi \
             TRACKBAR 3 {disabled 5 focus 4 pressed 3 active 2 {} 1} \
             -width 6 -height 12
         ttk::style layout Horizontal.TScale {
@@ -213,12 +221,12 @@
                     Vertical.Scale.track -sticky ns
                     Vertical.Scale.slider -side top -sticky {}
                 }
             }
         }
-        
+
         # Treeview
         ttk::style configure Item -padding {4 0 0 0}
-        
+
         package provide ttk::theme::vista 1.0
     }
 }

Index: library/ttk/winTheme.tcl
==================================================================
--- library/ttk/winTheme.tcl
+++ library/ttk/winTheme.tcl
@@ -8,10 +8,12 @@
 	ttk::style configure "." \
 	    -background SystemButtonFace \
 	    -foreground SystemWindowText \
 	    -selectforeground SystemHighlightText \
 	    -selectbackground SystemHighlight \
+	    -fieldbackground SystemWindow \
+	    -insertcolor SystemWindowText \
 	    -troughcolor SystemScrollbar \
 	    -font TkDefaultFont \
 	    ;
 
 	ttk::style map "." -foreground [list disabled SystemGrayText] ;
@@ -69,12 +71,16 @@
 
 	# Treeview:
 	ttk::style configure Heading -font TkHeadingFont -relief raised
 	ttk::style configure Treeview -background SystemWindow
 	ttk::style map Treeview \
-	    -background [list selected SystemHighlight] \
-	    -foreground [list selected SystemHighlightText] ;
+	    -background [list   disabled SystemButtonFace \
+				{!disabled !selected} SystemWindow \
+				selected SystemHighlight] \
+	    -foreground [list   disabled SystemGrayText \
+				{!disabled !selected} SystemWindowText \
+				selected SystemHighlightText]
 
         ttk::style configure TProgressbar \
 	    -background SystemHighlight -borderwidth 0 ;
     }
 }

Index: library/ttk/xpTheme.tcl
==================================================================
--- library/ttk/xpTheme.tcl
+++ library/ttk/xpTheme.tcl
@@ -9,10 +9,11 @@
 	ttk::style configure . \
 	    -background SystemButtonFace \
 	    -foreground SystemWindowText \
 	    -selectforeground SystemHighlightText \
 	    -selectbackground SystemHighlight \
+	    -insertcolor SystemWindowText \
 	    -font TkDefaultFont \
 	    ;
 
 	ttk::style map "." \
 	    -foreground [list disabled SystemGrayText] \
@@ -59,7 +60,17 @@
 	    -selectforeground [list !focus SystemWindowText] \
 	    ;
 
 	ttk::style configure Toolbutton -padding {4 4}
 
+	# Treeview:
+	ttk::style configure Heading -font TkHeadingFont -relief raised
+	ttk::style configure Treeview -background SystemWindow
+	ttk::style map Treeview \
+	    -background [list   disabled SystemButtonFace \
+				{!disabled !selected} SystemWindow \
+				selected SystemHighlight] \
+	    -foreground [list   disabled SystemGrayText \
+				{!disabled !selected} SystemWindowText \
+				selected SystemHighlightText];
     }
 }

Index: library/xmfbox.tcl
==================================================================
--- library/xmfbox.tcl
+++ library/xmfbox.tcl
@@ -154,20 +154,20 @@
     }
 
     # The filetypes radiobuttons
     # set data(fileType) $data(-defaulttype)
     # Default type to first entry
-    set initialTypeName [lindex $data(-filetypes) 0 0]
+    set initialTypeName [lindex $data(origfiletypes) 0 0]
     if {$data(-typevariable) ne ""} {
 	upvar #0 $data(-typevariable) typeVariable
 	if {[info exists typeVariable]} {
 	    set initialTypeName $typeVariable
 	}
     }
     set ix 0
     set data(fileType) 0
-    foreach fltr $data(-filetypes) {
+    foreach fltr $data(origfiletypes) {
 	set fname [lindex $fltr 0]
 	if {[string first $initialTypeName $fname] == 0} {
 	    set data(fileType) $ix
 	    break
 	}
@@ -183,11 +183,11 @@
 
     frame $f
     set cnt 0
     if {$data(-filetypes) ne {}} {
 	foreach type $data(-filetypes) {
-	    set title  [lindex [lindex $type 0] 0]
+	    set title  [lindex $type 0]
 	    set filter [lindex $type 1]
 	    radiobutton $f.b$cnt \
 		-text $title \
 		-variable ::tk::dialog::file::[winfo name $w](fileType) \
 		-value $cnt \
@@ -208,11 +208,10 @@
 proc ::tk::MotifFDialog_SetFilter {w type} {
     upvar ::tk::dialog::file::[winfo name $w] data
     variable ::tk::Priv
 
     set data(filter) [lindex $type 1]
-    set Priv(selectFileType) [lindex [lindex $type 0] 0]
 
     MotifFDialog_Update $w
 }
 
 # ::tk::MotifFDialog_Config --
@@ -297,10 +296,11 @@
 
     # 5. Parse the -filetypes option. It is not used by the motif
     #    file dialog, but we check for validity of the value to make sure
     #    the application code also runs fine with the TK file dialog.
     #
+    set data(origfiletypes) $data(-filetypes)
     set data(-filetypes) [::tk::FDGetFileTypes $data(-filetypes)]
 
     if {![info exists data(filter)]} {
 	set data(filter) *
     }
@@ -868,11 +868,11 @@
 
     # Return selected filter
     if {[info exists data(-typevariable)] && $data(-typevariable) ne ""
 	    && [info exists data(-filetypes)] && $data(-filetypes) ne ""} {
 	upvar #0 $data(-typevariable) typeVariable
-	set typeVariable [lindex $data(-filetypes) $data(fileType) 0]
+	set typeVariable [lindex $data(origfiletypes) $data(fileType) 0]
     }
 
     if {$data(-multiple) != 0} {
 	set Priv(selectFilePath) $newFileList
     } else {
@@ -978,11 +978,5 @@
     variable ::tk::Priv
 
     unset -nocomplain Priv(lbAccel,$w)
 }
 
-proc ::tk_getFileType {} {
-    variable ::tk::Priv
-
-    return $Priv(selectFileType)
-}
-

Index: macosx/GNUmakefile
==================================================================
--- macosx/GNUmakefile
+++ macosx/GNUmakefile
@@ -100,11 +100,11 @@
 
 PROJECT			:= tk
 PRODUCT_NAME		:= Tk
 
 UNIX_DIR		:= ${CURDIR}/../unix
-VERSION			:= $(shell awk -F= '/^TK_VERSION/ {print $$2; nextfile}' ${UNIX_DIR}/configure.in)
+VERSION			:= $(shell awk -F= '/^TK_VERSION/ {print $$2; nextfile}' ${UNIX_DIR}/configure.ac)
 TCL_VERSION		:= ${VERSION}
 wish			:= wish
 WISH			= wish${VERSION}
 
 BUILD_TARGET		:= all tktest
@@ -178,11 +178,11 @@
 ${objdir}/Makefile: ${UNIX_DIR}/Makefile.in ${UNIX_DIR}/configure \
 		     ${UNIX_DIR}/tkConfig.sh.in Tk-Info.plist.in Wish-Info.plist.in
 	mkdir -p "${OBJ_DIR}" && cd "${OBJ_DIR}" && \
 	if [ ${UNIX_DIR}/configure -nt config.status ]; then ${UNIX_DIR}/configure -C \
 	--prefix="${PREFIX}" --bindir="${BINDIR}" --libdir="${LIBDIR}" \
-	--mandir="${MANDIR}" --enable-threads --enable-framework \
+	--mandir="${MANDIR}" --enable-framework \
 	--with-tcl="${TCL_DIR}" \
 	${CONFIGURE_ARGS} ${EXTRA_CONFIGURE_ARGS}; else ./config.status; fi
 ifneq (${VERSION},${TCL_VERSION})
 	@cd "${OBJ_DIR}" && sed -e 's#/Versions/${TCL_VERSION}#/Versions/${VERSION}#' \
 	tkConfig.sh > tkConfig.sh.1 && mv -f tkConfig.sh.1 tkConfig.sh

Index: macosx/README
==================================================================
--- macosx/README
+++ macosx/README
@@ -1,42 +1,42 @@
-Tcl/Tk Mac OS X README
+Tcl/Tk macOS README
 ----------------------
 
-This is the README file for the Mac OS X/Darwin version of Tcl/Tk.
+This is the README file for the macOS/Darwin version of Tcl/Tk.
 
 1. Where to go for support
 --------------------------
 
 - The tcl-mac mailing list on sourceforge is the best place to ask questions
-specific to Tcl & Tk on Mac OS X:
+specific to Tcl & Tk on macOS:
 	http://lists.sourceforge.net/lists/listinfo/tcl-mac
 (this page also has a link to searchable archives of the list, please check them
 before asking on the list, many questions have already been answered).
 
 - For general Tcl/Tk questions, the newsgroup comp.lang.tcl is your best bet:
 	http://groups.google.com/group/comp.lang.tcl/
 
-- The Tcl'ers Wiki also has many pages dealing with Tcl & Tk on Mac OS X, see
+- The Tcl'ers Wiki also has many pages dealing with Tcl & Tk on macOS, see
 	http://wiki.tcl.tk/_/ref?N=3753
 	http://wiki.tcl.tk/_/ref?N=8361
 
-- Please report bugs with Tk on Mac OS X to the tracker:
+- Please report bugs with Tk on macOS to the tracker:
 	http://core.tcl.tk/tk/reportlist
 
-2. Using Tcl/Tk on Mac OS X
+2. Using Tcl/Tk on macOS
 ---------------------------
 
-- There are two versions of Tk available on Mac OS X: TkAqua using the native
+- There are two versions of Tk available on macOS: TkAqua using the native
 aqua widgets and look&feel, and TkX11 using the traditional unix X11 wigets.
 TkX11 requires an X11 server to be installed, such as Apple's X11 (which is
-available as an optional or default install on recent Mac OS X).
+available as an optional or default install on recent macOS).
 TkAqua and TkX11 can be distinguished at runtime via [tk windowingsystem].
 
-- At a minimum, Mac OS X 10.3 is required to run Tcl and TkX11.
-TkAqua requires Mac OS X 10.5 or later (starting with the Cocoa-based Tk 8.5.7).
+- At a minimum, macOS 10.3 is required to run Tcl and TkX11.
+TkAqua requires macOS 10.6 or later.
 
-- Unless weak-linking is used, Tcl/Tk built on Mac OS X 10.x will not run on
+- Unless weak-linking is used, Tcl/Tk built on macOS 10.x will not run on
 10.y with y < x; on the other hand Tcl/Tk built on 10.y will always run on 10.x
 with y <= x (but without any of the fixes and optimizations that would be
 available in a binary built on 10.x).
 Weak-linking is available on OS X 10.2 or later, it additionally allows Tcl/Tk
 built on 10.x to run on any 10.y with x > y >= z (for a chosen z >= 2).
@@ -60,12 +60,11 @@
 the Resources/Scripts directory of the framework.
 
 - [load]able binary extensions can linked as either ordinary shared libraries
 (.dylib) or as MachO bundles (since 8.4.10/8.5a3); bundles have the advantage
 that they are [load]ed more efficiently from a tcl VFS (no temporary copy to the
-native filesystem required), and prior to Mac OS X 10.5, only bundles can be
-[unload]ed.
+native filesystem required).
 
 - The 'deploy' target of macosx/GNUmakefile installs the html manpages into the
 standard documentation location in the Tcl/Tk frameworks:
 	Tcl.framework/Resources/Documentation/Reference/Tcl
 	Tk.framework/Resources/Documentation/Reference/Tk
@@ -161,11 +160,11 @@
 present, this procedure is invoked instead by the standard Help menu item.
 Support for the Window menu and [tk::mac::ShowHelp] was added with the
 Cocoa-based Tk 8.5.7.
 
 - The TkAqua-specific command [tk::unsupported::MacWindowStyle style] is used to
-get and set Mac OS X-specific toplevel window class and attributes. Note that
+get and set macOS-specific toplevel window class and attributes. Note that
 the window class and many attributes have to be set before the window is first
 mapped for the change to have any effect.
 The command has the following syntax:
 	tk::unsupported::MacWindowStyle style window ?class? ?attributes?
 The 2 argument form returns a list of the current class and attributes for the
@@ -177,80 +176,46 @@
 Window attribute names:
     standardDocument, standardFloating, resizable, fullZoom, horizontalZoom,
     verticalZoom, closeBox, collapseBox, toolbarButton, sideTitlebar,
     noTitleBar, unifiedTitleAndToolbar, metal, hud, noShadow, doesNotCycle,
     noActivates, hideOnSuspend, inWindowMenu, ignoreClicks, doesNotHide,
-    canJoinAllSpaces, moveToActiveSpace, nonActivating, black, dark, light,
-    gray, red, green, blue, cyan, yellow, magenta, orange, purple,
-    brown, clear, opacity
+    canJoinAllSpaces, moveToActiveSpace, nonActivating
 
 Note that not all attributes are valid for all window classes.
 Support for the 3 argument form was added with the Cocoa-based Tk 8.5.7, at the
 same time support for some legacy Carbon-specific classes and attributes was
 removed (they are still accepted by the command but no longer have any effect).
 
-The color window attributes (black, dark, red, etc.) and the "opacity" allow  one to set the background and opacity of a textured ("metal") window. This allows a Tk window to implement a window without the dividing line between the titlebar and the rest of the window, or the "unified toolbar" effect, which is increasingly standard in Mac applications. An example:
-
-toplevel .f
-tk::unsupported::MacWindowStyle style .f document {metal light opaque closeBox collapseBox resizable standardDocument }
-
-pack [label .f.f -bg  #ababab -text "This is a textured window\nwith opacity and a gray background\nsimilar to other Mac applications"] -fill both -expand yes
-
-The color attributes correspond to system-defined NSColor constants (e.g., red is [NSColor redColor]. The "light" and "dark" attributes correspond to lightGrayColor and darkGrayColor, respectively (because of the way the attributes are parsed, using "lightgray" and "darkgray" would cause a conflict with the core "gray" attribute).
-
-Below are the corresponding hex and/or Tk-defined colors that can be used from Tk widgets to match the NSColor-based attributes:
-
-black	#000000
-dark	#545454
-light	#ababab
-white	#ffffff
-gray	#7f7f7f
-red 	#ff0000
-green	#00ff00
-blue	#0000ff
-cyan	#00ffff
-yellow	#ffff00
-magenta	#ff00ff
-orange	#ff8000
-purple 	#800080
-brown	#996633
-clear	systemTransparent
-
-- The Cocoa-based TkAqua can be distinguished from the older Carbon-based
-version via the [winfo server .] command, example output on Mac OS X 10.5.7:
-    Cocoa-based:	CG409.3 Apple AppKit GC 949.46 Mac OS X 1057
-    Carbon-based:	QD10R30 Apple 1057
-
-- If you want to use Remote Debugging with Xcode, you need to set the
+If you want to use Remote Debugging with Xcode, you need to set the
 environment variable XCNOSTDIN to 1 in the Executable editor for Wish. That will
 cause us to force closing stdin & stdout.  Otherwise, given how Xcode launches
 Wish remotely, they will be left open and then Wish & gdb will fight for stdin.
 
 
-3. Building Tcl/Tk on Mac OS X
+3. Building Tcl/Tk on macOS
 ------------------------------
 
-- At least Mac OS X 10.3 is required to build Tcl and TkX11, and Mac OS X 10.5
-is required to build TkAqua.
-Apple's Xcode Developer Tools need to be installed (only the most recent version
-matching your OS release is supported), the Xcode installer is available on Mac
-OS X install media or may be present in /Applications/Installers on Macs that
-came with OS X preinstalled. The most recent version can always be downloaded
-from the ADC website http://connect.apple.com (free ADC membership required).
-
-- Tcl/Tk are most easily built as Mac OS X frameworks via GNUmakefile in
+- At least macOS 10.3 is required to build Tcl and TkX11, and macOS 10.6
+is required to build TkAqua.  The XCode application provides everything
+needed to build Tk, but it is not necessary to install the full XCode.
+It suffices to install the Command Line Tools package, which can be done
+by running the command:
+xcode-selecct --install
+
+- Tcl/Tk are most easily built as macOS frameworks via GNUmakefile in
 tcl/macosx and tk/macosx (see below for details), but can also be built with the
 standard unix configure and make buildsystem in tcl/unix resp. tk/unix as on any
 other unix platform (indeed, the GNUmakefiles are just wrappers around the unix
 buildsystem).
-The Mac OS X specific configure flags are --enable-aqua, --enable-framework and
+The macOS specific configure flags are --enable-aqua, --enable-framework and
 --disable-corefoundation (which disables CF and notably reverts to the standard
 select based notifier). Note that --enable-aqua is incompatible with
 --disable-corefoundation (for both Tcl and Tk configure).
 
-- It is also possible to build with the Xcode IDE via the projects in
-tk/macosx, take care to use the project matching your DevTools and OS version:
+- It was once possible to build with the Xcode IDE via the projects in
+tk/macosx, but this has not been tested recently. Take care to use the
+project matching your DevTools and OS version:
 	Tk.xcode: 		    for Xcode 3.1 on 10.5
 	Tk.xcodeproj:		    for Xcode 3.2 on 10.6
 These have the following targets:
 	Tk:			    calls through to tk/macosx/GNUMakefile,
 				    requires a corresponding build of the Tcl
@@ -290,11 +255,11 @@
 ${USER}.pbxuser file (located inside the Tk.xcodeproj bundle directory) with a
 text editor.
 
 - To build universal binaries outside of the Xcode IDE, set CFLAGS as follows:
 	export CFLAGS="-arch i386 -arch x86_64 -arch ppc"
-This requires Mac OS X 10.4 and Xcode 2.4 (or Xcode 2.2 if -arch x86_64 is
+This requires macOS 10.4 and Xcode 2.4 (or Xcode 2.2 if -arch x86_64 is
 omitted, but _not_ Xcode 2.1) and will work on any architecture (on PowerPC
 Tiger you need to add "-isysroot /Developer/SDKs/MacOSX10.4u.sdk").
 Note that configure requires CFLAGS to contain a least one architecture that can
 be run on the build machine (i.e. ppc on G3/G4, ppc or ppc64 on G5, ppc or i386
 on Core and ppc, i386 or x86_64 on Core2/Xeon).
@@ -301,13 +266,13 @@
 Universal builds of Tcl TEA extensions are also possible with CFLAGS set as
 above, they will be [load]able by universal as well as thin binaries of Tcl.
 
 - To enable weak-linking, set the MACOSX_DEPLOYMENT_TARGET environment variable
 to the minimal OS version the binaries should be able to run on, e.g:
-	export MACOSX_DEPLOYMENT_TARGET=10.4
+	export MACOSX_DEPLOYMENT_TARGET=10.6
 This requires at least gcc 3.1; with gcc 4 or later, set/add to CFLAGS instead:
-	export CFLAGS="-mmacosx-version-min=10.4"
+	export CFLAGS="-mmacosx-version-min=10.6"
 Support for weak-linking was added with 8.4.14/8.5a5.
 
 Detailed Instructions for building with macosx/GNUmakefile
 ----------------------------------------------------------
 
@@ -387,65 +352,221 @@
 	    TCL_FRAMEWORK_DIR=$HOME/Library/Frameworks TCLSH_DIR=$HOME/usr/bin
 	sudo make -C tk${ver}/macosx install \
 	    TCL_FRAMEWORK_DIR=$HOME/Library/Frameworks TCLSH_DIR=$HOME/usr/bin
 The Makefile variables TCL_FRAMEWORK_DIR and TCLSH_DIR were added with Tk 8.4.3.
 
-4. About the event loop in Tk for Mac OSX
------------------------------------------
+4. Details regarding the macOS port of Tk.
+-------------------------------------------
+
+4.1 About the event loop
+~~~~~~~~~~~~~~~~~~~~~~~~
 
-The main program in a typical OSX application looks like this (see *)
+The main program in a typical OSX application looks like this (see
+https://developer.apple.com/library/mac/documentation/Cocoa/\
+Reference/ApplicationKit/Classes/NSApplication_Class)
 
     void NSApplicationMain(int argc, char *argv[]) {
         [NSApplication sharedApplication];
         [NSBundle loadNibNamed:@"myMain" owner:NSApp];
         [NSApp run];
     }
+Here NSApp is a standard global variable, initialized by the OS, which
+points to an object in a subclass of NSApplication (called
+TKApplication in the case of the macOS port of Tk).
 
-The run method implements the event loop for the application.  There
-are three key steps in the run method.  First it calls
-[NSApp finishLaunching], which creates the bouncing application icon
-and does other mysterious things. Second it creates an
+The [NSApp run] method implements the event loop for a typical Mac
+application.  There are three key steps in the run method.  First it
+calls [NSApp finishLaunching], which creates the bouncing application
+icon and does other mysterious things. Second it creates an
 NSAutoreleasePool.  Third, it starts an event loop which drains the
 NSAutoreleasePool every time the queue is empty, and replaces the
 drained pool with a new one.  This third step is essential to
 preventing memory leaks, since the internal methods of Appkit objects
 all assume that an autorelease pool is in scope and will be drained
 when the event processing cycle ends.
 
-Mac OSX Tk does not call the [NSApp run] method at all.  Instead it
-uses the event loop built in to Tk.  So we must take care to replicate
-the important features of the method ourselves.  Here is how this
-works in outline.
-
-We add a private NSAUtoreleasePool* property to our subclass of
-NSApplication.  (The subclass is called TKApplication but can be
-referenced with the global variable NSApp).  The TkpInit
-function calls [NSApp _setup] which initializes this property by
-creating an NSAutoreleasePool. A bit later on, TkpInit calls
-[NSAPP _setupEventLoop] which in turn calls the
-[NSApp finishLaunching] method.
-
-Each time that Tcl processes an event in its queue, it calls a
-platform specific function which, in the case of Mac OSX, is named
-TkMacOSXEventsCheckProc.  In the unix implementations of Tk, including
-the Mac OSX version, this function collects events from an "event
-source", and transfers them to the Tcl event queue.  In Mac OSX the
-event source is the NSApplication event queue.  Each NSEvent is
-converted to a Tcl event which is added to the Tcl event queue.  The
-NSEvent is also passed to [NSApp sendevent], which sends the event on
-to the application's NSWindows, which send it to their NSViews, etc.
+The macOS Tk application does not call the [NSApp run] method at
+all.  Instead it uses the event loop built in to Tk.  So the
+application must take care to replicate the important features of the
+method ourselves.  The way that autorelease pools are handled is
+discussed in 4.2 below.  Here we discuss the event handling itself.
+
+The Tcl event loop simply consists of repeated calls to TclDoOneEvent.
+Each call to TclDoOneEvent begins by collecting all pending events from
+an "event source", converting them to Tcl events and adding them
+to the Tcl event queue. For macOS, the event source is the NSApp
+object, which maintains an event queue even though its run method
+will never be called to process them.  The NSApp provides methods for
+inspecting the queue and removing events from it as well as the
+[NSApp sendevent] which sends an event to all of the application's
+NSWindows which can then send it to subwindows, etc.
+
+The event collection process consists of first calling a platform
+specific SetupProc and then a platform specific CheckProc.  In
+the macOS port, these are named TkMacOSXEventsSetupProc and
+TkMacOSXEventsCheckProc.
+
+It is important to understand that the Apple window manager does not
+have the concept of an expose event.  Their replacement for an expose
+event is to have the window manager call the [NSView drawRect] method
+in any situation where an expose event for that NSView would be
+generated in X11.  The [NSView drawRect] method is a no-op which is
+expected to be overridden by any application.  In the case of Tcl, the
+replacement [NSView drawRect] method creates a Tcl expose event
+for each dirty rectangle of the NSView, and then adds the expose
+event to the Tcl queue.
+
+
+4.2 Autorelease pools
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+In order to carry out the job of managing autorelease pools, which
+would normally be handled by the [NSApp run] method, a private
+NSAUtoreleasePool* property is added to the TkApplication subclass of
+NSApplication. The TkpInit function calls [NSApp _setup] which
+initializes this property by creating an NSAutoreleasePool prior to
+calling [NSApp finishLaunching].  This mimics the behavior of the
+[NSApp run] method, which calls [NSApp finishLaunching] just before
+starting the event loop.
+
 Since the CheckProc function gets called for every Tk event, it is an
 appropriate place to drain the main NSAutoreleasePool and replace it
-with a new pool.  This is done by calling the method
-[NSApp _resetAutoreleasePool], where _resetAutoreleasePool is a method
-which we define for the subclass TKApplication.
-
-One minor caveat is that there are several steps of the Tk
-initialization which precede the call to TkpInit.  Notably, the font
-package is initialized first.  Since there is no NSAUtoreleasePool in
-scope prior to calling TkpInit, the functions called in these
-preliminary stages need to create and drain their own
+with a new pool.  This is done by calling the method [NSApp
+_resetAutoreleasePool], where _resetAutoreleasePool is a method which
+we define for the subclass.  Unfortunately, by itself this is not
+sufficient for safe memory managememt because, as was made painfully
+evident with the release of OS X 10.13, it is possible for calls to
+TclDoOneEvent, and hence to CheckProc, to be nested.  Draining the
+autorelease pool in a nested call leads to crashes as objects in use
+by the outer call can get freed by the inner call and then reused later.
+One particular situation where this happens is when a modal dialogue
+gets posted by a Tk Application.  To address this, the NSApp object
+also implements a semaphore to prevent draining the autorelease pool
+in nested calls to CheckProc.
+
+One additional minor caveat for developers is that there are several
+steps of the Tk initialization which precede the call to TkpInit.
+Notably, the font package is initialized first.  Since there is no
+NSAUtoreleasePool in scope prior to calling TkpInit, the functions
+called in these preliminary stages need to create and drain their own
 NSAutoreleasePools whenever they call methods of Appkit objects
 (e.g. NSFont).
 
-* https://developer.apple.com/library/mac/documentation/Cocoa/\
-Reference/ApplicationKit/Classes/NSApplication_Class
+4.3 Clipping regions and "ghost windows"
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Another unusual aspect of the macOS port is its use of clipping
+regions.  It was part of Daniel Steffen's original design that the
+TkWindowPrivate struct maintains three HIShapeRef regions, named
+visRgn, aboveVisRgn and drawRgn.  These regions are used as clipping
+masks whenever drawing into an NSView.  The visRgn is the bounding box
+of the window with a rectangle removed for each subwindow and for each
+sibling window at a higher stacking level.  The drawRgn is the
+intersection of the visRgn with the clipping rectangle of the
+window. (Normally, the clipping rectangle is the same as the bounding
+rectangle, but drawing can be clipped to a smaller rectangle by
+calling TkpClipDrawableToRect.) The aboveVisRgn is the intersection of
+the window's bounding rectangle with the bounding rectangle of the
+parent window.  Much of the code in tkMacOSXSubindows.c is devoted to
+rebuilding these clipping regions whenever something changes in the
+layout of the windows.  This turns out to be a tricky thing to do and
+it is extremely prone to errors which can be difficult to trace.
+
+It is not entirely clear what the original reason for using these
+clipping regions was.  But one benefit is that if they are correctly
+maintained then it allows windows to be drawn in any order.  You do
+not have to draw them in the order of the window hierarchy.  Each
+window can draw its entire rectangle through its own mask and never
+have to worry about drawing in the wrong place.  It is likely that
+the need for using clipping regions arose because, as Apple explicitly
+states in the documentation for [NSView subviews],
+
+    "The order of the subviews may be considered as being
+    back-to-front, but this does not imply invalidation and drawing
+    behavior."
+
+In the early versions of the macOS port, buttons were implemented as
+subviews of class TkButton.  This probably exacerbated the likelihood
+that Tk windows would need to be drawn in arbitrary order.
+
+The most obvious side effect caused by not maintaining the clipping
+regions is the appearance of so-called "ghost windows".  A common
+situation where these may arise is when a window containing buttons
+is being scrolled.  A user may see two images of the same button on
+the screen, one in the pre-scroll location and one in the post-scroll
+location.
+
+To see how these 'ghost windows' can arise, think about what happens if
+the clipping regions are not maintained correctly.  A window might
+have a rectangle missing from its clipping region because that
+rectangle is the bounding rectangle for a subwindow, say a button.
+The parent should not draw in the missing rectangle since doing so
+would trash the button.  The button is responsible for drawing
+there. Now imagine that the button gets moved, say by a scroll, but
+the missing rectangle in the parent's clipping region does not get
+moved correctly, or it gets moved later on, after the parent has
+redrawn itself.  The parent would still not be allowed to draw in the
+old rectangle, so the user would continue to see the image of the
+button in its old location, as well as another image in the new
+location.  This is a prototypical example of a "ghost window".
+Anytime you see a "ghost window", you should suspect problems with the
+updates to the clipping region visRgn.  It is natural to look for
+timing issues, race conditions, or other "event loop problems".  But
+in fact, the whole design of the code is to make those timing issues
+irrelevant.  As long as the clipping regions are correctly maintained
+the timing does not matter.  And if they are not correctly maintained
+then you will see "ghost windows".
+
+It is worth including a detailed description of one specific place
+where the failure to correctly maintain clipping regions caused "ghost
+window" artifacts that plagued the macOS port for years.  These
+occurred when scrolling a Text widget which contained embedded
+subwindows.  It involved some specific differences between the
+low-level behavior of Apple's window manager versus those of the other
+platforms, and the fix ultimately required changes in the generic Tk
+implementation (documented in the comments in the DisplayText
+function).
+
+The Text widget attempts to improve perfomance when scrolling by
+minimizing the number of text lines which need to be redisplayed.  It
+does this by calling the platform-specific TkScrollWindow function
+which uses a low-level routine to map one rectangle of the window to
+another.  The TkScrollWindow function returns a damage region which is
+then used by the Text widget's DisplayText function to determine which
+text lines need to be redrawn.  On the unix and win platforms, this
+damage region includes bounding rectangles for all embedded windows
+inside the Text widget.  The way that this works is system dependent.
+On unix, the low level scrolling is done by XCopyRegion, which
+generates a GraphicsExpose event for each embedded window.  These
+GraphicsExposed events are processsed within TkScrollWindow, using a
+special handler which adds the bounding rectangle of each subwindow to
+the damage region.  On the win platform the damage region is built by
+the low level function ScrollWindowEx, and it also includes bounding
+rectangles for all embedded windows.  This is possible because on X11
+and Windows every Tk widget is also known to the window manager as a
+window.  The situation is different on macOS.  The underlying object
+for a top level window on macOS is the NSView.  However, Apple
+explicitly warns in its documentation that performance degradation
+occurs when an NSView has more than about 100 subviews.  A Text widget
+with thousands of lines of text could easily contain more than 100
+embedded windows.  In fact, while the original Cocoa port of Tk did
+use the NSButton object, which is derived from NSView, as the basis
+for its Tk Buttons, that was changed in order to improve performance.
+Moreover, the low level routine used for scrolling on macOS, namely
+[NSView scrollrect:by], does not provide any damage information.  So
+TkScrollWindow needs to work differently on macOS.  Since it would be
+inefficient to iterate through all embedded windows in a Text widget,
+looking for those which meet the scrolling area, the damage region
+constructed by TkScrollWindow contains only the difference between the
+source and destination rectangles for the scrolling.  The embedded
+windows are redrawn within the DisplayText function by some
+conditional code which is only used for macOS.
+
+5.0 Virtual events on 10.14
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+10.14 supports system appearance changes, and has added a "Dark Mode"
+that casts all window frames and menus as black. Tk 8.6.9 has added two
+virtual events, <<LightAqua>> and <<DarkAqua>>, to allow you to update
+your Tk app's appearance when the system appearance changes. Just bind
+your appearance-updating code to these virtual events and you will see
+it triggered when the system appearance toggles between dark and light.

Index: macosx/Tk-Common.xcconfig
==================================================================
--- macosx/Tk-Common.xcconfig
+++ macosx/Tk-Common.xcconfig
@@ -34,13 +34,13 @@
 LIBDIR = $(PREFIX)/lib
 MANDIR = $(PREFIX)/man
 PER_ARCH_CFLAGS_ppc = -mcpu=G3 -mtune=G4 $(PER_ARCH_CFLAGS_ppc)
 PREFIX = /usr/local
 TCL_BUILD_DIR = $(OBJROOT)/../tcl/Tcl.build/$(CONFIGURATION)/Tcl.build/Objects
-TCL_CONFIGURE_ARGS = --enable-threads --enable-dtrace
+TCL_CONFIGURE_ARGS = --enable-dtrace
 TCL_FRAMEWORK_DIR = $(SYMROOT)/../tcl/$(CONFIGURATION)
 TCL_LIBRARY = $(LIBDIR)/tcl$(VERSION)
 TCL_PACKAGE_PATH = "$(LIBDIR)"
 TCL_DEFS = HAVE_TCL_CONFIG_H
 TK_LIBRARY = $(LIBDIR)/tk$(VERSION)
 TK_DEFS = HAVE_TK_CONFIG_H TCL_NO_DEPRECATED
-VERSION = 8.6
+VERSION = 8.7

Index: macosx/Tk.xcode/project.pbxproj
==================================================================
--- macosx/Tk.xcode/project.pbxproj
+++ macosx/Tk.xcode/project.pbxproj
@@ -1170,11 +1170,11 @@
 		F966BC6808F27A3D005CB29B /* winWm.test */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = winWm.test; sourceTree = "<group>"; };
 		F966BC6908F27A3D005CB29B /* wm.test */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = wm.test; sourceTree = "<group>"; };
 		F966BC6A08F27A3D005CB29B /* xmfbox.test */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = xmfbox.test; sourceTree = "<group>"; };
 		F966BC6C08F27A3D005CB29B /* aclocal.m4 */ = {isa = PBXFileReference; explicitFileType = text.script.sh; fileEncoding = 4; path = aclocal.m4; sourceTree = "<group>"; };
 		F966BC6D08F27A3D005CB29B /* configure */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = configure; sourceTree = "<group>"; };
-		F966BC6E08F27A3D005CB29B /* configure.in */ = {isa = PBXFileReference; explicitFileType = text.script.sh; fileEncoding = 4; path = configure.in; sourceTree = "<group>"; };
+		F966BC6E08F27A3D005CB29B /* configure.ac */ = {isa = PBXFileReference; explicitFileType = text.script.sh; fileEncoding = 4; path = configure.ac; sourceTree = "<group>"; };
 		F966BC6F08F27A3D005CB29B /* install-sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = "install-sh"; sourceTree = "<group>"; };
 		F966BC7008F27A3D005CB29B /* installManPage */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = installManPage; sourceTree = "<group>"; };
 		F966BC7108F27A3D005CB29B /* Makefile.in */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 4; path = Makefile.in; sourceTree = "<group>"; };
 		F966BC7208F27A3D005CB29B /* README */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README; sourceTree = "<group>"; };
 		F966BC7308F27A3D005CB29B /* tcl.m4 */ = {isa = PBXFileReference; explicitFileType = text.script.sh; fileEncoding = 4; path = tcl.m4; sourceTree = "<group>"; };
@@ -1209,21 +1209,18 @@
 		F966BC9008F27A3D005CB29B /* tkUnixWm.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tkUnixWm.c; sourceTree = "<group>"; };
 		F966BC9108F27A3D005CB29B /* tkUnixXId.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tkUnixXId.c; sourceTree = "<group>"; };
 		F966BC9408F27A3D005CB29B /* aclocal.m4 */ = {isa = PBXFileReference; explicitFileType = text.script.sh; fileEncoding = 4; path = aclocal.m4; sourceTree = "<group>"; };
 		F966BC9508F27A3D005CB29B /* buildall.vc.bat */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = buildall.vc.bat; sourceTree = "<group>"; };
 		F966BC9608F27A3E005CB29B /* configure */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = configure; sourceTree = "<group>"; };
-		F966BC9708F27A3E005CB29B /* configure.in */ = {isa = PBXFileReference; explicitFileType = text.script.sh; fileEncoding = 4; path = configure.in; sourceTree = "<group>"; };
-		F966BC9808F27A3E005CB29B /* makefile.bc */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 4; path = makefile.bc; sourceTree = "<group>"; };
+		F966BC9708F27A3E005CB29B /* configure.ac */ = {isa = PBXFileReference; explicitFileType = text.script.sh; fileEncoding = 4; path = configure.ac; sourceTree = "<group>"; };
 		F966BC9908F27A3E005CB29B /* Makefile.in */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 4; path = Makefile.in; sourceTree = "<group>"; };
 		F966BC9A08F27A3E005CB29B /* makefile.vc */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 4; path = makefile.vc; sourceTree = "<group>"; };
-		F966BC9B08F27A3E005CB29B /* mkd.bat */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mkd.bat; sourceTree = "<group>"; };
 		F966BC9C08F27A3E005CB29B /* nmakehlp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = nmakehlp.c; sourceTree = "<group>"; };
 		F966BCEE08F27A3E005CB29B /* tk.rc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = tk.rc; sourceTree = "<group>"; };
 		F966BCEF08F27A3E005CB29B /* tk_base.rc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = tk_base.rc; sourceTree = "<group>"; };
 		F966BCF208F27A3E005CB29B /* wish.rc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = wish.rc; sourceTree = "<group>"; };
 		F966BCF308F27A3E005CB29B /* README */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README; sourceTree = "<group>"; };
-		F966BCF408F27A3E005CB29B /* rmd.bat */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = rmd.bat; sourceTree = "<group>"; };
 		F966BCF508F27A3F005CB29B /* rules.vc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = rules.vc; sourceTree = "<group>"; };
 		F966BCF608F27A3F005CB29B /* stubs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = stubs.c; sourceTree = "<group>"; };
 		F966BCF708F27A3F005CB29B /* tcl.m4 */ = {isa = PBXFileReference; explicitFileType = text.script.sh; fileEncoding = 4; path = tcl.m4; sourceTree = "<group>"; };
 		F966BCF808F27A3F005CB29B /* tkConfig.sh.in */ = {isa = PBXFileReference; explicitFileType = text.script.sh; fileEncoding = 4; path = tkConfig.sh.in; sourceTree = "<group>"; };
 		F966BCF908F27A3F005CB29B /* tkWin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tkWin.h; sourceTree = "<group>"; };
@@ -1914,11 +1911,11 @@
 		F96D43CD08F272B7004A47F5 /* winNotify.test */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = winNotify.test; sourceTree = "<group>"; };
 		F96D43CE08F272B7004A47F5 /* winPipe.test */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = winPipe.test; sourceTree = "<group>"; };
 		F96D43CF08F272B7004A47F5 /* winTime.test */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = winTime.test; sourceTree = "<group>"; };
 		F96D43D108F272B8004A47F5 /* checkLibraryDoc.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = checkLibraryDoc.tcl; sourceTree = "<group>"; };
 		F96D43D208F272B8004A47F5 /* configure */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = configure; sourceTree = "<group>"; };
-		F96D43D308F272B8004A47F5 /* configure.in */ = {isa = PBXFileReference; explicitFileType = text.script.sh; fileEncoding = 4; path = configure.in; sourceTree = "<group>"; };
+		F96D43D308F272B8004A47F5 /* configure.ac */ = {isa = PBXFileReference; explicitFileType = text.script.sh; fileEncoding = 4; path = configure.ac; sourceTree = "<group>"; };
 		F96D442208F272B8004A47F5 /* eolFix.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = eolFix.tcl; sourceTree = "<group>"; };
 		F96D442408F272B8004A47F5 /* fix_tommath_h.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = fix_tommath_h.tcl; sourceTree = "<group>"; };
 		F96D442508F272B8004A47F5 /* genStubs.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = genStubs.tcl; sourceTree = "<group>"; };
 		F96D442708F272B8004A47F5 /* index.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = index.tcl; sourceTree = "<group>"; };
 		F96D442808F272B8004A47F5 /* installData.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = installData.tcl; sourceTree = "<group>"; };
@@ -1939,11 +1936,11 @@
 		F96D443A08F272B9004A47F5 /* tclZIC.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = tclZIC.tcl; sourceTree = "<group>"; };
 		F96D443B08F272B9004A47F5 /* uniClass.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = uniClass.tcl; sourceTree = "<group>"; };
 		F96D443C08F272B9004A47F5 /* uniParse.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = uniParse.tcl; sourceTree = "<group>"; };
 		F96D444008F272B9004A47F5 /* aclocal.m4 */ = {isa = PBXFileReference; explicitFileType = text.script.sh; fileEncoding = 4; path = aclocal.m4; sourceTree = "<group>"; };
 		F96D444108F272B9004A47F5 /* configure */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = configure; sourceTree = "<group>"; };
-		F96D444208F272B9004A47F5 /* configure.in */ = {isa = PBXFileReference; explicitFileType = text.script.sh; fileEncoding = 4; path = configure.in; sourceTree = "<group>"; };
+		F96D444208F272B9004A47F5 /* configure.ac */ = {isa = PBXFileReference; explicitFileType = text.script.sh; fileEncoding = 4; path = configure.ac; sourceTree = "<group>"; };
 		F96D444408F272B9004A47F5 /* Makefile.in */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 4; path = Makefile.in; sourceTree = "<group>"; };
 		F96D444508F272B9004A47F5 /* pkga.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = pkga.c; sourceTree = "<group>"; };
 		F96D444608F272B9004A47F5 /* pkgb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = pkgb.c; sourceTree = "<group>"; };
 		F96D444708F272B9004A47F5 /* pkgc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = pkgc.c; sourceTree = "<group>"; };
 		F96D444808F272B9004A47F5 /* pkgd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = pkgd.c; sourceTree = "<group>"; };
@@ -1982,14 +1979,12 @@
 		F96D446C08F272B9004A47F5 /* tclXtNotify.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tclXtNotify.c; sourceTree = "<group>"; };
 		F96D446D08F272B9004A47F5 /* tclXtTest.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tclXtTest.c; sourceTree = "<group>"; };
 		F96D447008F272BA004A47F5 /* aclocal.m4 */ = {isa = PBXFileReference; explicitFileType = text.script.sh; fileEncoding = 4; path = aclocal.m4; sourceTree = "<group>"; };
 		F96D447108F272BA004A47F5 /* buildall.vc.bat */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = buildall.vc.bat; sourceTree = "<group>"; };
 		F96D447208F272BA004A47F5 /* cat.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cat.c; sourceTree = "<group>"; };
-		F96D447308F272BA004A47F5 /* coffbase.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = coffbase.txt; sourceTree = "<group>"; };
 		F96D447408F272BA004A47F5 /* configure */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = configure; sourceTree = "<group>"; };
-		F96D447508F272BA004A47F5 /* configure.in */ = {isa = PBXFileReference; explicitFileType = text.script.sh; fileEncoding = 4; path = configure.in; sourceTree = "<group>"; };
-		F96D447608F272BA004A47F5 /* makefile.bc */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 4; path = makefile.bc; sourceTree = "<group>"; };
+		F96D447508F272BA004A47F5 /* configure.ac */ = {isa = PBXFileReference; explicitFileType = text.script.sh; fileEncoding = 4; path = configure.ac; sourceTree = "<group>"; };
 		F96D447708F272BA004A47F5 /* Makefile.in */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 4; path = Makefile.in; sourceTree = "<group>"; };
 		F96D447808F272BA004A47F5 /* makefile.vc */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 4; path = makefile.vc; sourceTree = "<group>"; };
 		F96D447908F272BA004A47F5 /* nmakehlp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = nmakehlp.c; sourceTree = "<group>"; };
 		F96D447A08F272BA004A47F5 /* README */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README; sourceTree = "<group>"; };
 		F96D447C08F272BA004A47F5 /* rules.vc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = rules.vc; sourceTree = "<group>"; };
@@ -2741,11 +2736,11 @@
 		F966BC6B08F27A3D005CB29B /* unix */ = {
 			isa = PBXGroup;
 			children = (
 				F966BC6C08F27A3D005CB29B /* aclocal.m4 */,
 				F966BC6D08F27A3D005CB29B /* configure */,
-				F966BC6E08F27A3D005CB29B /* configure.in */,
+				F966BC6E08F27A3D005CB29B /* configure.ac */,
 				F966BC6F08F27A3D005CB29B /* install-sh */,
 				F966BC7008F27A3D005CB29B /* installManPage */,
 				F966BC7108F27A3D005CB29B /* Makefile.in */,
 				F966BC7208F27A3D005CB29B /* README */,
 				F966BC7308F27A3D005CB29B /* tcl.m4 */,
@@ -2788,15 +2783,13 @@
 			isa = PBXGroup;
 			children = (
 				F966BC9408F27A3D005CB29B /* aclocal.m4 */,
 				F966BC9508F27A3D005CB29B /* buildall.vc.bat */,
 				F966BC9608F27A3E005CB29B /* configure */,
-				F966BC9708F27A3E005CB29B /* configure.in */,
-				F966BC9808F27A3E005CB29B /* makefile.bc */,
+				F966BC9708F27A3E005CB29B /* configure.ac */,
 				F966BC9908F27A3E005CB29B /* Makefile.in */,
 				F966BC9A08F27A3E005CB29B /* makefile.vc */,
-				F966BC9B08F27A3E005CB29B /* mkd.bat */,
 				F966BC9C08F27A3E005CB29B /* nmakehlp.c */,
 				F966BC9D08F27A3E005CB29B /* rc */,
 				F966BCF308F27A3E005CB29B /* README */,
 				F966BCF408F27A3E005CB29B /* rmd.bat */,
 				F966BCF508F27A3F005CB29B /* rules.vc */,
@@ -3724,11 +3717,11 @@
 		F96D43D008F272B8004A47F5 /* tools */ = {
 			isa = PBXGroup;
 			children = (
 				F96D43D108F272B8004A47F5 /* checkLibraryDoc.tcl */,
 				F96D43D208F272B8004A47F5 /* configure */,
-				F96D43D308F272B8004A47F5 /* configure.in */,
+				F96D43D308F272B8004A47F5 /* configure.ac */,
 				F96D442208F272B8004A47F5 /* eolFix.tcl */,
 				F96D442408F272B8004A47F5 /* fix_tommath_h.tcl */,
 				F96D442508F272B8004A47F5 /* genStubs.tcl */,
 				F96D442708F272B8004A47F5 /* index.tcl */,
 				F96D442808F272B8004A47F5 /* installData.tcl */,
@@ -3757,11 +3750,11 @@
 		F96D443E08F272B9004A47F5 /* unix */ = {
 			isa = PBXGroup;
 			children = (
 				F96D444008F272B9004A47F5 /* aclocal.m4 */,
 				F96D444108F272B9004A47F5 /* configure */,
-				F96D444208F272B9004A47F5 /* configure.in */,
+				F96D444208F272B9004A47F5 /* configure.ac */,
 				F96D444308F272B9004A47F5 /* dltest */,
 				F96D444D08F272B9004A47F5 /* install-sh */,
 				F96D444E08F272B9004A47F5 /* installManPage */,
 				F96D444F08F272B9004A47F5 /* ldAix */,
 				F96D445008F272B9004A47F5 /* Makefile.in */,
@@ -3817,14 +3810,12 @@
 			isa = PBXGroup;
 			children = (
 				F96D447008F272BA004A47F5 /* aclocal.m4 */,
 				F96D447108F272BA004A47F5 /* buildall.vc.bat */,
 				F96D447208F272BA004A47F5 /* cat.c */,
-				F96D447308F272BA004A47F5 /* coffbase.txt */,
 				F96D447408F272BA004A47F5 /* configure */,
-				F96D447508F272BA004A47F5 /* configure.in */,
-				F96D447608F272BA004A47F5 /* makefile.bc */,
+				F96D447508F272BA004A47F5 /* configure.ac */,
 				F96D447708F272BA004A47F5 /* Makefile.in */,
 				F96D447808F272BA004A47F5 /* makefile.vc */,
 				F96D447908F272BA004A47F5 /* nmakehlp.c */,
 				F96D447A08F272BA004A47F5 /* README */,
 				F96D447C08F272BA004A47F5 /* rules.vc */,
@@ -3972,11 +3963,11 @@
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 				"$(TCL_SRCROOT)/macosx/configure.ac",
-				"$(TCL_SRCROOT)/unix/configure.in",
+				"$(TCL_SRCROOT)/unix/configure.ac",
 				"$(TCL_SRCROOT)/unix/tcl.m4",
 				"$(TCL_SRCROOT)/unix/aclocal.m4",
 				"$(TCL_SRCROOT)/unix/tclConfig.sh.in",
 				"$(TCL_SRCROOT)/unix/Makefile.in",
 				"$(TCL_SRCROOT)/unix/dltest/Makefile.in",
@@ -3985,21 +3976,21 @@
 			outputPaths = (
 				"$(DERIVED_FILE_DIR)/tcl/tclConfig.sh",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/bash;
-			shellScript = "## tcl configure shell script phase\n\ncd \"${TCL_SRCROOT}\"/macosx &&\nif [ configure.ac -nt configure -o ../unix/configure.in -nt configure -o ../unix/tcl.m4 -nt configure -o ../unix/aclocal.m4 -nt configure ]; then\n    echo \"Running autoconf & autoheader in tcl/macosx\"\n    rm -rf autom4te.cache\n    ${AUTOCONF:-${DEVELOPER_DIR}/usr/bin/autoconf} && ${AUTOHEADER:-${DEVELOPER_DIR}/usr/bin/autoheader} || exit $?\n    rm -rf autom4te.cache\nfi\n\ncd \"${DERIVED_FILE_DIR}\" && mkdir -p tcl && cd tcl &&\nif [ \"${TCL_SRCROOT}\"/macosx/configure -nt config.status ]; then\n    echo \"Configuring Tcl\"\n    CC=$(xcrun -find ${GCC} || echo ${GCC})\n    \"${TCL_SRCROOT}\"/macosx/configure --cache-file=../config.cache --prefix=${PREFIX} --bindir=${BINDIR} --libdir=${LIBDIR} --mandir=${MANDIR} --includedir=${INCLUDEDIR} --disable-shared CC=${CC} LD=${CC} ${CONFIGURE_ARGS}\nelse\n    ./config.status\nfi\n";
+			shellScript = "## tcl configure shell script phase\n\ncd \"${TCL_SRCROOT}\"/macosx &&\nif [ configure.ac -nt configure -o ../unix/configure.ac -nt configure -o ../unix/tcl.m4 -nt configure -o ../unix/aclocal.m4 -nt configure ]; then\n    echo \"Running autoconf & autoheader in tcl/macosx\"\n    rm -rf autom4te.cache\n    ${AUTOCONF:-${DEVELOPER_DIR}/usr/bin/autoconf} && ${AUTOHEADER:-${DEVELOPER_DIR}/usr/bin/autoheader} || exit $?\n    rm -rf autom4te.cache\nfi\n\ncd \"${DERIVED_FILE_DIR}\" && mkdir -p tcl && cd tcl &&\nif [ \"${TCL_SRCROOT}\"/macosx/configure -nt config.status ]; then\n    echo \"Configuring Tcl\"\n    CC=$(xcrun -find ${GCC} || echo ${GCC})\n    \"${TCL_SRCROOT}\"/macosx/configure --cache-file=../config.cache --prefix=${PREFIX} --bindir=${BINDIR} --libdir=${LIBDIR} --mandir=${MANDIR} --includedir=${INCLUDEDIR} --disable-shared CC=${CC} LD=${CC} ${CONFIGURE_ARGS}\nelse\n    ./config.status\nfi\n";
 			showEnvVarsInLog = 0;
 		};
 		F9A5C5F608F651AB008AE941 /* Configure Tk */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 				"$(TK_SRCROOT)/macosx/configure.ac",
-				"$(TK_SRCROOT)/unix/configure.in",
+				"$(TK_SRCROOT)/unix/configure.ac",
 				"$(TK_SRCROOT)/unix/tcl.m4",
 				"$(TK_SRCROOT)/unix/aclocal.m4",
 				"$(TK_SRCROOT)/unix/tkConfig.sh.in",
 			);
 			name = "Configure Tk";
@@ -4006,21 +3997,21 @@
 			outputPaths = (
 				"$(DERIVED_FILE_DIR)/tk/tkConfig.sh",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/bash;
-			shellScript = "## tk configure shell script phase\n\ncd \"${TK_SRCROOT}\"/macosx &&\nif [ configure.ac -nt configure -o ../unix/configure.in -nt configure -o ../unix/tcl.m4 -nt configure -o ../unix/aclocal.m4 -nt configure ]; then\n    echo \"Running autoconf & autoheader in tk/macosx\"\n    rm -rf autom4te.cache\n    ${AUTOCONF:-${DEVELOPER_DIR}/usr/bin/autoconf} && ${AUTOHEADER:-${DEVELOPER_DIR}/usr/bin/autoheader} || exit $?\n    rm -rf autom4te.cache\nfi\n\ncd \"${DERIVED_FILE_DIR}\" && mkdir -p tk && cd tk &&\nif [ \"${TK_SRCROOT}\"/macosx/configure -nt config.status ]; then\n    echo \"Configuring Tk\"\n    CC=$(xcrun -find ${GCC} || echo ${GCC})\n    \"${TK_SRCROOT}\"/macosx/configure --cache-file=../config.cache --prefix=${PREFIX} --bindir=${BINDIR} --libdir=${LIBDIR} --mandir=${MANDIR} --includedir=${INCLUDEDIR} --disable-shared --enable-aqua --with-tcl=../tcl CC=${CC} LD=${CC} ${CONFIGURE_ARGS}\nelse\n    ./config.status\nfi\n";
+			shellScript = "## tk configure shell script phase\n\ncd \"${TK_SRCROOT}\"/macosx &&\nif [ configure.ac -nt configure -o ../unix/configure.ac -nt configure -o ../unix/tcl.m4 -nt configure -o ../unix/aclocal.m4 -nt configure ]; then\n    echo \"Running autoconf & autoheader in tk/macosx\"\n    rm -rf autom4te.cache\n    ${AUTOCONF:-${DEVELOPER_DIR}/usr/bin/autoconf} && ${AUTOHEADER:-${DEVELOPER_DIR}/usr/bin/autoheader} || exit $?\n    rm -rf autom4te.cache\nfi\n\ncd \"${DERIVED_FILE_DIR}\" && mkdir -p tk && cd tk &&\nif [ \"${TK_SRCROOT}\"/macosx/configure -nt config.status ]; then\n    echo \"Configuring Tk\"\n    CC=$(xcrun -find ${GCC} || echo ${GCC})\n    \"${TK_SRCROOT}\"/macosx/configure --cache-file=../config.cache --prefix=${PREFIX} --bindir=${BINDIR} --libdir=${LIBDIR} --mandir=${MANDIR} --includedir=${INCLUDEDIR} --disable-shared --enable-aqua --with-tcl=../tcl CC=${CC} LD=${CC} ${CONFIGURE_ARGS}\nelse\n    ./config.status\nfi\n";
 			showEnvVarsInLog = 0;
 		};
 		F9FD30B40CC1AD070073837D /* Configure Tcl */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 				"$(TCL_SRCROOT)/macosx/configure.ac",
-				"$(TCL_SRCROOT)/unix/configure.in",
+				"$(TCL_SRCROOT)/unix/configure.ac",
 				"$(TCL_SRCROOT)/unix/tcl.m4",
 				"$(TCL_SRCROOT)/unix/aclocal.m4",
 				"$(TCL_SRCROOT)/unix/tclConfig.sh.in",
 				"$(TCL_SRCROOT)/unix/Makefile.in",
 				"$(TCL_SRCROOT)/unix/dltest/Makefile.in",
@@ -4029,21 +4020,21 @@
 			outputPaths = (
 				"$(DERIVED_FILE_DIR)/tcl/tclConfig.sh",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/bash;
-			shellScript = "## tcl configure shell script phase\n\ncd \"${TCL_SRCROOT}\"/macosx &&\nif [ configure.ac -nt configure -o ../unix/configure.in -nt configure -o ../unix/tcl.m4 -nt configure -o ../unix/aclocal.m4 -nt configure ]; then\n    echo \"Running autoconf & autoheader in tcl/macosx\"\n    rm -rf autom4te.cache\n    ${AUTOCONF:-${DEVELOPER_DIR}/usr/bin/autoconf} && ${AUTOHEADER:-${DEVELOPER_DIR}/usr/bin/autoheader} || exit $?\n    rm -rf autom4te.cache\nfi\n\ncd \"${DERIVED_FILE_DIR}\" && mkdir -p tcl && cd tcl &&\nif [ \"${TCL_SRCROOT}\"/macosx/configure -nt config.status ]; then\n    echo \"Configuring Tcl\"\n    CC=$(xcrun -find ${GCC} || echo ${GCC})\n    \"${TCL_SRCROOT}\"/macosx/configure --cache-file=../config.cache --prefix=${PREFIX} --bindir=${BINDIR} --libdir=${LIBDIR} --mandir=${MANDIR} --includedir=${INCLUDEDIR} --disable-shared CC=${CC} LD=${CC} ${CONFIGURE_ARGS}\nelse\n    ./config.status\nfi\n";
+			shellScript = "## tcl configure shell script phase\n\ncd \"${TCL_SRCROOT}\"/macosx &&\nif [ configure.ac -nt configure -o ../unix/configure.ac -nt configure -o ../unix/tcl.m4 -nt configure -o ../unix/aclocal.m4 -nt configure ]; then\n    echo \"Running autoconf & autoheader in tcl/macosx\"\n    rm -rf autom4te.cache\n    ${AUTOCONF:-${DEVELOPER_DIR}/usr/bin/autoconf} && ${AUTOHEADER:-${DEVELOPER_DIR}/usr/bin/autoheader} || exit $?\n    rm -rf autom4te.cache\nfi\n\ncd \"${DERIVED_FILE_DIR}\" && mkdir -p tcl && cd tcl &&\nif [ \"${TCL_SRCROOT}\"/macosx/configure -nt config.status ]; then\n    echo \"Configuring Tcl\"\n    CC=$(xcrun -find ${GCC} || echo ${GCC})\n    \"${TCL_SRCROOT}\"/macosx/configure --cache-file=../config.cache --prefix=${PREFIX} --bindir=${BINDIR} --libdir=${LIBDIR} --mandir=${MANDIR} --includedir=${INCLUDEDIR} --disable-shared CC=${CC} LD=${CC} ${CONFIGURE_ARGS}\nelse\n    ./config.status\nfi\n";
 			showEnvVarsInLog = 0;
 		};
 		F9FD30B50CC1AD070073837D /* Configure Tk */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 				"$(TK_SRCROOT)/macosx/configure.ac",
-				"$(TK_SRCROOT)/unix/configure.in",
+				"$(TK_SRCROOT)/unix/configure.ac",
 				"$(TK_SRCROOT)/unix/tcl.m4",
 				"$(TK_SRCROOT)/unix/aclocal.m4",
 				"$(TK_SRCROOT)/unix/tkConfig.sh.in",
 			);
 			name = "Configure Tk";
@@ -4050,11 +4041,11 @@
 			outputPaths = (
 				"$(DERIVED_FILE_DIR)/tk/tkConfig.sh",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/bash;
-			shellScript = "## tk configure shell script phase\n\ncd \"${TK_SRCROOT}\"/macosx &&\nif [ configure.ac -nt configure -o ../unix/configure.in -nt configure -o ../unix/tcl.m4 -nt configure -o ../unix/aclocal.m4 -nt configure ]; then\n    echo \"Running autoconf & autoheader in tk/macosx\"\n    rm -rf autom4te.cache\n    ${AUTOCONF:-${DEVELOPER_DIR}/usr/bin/autoconf} && ${AUTOHEADER:-${DEVELOPER_DIR}/usr/bin/autoheader} || exit $?\n    rm -rf autom4te.cache\nfi\n\ncd \"${DERIVED_FILE_DIR}\" && mkdir -p tk && cd tk &&\nif [ \"${TK_SRCROOT}\"/macosx/configure -nt config.status ]; then\n    echo \"Configuring Tk\"\n    CC=$(xcrun -find ${GCC} || echo ${GCC})\n    PATH=\"${PATH}:/usr/X11R6/bin\" \"${TK_SRCROOT}\"/macosx/configure --cache-file=../config.cache --prefix=${PREFIX} --bindir=${BINDIR} --libdir=${LIBDIR} --mandir=${MANDIR} --includedir=${INCLUDEDIR} --disable-shared --enable-xft --with-tcl=../tcl CC=${CC} LD=${CC} ${CONFIGURE_ARGS}\nelse\n    ./config.status\nfi";
+			shellScript = "## tk configure shell script phase\n\ncd \"${TK_SRCROOT}\"/macosx &&\nif [ configure.ac -nt configure -o ../unix/configure.ac -nt configure -o ../unix/tcl.m4 -nt configure -o ../unix/aclocal.m4 -nt configure ]; then\n    echo \"Running autoconf & autoheader in tk/macosx\"\n    rm -rf autom4te.cache\n    ${AUTOCONF:-${DEVELOPER_DIR}/usr/bin/autoconf} && ${AUTOHEADER:-${DEVELOPER_DIR}/usr/bin/autoheader} || exit $?\n    rm -rf autom4te.cache\nfi\n\ncd \"${DERIVED_FILE_DIR}\" && mkdir -p tk && cd tk &&\nif [ \"${TK_SRCROOT}\"/macosx/configure -nt config.status ]; then\n    echo \"Configuring Tk\"\n    CC=$(xcrun -find ${GCC} || echo ${GCC})\n    PATH=\"${PATH}:/usr/X11R6/bin\" \"${TK_SRCROOT}\"/macosx/configure --cache-file=../config.cache --prefix=${PREFIX} --bindir=${BINDIR} --libdir=${LIBDIR} --mandir=${MANDIR} --includedir=${INCLUDEDIR} --disable-shared --enable-xft --with-tcl=../tcl CC=${CC} LD=${CC} ${CONFIGURE_ARGS}\nelse\n    ./config.status\nfi";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */

Index: macosx/Tk.xcodeproj/project.pbxproj
==================================================================
--- macosx/Tk.xcodeproj/project.pbxproj
+++ macosx/Tk.xcodeproj/project.pbxproj
@@ -1170,11 +1170,11 @@
 		F966BC6808F27A3D005CB29B /* winWm.test */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = winWm.test; sourceTree = "<group>"; };
 		F966BC6908F27A3D005CB29B /* wm.test */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = wm.test; sourceTree = "<group>"; };
 		F966BC6A08F27A3D005CB29B /* xmfbox.test */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = xmfbox.test; sourceTree = "<group>"; };
 		F966BC6C08F27A3D005CB29B /* aclocal.m4 */ = {isa = PBXFileReference; explicitFileType = text.script.sh; fileEncoding = 4; path = aclocal.m4; sourceTree = "<group>"; };
 		F966BC6D08F27A3D005CB29B /* configure */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = configure; sourceTree = "<group>"; };
-		F966BC6E08F27A3D005CB29B /* configure.in */ = {isa = PBXFileReference; explicitFileType = text.script.sh; fileEncoding = 4; path = configure.in; sourceTree = "<group>"; };
+		F966BC6E08F27A3D005CB29B /* configure.ac */ = {isa = PBXFileReference; explicitFileType = text.script.sh; fileEncoding = 4; path = configure.ac; sourceTree = "<group>"; };
 		F966BC6F08F27A3D005CB29B /* install-sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = "install-sh"; sourceTree = "<group>"; };
 		F966BC7008F27A3D005CB29B /* installManPage */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = installManPage; sourceTree = "<group>"; };
 		F966BC7108F27A3D005CB29B /* Makefile.in */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 4; path = Makefile.in; sourceTree = "<group>"; };
 		F966BC7208F27A3D005CB29B /* README */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README; sourceTree = "<group>"; };
 		F966BC7308F27A3D005CB29B /* tcl.m4 */ = {isa = PBXFileReference; explicitFileType = text.script.sh; fileEncoding = 4; path = tcl.m4; sourceTree = "<group>"; };
@@ -1209,21 +1209,18 @@
 		F966BC9008F27A3D005CB29B /* tkUnixWm.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tkUnixWm.c; sourceTree = "<group>"; };
 		F966BC9108F27A3D005CB29B /* tkUnixXId.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tkUnixXId.c; sourceTree = "<group>"; };
 		F966BC9408F27A3D005CB29B /* aclocal.m4 */ = {isa = PBXFileReference; explicitFileType = text.script.sh; fileEncoding = 4; path = aclocal.m4; sourceTree = "<group>"; };
 		F966BC9508F27A3D005CB29B /* buildall.vc.bat */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = buildall.vc.bat; sourceTree = "<group>"; };
 		F966BC9608F27A3E005CB29B /* configure */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = configure; sourceTree = "<group>"; };
-		F966BC9708F27A3E005CB29B /* configure.in */ = {isa = PBXFileReference; explicitFileType = text.script.sh; fileEncoding = 4; path = configure.in; sourceTree = "<group>"; };
-		F966BC9808F27A3E005CB29B /* makefile.bc */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 4; path = makefile.bc; sourceTree = "<group>"; };
+		F966BC9708F27A3E005CB29B /* configure.ac */ = {isa = PBXFileReference; explicitFileType = text.script.sh; fileEncoding = 4; path = configure.ac; sourceTree = "<group>"; };
 		F966BC9908F27A3E005CB29B /* Makefile.in */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 4; path = Makefile.in; sourceTree = "<group>"; };
 		F966BC9A08F27A3E005CB29B /* makefile.vc */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 4; path = makefile.vc; sourceTree = "<group>"; };
-		F966BC9B08F27A3E005CB29B /* mkd.bat */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = mkd.bat; sourceTree = "<group>"; };
 		F966BC9C08F27A3E005CB29B /* nmakehlp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = nmakehlp.c; sourceTree = "<group>"; };
 		F966BCEE08F27A3E005CB29B /* tk.rc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = tk.rc; sourceTree = "<group>"; };
 		F966BCEF08F27A3E005CB29B /* tk_base.rc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = tk_base.rc; sourceTree = "<group>"; };
 		F966BCF208F27A3E005CB29B /* wish.rc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = wish.rc; sourceTree = "<group>"; };
 		F966BCF308F27A3E005CB29B /* README */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README; sourceTree = "<group>"; };
-		F966BCF408F27A3E005CB29B /* rmd.bat */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = rmd.bat; sourceTree = "<group>"; };
 		F966BCF508F27A3F005CB29B /* rules.vc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = rules.vc; sourceTree = "<group>"; };
 		F966BCF608F27A3F005CB29B /* stubs.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = stubs.c; sourceTree = "<group>"; };
 		F966BCF708F27A3F005CB29B /* tcl.m4 */ = {isa = PBXFileReference; explicitFileType = text.script.sh; fileEncoding = 4; path = tcl.m4; sourceTree = "<group>"; };
 		F966BCF808F27A3F005CB29B /* tkConfig.sh.in */ = {isa = PBXFileReference; explicitFileType = text.script.sh; fileEncoding = 4; path = tkConfig.sh.in; sourceTree = "<group>"; };
 		F966BCF908F27A3F005CB29B /* tkWin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tkWin.h; sourceTree = "<group>"; };
@@ -1914,11 +1911,11 @@
 		F96D43CD08F272B7004A47F5 /* winNotify.test */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = winNotify.test; sourceTree = "<group>"; };
 		F96D43CE08F272B7004A47F5 /* winPipe.test */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = winPipe.test; sourceTree = "<group>"; };
 		F96D43CF08F272B7004A47F5 /* winTime.test */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = winTime.test; sourceTree = "<group>"; };
 		F96D43D108F272B8004A47F5 /* checkLibraryDoc.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = checkLibraryDoc.tcl; sourceTree = "<group>"; };
 		F96D43D208F272B8004A47F5 /* configure */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = configure; sourceTree = "<group>"; };
-		F96D43D308F272B8004A47F5 /* configure.in */ = {isa = PBXFileReference; explicitFileType = text.script.sh; fileEncoding = 4; path = configure.in; sourceTree = "<group>"; };
+		F96D43D308F272B8004A47F5 /* configure.ac */ = {isa = PBXFileReference; explicitFileType = text.script.sh; fileEncoding = 4; path = configure.ac; sourceTree = "<group>"; };
 		F96D442208F272B8004A47F5 /* eolFix.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = eolFix.tcl; sourceTree = "<group>"; };
 		F96D442408F272B8004A47F5 /* fix_tommath_h.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = fix_tommath_h.tcl; sourceTree = "<group>"; };
 		F96D442508F272B8004A47F5 /* genStubs.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = genStubs.tcl; sourceTree = "<group>"; };
 		F96D442708F272B8004A47F5 /* index.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = index.tcl; sourceTree = "<group>"; };
 		F96D442808F272B8004A47F5 /* installData.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = installData.tcl; sourceTree = "<group>"; };
@@ -1939,11 +1936,11 @@
 		F96D443A08F272B9004A47F5 /* tclZIC.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = tclZIC.tcl; sourceTree = "<group>"; };
 		F96D443B08F272B9004A47F5 /* uniClass.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = uniClass.tcl; sourceTree = "<group>"; };
 		F96D443C08F272B9004A47F5 /* uniParse.tcl */ = {isa = PBXFileReference; explicitFileType = text.script; fileEncoding = 4; path = uniParse.tcl; sourceTree = "<group>"; };
 		F96D444008F272B9004A47F5 /* aclocal.m4 */ = {isa = PBXFileReference; explicitFileType = text.script.sh; fileEncoding = 4; path = aclocal.m4; sourceTree = "<group>"; };
 		F96D444108F272B9004A47F5 /* configure */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = configure; sourceTree = "<group>"; };
-		F96D444208F272B9004A47F5 /* configure.in */ = {isa = PBXFileReference; explicitFileType = text.script.sh; fileEncoding = 4; path = configure.in; sourceTree = "<group>"; };
+		F96D444208F272B9004A47F5 /* configure.ac */ = {isa = PBXFileReference; explicitFileType = text.script.sh; fileEncoding = 4; path = configure.ac; sourceTree = "<group>"; };
 		F96D444408F272B9004A47F5 /* Makefile.in */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 4; path = Makefile.in; sourceTree = "<group>"; };
 		F96D444508F272B9004A47F5 /* pkga.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = pkga.c; sourceTree = "<group>"; };
 		F96D444608F272B9004A47F5 /* pkgb.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = pkgb.c; sourceTree = "<group>"; };
 		F96D444708F272B9004A47F5 /* pkgc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = pkgc.c; sourceTree = "<group>"; };
 		F96D444808F272B9004A47F5 /* pkgd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = pkgd.c; sourceTree = "<group>"; };
@@ -1982,14 +1979,12 @@
 		F96D446C08F272B9004A47F5 /* tclXtNotify.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tclXtNotify.c; sourceTree = "<group>"; };
 		F96D446D08F272B9004A47F5 /* tclXtTest.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tclXtTest.c; sourceTree = "<group>"; };
 		F96D447008F272BA004A47F5 /* aclocal.m4 */ = {isa = PBXFileReference; explicitFileType = text.script.sh; fileEncoding = 4; path = aclocal.m4; sourceTree = "<group>"; };
 		F96D447108F272BA004A47F5 /* buildall.vc.bat */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = buildall.vc.bat; sourceTree = "<group>"; };
 		F96D447208F272BA004A47F5 /* cat.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cat.c; sourceTree = "<group>"; };
-		F96D447308F272BA004A47F5 /* coffbase.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = coffbase.txt; sourceTree = "<group>"; };
 		F96D447408F272BA004A47F5 /* configure */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = configure; sourceTree = "<group>"; };
-		F96D447508F272BA004A47F5 /* configure.in */ = {isa = PBXFileReference; explicitFileType = text.script.sh; fileEncoding = 4; path = configure.in; sourceTree = "<group>"; };
-		F96D447608F272BA004A47F5 /* makefile.bc */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 4; path = makefile.bc; sourceTree = "<group>"; };
+		F96D447508F272BA004A47F5 /* configure.ac */ = {isa = PBXFileReference; explicitFileType = text.script.sh; fileEncoding = 4; path = configure.ac; sourceTree = "<group>"; };
 		F96D447708F272BA004A47F5 /* Makefile.in */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 4; path = Makefile.in; sourceTree = "<group>"; };
 		F96D447808F272BA004A47F5 /* makefile.vc */ = {isa = PBXFileReference; explicitFileType = sourcecode.make; fileEncoding = 4; path = makefile.vc; sourceTree = "<group>"; };
 		F96D447908F272BA004A47F5 /* nmakehlp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = nmakehlp.c; sourceTree = "<group>"; };
 		F96D447A08F272BA004A47F5 /* README */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README; sourceTree = "<group>"; };
 		F96D447C08F272BA004A47F5 /* rules.vc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = rules.vc; sourceTree = "<group>"; };
@@ -2741,11 +2736,11 @@
 		F966BC6B08F27A3D005CB29B /* unix */ = {
 			isa = PBXGroup;
 			children = (
 				F966BC6C08F27A3D005CB29B /* aclocal.m4 */,
 				F966BC6D08F27A3D005CB29B /* configure */,
-				F966BC6E08F27A3D005CB29B /* configure.in */,
+				F966BC6E08F27A3D005CB29B /* configure.ac */,
 				F966BC6F08F27A3D005CB29B /* install-sh */,
 				F966BC7008F27A3D005CB29B /* installManPage */,
 				F966BC7108F27A3D005CB29B /* Makefile.in */,
 				F966BC7208F27A3D005CB29B /* README */,
 				F966BC7308F27A3D005CB29B /* tcl.m4 */,
@@ -2788,19 +2783,16 @@
 			isa = PBXGroup;
 			children = (
 				F966BC9408F27A3D005CB29B /* aclocal.m4 */,
 				F966BC9508F27A3D005CB29B /* buildall.vc.bat */,
 				F966BC9608F27A3E005CB29B /* configure */,
-				F966BC9708F27A3E005CB29B /* configure.in */,
-				F966BC9808F27A3E005CB29B /* makefile.bc */,
+				F966BC9708F27A3E005CB29B /* configure.ac */,
 				F966BC9908F27A3E005CB29B /* Makefile.in */,
 				F966BC9A08F27A3E005CB29B /* makefile.vc */,
-				F966BC9B08F27A3E005CB29B /* mkd.bat */,
 				F966BC9C08F27A3E005CB29B /* nmakehlp.c */,
 				F966BC9D08F27A3E005CB29B /* rc */,
 				F966BCF308F27A3E005CB29B /* README */,
-				F966BCF408F27A3E005CB29B /* rmd.bat */,
 				F966BCF508F27A3F005CB29B /* rules.vc */,
 				F966BCF608F27A3F005CB29B /* stubs.c */,
 				F966BCF708F27A3F005CB29B /* tcl.m4 */,
 				F966BCF808F27A3F005CB29B /* tkConfig.sh.in */,
 				F966BCF908F27A3F005CB29B /* tkWin.h */,
@@ -3724,11 +3716,11 @@
 		F96D43D008F272B8004A47F5 /* tools */ = {
 			isa = PBXGroup;
 			children = (
 				F96D43D108F272B8004A47F5 /* checkLibraryDoc.tcl */,
 				F96D43D208F272B8004A47F5 /* configure */,
-				F96D43D308F272B8004A47F5 /* configure.in */,
+				F96D43D308F272B8004A47F5 /* configure.ac */,
 				F96D442208F272B8004A47F5 /* eolFix.tcl */,
 				F96D442408F272B8004A47F5 /* fix_tommath_h.tcl */,
 				F96D442508F272B8004A47F5 /* genStubs.tcl */,
 				F96D442708F272B8004A47F5 /* index.tcl */,
 				F96D442808F272B8004A47F5 /* installData.tcl */,
@@ -3757,11 +3749,11 @@
 		F96D443E08F272B9004A47F5 /* unix */ = {
 			isa = PBXGroup;
 			children = (
 				F96D444008F272B9004A47F5 /* aclocal.m4 */,
 				F96D444108F272B9004A47F5 /* configure */,
-				F96D444208F272B9004A47F5 /* configure.in */,
+				F96D444208F272B9004A47F5 /* configure.ac */,
 				F96D444308F272B9004A47F5 /* dltest */,
 				F96D444D08F272B9004A47F5 /* install-sh */,
 				F96D444E08F272B9004A47F5 /* installManPage */,
 				F96D444F08F272B9004A47F5 /* ldAix */,
 				F96D445008F272B9004A47F5 /* Makefile.in */,
@@ -3817,14 +3809,12 @@
 			isa = PBXGroup;
 			children = (
 				F96D447008F272BA004A47F5 /* aclocal.m4 */,
 				F96D447108F272BA004A47F5 /* buildall.vc.bat */,
 				F96D447208F272BA004A47F5 /* cat.c */,
-				F96D447308F272BA004A47F5 /* coffbase.txt */,
 				F96D447408F272BA004A47F5 /* configure */,
-				F96D447508F272BA004A47F5 /* configure.in */,
-				F96D447608F272BA004A47F5 /* makefile.bc */,
+				F96D447508F272BA004A47F5 /* configure.ac */,
 				F96D447708F272BA004A47F5 /* Makefile.in */,
 				F96D447808F272BA004A47F5 /* makefile.vc */,
 				F96D447908F272BA004A47F5 /* nmakehlp.c */,
 				F96D447A08F272BA004A47F5 /* README */,
 				F96D447C08F272BA004A47F5 /* rules.vc */,
@@ -3975,11 +3965,11 @@
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 				"$(TCL_SRCROOT)/macosx/configure.ac",
-				"$(TCL_SRCROOT)/unix/configure.in",
+				"$(TCL_SRCROOT)/unix/configure.ac",
 				"$(TCL_SRCROOT)/unix/tcl.m4",
 				"$(TCL_SRCROOT)/unix/aclocal.m4",
 				"$(TCL_SRCROOT)/unix/tclConfig.sh.in",
 				"$(TCL_SRCROOT)/unix/Makefile.in",
 				"$(TCL_SRCROOT)/unix/dltest/Makefile.in",
@@ -3988,21 +3978,21 @@
 			outputPaths = (
 				"$(DERIVED_FILE_DIR)/tcl/tclConfig.sh",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/bash;
-			shellScript = "## tcl configure shell script phase\n\ncd \"${TCL_SRCROOT}\"/macosx &&\nif [ configure.ac -nt configure -o ../unix/configure.in -nt configure -o ../unix/tcl.m4 -nt configure -o ../unix/aclocal.m4 -nt configure ]; then\n    echo \"Running autoconf & autoheader in tcl/macosx\"\n    rm -rf autom4te.cache\n    ${AUTOCONF:-${DEVELOPER_DIR}/usr/bin/autoconf} && ${AUTOHEADER:-${DEVELOPER_DIR}/usr/bin/autoheader} || exit $?\n    rm -rf autom4te.cache\nfi\n\ncd \"${DERIVED_FILE_DIR}\" && mkdir -p tcl && cd tcl &&\nif [ \"${TCL_SRCROOT}\"/macosx/configure -nt config.status ]; then\n    echo \"Configuring Tcl\"\n    CC=$(xcrun -find ${GCC} || echo ${GCC})\n    \"${TCL_SRCROOT}\"/macosx/configure --cache-file=../config.cache --prefix=${PREFIX} --bindir=${BINDIR} --libdir=${LIBDIR} --mandir=${MANDIR} --includedir=${INCLUDEDIR} --disable-shared CC=${CC} LD=${CC} ${CONFIGURE_ARGS}\nelse\n    ./config.status\nfi\n";
+			shellScript = "## tcl configure shell script phase\n\ncd \"${TCL_SRCROOT}\"/macosx &&\nif [ configure.ac -nt configure -o ../unix/configure.ac -nt configure -o ../unix/tcl.m4 -nt configure -o ../unix/aclocal.m4 -nt configure ]; then\n    echo \"Running autoconf & autoheader in tcl/macosx\"\n    rm -rf autom4te.cache\n    ${AUTOCONF:-${DEVELOPER_DIR}/usr/bin/autoconf} && ${AUTOHEADER:-${DEVELOPER_DIR}/usr/bin/autoheader} || exit $?\n    rm -rf autom4te.cache\nfi\n\ncd \"${DERIVED_FILE_DIR}\" && mkdir -p tcl && cd tcl &&\nif [ \"${TCL_SRCROOT}\"/macosx/configure -nt config.status ]; then\n    echo \"Configuring Tcl\"\n    CC=$(xcrun -find ${GCC} || echo ${GCC})\n    \"${TCL_SRCROOT}\"/macosx/configure --cache-file=../config.cache --prefix=${PREFIX} --bindir=${BINDIR} --libdir=${LIBDIR} --mandir=${MANDIR} --includedir=${INCLUDEDIR} --disable-shared CC=${CC} LD=${CC} ${CONFIGURE_ARGS}\nelse\n    ./config.status\nfi\n";
 			showEnvVarsInLog = 0;
 		};
 		F9A5C5F608F651AB008AE941 /* Configure Tk */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 				"$(TK_SRCROOT)/macosx/configure.ac",
-				"$(TK_SRCROOT)/unix/configure.in",
+				"$(TK_SRCROOT)/unix/configure.ac",
 				"$(TK_SRCROOT)/unix/tcl.m4",
 				"$(TK_SRCROOT)/unix/aclocal.m4",
 				"$(TK_SRCROOT)/unix/tkConfig.sh.in",
 			);
 			name = "Configure Tk";
@@ -4009,21 +3999,21 @@
 			outputPaths = (
 				"$(DERIVED_FILE_DIR)/tk/tkConfig.sh",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/bash;
-			shellScript = "## tk configure shell script phase\n\ncd \"${TK_SRCROOT}\"/macosx &&\nif [ configure.ac -nt configure -o ../unix/configure.in -nt configure -o ../unix/tcl.m4 -nt configure -o ../unix/aclocal.m4 -nt configure ]; then\n    echo \"Running autoconf & autoheader in tk/macosx\"\n    rm -rf autom4te.cache\n    ${AUTOCONF:-${DEVELOPER_DIR}/usr/bin/autoconf} && ${AUTOHEADER:-${DEVELOPER_DIR}/usr/bin/autoheader} || exit $?\n    rm -rf autom4te.cache\nfi\n\ncd \"${DERIVED_FILE_DIR}\" && mkdir -p tk && cd tk &&\nif [ \"${TK_SRCROOT}\"/macosx/configure -nt config.status ]; then\n    echo \"Configuring Tk\"\n    CC=$(xcrun -find ${GCC} || echo ${GCC})\n    \"${TK_SRCROOT}\"/macosx/configure --cache-file=../config.cache --prefix=${PREFIX} --bindir=${BINDIR} --libdir=${LIBDIR} --mandir=${MANDIR} --includedir=${INCLUDEDIR} --disable-shared --enable-aqua --with-tcl=../tcl CC=${CC} LD=${CC} ${CONFIGURE_ARGS}\nelse\n    ./config.status\nfi\n";
+			shellScript = "## tk configure shell script phase\n\ncd \"${TK_SRCROOT}\"/macosx &&\nif [ configure.ac -nt configure -o ../unix/configure.ac -nt configure -o ../unix/tcl.m4 -nt configure -o ../unix/aclocal.m4 -nt configure ]; then\n    echo \"Running autoconf & autoheader in tk/macosx\"\n    rm -rf autom4te.cache\n    ${AUTOCONF:-${DEVELOPER_DIR}/usr/bin/autoconf} && ${AUTOHEADER:-${DEVELOPER_DIR}/usr/bin/autoheader} || exit $?\n    rm -rf autom4te.cache\nfi\n\ncd \"${DERIVED_FILE_DIR}\" && mkdir -p tk && cd tk &&\nif [ \"${TK_SRCROOT}\"/macosx/configure -nt config.status ]; then\n    echo \"Configuring Tk\"\n    CC=$(xcrun -find ${GCC} || echo ${GCC})\n    \"${TK_SRCROOT}\"/macosx/configure --cache-file=../config.cache --prefix=${PREFIX} --bindir=${BINDIR} --libdir=${LIBDIR} --mandir=${MANDIR} --includedir=${INCLUDEDIR} --disable-shared --enable-aqua --with-tcl=../tcl CC=${CC} LD=${CC} ${CONFIGURE_ARGS}\nelse\n    ./config.status\nfi\n";
 			showEnvVarsInLog = 0;
 		};
 		F9FD30B40CC1AD070073837D /* Configure Tcl */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 				"$(TCL_SRCROOT)/macosx/configure.ac",
-				"$(TCL_SRCROOT)/unix/configure.in",
+				"$(TCL_SRCROOT)/unix/configure.ac",
 				"$(TCL_SRCROOT)/unix/tcl.m4",
 				"$(TCL_SRCROOT)/unix/aclocal.m4",
 				"$(TCL_SRCROOT)/unix/tclConfig.sh.in",
 				"$(TCL_SRCROOT)/unix/Makefile.in",
 				"$(TCL_SRCROOT)/unix/dltest/Makefile.in",
@@ -4032,21 +4022,21 @@
 			outputPaths = (
 				"$(DERIVED_FILE_DIR)/tcl/tclConfig.sh",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/bash;
-			shellScript = "## tcl configure shell script phase\n\ncd \"${TCL_SRCROOT}\"/macosx &&\nif [ configure.ac -nt configure -o ../unix/configure.in -nt configure -o ../unix/tcl.m4 -nt configure -o ../unix/aclocal.m4 -nt configure ]; then\n    echo \"Running autoconf & autoheader in tcl/macosx\"\n    rm -rf autom4te.cache\n    ${AUTOCONF:-${DEVELOPER_DIR}/usr/bin/autoconf} && ${AUTOHEADER:-${DEVELOPER_DIR}/usr/bin/autoheader} || exit $?\n    rm -rf autom4te.cache\nfi\n\ncd \"${DERIVED_FILE_DIR}\" && mkdir -p tcl && cd tcl &&\nif [ \"${TCL_SRCROOT}\"/macosx/configure -nt config.status ]; then\n    echo \"Configuring Tcl\"\n    CC=$(xcrun -find ${GCC} || echo ${GCC})\n    \"${TCL_SRCROOT}\"/macosx/configure --cache-file=../config.cache --prefix=${PREFIX} --bindir=${BINDIR} --libdir=${LIBDIR} --mandir=${MANDIR} --includedir=${INCLUDEDIR} --disable-shared CC=${CC} LD=${CC} ${CONFIGURE_ARGS}\nelse\n    ./config.status\nfi\n";
+			shellScript = "## tcl configure shell script phase\n\ncd \"${TCL_SRCROOT}\"/macosx &&\nif [ configure.ac -nt configure -o ../unix/configure.ac -nt configure -o ../unix/tcl.m4 -nt configure -o ../unix/aclocal.m4 -nt configure ]; then\n    echo \"Running autoconf & autoheader in tcl/macosx\"\n    rm -rf autom4te.cache\n    ${AUTOCONF:-${DEVELOPER_DIR}/usr/bin/autoconf} && ${AUTOHEADER:-${DEVELOPER_DIR}/usr/bin/autoheader} || exit $?\n    rm -rf autom4te.cache\nfi\n\ncd \"${DERIVED_FILE_DIR}\" && mkdir -p tcl && cd tcl &&\nif [ \"${TCL_SRCROOT}\"/macosx/configure -nt config.status ]; then\n    echo \"Configuring Tcl\"\n    CC=$(xcrun -find ${GCC} || echo ${GCC})\n    \"${TCL_SRCROOT}\"/macosx/configure --cache-file=../config.cache --prefix=${PREFIX} --bindir=${BINDIR} --libdir=${LIBDIR} --mandir=${MANDIR} --includedir=${INCLUDEDIR} --disable-shared CC=${CC} LD=${CC} ${CONFIGURE_ARGS}\nelse\n    ./config.status\nfi\n";
 			showEnvVarsInLog = 0;
 		};
 		F9FD30B50CC1AD070073837D /* Configure Tk */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
 				"$(TK_SRCROOT)/macosx/configure.ac",
-				"$(TK_SRCROOT)/unix/configure.in",
+				"$(TK_SRCROOT)/unix/configure.ac",
 				"$(TK_SRCROOT)/unix/tcl.m4",
 				"$(TK_SRCROOT)/unix/aclocal.m4",
 				"$(TK_SRCROOT)/unix/tkConfig.sh.in",
 			);
 			name = "Configure Tk";
@@ -4053,11 +4043,11 @@
 			outputPaths = (
 				"$(DERIVED_FILE_DIR)/tk/tkConfig.sh",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/bash;
-			shellScript = "## tk configure shell script phase\n\ncd \"${TK_SRCROOT}\"/macosx &&\nif [ configure.ac -nt configure -o ../unix/configure.in -nt configure -o ../unix/tcl.m4 -nt configure -o ../unix/aclocal.m4 -nt configure ]; then\n    echo \"Running autoconf & autoheader in tk/macosx\"\n    rm -rf autom4te.cache\n    ${AUTOCONF:-${DEVELOPER_DIR}/usr/bin/autoconf} && ${AUTOHEADER:-${DEVELOPER_DIR}/usr/bin/autoheader} || exit $?\n    rm -rf autom4te.cache\nfi\n\ncd \"${DERIVED_FILE_DIR}\" && mkdir -p tk && cd tk &&\nif [ \"${TK_SRCROOT}\"/macosx/configure -nt config.status ]; then\n    echo \"Configuring Tk\"\n    CC=$(xcrun -find ${GCC} || echo ${GCC})\n    PATH=\"${PATH}:/usr/X11R6/bin\" \"${TK_SRCROOT}\"/macosx/configure --cache-file=../config.cache --prefix=${PREFIX} --bindir=${BINDIR} --libdir=${LIBDIR} --mandir=${MANDIR} --includedir=${INCLUDEDIR} --disable-shared --enable-xft --with-tcl=../tcl CC=${CC} LD=${CC} ${CONFIGURE_ARGS}\nelse\n    ./config.status\nfi";
+			shellScript = "## tk configure shell script phase\n\ncd \"${TK_SRCROOT}\"/macosx &&\nif [ configure.ac -nt configure -o ../unix/configure.ac -nt configure -o ../unix/tcl.m4 -nt configure -o ../unix/aclocal.m4 -nt configure ]; then\n    echo \"Running autoconf & autoheader in tk/macosx\"\n    rm -rf autom4te.cache\n    ${AUTOCONF:-${DEVELOPER_DIR}/usr/bin/autoconf} && ${AUTOHEADER:-${DEVELOPER_DIR}/usr/bin/autoheader} || exit $?\n    rm -rf autom4te.cache\nfi\n\ncd \"${DERIVED_FILE_DIR}\" && mkdir -p tk && cd tk &&\nif [ \"${TK_SRCROOT}\"/macosx/configure -nt config.status ]; then\n    echo \"Configuring Tk\"\n    CC=$(xcrun -find ${GCC} || echo ${GCC})\n    PATH=\"${PATH}:/usr/X11R6/bin\" \"${TK_SRCROOT}\"/macosx/configure --cache-file=../config.cache --prefix=${PREFIX} --bindir=${BINDIR} --libdir=${LIBDIR} --mandir=${MANDIR} --includedir=${INCLUDEDIR} --disable-shared --enable-xft --with-tcl=../tcl CC=${CC} LD=${CC} ${CONFIGURE_ARGS}\nelse\n    ./config.status\nfi";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */

Index: macosx/Wish-Info.plist.in
==================================================================
--- macosx/Wish-Info.plist.in
+++ macosx/Wish-Info.plist.in
@@ -67,11 +67,11 @@
 	<key>CFBundleSignature</key>
 	<string>WiSH</string>
 	<key>CFBundleVersion</key>
 	<string>@TK_VERSION@@TK_PATCH_LEVEL@</string>
 	<key>LSMinimumSystemVersion</key>
-	<string>10.5.0</string>
+	<string>10.6.0</string>
 	<key>LSRequiresCarbon</key>
 	<true/>
 	<key>NSAppleScriptEnabled</key>
 	<true/>
 	<key>OSAScriptingDefinition</key>

Index: macosx/configure.ac
==================================================================
--- macosx/configure.ac
+++ macosx/configure.ac
@@ -6,6 +6,6 @@
 dnl	Ensure that the config (auto)headers support is used, then just
 dnl	include the configure sources from ../unix:
 
 m4_include(../unix/aclocal.m4)
 m4_define(SC_USE_CONFIG_HEADERS)
-m4_include(../unix/configure.in)
+m4_include(../unix/configure.ac)

Index: macosx/tkMacOSXBitmap.c
==================================================================
--- macosx/tkMacOSXBitmap.c
+++ macosx/tkMacOSXBitmap.c
@@ -10,11 +10,11 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
 
 #include "tkMacOSXPrivate.h"
-
+#include "tkMacOSXConstants.h"
 /*
  * This structure holds information about native bitmaps.
  */
 
 typedef struct {
@@ -171,11 +171,11 @@
     Pixmap pixmap;
     IconRef icon;
     OSErr err;
 
     err = ChkErr(GetIconRef, kOnSystemDisk, kSystemIconsCreator,
-	    PTR2UINT(source), &icon);
+	    (unsigned int)PTR2UINT(source), &icon);
     if (err == noErr) {
 	pixmap = GetBitmapForIcon(display, icon, CGSizeMake(builtInIconSize,
 		builtInIconSize));
 	ReleaseIconRef(icon);
     } else {
@@ -208,11 +208,11 @@
     Tcl_Encoding encoding = Tcl_GetEncoding(NULL, "macRoman");
 
     Tcl_UtfToExternalDString(encoding, s, -1, &ds);
     if (Tcl_DStringLength(&ds) <= 4) {
 	char string[4] = {};
-	memcpy(string, Tcl_DStringValue(&ds), (size_t) Tcl_DStringLength(&ds));
+	memcpy(string, Tcl_DStringValue(&ds), Tcl_DStringLength(&ds));
 	*t = (OSType) string[0] << 24 | (OSType) string[1] << 16 |
 	     (OSType) string[2] <<  8 | (OSType) string[3];
 	result = TCL_OK;
     }
     Tcl_DStringFree(&ds);
@@ -296,11 +296,11 @@
 	}
     } else {
 	string = [NSString stringWithUTF8String:name];
 	image = [NSImage imageNamed:string];
 	if (!image) {
-	    NSURL *url = [NSURL URLWithString:string];
+	    NSURL *url = [NSURL fileURLWithPath:string];
 	    if (url) {
 		image = [[[NSImage alloc] initWithContentsOfURL:url]
 			autorelease];
 	    }
 	}

Index: macosx/tkMacOSXButton.c
==================================================================
--- macosx/tkMacOSXButton.c
+++ macosx/tkMacOSXButton.c
@@ -19,23 +19,20 @@
 #include "tkMacOSXPrivate.h"
 #include "tkButton.h"
 #include "tkMacOSXFont.h"
 #include "tkMacOSXDebug.h"
 
-
 #define FIRST_DRAW	    2
 #define ACTIVE		    4
 
-
 /*
- * Default insets for controls
+ * Extra padding used for computing the content size that should
+ * be allowed when drawing the HITheme button.
  */
 
-#define DEF_INSET_LEFT 12
-#define DEF_INSET_RIGHT 12
-#define DEF_INSET_TOP 1
-#define DEF_INSET_BOTTOM 1
+#define HI_PADX 2
+#define HI_PADY 1
 
 /*
  * Some defines used to control what type of control is drawn.
  */
 
@@ -316,13 +313,12 @@
 	Tk_FreeTextLayout(butPtr->textLayout);
 	butPtr->textLayout = Tk_ComputeTextLayout(butPtr->tkfont,
 		Tcl_GetString(butPtr->textPtr), -1, butPtr->wrapLength,
 		butPtr->justify, 0, &butPtr->textWidth, &butPtr->textHeight);
 
-	/*Remove extraneous padding around label widgets.*/
 	txtWidth = butPtr->textWidth;
-	txtHeight = butPtr->textHeight + DEF_INSET_BOTTOM + DEF_INSET_TOP;
+	txtHeight = butPtr->textHeight;
 	charWidth = Tk_TextWidth(butPtr->tkfont, "0", 1);
 	Tk_GetFontMetrics(butPtr->tkfont, &fm);
 	haveText = (txtWidth != 0 && txtHeight != 0);
     }
 
@@ -393,11 +389,11 @@
         HIRect tmpRect;
     	HIRect contBounds;
         int paddingx = 0;
         int paddingy = 0;
 
-    	tmpRect = CGRectMake(0, 0, width, height);
+    	tmpRect = CGRectMake(0, 0, width + 2*HI_PADX, height + 2*HI_PADY);
 
         HIThemeGetButtonContentBounds(&tmpRect, &mbPtr->drawinfo, &contBounds);
         /* If the content region has a minimum height, match it. */
         if (height < contBounds.size.height) {
     	  height = contBounds.size.height;
@@ -646,11 +642,11 @@
 	TkComputeAnchor(butPtr->anchor, tkwin, butPtr->padX, butPtr->padY,
 			butPtr->textWidth + butPtr->indicatorSpace,
 			  butPtr->textHeight, &x, &y);
 	x += butPtr->indicatorSpace;
 	Tk_DrawTextLayout(butPtr->display, pixmap, dpPtr->gc, butPtr->textLayout,
-			  x, y - DEF_INSET_BOTTOM, 0, -1);
+			  x, y, 0, -1);
     }
 
     /*
      * If the button is disabled with a stipple rather than a special
      * foreground color, generate the stippled effect.  If the widget
@@ -783,23 +779,10 @@
 
 	if (!TkMacOSXSetupDrawingContext(pixmap, dpPtr->gc, 1, &dc)) {
 	    return;
 	}
 
-
-	if (mbPtr->btnkind == kThemePushButton) {
-	    /*
-	     * For some reason, pushbuttons get drawn a bit
-	     * too low, normally.  Correct for this.
-	     */
-	    if (cntrRect.size.height < 22) {
-		cntrRect.origin.y -= 1;
-	    } else if (cntrRect.size.height < 23) {
-		cntrRect.origin.y -= 2;
-	    }
-	}
-
         hiinfo.version = 0;
         hiinfo.state = mbPtr->drawinfo.state;
         hiinfo.kind  = mbPtr->btnkind;
         hiinfo.value = mbPtr->drawinfo.value;
         hiinfo.adornment = mbPtr->drawinfo.adornment;
@@ -907,11 +890,14 @@
 
     if (tkwin == NULL || !Tk_IsMapped(tkwin)) {
         return;
     }
 
-    /*Overlay Tk elements over button native region: drawing elements within button boundaries/native region causes unpredictable metrics.*/
+    /*
+     * Overlay Tk elements over button native region: drawing elements
+     * within button boundaries/native region causes unpredictable metrics.
+     */
     DrawButtonImageAndText( butPtr);
 }
 
 /*
  *--------------------------------------------------------------

Index: macosx/tkMacOSXClipboard.c
==================================================================
--- macosx/tkMacOSXClipboard.c
+++ macosx/tkMacOSXClipboard.c
@@ -68,14 +68,12 @@
 - (void) tkCheckPasteboard
 {
     if (clipboardOwner && [[NSPasteboard generalPasteboard] changeCount] !=
 	    changeCount) {
 	TkDisplay *dispPtr = TkGetDisplayList();
-
 	if (dispPtr) {
 	    XEvent event;
-
 	    event.xany.type = SelectionClear;
 	    event.xany.serial = NextRequest(Tk_Display(clipboardOwner));
 	    event.xany.send_event = False;
 	    event.xany.window = Tk_WindowId(clipboardOwner);
 	    event.xany.display = Tk_Display(clipboardOwner);
@@ -123,12 +121,14 @@
     ClientData clientData)	/* Arbitrary value to pass to proc. */
 {
     int result = TCL_ERROR;
     TkDisplay *dispPtr = ((TkWindow *) tkwin)->dispPtr;
 
-    if (dispPtr && selection == dispPtr->clipboardAtom && (target == XA_STRING
-	    || target == dispPtr->utf8Atom)) {
+    int haveExternalClip = ([[NSPasteboard generalPasteboard] changeCount] != changeCount);
+    if (dispPtr && (haveExternalClip || dispPtr->clipboardActive)
+	        && selection == dispPtr->clipboardAtom
+	        && (target == XA_STRING || target == dispPtr->utf8Atom)) {
 	NSString *string = nil;
 	NSPasteboard *pb = [NSPasteboard generalPasteboard];
 	NSString *type = [pb availableTypeFromArray:[NSArray arrayWithObject:
 		NSStringPboardType]];
 
@@ -174,11 +174,10 @@
 
     if (dispPtr && selection == dispPtr->clipboardAtom) {
 	clipboardOwner = owner ? Tk_IdToWindow(display, owner) : NULL;
 	if (!dispPtr->clipboardActive) {
 	    NSPasteboard *pb = [NSPasteboard generalPasteboard];
-
 	    changeCount = [pb declareTypes:[NSArray array] owner:NSApp];
 	}
     }
     return Success;
 }
@@ -286,36 +285,14 @@
 void
 TkSelPropProc(
     register XEvent *eventPtr)	/* X PropertyChange event. */
 {
 }
-
-/*
- *----------------------------------------------------------------------
- *
- * TkSuspendClipboard --
- *
- *	Handle clipboard conversion as required by the suppend event.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The local scrap is moved to the global scrap.
- *
- *----------------------------------------------------------------------
- */
-
-void
-TkSuspendClipboard(void)
-{
-    changeCount = [[NSPasteboard generalPasteboard] changeCount];
-}
 
 /*
  * Local Variables:
  * mode: objc
  * c-basic-offset: 4
  * fill-column: 79
  * coding: utf-8
  * End:
  */

Index: macosx/tkMacOSXColor.c
==================================================================
--- macosx/tkMacOSXColor.c
+++ macosx/tkMacOSXColor.c
@@ -264,17 +264,13 @@
 	case TRANSPARENT_PIXEL:
 	    rgba[3]	= 0.0;
 	    break;
 	}
 
-        // this attempts to find something roughly fitting for any display
-//	*c = CGColorCreateGenericRGB(rgba[0], rgba[1], rgba[2], rgba[3]);
-
-        // may be off for non-main display but in most cases better than prev
 	static CGColorSpaceRef deviceRGBSpace = NULL;
 	if (!deviceRGBSpace) {
-	    deviceRGBSpace = CGDisplayCopyColorSpace(CGMainDisplayID());
+	    deviceRGBSpace = CGColorSpaceCreateDeviceRGB();
 	}
 	*c = CGColorCreate(deviceRGBSpace, rgba );
     }
     return err;
 }

ADDED   macosx/tkMacOSXConstants.h
Index: macosx/tkMacOSXConstants.h
==================================================================
--- /dev/null
+++ macosx/tkMacOSXConstants.h
@@ -0,0 +1,96 @@
+/*
+ * tkMacOSXConstants.h --
+ *
+ *	Macros which map the names of NS constants used in the Tk code to
+ *      the new name that Apple came up with for subsequent versions of the
+ *      operating system.  (Each new OS release seems to come with a new
+ *      naming convention for the same old constants.)
+ *
+ * Copyright (c) 2017 Marc Culler
+ *
+ * See the file "license.terms" for information on usage and redistribution
+ * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ */
+
+#ifndef _TKMACCONSTANTS
+#define _TKMACCONSTANTS
+
+/*
+ * Let's raise a glass for the project manager who improves our lives by
+ * generating deprecation warnings about pointless changes of the names
+ * of constants.
+ */
+
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 101000
+#define NSOKButton NSModalResponseOK
+#endif
+
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
+#define NSAppKitDefined NSEventTypeAppKitDefined
+#define NSApplicationActivatedEventType NSEventSubtypeApplicationActivated
+#define NSApplicationDeactivatedEventType NSEventSubtypeApplicationDeactivated
+#define NSWindowExposedEventType NSEventSubtypeWindowExposed
+#define NSScreenChangedEventType NSEventSubtypeScreenChanged
+#define NSWindowMovedEventType NSEventSubtypeWindowMoved
+#define NSKeyUp NSEventTypeKeyUp
+#define NSKeyDown NSEventTypeKeyDown
+#define NSFlagsChanged NSEventTypeFlagsChanged
+#define NSLeftMouseDown NSEventTypeLeftMouseDown
+#define NSLeftMouseUp NSEventTypeLeftMouseUp
+#define NSRightMouseDown NSEventTypeRightMouseDown
+#define NSRightMouseUp NSEventTypeRightMouseUp
+#define NSLeftMouseDragged NSEventTypeLeftMouseDragged
+#define NSRightMouseDragged NSEventTypeRightMouseDragged
+#define NSMouseMoved NSEventTypeMouseMoved
+#define NSMouseEntered NSEventTypeMouseEntered
+#define NSMouseExited NSEventTypeMouseExited
+#define NSScrollWheel NSEventTypeScrollWheel
+#define NSOtherMouseDown NSEventTypeOtherMouseDown
+#define NSOtherMouseUp NSEventTypeOtherMouseUp
+#define NSOtherMouseDragged NSEventTypeOtherMouseDragged
+#define NSTabletPoint NSEventTypeTabletPoint
+#define NSTabletProximity NSEventTypeTabletProximity
+#define NSDeviceIndependentModifierFlagsMask NSEventModifierFlagDeviceIndependentFlagsMask
+#define NSCommandKeyMask NSEventModifierFlagCommand
+#define NSShiftKeyMask NSEventModifierFlagShift
+#define NSAlphaShiftKeyMask NSEventModifierFlagCapsLock
+#define NSAlternateKeyMask NSEventModifierFlagOption
+#define NSControlKeyMask NSEventModifierFlagControl
+#define NSNumericPadKeyMask NSEventModifierFlagNumericPad
+#define NSFunctionKeyMask NSEventModifierFlagFunction
+#define NSCursorUpdate NSEventTypeCursorUpdate
+#define NSTexturedBackgroundWindowMask NSWindowStyleMaskTexturedBackground
+#define NSCompositeCopy NSCompositingOperationCopy
+#define NSWarningAlertStyle NSAlertStyleWarning
+#define NSInformationalAlertStyle NSAlertStyleInformational
+#define NSCriticalAlertStyle NSAlertStyleCritical
+#define NSCenterTextAlignment NSTextAlignmentCenter
+#define NSDeviceIndependentModifierFlagsMask NSEventModifierFlagDeviceIndependentFlagsMask
+#define NSCommandKeyMask NSEventModifierFlagCommand
+#define NSShiftKeyMask NSEventModifierFlagShift
+#define NSAlphaShiftKeyMask NSEventModifierFlagCapsLock
+#define NSAlternateKeyMask NSEventModifierFlagOption
+#define NSControlKeyMask NSEventModifierFlagControl
+#define NSNumericPadKeyMask NSEventModifierFlagNumericPad
+#define NSFunctionKeyMask NSEventModifierFlagFunction
+#define NSKeyUp NSEventTypeKeyUp
+#define NSKeyDown NSEventTypeKeyDown
+#define NSFlagsChanged NSEventTypeFlagsChanged
+#define NSAlphaShiftKeyMask NSEventModifierFlagCapsLock
+#define NSShiftKeyMask NSEventModifierFlagShift
+#define NSAnyEventMask NSEventMaskAny
+#define NSTexturedBackgroundWindowMask NSWindowStyleMaskTexturedBackground
+#define NSUtilityWindowMask NSWindowStyleMaskUtilityWindow
+#define NSNonactivatingPanelMask NSWindowStyleMaskNonactivatingPanel
+#define NSDocModalWindowMask NSWindowStyleMaskDocModalWindow
+#define NSHUDWindowMask NSWindowStyleMaskHUDWindow
+#define NSTitledWindowMask NSWindowStyleMaskTitled
+#define NSClosableWindowMask NSWindowStyleMaskClosable
+#define NSResizableWindowMask NSWindowStyleMaskResizable
+#define NSUnifiedTitleAndToolbarWindowMask NSWindowStyleMaskUnifiedTitleAndToolbar
+#define NSMiniaturizableWindowMask NSWindowStyleMaskMiniaturizable
+#define NSBorderlessWindowMask NSWindowStyleMaskBorderless
+#define NSFullScreenWindowMask NSWindowStyleMaskFullScreen
+#endif
+
+#endif

Index: macosx/tkMacOSXDefault.h
==================================================================
--- macosx/tkMacOSXDefault.h
+++ macosx/tkMacOSXDefault.h
@@ -189,10 +189,12 @@
 #define DEF_ENTRY_INSERT_OFF_TIME	"300"
 #define DEF_ENTRY_INSERT_ON_TIME	"600"
 /* #define DEF_ENTRY_INSERT_WIDTH		"2" */
 #define DEF_ENTRY_INSERT_WIDTH		"1"
 #define DEF_ENTRY_JUSTIFY		"left"
+#define DEF_ENTRY_PLACEHOLDER		""
+#define DEF_ENTRY_PLACEHOLDERFG		"#b3b3b3"
 #define DEF_ENTRY_READONLY_BG_COLOR	NORMAL_BG
 #define DEF_ENTRY_READONLY_BG_MONO	WHITE
 #define DEF_ENTRY_RELIEF		"sunken"
 /* #define DEF_ENTRY_RELIEF		"solid" */
 #define DEF_ENTRY_SCROLL_COMMAND	""
@@ -310,10 +312,11 @@
 #define DEF_MENU_ACTIVE_BG_COLOR	"systemMenuActive"
 #define DEF_MENU_ACTIVE_BG_MONO		BLACK
 #define DEF_MENU_ACTIVE_BORDER_WIDTH	"0"
 #define DEF_MENU_ACTIVE_FG_COLOR	"systemMenuActiveText"
 #define DEF_MENU_ACTIVE_FG_MONO		WHITE
+#define DEF_MENU_ACTIVE_RELIEF		"flat"
 #define DEF_MENU_BG_COLOR		"systemMenu"
 #define DEF_MENU_BG_MONO		WHITE
 #define DEF_MENU_BORDER_WIDTH		"0"
 #define DEF_MENU_CURSOR			"arrow"
 #define DEF_MENU_DISABLED_FG_COLOR	"systemMenuDisabled"
@@ -323,15 +326,10 @@
 #define DEF_MENU_POST_COMMAND		""
 #define DEF_MENU_RELIEF			"flat"
 #define DEF_MENU_SELECT_COLOR		"systemMenuActive"
 #define DEF_MENU_SELECT_MONO		BLACK
 #define DEF_MENU_TAKE_FOCUS		"0"
-
-/*
- * FIXME: Turn the default back to 1 when we make tearoff menus work again.
- */
-
 #define DEF_MENU_TEAROFF		"0"
 #define DEF_MENU_TEAROFF_CMD		((char *) NULL)
 #define DEF_MENU_TITLE			""
 #define DEF_MENU_TYPE			"normal"
 

Index: macosx/tkMacOSXDialog.c
==================================================================
--- macosx/tkMacOSXDialog.c
+++ macosx/tkMacOSXDialog.c
@@ -4,17 +4,19 @@
  *	Contains the Mac implementation of the common dialog boxes.
  *
  * Copyright (c) 1996-1997 Sun Microsystems, Inc.
  * Copyright 2001-2009, Apple Inc.
  * Copyright (c) 2006-2009 Daniel A. Steffen <das@users.sourceforge.net>
+ * Copyright (c) 2017 Christian Gollwitzer.
  *
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
 
 #include "tkMacOSXPrivate.h"
 #include "tkFileFilter.h"
+#include "tkMacOSXConstants.h"
 
 #if MAC_OS_X_VERSION_MIN_REQUIRED < 1090
 #define modalOK     NSOKButton
 #define modalCancel NSCancelButton
 #else
@@ -22,10 +24,31 @@
 #define modalCancel NSModalResponseCancel
 #endif
 #define modalOther  -1
 #define modalError  -2
 
+/*Vars for filtering in "open file" and "save file" dialogs.*/
+typedef struct {
+    bool doFileTypes; // show the accessory view which displays the filter menu
+    bool preselectFilter; // a filter was selected by the typevariable
+    bool userHasSelectedFilter; // The user has changed the filter in the accessory view
+
+    NSMutableArray *fileTypeNames; // array of names, e.g. "Text document"
+    NSMutableArray *fileTypeExtensions; // array of allowed extensions per name, e.g. "txt", "doc"
+    NSMutableArray *fileTypeLabels; // displayed string, e.g. "Text document (.txt, .doc)"
+    NSMutableArray *fileTypeAllowsAll; // boolean if the all pattern (*.*) is included
+
+    NSMutableArray *allowedExtensions; // set of all allowed extensions
+    bool allowedExtensionsAllowAll; // set of all allowed extensions includes *.*
+
+    NSUInteger fileTypeIndex; // index of currently selected filter
+} filepanelFilterInfo;
+
+filepanelFilterInfo filterInfo;
+
+NSOpenPanel *openpanel;
+NSSavePanel *savepanel;
 
 static const char *const colorOptionStrings[] = {
     "-initialcolor", "-parent", "-title", NULL
 };
 enum colorOptions {
@@ -92,11 +115,11 @@
 };
 enum alertIconOptions {
     ICON_ERROR, ICON_INFO, ICON_QUESTION, ICON_WARNING
 };
 static const char *const alertButtonStrings[] = {
-    "abort", "retry", "ignore", "ok", "cancel", "yes", "no", NULL
+    "abort", "retry", "ignore", "ok", "cancel", "no", "yes", NULL
 };
 
 static const NSString *const alertButtonNames[][3] = {
     [TYPE_ABORTRETRYIGNORE] =   {@"Abort", @"Retry", @"Ignore"},
     [TYPE_OK] =			{@"OK"},
@@ -122,12 +145,12 @@
 			    /*  abort retry ignore ok   cancel yes   no */
     [TYPE_ABORTRETRYIGNORE] =   {1,    2,    3,    0,    0,    0,    0},
     [TYPE_OK] =			{0,    0,    0,    1,    0,    0,    0},
     [TYPE_OKCANCEL] =		{0,    0,    0,    1,    2,    0,    0},
     [TYPE_RETRYCANCEL] =	{0,    1,    0,    0,    2,    0,    0},
-    [TYPE_YESNO] =		{0,    0,    0,    0,    0,    1,    2},
-    [TYPE_YESNOCANCEL] =	{0,    0,    0,    0,    3,    1,    2},
+    [TYPE_YESNO] =		{0,    0,    0,    0,    0,    2,    1},
+    [TYPE_YESNOCANCEL] =	{0,    0,    0,    0,    3,    2,    1},
 };
 
 /*
  * Need also the inverse mapping, from NSAlertFirstButtonReturn etc to the
  * descriptive button text string index.
@@ -136,30 +159,28 @@
 static const short alertNativeButtonIndexAndTypeToButtonIndex[][3] = {
     [TYPE_ABORTRETRYIGNORE] =   {0, 1, 2},
     [TYPE_OK] =			{3, 0, 0},
     [TYPE_OKCANCEL] =		{3, 4, 0},
     [TYPE_RETRYCANCEL] =	{1, 4, 0},
-    [TYPE_YESNO] =		{5, 6, 0},
-    [TYPE_YESNOCANCEL] =	{5, 6, 4},
+    [TYPE_YESNO] =		{6, 5, 0},
+    [TYPE_YESNOCANCEL] =	{6, 5, 4},
 };
 
 /*
  * Construct a file URL from directory and filename.  Either may
  * be nil.  If both are nil, returns nil.
  */
-#if MAC_OS_X_VERSION_MIN_REQUIRED > 1050
 static NSURL *getFileURL(NSString *directory, NSString *filename) {
     NSURL *url = nil;
     if (directory) {
-	url = [NSURL fileURLWithPath:directory];
+	url = [NSURL fileURLWithPath:directory isDirectory:YES];
     }
     if (filename) {
 	url = [NSURL URLWithString:filename relativeToURL:url];
     }
     return url;
 }
-#endif
 
 #pragma mark TKApplication(TKDialog)
 
 @interface NSColorPanel(TKDialog)
 - (void) _setUseModalAppearance: (BOOL) flag;
@@ -170,11 +191,11 @@
 - (void) tkFilePanelDidEnd: (NSSavePanel *) panel
 	returnCode: (NSInteger) returnCode contextInfo: (void *) contextInfo
 {
     FilePanelCallbackInfo *callbackInfo = contextInfo;
 
-    if (returnCode == NSFileHandlingPanelOKButton) {
+    if (returnCode == modalOK) {
 	Tcl_Obj *resultObj;
 
 	if (callbackInfo->multiple) {
 	    resultObj = Tcl_NewListObj(0, NULL);
 	    for (NSURL *url in [(NSOpenPanel*)panel URLs]) {
@@ -198,11 +219,11 @@
 		ckfree(tmpv);
 	    }
 	} else {
 	    Tcl_SetObjResult(callbackInfo->interp, resultObj);
 	}
-    } else if (returnCode == NSFileHandlingPanelCancelButton) {
+    } else if (returnCode == modalCancel) {
 	Tcl_ResetResult(callbackInfo->interp);
     }
     if (panel == [NSApp modalWindow]) {
 	[NSApp stopModalWithCode:returnCode];
     }
@@ -209,10 +230,11 @@
     if (callbackInfo->cmdObj) {
 	Tcl_DecrRefCount(callbackInfo->cmdObj);
 	ckfree(callbackInfo);
     }
 }
+
 
 - (void) tkAlertDidEnd: (NSAlert *) alert returnCode: (NSInteger) returnCode
 	contextInfo: (void *) contextInfo
 {
     AlertCallbackInfo *callbackInfo = contextInfo;
@@ -245,10 +267,46 @@
     if (callbackInfo->cmdObj) {
 	Tcl_DecrRefCount(callbackInfo->cmdObj);
 	ckfree(callbackInfo);
     }
 }
+
+- (void)selectFormat:(id)sender  {
+    NSPopUpButton *button      = (NSPopUpButton *)sender;
+    filterInfo.fileTypeIndex   = [button indexOfSelectedItem];
+
+    if ([[filterInfo.fileTypeAllowsAll objectAtIndex:filterInfo.fileTypeIndex] boolValue]) {
+	[openpanel setAllowsOtherFileTypes:YES];
+	/* setAllowsOtherFileTypes might have no effect; it's inherited from the
+	 * NSSavePanel, where it has the effect that it does not append an extension
+	 * Setting the allowed file types to nil allows selecting any file */
+	[openpanel setAllowedFileTypes:nil];
+    } else {
+	NSMutableArray *allowedtypes = [filterInfo.fileTypeExtensions objectAtIndex:filterInfo.fileTypeIndex];
+	[openpanel setAllowedFileTypes:allowedtypes];
+	[openpanel setAllowsOtherFileTypes:NO];
+    }
+
+    filterInfo.userHasSelectedFilter = true;
+}
+
+- (void)saveFormat:(id)sender  {
+    NSPopUpButton *button     = (NSPopUpButton *)sender;
+    filterInfo.fileTypeIndex  = [button indexOfSelectedItem];
+
+    if ([[filterInfo.fileTypeAllowsAll objectAtIndex:filterInfo.fileTypeIndex] boolValue]) {
+	[savepanel setAllowsOtherFileTypes:YES];
+	[savepanel setAllowedFileTypes:nil];
+    } else {
+	NSMutableArray *allowedtypes = [filterInfo.fileTypeExtensions objectAtIndex:filterInfo.fileTypeIndex];
+	[savepanel setAllowedFileTypes:allowedtypes];
+	[savepanel setAllowsOtherFileTypes:NO];
+    }
+
+    filterInfo.userHasSelectedFilter = true;
+}
+
 @end
 
 #pragma mark -
 
 /*
@@ -337,11 +395,11 @@
 	[colorPanel setColor:initialColor];
     }
     returnCode = [NSApp runModalForWindow:colorPanel];
     if (returnCode == modalOK) {
 	color = [[colorPanel color] colorUsingColorSpace:
-		[NSColorSpace genericRGBColorSpace]];
+		[NSColorSpace deviceRGBColorSpace]];
 	numberOfComponents = [color numberOfComponents];
     }
     if (color && numberOfComponents >= 3 && numberOfComponents <= 4) {
 	CGFloat components[4];
 	char colorstr[8];
@@ -358,10 +416,124 @@
     result = TCL_OK;
 
 end:
     return result;
 }
+
+/* dissect the -filetype nested lists and store the information
+ * in the filterInfo structure */
+int parseFileFilters(Tcl_Interp *interp, Tcl_Obj *fileTypesPtr, Tcl_Obj *typeVariablePtr) {
+
+    if (!fileTypesPtr) {
+	filterInfo.doFileTypes = false;
+	return TCL_OK;
+    }
+
+    FileFilterList fl;
+    TkInitFileFilters(&fl);
+    if (TkGetFileFilters(interp, &fl, fileTypesPtr, 0) != TCL_OK) {
+	TkFreeFileFilters(&fl);
+	return TCL_ERROR;
+    }
+
+    filterInfo.doFileTypes = (fl.filters != NULL);
+
+    filterInfo.fileTypeIndex = 0;
+    filterInfo.fileTypeExtensions = [NSMutableArray array];
+    filterInfo.fileTypeNames = [NSMutableArray array];
+    filterInfo.fileTypeLabels = [NSMutableArray array];
+    filterInfo.fileTypeAllowsAll = [NSMutableArray array];
+
+    filterInfo.allowedExtensions = [NSMutableArray array];
+    filterInfo.allowedExtensionsAllowAll = NO;
+
+    if (filterInfo.doFileTypes) {
+	for (FileFilter *filterPtr = fl.filters; filterPtr;
+		filterPtr = filterPtr->next) {
+	    NSString * name = [[NSString alloc] initWithUTF8String: filterPtr -> name];
+	    [filterInfo.fileTypeNames addObject:name];
+	    [name release];
+	    NSMutableArray * clauseextensions = [NSMutableArray array];
+	    NSMutableArray * displayextensions = [NSMutableArray array];
+	    bool allowsAll = NO;
+
+	    for (FileFilterClause *clausePtr = filterPtr->clauses; clausePtr;
+		    clausePtr = clausePtr->next) {
+
+		for (GlobPattern *globPtr = clausePtr->patterns; globPtr;
+			globPtr = globPtr->next) {
+		    const char *str = globPtr->pattern;
+		    while (*str && (*str == '*' || *str == '.')) {
+		    	str++;
+		     }
+		    if (*str) {
+			NSString *extension = [[NSString alloc] initWithUTF8String:str];
+			if (![filterInfo.allowedExtensions containsObject:extension]) {
+			    [filterInfo.allowedExtensions addObject:extension];
+			}
+
+			[clauseextensions addObject:extension];
+			[displayextensions addObject:[@"." stringByAppendingString:extension]];
+
+			[extension release];
+		    } else {
+			// it is the all pattern (*, .* or *.*)
+			allowsAll = YES;
+			filterInfo.allowedExtensionsAllowAll = YES;
+			[displayextensions addObject:@"*"];
+		    }
+		}
+	    }
+	    [filterInfo.fileTypeExtensions addObject:clauseextensions];
+	    [filterInfo.fileTypeAllowsAll addObject:[NSNumber numberWithBool:allowsAll]];
+
+	    NSMutableString * label = [[NSMutableString alloc] initWithString:name];
+	    [label appendString:@" ("];
+	    [label appendString:[displayextensions componentsJoinedByString:@", "]];
+	    [label appendString:@")"];
+	    [filterInfo.fileTypeLabels addObject:label];
+	    [label release];
+
+	}
+
+	/* Check if the typevariable exists and matches one of the names */
+	filterInfo.preselectFilter = false;
+	filterInfo.userHasSelectedFilter = false;
+	if (typeVariablePtr) {
+	    /* extract the variable content as a NSString */
+	    Tcl_Obj *selectedFileTypeObj = Tcl_ObjGetVar2(interp, typeVariablePtr, NULL, TCL_GLOBAL_ONLY);
+
+	    /* check that the typevariable exists */
+	    if (selectedFileTypeObj != NULL) {
+		const char *selectedFileType = Tcl_GetString(selectedFileTypeObj);
+		NSString *selectedFileTypeStr = [[NSString alloc] initWithUTF8String:selectedFileType];
+		NSUInteger index = [filterInfo.fileTypeNames indexOfObject:selectedFileTypeStr];
+
+		if (index != NSNotFound) {
+		    filterInfo.fileTypeIndex = index;
+		    filterInfo.preselectFilter = true;
+		}
+	    }
+	}
+
+    }
+
+    TkFreeFileFilters(&fl);
+    return TCL_OK;
+}
+
+bool filterCompatible(NSString *extension, int filterIndex) {
+    NSMutableArray *allowedExtensions = [filterInfo.fileTypeExtensions objectAtIndex: filterIndex];
+
+    /* If this contains the all pattern, accept any extension */
+    if ([[filterInfo.fileTypeAllowsAll objectAtIndex:filterIndex] boolValue]) {
+	return true;
+    }
+
+    return [allowedExtensions containsObject: extension];
+}
+
 
 /*
  *----------------------------------------------------------------------
  *
  * Tk_GetOpenFileObjCmd --
@@ -386,23 +558,20 @@
 {
     Tk_Window tkwin = clientData;
     char *str;
     int i, result = TCL_ERROR, haveParentOption = 0;
     int index, len, multiple = 0;
-    FileFilterList fl;
-    Tcl_Obj *cmdObj = NULL, *typeVariablePtr = NULL;
+    Tcl_Obj *cmdObj = NULL, *typeVariablePtr = NULL, *fileTypesPtr = NULL;
     FilePanelCallbackInfo callbackInfoStruct;
     FilePanelCallbackInfo *callbackInfo = &callbackInfoStruct;
     NSString *directory = nil, *filename = nil;
-    NSString *message, *title, *type;
+    NSString *message = nil, *title = nil;
     NSWindow *parent;
-    NSMutableArray *fileTypes = nil;
-    NSOpenPanel *panel = [NSOpenPanel openPanel];
+    openpanel =  [NSOpenPanel openPanel];
     NSInteger modalReturnCode = modalError;
     BOOL parentIsKey = NO;
 
-    TkInitFileFilters(&fl);
     for (i = 1; i < objc; i += 2) {
 	if (Tcl_GetIndexFromObjStruct(interp, objv[i], openOptionStrings,
 		sizeof(char *), "option", TCL_EXACT, &index) != TCL_OK) {
 	    goto end;
 	}
@@ -414,13 +583,11 @@
 	}
 	switch (index) {
 	case OPEN_DEFAULT:
 	    break;
 	case OPEN_FILETYPES:
-	    if (TkGetFileFilters(interp, &fl, objv[i + 1], 0) != TCL_OK) {
-		goto end;
-	    }
+	    fileTypesPtr = objv[i + 1];
 	    break;
 	case OPEN_INITDIR:
 	    str = Tcl_GetStringFromObj(objv[i + 1], &len);
 	    if (len) {
 		directory = [[[NSString alloc] initWithUTF8String:str]
@@ -435,12 +602,10 @@
 	    }
 	    break;
 	case OPEN_MESSAGE:
 	    message = [[NSString alloc] initWithUTF8String:
 		    Tcl_GetString(objv[i + 1])];
-	    [panel setMessage:message];
-	    [message release];
 	    break;
 	case OPEN_MULTIPLE:
 	    if (Tcl_GetBooleanFromObj(interp, objv[i + 1],
 		    &multiple) != TCL_OK) {
 		goto end;
@@ -455,115 +620,185 @@
 	    haveParentOption = 1;
 	    break;
 	case OPEN_TITLE:
 	    title = [[NSString alloc] initWithUTF8String:
 		    Tcl_GetString(objv[i + 1])];
-	    [panel setTitle:title];
-	    [title release];
 	    break;
 	case OPEN_TYPEVARIABLE:
 	    typeVariablePtr = objv[i + 1];
 	    break;
 	case OPEN_COMMAND:
 	    cmdObj = objv[i+1];
 	    break;
 	}
     }
-    [panel setAllowsMultipleSelection:multiple];
-    if (fl.filters) {
-	fileTypes = [NSMutableArray array];
-	for (FileFilter *filterPtr = fl.filters; filterPtr;
-		filterPtr = filterPtr->next) {
-	    for (FileFilterClause *clausePtr = filterPtr->clauses; clausePtr;
-		    clausePtr = clausePtr->next) {
-		for (GlobPattern *globPtr = clausePtr->patterns; globPtr;
-			globPtr = globPtr->next) {
-		    str = globPtr->pattern;
-		    while (*str && (*str == '*' || *str == '.')) {
-			str++;
-		    }
-		    if (*str) {
-			type = [[NSString alloc] initWithUTF8String:str];
-			if (![fileTypes containsObject:type]) {
-			    [fileTypes addObject:type];
-			}
-			[type release];
-		    }
-		}
-		for (MacFileType *mfPtr = clausePtr->macTypes; mfPtr;
-			mfPtr = mfPtr->next) {
-		    if (mfPtr->type) {
-			type = NSFileTypeForHFSTypeCode(mfPtr->type);
-			if (![fileTypes containsObject:type]) {
-			    [fileTypes addObject:type];
-			}
-		    }
-		}
-	    }
-	}
-    }
-    [panel setAllowedFileTypes:fileTypes];
+
+    if (title) {
+	[openpanel setTitle:title];
+
+	/* From OSX 10.11, the title string is silently ignored in the open panel.
+	 * Prepend the title to the message in this case
+	 * NOTE should be conditional on OSX version, but
+	 * -mmacosx-version-min does not revert this behaviour*/
+
+	if (message) {
+	    NSString *fullmessage = [[NSString alloc] initWithFormat:@"%@\n%@",title,message];
+	    [message release];
+	    [title release];
+	    message = fullmessage;
+	} else {
+	    message = title;
+	}
+    }
+
+    if (message) {
+	[openpanel setMessage:message];
+	[message release];
+    }
+
+    [openpanel setAllowsMultipleSelection:multiple];
+
+    if (parseFileFilters(interp, fileTypesPtr, typeVariablePtr) != TCL_OK) {
+	goto end;
+    }
+
+    if (filterInfo.doFileTypes) {
+	NSView  *accessoryView = [[NSView alloc] initWithFrame:NSMakeRect(0.0, 0.0, 300, 32.0)];
+	NSTextField *label = [[NSTextField alloc] initWithFrame:NSMakeRect(0, 0, 60, 22)];
+	[label setEditable:NO];
+	[label setStringValue:@"Filter:"];
+	[label setBordered:NO];
+	[label setBezeled:NO];
+	[label setDrawsBackground:NO];
+
+	NSPopUpButton *popupButton = [[NSPopUpButton alloc] initWithFrame:NSMakeRect(50.0, 2, 240, 22.0) pullsDown:NO];
+	[popupButton addItemsWithTitles:filterInfo.fileTypeLabels];
+	[popupButton setAction:@selector(selectFormat:)];
+
+	[accessoryView addSubview:label];
+	[accessoryView addSubview:popupButton];
+
+	if (filterInfo.preselectFilter) {
+	    /* A specific filter was selected from the typevariable. Select it and
+	     * open the accessory view */
+	    [popupButton selectItemAtIndex:filterInfo.fileTypeIndex];
+	    /* on OSX > 10.11, the optons are not visible by default. Ergo allow all file types
+	    [openpanel setAllowedFileTypes:filterInfo.fileTypeExtensions[filterInfo.fileTypeIndex]];
+	    */
+	    [openpanel setAllowedFileTypes:filterInfo.allowedExtensions];
+	} else {
+	    [openpanel setAllowedFileTypes:filterInfo.allowedExtensions];
+	}
+
+	if (filterInfo.allowedExtensionsAllowAll) {
+	    [openpanel setAllowsOtherFileTypes:YES];
+	} else {
+	    [openpanel setAllowsOtherFileTypes:NO];
+	}
+
+	[openpanel setAccessoryView:accessoryView];
+    } else {
+	/* No filters are given. Allow picking all files */
+	[openpanel setAllowsOtherFileTypes:YES];
+    }
+
     if (cmdObj) {
 	callbackInfo = ckalloc(sizeof(FilePanelCallbackInfo));
 	if (Tcl_IsShared(cmdObj)) {
 	    cmdObj = Tcl_DuplicateObj(cmdObj);
 	}
 	Tcl_IncrRefCount(cmdObj);
     }
+
     callbackInfo->cmdObj = cmdObj;
     callbackInfo->interp = interp;
     callbackInfo->multiple = multiple;
     parent = TkMacOSXDrawableWindow(((TkWindow *) tkwin)->window);
     if (haveParentOption && parent && ![parent attachedSheet]) {
-	    parentIsKey = [parent isKeyWindow];
-#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
-	[panel beginSheetForDirectory:directory
-	       file:filename
-	       types:fileTypes
-	       modalForWindow:parent
-	       modalDelegate:NSApp
-	       didEndSelector:
-		   @selector(tkFilePanelDidEnd:returnCode:contextInfo:)
-	       contextInfo:callbackInfo];
-#else
-	[panel setAllowedFileTypes:fileTypes];
-	[panel setDirectoryURL:getFileURL(directory, filename)];
-	[panel beginSheetModalForWindow:parent
+	parentIsKey = [parent isKeyWindow];
+	if (directory || filename ) {
+	    NSURL * fileURL = getFileURL(directory, filename);
+	    [openpanel setDirectoryURL:fileURL];
+	}
+
+	[openpanel beginSheetModalForWindow:parent
 	       completionHandler:^(NSInteger returnCode)
-	       { [NSApp tkFilePanelDidEnd:panel
+	       { [NSApp tkFilePanelDidEnd:openpanel
 		       returnCode:returnCode
 		       contextInfo:callbackInfo ]; } ];
-#endif
-	modalReturnCode = cmdObj ? modalOther : [NSApp runModalForWindow:panel];
+	modalReturnCode = cmdObj ? modalOther : [NSApp runModalForWindow:openpanel];
     } else {
-#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
-	modalReturnCode = [panel runModalForDirectory:directory
-				 file:filename];
-#else
-	[panel setDirectoryURL:getFileURL(directory, filename)];
-	modalReturnCode = [panel runModal];
-#endif
-	[NSApp tkFilePanelDidEnd:panel returnCode:modalReturnCode
+	if (directory || filename ) {
+	    NSURL * fileURL = getFileURL(directory, filename);
+	    [openpanel setDirectoryURL:fileURL];
+	}
+
+	modalReturnCode = [openpanel runModal];
+	[NSApp tkFilePanelDidEnd:openpanel returnCode:modalReturnCode
 		contextInfo:callbackInfo];
     }
     result = (modalReturnCode != modalError) ? TCL_OK : TCL_ERROR;
     if (parentIsKey) {
 	[parent makeKeyWindow];
     }
-    if (typeVariablePtr && result == TCL_OK) {
+
+    if ((typeVariablePtr && (modalReturnCode == NSOKButton)) &&
+	filterInfo.doFileTypes) {
 	/*
-	 * The -typevariable option is not really supported.
+	 * The -typevariable must be set to the selected file type, if the dialog was not cancelled
 	 */
+	NSUInteger selectedFilterIndex = filterInfo.fileTypeIndex;
+	NSString *selectedFilter = NULL;
+	if (filterInfo.userHasSelectedFilter) {
+	    selectedFilterIndex = filterInfo.fileTypeIndex;
+	    selectedFilter = [filterInfo.fileTypeNames objectAtIndex:selectedFilterIndex];
+	} else {
+	    /* Difficult case: the user has not touched the filter settings, but we must
+	     * return something in the typevariable. First check if the preselected type is compatible
+	     * with the selected file, otherwise choose the first compatible type from the list,
+	     * finally fall back to the empty string */
+	    NSURL *selectedFile;
+	    if (multiple) {
+		// Use the first file in the case of multiple selection
+		// Anyway it is not overly useful here
+		selectedFile = [[openpanel URLs] objectAtIndex:0];
+	    } else {
+		selectedFile = [openpanel URL];
+	    }
 
-	Tcl_SetVar2(interp, Tcl_GetString(typeVariablePtr), NULL,
-		"", TCL_GLOBAL_ONLY);
+	    NSString *extension = [selectedFile pathExtension];
+	    if (filterInfo.preselectFilter &&
+		filterCompatible(extension, filterInfo.fileTypeIndex)) {
+		selectedFilterIndex = filterInfo.fileTypeIndex;  // The preselection from the typevariable
+		selectedFilter = [filterInfo.fileTypeNames objectAtIndex:selectedFilterIndex];
+	    } else {
+		// scan the list
+		NSUInteger i;
+		for (i = 0; i < [filterInfo.fileTypeNames count]; i++) {
+		    if (filterCompatible(extension, i)) {
+			selectedFilterIndex = i;
+			break;
+		    }
+		}
+		if (i == selectedFilterIndex) {
+		    selectedFilter = [filterInfo.fileTypeNames objectAtIndex:selectedFilterIndex];
+		} else {
+		    selectedFilter = @"";
+		}
+
+	    }
+	}
+
+	Tcl_ObjSetVar2(interp, typeVariablePtr, NULL,
+		Tcl_NewStringObj([selectedFilter UTF8String], -1), TCL_GLOBAL_ONLY);
     }
+
 
   end:
-    TkFreeFileFilters(&fl);
     return result;
 }
+
 
 /*
  *----------------------------------------------------------------------
  *
  * Tk_GetSaveFileObjCmd --
@@ -589,23 +824,20 @@
     Tk_Window tkwin = clientData;
     char *str;
     int i, result = TCL_ERROR, haveParentOption = 0;
     int confirmOverwrite = 1;
     int index, len;
-    FileFilterList fl;
-    Tcl_Obj *cmdObj = NULL;
+    Tcl_Obj *cmdObj = NULL, *typeVariablePtr = NULL, *fileTypesPtr = NULL;
     FilePanelCallbackInfo callbackInfoStruct;
     FilePanelCallbackInfo *callbackInfo = &callbackInfoStruct;
     NSString *directory = nil, *filename = nil, *defaultType = nil;
-    NSString *message, *title, *type;
+    NSString *message = nil, *title = nil;
     NSWindow *parent;
-    NSMutableArray *fileTypes = nil;
-    NSSavePanel *panel = [NSSavePanel savePanel];
+    savepanel =  [NSSavePanel savePanel];
     NSInteger modalReturnCode = modalError;
     BOOL parentIsKey = NO;
 
-    TkInitFileFilters(&fl);
     for (i = 1; i < objc; i += 2) {
 	if (Tcl_GetIndexFromObjStruct(interp, objv[i], saveOptionStrings,
 		sizeof(char *), "option", TCL_EXACT, &index) != TCL_OK) {
 	    goto end;
 	}
@@ -614,100 +846,131 @@
 		    "value for \"%s\" missing", Tcl_GetString(objv[i])));
 	    Tcl_SetErrorCode(interp, "TK", "FILEDIALOG", "VALUE", NULL);
 	    goto end;
 	}
 	switch (index) {
-	case SAVE_DEFAULT:
-	    str = Tcl_GetStringFromObj(objv[i + 1], &len);
-	    while (*str && (*str == '*' || *str == '.')) {
-		str++;
-	    }
-	    if (*str) {
-		defaultType = [[[NSString alloc] initWithUTF8String:str]
-			autorelease];
-	    }
-	    break;
-	case SAVE_FILETYPES:
-	    if (TkGetFileFilters(interp, &fl, objv[i + 1], 0) != TCL_OK) {
-		goto end;
-	    }
-	    break;
-	case SAVE_INITDIR:
-	    str = Tcl_GetStringFromObj(objv[i + 1], &len);
-	    if (len) {
-		directory = [[[NSString alloc] initWithUTF8String:str]
-			autorelease];
-	    }
-	    break;
-	case SAVE_INITFILE:
-	    str = Tcl_GetStringFromObj(objv[i + 1], &len);
-	    if (len) {
-		filename = [[[NSString alloc] initWithUTF8String:str]
-			autorelease];
-	    }
-	    break;
-	case SAVE_MESSAGE:
-	    message = [[NSString alloc] initWithUTF8String:
-		    Tcl_GetString(objv[i + 1])];
-	    [panel setMessage:message];
-	    [message release];
-	    break;
-	case SAVE_PARENT:
-	    str = Tcl_GetStringFromObj(objv[i + 1], &len);
-	    tkwin = Tk_NameToWindow(interp, str, tkwin);
-	    if (!tkwin) {
-		goto end;
-	    }
-	    haveParentOption = 1;
-	    break;
-	case SAVE_TITLE:
-	    title = [[NSString alloc] initWithUTF8String:
-		    Tcl_GetString(objv[i + 1])];
-	    [panel setTitle:title];
-	    [title release];
-	    break;
-	case SAVE_TYPEVARIABLE:
-	    break;
-	case SAVE_COMMAND:
-	    cmdObj = objv[i+1];
-	    break;
-	case SAVE_CONFIRMOW:
-	    if (Tcl_GetBooleanFromObj(interp, objv[i + 1],
-		    &confirmOverwrite) != TCL_OK) {
-		goto end;
-	    }
-	    break;
-	}
-    }
-    if (fl.filters || defaultType) {
-	fileTypes = [NSMutableArray array];
-	[fileTypes addObject:defaultType ? defaultType : (id)kUTTypeContent];
-	for (FileFilter *filterPtr = fl.filters; filterPtr;
-		filterPtr = filterPtr->next) {
-	    for (FileFilterClause *clausePtr = filterPtr->clauses; clausePtr;
-		    clausePtr = clausePtr->next) {
-		for (GlobPattern *globPtr = clausePtr->patterns; globPtr;
-			globPtr = globPtr->next) {
-		    str = globPtr->pattern;
-		    while (*str && (*str == '*' || *str == '.')) {
-			str++;
-		    }
-		    if (*str) {
-			type = [[NSString alloc] initWithUTF8String:str];
-			if (![fileTypes containsObject:type]) {
-			    [fileTypes addObject:type];
-			}
-			[type release];
-		    }
-		}
-	    }
-	}
-	[panel setAllowedFileTypes:fileTypes];
-	[panel setAllowsOtherFileTypes:YES];
-    }
-    [panel setCanSelectHiddenExtension:YES];
-    [panel setExtensionHidden:NO];
+	    case SAVE_DEFAULT:
+		str = Tcl_GetStringFromObj(objv[i + 1], &len);
+		while (*str && (*str == '*' || *str == '.')) {
+		    str++;
+		}
+		if (*str) {
+		    defaultType = [[[NSString alloc] initWithUTF8String:str]
+			    autorelease];
+		}
+		break;
+	    case SAVE_FILETYPES:
+		fileTypesPtr = objv[i + 1];
+		break;
+	    case SAVE_INITDIR:
+		str = Tcl_GetStringFromObj(objv[i + 1], &len);
+		if (len) {
+		    directory = [[[NSString alloc] initWithUTF8String:str]
+			    autorelease];
+		}
+		break;
+	    case SAVE_INITFILE:
+		str = Tcl_GetStringFromObj(objv[i + 1], &len);
+		if (len) {
+		    filename = [[[NSString alloc] initWithUTF8String:str]
+			    autorelease];
+		    [savepanel setNameFieldStringValue:filename];
+		}
+		break;
+	    case SAVE_MESSAGE:
+		message = [[NSString alloc] initWithUTF8String:
+			Tcl_GetString(objv[i + 1])];
+		break;
+	    case SAVE_PARENT:
+		str = Tcl_GetStringFromObj(objv[i + 1], &len);
+		tkwin = Tk_NameToWindow(interp, str, tkwin);
+		if (!tkwin) {
+		    goto end;
+		}
+		haveParentOption = 1;
+		break;
+	    case SAVE_TITLE:
+		title = [[NSString alloc] initWithUTF8String:
+			Tcl_GetString(objv[i + 1])];
+		break;
+	    case SAVE_TYPEVARIABLE:
+		typeVariablePtr = objv[i + 1];
+		break;
+	    case SAVE_COMMAND:
+		cmdObj = objv[i+1];
+		break;
+	    case SAVE_CONFIRMOW:
+		if (Tcl_GetBooleanFromObj(interp, objv[i + 1],
+			&confirmOverwrite) != TCL_OK) {
+		    goto end;
+		}
+		break;
+	}
+    }
+
+    if (title) {
+	[savepanel setTitle:title];
+
+	/* From OSX 10.11, the title string is silently ignored, if the save panel is a sheet.
+	 * Prepend the title to the message in this case
+	 * NOTE should be conditional on OSX version, but
+	 * -mmacosx-version-min does not revert this behaviour*/
+	if (haveParentOption) {
+	    if (message) {
+		NSString *fullmessage = [[NSString alloc] initWithFormat:@"%@\n%@",title,message];
+		[message release];
+		[title release];
+		message = fullmessage;
+	    } else {
+		message = title;
+	    }
+	}
+    }
+
+    if (message) {
+	[savepanel setMessage:message];
+	[message release];
+    }
+
+    if (parseFileFilters(interp, fileTypesPtr, typeVariablePtr) != TCL_OK) {
+	goto end;
+    }
+
+    if (filterInfo.doFileTypes) {
+	NSView  *accessoryView = [[NSView alloc] initWithFrame:NSMakeRect(0.0, 0.0, 300, 32.0)];
+	NSTextField *label = [[NSTextField alloc] initWithFrame:NSMakeRect(0, 0, 60, 22)];
+	[label setEditable:NO];
+	[label setStringValue:NSLocalizedString(@"Format:", nil)];
+	[label setBordered:NO];
+	[label setBezeled:NO];
+	[label setDrawsBackground:NO];
+
+	NSPopUpButton *popupButton = [[NSPopUpButton alloc] initWithFrame:NSMakeRect(50.0, 2, 340, 22.0) pullsDown:NO];
+	[popupButton addItemsWithTitles:filterInfo.fileTypeLabels];
+	[popupButton selectItemAtIndex:filterInfo.fileTypeIndex];
+	[popupButton setAction:@selector(saveFormat:)];
+
+	[accessoryView addSubview:label];
+	[accessoryView addSubview:popupButton];
+
+	[savepanel setAccessoryView:accessoryView];
+
+	[savepanel setAllowedFileTypes:[filterInfo.fileTypeExtensions objectAtIndex:filterInfo.fileTypeIndex]];
+	[savepanel setAllowsOtherFileTypes:filterInfo.allowedExtensionsAllowAll];
+    } else if (defaultType) {
+	/* If no filetypes are given, defaultextension is an alternative way
+	 * to specify the attached extension. Just propose this extension,
+	 * but don't display an accessory view */
+	NSMutableArray *AllowedFileTypes = [NSMutableArray array];
+	[AllowedFileTypes addObject:defaultType];
+	[savepanel setAllowedFileTypes:AllowedFileTypes];
+	[savepanel setAllowsOtherFileTypes:YES];
+    }
+
+    [savepanel setCanSelectHiddenExtension:YES];
+    [savepanel setExtensionHidden:NO];
+
     if (cmdObj) {
 	callbackInfo = ckalloc(sizeof(FilePanelCallbackInfo));
 	if (Tcl_IsShared(cmdObj)) {
 	    cmdObj = Tcl_DuplicateObj(cmdObj);
 	}
@@ -714,46 +977,59 @@
 	Tcl_IncrRefCount(cmdObj);
     }
     callbackInfo->cmdObj = cmdObj;
     callbackInfo->interp = interp;
     callbackInfo->multiple = 0;
+
     parent = TkMacOSXDrawableWindow(((TkWindow *) tkwin)->window);
     if (haveParentOption && parent && ![parent attachedSheet]) {
        parentIsKey = [parent isKeyWindow];
-#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
-	[panel beginSheetForDirectory:directory
-	       file:filename
-	       modalForWindow:parent
-	       modalDelegate:NSApp
-	       didEndSelector:
-		   @selector(tkFilePanelDidEnd:returnCode:contextInfo:)
-	       contextInfo:callbackInfo];
-#else
-	[panel setDirectoryURL:getFileURL(directory, filename)];
-	[panel beginSheetModalForWindow:parent
+       if (directory) {
+	    [savepanel setDirectoryURL:[NSURL fileURLWithPath:directory isDirectory:YES]];
+	}
+	   /*check for file name, otherwise set to empty string; crashes with uncaught exception if set to nil*/
+	if (filename) {
+	    [savepanel setNameFieldStringValue:filename];
+	} else {
+	    [savepanel setNameFieldStringValue:@""];
+	}
+	[savepanel beginSheetModalForWindow:parent
 	       completionHandler:^(NSInteger returnCode)
-	       { [NSApp tkFilePanelDidEnd:panel
+	       { [NSApp tkFilePanelDidEnd:savepanel
 		       returnCode:returnCode
 		       contextInfo:callbackInfo ]; } ];
-#endif
-	modalReturnCode = cmdObj ? modalOther : [NSApp runModalForWindow:panel];
+	modalReturnCode = cmdObj ? modalOther : [NSApp runModalForWindow:savepanel];
     } else {
-#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
-	modalReturnCode = [panel runModalForDirectory:directory file:filename];
-#else
-	[panel setDirectoryURL:getFileURL(directory, filename)];
-	modalReturnCode = [panel runModal];
-#endif
-	[NSApp tkFilePanelDidEnd:panel returnCode:modalReturnCode
+	if (directory) {
+	    [savepanel setDirectoryURL:[NSURL fileURLWithPath:directory isDirectory:YES]];
+	}
+	 /*check for file name, otherwise set to empty string; crashes with uncaught exception if set to nil*/
+	if (filename) {
+	    [savepanel setNameFieldStringValue:filename];
+	} else {
+	    [savepanel setNameFieldStringValue:@""];
+	}
+	modalReturnCode = [savepanel runModal];
+	[NSApp tkFilePanelDidEnd:savepanel returnCode:modalReturnCode
 		contextInfo:callbackInfo];
     }
     result = (modalReturnCode != modalError) ? TCL_OK : TCL_ERROR;
     if (parentIsKey) {
 	[parent makeKeyWindow];
     }
+
+    if ((typeVariablePtr && (modalReturnCode == NSOKButton)) && filterInfo.doFileTypes) {
+	/*
+	 * The -typevariable must be set to the selected file type, if the dialog was not cancelled
+	 */
+	NSString * selectedFilter = [filterInfo.fileTypeNames objectAtIndex:filterInfo.fileTypeIndex];
+	Tcl_ObjSetVar2(interp, typeVariablePtr, NULL,
+		Tcl_NewStringObj([selectedFilter UTF8String], -1), TCL_GLOBAL_ONLY);
+    }
+
+
   end:
-    TkFreeFileFilters(&fl);
     return result;
 }
 
 /*
  *----------------------------------------------------------------------
@@ -785,11 +1061,11 @@
     int i, result = TCL_ERROR, haveParentOption = 0;
     int index, len, mustexist = 0;
     Tcl_Obj *cmdObj = NULL;
     FilePanelCallbackInfo callbackInfoStruct;
     FilePanelCallbackInfo *callbackInfo = &callbackInfoStruct;
-    NSString *directory = nil, *filename = nil;
+    NSString *directory = nil;
     NSString *message, *title;
     NSWindow *parent;
     NSOpenPanel *panel = [NSOpenPanel openPanel];
     NSInteger modalReturnCode = modalError;
     BOOL parentIsKey = NO;
@@ -856,36 +1132,27 @@
 	Tcl_IncrRefCount(cmdObj);
     }
     callbackInfo->cmdObj = cmdObj;
     callbackInfo->interp = interp;
     callbackInfo->multiple = 0;
+    /*check for directory value, set to root if not specified; otherwise crashes with exception because of nil string parameter*/
+    if (!directory) {
+	directory = @"/";
+    }
     parent = TkMacOSXDrawableWindow(((TkWindow *) tkwin)->window);
     if (haveParentOption && parent && ![parent attachedSheet]) {
-      parentIsKey = [parent isKeyWindow];
-#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
-	[panel beginSheetForDirectory:directory
-		file:filename
-		modalForWindow:parent
-		modalDelegate:NSApp
-		didEndSelector: @selector(tkFilePanelDidEnd:returnCode:contextInfo:)
-		contextInfo:callbackInfo];
-#else
-	[panel setDirectoryURL:getFileURL(directory, filename)];
+	parentIsKey = [parent isKeyWindow];
+	[panel setDirectoryURL:[NSURL fileURLWithPath:directory isDirectory:YES]];
 	[panel beginSheetModalForWindow:parent
 	       completionHandler:^(NSInteger returnCode)
 	       { [NSApp tkFilePanelDidEnd:panel
 		       returnCode:returnCode
 		       contextInfo:callbackInfo ]; } ];
-#endif
 	modalReturnCode = cmdObj ? modalOther : [NSApp runModalForWindow:panel];
     } else {
-#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
-	modalReturnCode = [panel runModalForDirectory:directory file:nil];
-#else
-	[panel setDirectoryURL:getFileURL(directory, filename)];
+	[panel setDirectoryURL:[NSURL fileURLWithPath:directory isDirectory:YES]];
 	modalReturnCode = [panel runModal];
-#endif
 	[NSApp tkFilePanelDidEnd:panel returnCode:modalReturnCode
 		contextInfo:callbackInfo];
     }
     result = (modalReturnCode != modalError) ? TCL_OK : TCL_ERROR;
     if (parentIsKey) {
@@ -1061,11 +1328,11 @@
 	    [message release];
 	    break;
 
 	case ALERT_ICON:
 	    if (Tcl_GetIndexFromObjStruct(interp, objv[i + 1], alertIconStrings,
-		    sizeof(char *), "value", TCL_EXACT, &iconIndex) != TCL_OK) {
+		    sizeof(char *), "-icon value", TCL_EXACT, &iconIndex) != TCL_OK) {
 		goto end;
 	    }
 	    break;
 
 	case ALERT_MESSAGE:
@@ -1091,11 +1358,11 @@
 	    [title release];
 	    break;
 
 	case ALERT_TYPE:
 	    if (Tcl_GetIndexFromObjStruct(interp, objv[i + 1], alertTypeStrings,
-		    sizeof(char *), "value", TCL_EXACT, &typeIndex) != TCL_OK) {
+		    sizeof(char *), "-type value", TCL_EXACT, &typeIndex) != TCL_OK) {
 		goto end;
 	    }
 	    break;
 	case ALERT_COMMAND:
 	    cmdObj = objv[i+1];
@@ -1107,11 +1374,11 @@
 	 * Any '-default' option needs to know the '-type' option, which is
 	 * why we do this here.
 	 */
 
 	if (Tcl_GetIndexFromObjStruct(interp, objv[indexDefaultOption + 1],
-		alertButtonStrings, sizeof(char *), "value", TCL_EXACT, &index) != TCL_OK) {
+		alertButtonStrings, sizeof(char *), "-default value", TCL_EXACT, &index) != TCL_OK) {
 	    goto end;
 	}
 
 	/*
 	 * Need to map from "ok" etc. to 1, 2, 3, right to left.

Index: macosx/tkMacOSXDraw.c
==================================================================
--- macosx/tkMacOSXDraw.c
+++ macosx/tkMacOSXDraw.c
@@ -14,11 +14,10 @@
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
 
 #include "tkMacOSXPrivate.h"
 #include "tkMacOSXDebug.h"
-#include "xbytes.h"
 #include "tkButton.h"
 
 /*
 #ifdef TK_MAC_DEBUG
 #define TK_MAC_DEBUG_DRAWING
@@ -43,16 +42,10 @@
 /*
  * Prototypes for functions used only in this file.
  */
 
 static void ClipToGC(Drawable d, GC gc, HIShapeRef *clipRgnPtr);
-static CGImageRef CreateCGImageWithXImage(XImage *ximage);
-static CGContextRef GetCGContextForDrawable(Drawable d);
-static void DrawCGImage(Drawable d, GC gc, CGContextRef context, CGImageRef image,
-	unsigned long imageForeground, unsigned long imageBackground,
-	CGRect imageBounds, CGRect srcBounds, CGRect dstBounds);
-
 
 /*
  *----------------------------------------------------------------------
  *
  * TkMacOSXInitCGDrawing --
@@ -106,17 +99,18 @@
 }
 
 /*
  *----------------------------------------------------------------------
  *
- * BitmapRepFromDrawableRect
+ * TkMacOSXBitmapRepFromDrawableRect
  *
  *	Extract bitmap data from a MacOSX drawable as an NSBitmapImageRep.
  *
  * Results:
- *	Returns an autoreleased NSBitmapRep representing the image of the given
- *      rectangle of the given drawable.
+ *	Returns an NSBitmapRep representing the image of the given
+ *      rectangle of the given drawable.  This object is retained.
+ *      The caller is responsible for releasing it.
  *
  *      NOTE: The x,y coordinates should be relative to a coordinate system with
  *      origin at the top left, as used by XImage and CGImage, not bottom
  *      left as used by NSView.
  *
@@ -124,11 +118,11 @@
  *     None
  *
  *----------------------------------------------------------------------
  */
 NSBitmapImageRep*
-BitmapRepFromDrawableRect(
+TkMacOSXBitmapRepFromDrawableRect(
         Drawable drawable,
 	int x,
 	int y,
 	unsigned int width,
 	unsigned int height)
@@ -138,34 +132,34 @@
     CGImageRef cg_image=NULL, sub_cg_image=NULL;
     NSBitmapImageRep *bitmap_rep=NULL;
     NSView *view=NULL;
     if ( mac_drawable->flags & TK_IS_PIXMAP ) {
 	/*
-	   This means that the MacDrawable is functioning as a Tk Pixmap, so its view
-	   field is NULL.
+	 * This means that the MacDrawable is functioning as a
+	 * Tk Pixmap, so its view field is NULL.
 	*/
-	cg_context = GetCGContextForDrawable(drawable);
+	cg_context = TkMacOSXGetCGContextForDrawable(drawable);
 	CGRect image_rect = CGRectMake(x, y, width, height);
 	cg_image = CGBitmapContextCreateImage( (CGContextRef) cg_context);
 	sub_cg_image = CGImageCreateWithImageInRect(cg_image, image_rect);
 	if ( sub_cg_image ) {
-	    /*This can be dealloc'ed prematurely if set for autorelease, causing crashes.*/
 	    bitmap_rep = [NSBitmapImageRep alloc];
 	    [bitmap_rep initWithCGImage:sub_cg_image];
 	}
 	if ( cg_image ) {
 	    CGImageRelease(cg_image);
 	}
     } else if ( (view = TkMacOSXDrawableView(mac_drawable)) ) {
-	/* convert top-left coordinates to NSView coordinates */
+	/*
+	 * Convert Tk top-left to NSView bottom-left coordinates.
+	 */
 	int view_height = [view bounds].size.height;
 	NSRect view_rect = NSMakeRect(x + mac_drawable->xOff,
-				      view_height - height - y - mac_drawable->yOff,
-				      width,height);
+			       view_height - height - y - mac_drawable->yOff,
+			       width, height);
 
 	if ( [view lockFocusIfCanDraw] ) {
-	    /*This can be dealloc'ed prematurely if set for autorelease, causing crashes.*/
 	    bitmap_rep = [NSBitmapImageRep alloc];
 	    bitmap_rep = [bitmap_rep initWithFocusedViewRect:view_rect];
 	    [view unlockFocus];
 	} else {
 	    TkMacOSXDbgMsg("Could not lock focus on view.");
@@ -228,20 +222,20 @@
 
     if ( dc.context ) {
 	if (srcDraw->flags & TK_IS_PIXMAP) {
 	    img = TkMacOSXCreateCGImageWithDrawable(src);
 	}else if (TkMacOSXDrawableWindow(src)) {
-	    bitmap_rep =  BitmapRepFromDrawableRect(src, src_x, src_y, width, height);
+	    bitmap_rep =  TkMacOSXBitmapRepFromDrawableRect(src, src_x, src_y, width, height);
 	    if ( bitmap_rep ) {
 		img = [bitmap_rep CGImage];
 	    }
 	} else {
 	    TkMacOSXDbgMsg("Invalid source drawable - neither window nor pixmap.");
 	}
 
 	if (img) {
-	    DrawCGImage(dst, gc, dc.context, img, gc->foreground, gc->background,
+	    TkMacOSXDrawCGImage(dst, gc, dc.context, img, gc->foreground, gc->background,
 			CGRectMake(0, 0, srcDraw->size.width, srcDraw->size.height),
 			CGRectMake(src_x, src_y, width, height),
 			CGRectMake(dest_x, dest_y, width, height));
 	    CFRelease(img);
 
@@ -337,11 +331,11 @@
 		    CGImageRelease(img);
 		    CGImageRelease(mask);
 		    CGImageRelease(submask);
 		    CGImageRelease(subimage);
 		} else {
-		    DrawCGImage(dst, gc, dc.context, img, gc->foreground, imageBackground,
+		    TkMacOSXDrawCGImage(dst, gc, dc.context, img, gc->foreground, imageBackground,
 				CGRectMake(0, 0, srcDraw->size.width, srcDraw->size.height),
 				CGRectMake(src_x, src_y, width, height),
 				CGRectMake(dest_x, dest_y, width, height));
 		    CGImageRelease(img);
 		}
@@ -354,162 +348,10 @@
 	TkMacOSXRestoreDrawingContext(&dc);
     } else { /* source drawable is a window, not a Pixmap */
 	XCopyArea(display, src, dst, gc, src_x, src_y, width, height, dest_x, dest_y);
     }
 }
-
-/*
- *----------------------------------------------------------------------
- *
- * TkPutImage --
- *
- *	Copies a subimage from an in-memory image to a rectangle of
- *	of the specified drawable.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Draws the image on the specified drawable.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TkPutImage(
-    unsigned long *colors,	/* Unused on Macintosh. */
-    int ncolors,			/* Unused on Macintosh. */
-    Display* display,		/* Display. */
-    Drawable d,			/* Drawable to place image on. */
-    GC gc,				/* GC to use. */
-    XImage* image,		/* Image to place. */
-    int src_x,			/* Source X & Y. */
-    int src_y,
-    int dest_x,			/* Destination X & Y. */
-    int dest_y,
-    unsigned int width,	/* Same width & height for both */
-    unsigned int height)	/* distination and source. */
-{
-    TkMacOSXDrawingContext dc;
-
-    display->request++;
-    if (!TkMacOSXSetupDrawingContext(d, gc, 1, &dc)) {
-	return BadDrawable;
-    }
-    if (dc.context) {
-	CGImageRef img = CreateCGImageWithXImage(image);
-
-	if (img) {
-	    /* If the XImage has big pixels, rescale the source dimensions.*/
-	    int pp = image->pixelpower;
-	    DrawCGImage(d, gc, dc.context, img, gc->foreground, gc->background,
-		    CGRectMake(0, 0, image->width<<pp, image->height<<pp),
-		    CGRectMake(src_x<<pp, src_y<<pp, width<<pp, height<<pp),
-		    CGRectMake(dest_x, dest_y, width, height));
-	    CFRelease(img);
-	} else {
-	    TkMacOSXDbgMsg("Invalid source drawable");
-	}
-    } else {
-	TkMacOSXDbgMsg("Invalid destination drawable");
-    }
-    TkMacOSXRestoreDrawingContext(&dc);
-    return Success;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * CreateCGImageWithXImage --
- *
- *	Create CGImage from XImage, copying the image data.
- *
- * Results:
- *	CGImage, release after use.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static void ReleaseData(void *info, const void *data, size_t size) {
-    ckfree(info);
-}
-
-CGImageRef
-CreateCGImageWithXImage(
-    XImage *image)
-{
-    CGImageRef img = NULL;
-    size_t bitsPerComponent, bitsPerPixel;
-    size_t len = image->bytes_per_line * image->height;
-    const CGFloat *decode = NULL;
-    CGBitmapInfo bitmapInfo;
-    CGDataProviderRef provider = NULL;
-    char *data = NULL;
-    CGDataProviderReleaseDataCallback releaseData = ReleaseData;
-
-    if (image->bits_per_pixel == 1) {
-	/*
-	 * BW image
-	 */
-
-	/* Reverses the sense of the bits */
-	static const CGFloat decodeWB[2] = {1, 0};
-	decode = decodeWB;
-
-	bitsPerComponent = 1;
-	bitsPerPixel = 1;
-	if (image->bitmap_bit_order != MSBFirst) {
-	    char *srcPtr = image->data + image->xoffset;
-	    char *endPtr = srcPtr + len;
-	    char *destPtr = (data = ckalloc(len));
-
-	    while (srcPtr < endPtr) {
-		*destPtr++ = xBitReverseTable[(unsigned char)(*(srcPtr++))];
-	    }
-	} else {
-	    data = memcpy(ckalloc(len), image->data + image->xoffset, len);
-	}
-	if (data) {
-	    provider = CGDataProviderCreateWithData(data, data, len, releaseData);
-	}
-	if (provider) {
-	    img = CGImageMaskCreate(image->width, image->height, bitsPerComponent,
-				    bitsPerPixel, image->bytes_per_line, provider, decode, 0);
-	}
-    } else if (image->format == ZPixmap && image->bits_per_pixel == 32) {
-	/*
-	 * Color image
-	 */
-
-	CGColorSpaceRef colorspace = CGColorSpaceCreateWithName(kCGColorSpaceSRGB);
-
-	bitsPerComponent = 8;
-	bitsPerPixel = 32;
-	bitmapInfo = (image->byte_order == MSBFirst ?
-		kCGBitmapByteOrder32Big : kCGBitmapByteOrder32Little) |
-		kCGImageAlphaNoneSkipFirst;
-	data = memcpy(ckalloc(len), image->data + image->xoffset, len);
-	if (data) {
-	    provider = CGDataProviderCreateWithData(data, data, len, releaseData);
-	}
-	if (provider) {
-	    img = CGImageCreate(image->width, image->height, bitsPerComponent,
-		    bitsPerPixel, image->bytes_per_line, colorspace, bitmapInfo,
-		    provider, decode, 0, kCGRenderingIntentDefault);
-	    CFRelease(provider);
-	}
-	if (colorspace) {
-	    CFRelease(colorspace);
-	}
-    } else {
-	TkMacOSXDbgMsg("Unsupported image type");
-    }
-    return img;
-}
 
 /*
  *----------------------------------------------------------------------
  *
  * TkMacOSXCreateCGImageWithDrawable --
@@ -528,11 +370,11 @@
 CGImageRef
 TkMacOSXCreateCGImageWithDrawable(
     Drawable drawable)
 {
     CGImageRef img = NULL;
-    CGContextRef context = GetCGContextForDrawable(drawable);
+    CGContextRef context = TkMacOSXGetCGContextForDrawable(drawable);
 
     if (context) {
 	img = CGBitmapContextCreateImage(context);
     }
     return img;
@@ -596,12 +438,14 @@
     Tk_Image image,
     int width,
     int height)
 {
     Pixmap pixmap = Tk_GetPixmap(display, None, width, height, 0);
+    MacDrawable *macDraw = (MacDrawable *) pixmap;
     NSImage *nsImage;
 
+    macDraw->flags |= TK_USE_XIMAGE_ALPHA;
     Tk_RedrawImage(image, 0, 0, width, height, pixmap, 0, 0);
     nsImage = CreateNSImageWithPixmap(pixmap, width, height);
     Tk_FreePixmap(display, pixmap);
 
     return [nsImage autorelease];
@@ -647,11 +491,11 @@
 }
 
 /*
  *----------------------------------------------------------------------
  *
- * GetCGContextForDrawable --
+ * TkMacOSXGetCGContextForDrawable --
  *
  *	Get CGContext for given Drawable, creating one if necessary.
  *
  * Results:
  *	CGContext.
@@ -661,14 +505,14 @@
  *
  *----------------------------------------------------------------------
  */
 
 CGContextRef
-GetCGContextForDrawable(
-    Drawable d)
+TkMacOSXGetCGContextForDrawable(
+    Drawable drawable)
 {
-    MacDrawable *macDraw = (MacDrawable *) d;
+    MacDrawable *macDraw = (MacDrawable *) drawable;
 
     if (macDraw && (macDraw->flags & TK_IS_PIXMAP) && !macDraw->context) {
 	const size_t bitsPerComponent = 8;
 	size_t bitsPerPixel, bytesPerRow, len;
 	CGColorSpaceRef colorspace = NULL;
@@ -683,11 +527,11 @@
 
 	if (macDraw->flags & TK_IS_BW_PIXMAP) {
 	    bitsPerPixel = 8;
 	    bitmapInfo = (CGBitmapInfo)kCGImageAlphaOnly;
 	} else {
-	    colorspace = CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB);
+	    colorspace = CGColorSpaceCreateDeviceRGB();
 	    bitsPerPixel = 32;
 	    bitmapInfo |= kCGImageAlphaPremultipliedFirst;
 	}
 	bytesPerRow = ((size_t) macDraw->size.width * bitsPerPixel + 127) >> 3
 		& ~15;
@@ -709,11 +553,11 @@
 }
 
 /*
  *----------------------------------------------------------------------
  *
- * DrawCGImage --
+ * TkMacOSXDrawCGImage --
  *
  *	Draw CG image into drawable.
  *
  * Results:
  *	None.
@@ -723,11 +567,11 @@
  *
  *----------------------------------------------------------------------
  */
 
 void
-DrawCGImage(
+TkMacOSXDrawCGImage(
     Drawable d,
     GC gc,
     CGContextRef context,
     CGImageRef image,
     unsigned long imageForeground,
@@ -856,10 +700,20 @@
 		prevx += points[i].x;
 		prevy += points[i].y;
 		CGContextAddLineToPoint(dc.context, prevx, prevy);
 	    }
 	}
+        /*
+         * In the case of closed polylines, the first and last points
+         * are the same. We want miter or bevel join be rendered also
+         * at this point, this needs telling CoreGraphics that the
+         * path is closed.
+         */
+        if ((points[0].x == points[npoints-1].x) &&
+                (points[0].y == points[npoints-1].y)) {
+            CGContextClosePath(dc.context);
+        }
 	CGContextStrokePath(dc.context);
     }
     TkMacOSXRestoreDrawingContext(&dc);
     return Success;
 }
@@ -878,11 +732,11 @@
  *	Renders a series of unconnected lines.
  *
  *----------------------------------------------------------------------
  */
 
-void
+int
 XDrawSegments(
     Display *display,
     Drawable d,
     GC gc,
     XSegment *segments,
@@ -892,11 +746,11 @@
     TkMacOSXDrawingContext dc;
     int i, lw = gc->line_width;
 
     display->request++;
     if (!TkMacOSXSetupDrawingContext(d, gc, 1, &dc)) {
-	return;
+	return BadDrawable;
     }
     if (dc.context) {
 	double o = (lw % 2) ? .5 : 0;
 
 	for (i = 0; i < nsegments; i++) {
@@ -909,10 +763,11 @@
 		    macWin->yOff + segments[i].y2 + o);
 	    CGContextStrokePath(dc.context);
 	}
     }
     TkMacOSXRestoreDrawingContext(&dc);
+    return Success;
 }
 
 /*
  *----------------------------------------------------------------------
  *
@@ -1473,11 +1328,11 @@
  *
  *	Scroll a rectangle of the specified window and accumulate
  *	a damage region.
  *
  * Results:
- *	Returns 0 if the scroll genereated no additional damage.
+ *	Returns 0 if the scroll generated no additional damage.
  *	Otherwise, sets the region that needs to be repainted after
  *	scrolling and returns 1.
  *
  * Side effects:
  *	Scrolls the bits in the window.
@@ -1503,78 +1358,43 @@
     int result = 0;
 
     if ( view ) {
   	/*  Get the scroll area in NSView coordinates (origin at bottom left). */
   	bounds = [view bounds];
- 	scrollSrc = NSMakeRect(
-			       macDraw->xOff + x,
+ 	scrollSrc = NSMakeRect(macDraw->xOff + x,
 			       bounds.size.height - height - (macDraw->yOff + y),
 			       width, height);
  	scrollDst = NSOffsetRect(scrollSrc, dx, -dy);
 
   	/* Limit scrolling to the window content area. */
  	visRect = [view visibleRect];
  	scrollSrc = NSIntersectionRect(scrollSrc, visRect);
  	scrollDst = NSIntersectionRect(scrollDst, visRect);
  	if ( !NSIsEmptyRect(scrollSrc) && !NSIsEmptyRect(scrollDst) ) {
-
   	    /*
   	     * Mark the difference between source and destination as damaged.
 	     * This region is described in NSView coordinates (y=0 at the bottom)
 	     * and converted to Tk coordinates later.
   	     */
 
 	    srcRect = CGRectMake(x, y, width, height);
 	    dstRect = CGRectOffset(srcRect, dx, dy);
 
-	    /* Expand the rectangles slightly to avoid degeneracies. */
-	    srcRect.origin.y -= 1;
-	    srcRect.size.height += 2;
-	    dstRect.origin.y += 1;
-	    dstRect.size.height -= 2;
-
 	    /* Compute the damage. */
   	    dmgRgn = HIShapeCreateMutableWithRect(&srcRect);
  	    extraRgn = HIShapeCreateWithRect(&dstRect);
  	    ChkErr(HIShapeDifference, dmgRgn, extraRgn, (HIMutableShapeRef) dmgRgn);
 	    result = HIShapeIsEmpty(dmgRgn) ? 0 : 1;
 
-	    /* Convert to Tk coordinates. */
+	    /* Convert to Tk coordinates, offset by the window origin. */
 	    TkMacOSXSetWithNativeRegion(damageRgn, dmgRgn);
 	    if (extraRgn) {
 		CFRelease(extraRgn);
 	    }
 
  	    /* Scroll the rectangle. */
  	    [view scrollRect:scrollSrc by:NSMakeSize(dx, -dy)];
-
-	    /* Shift the Tk children which meet the source rectangle. */
-	    TkWindow *winPtr = (TkWindow *)tkwin;
-	    TkWindow *childPtr;
-	    CGRect childBounds;
-	    for (childPtr = winPtr->childList; childPtr != NULL; childPtr = childPtr->nextPtr) {
-		if (Tk_IsMapped(childPtr) && !Tk_IsTopLevel(childPtr)) {
-		    TkMacOSXWinCGBounds(childPtr, &childBounds);
-		    if (CGRectIntersectsRect(srcRect, childBounds)) {
-			MacDrawable *macChild = childPtr->privatePtr;
-			if (macChild) {
-			    macChild->yOff += dy;
-			    macChild->xOff += dx;
-			    childPtr->changes.y = macChild->yOff;
-			    childPtr->changes.x = macChild->xOff;
-			}
-		    }
-		}
-	    }
-
-	    /* Queue up Expose events for the damage region. */
-	    int oldMode = Tcl_SetServiceMode(TCL_SERVICE_NONE);
-	    [view generateExposeEvents:dmgRgn childrenOnly:1];
-	    Tcl_SetServiceMode(oldMode);
-
-	    /* Belt and suspenders: make the AppKit request a redraw
-	       when it gets control again. */
   	}
     } else {
 	dmgRgn = HIShapeCreateEmpty();
 	TkMacOSXSetWithNativeRegion(damageRgn, dmgRgn);
     }
@@ -1647,11 +1467,11 @@
     }
     if (dontDraw) {
 	goto end;
     }
     if (useCG) {
-	dc.context = GetCGContextForDrawable(d);
+	dc.context = TkMacOSXGetCGContextForDrawable(d);
     }
     if (!dc.context || !(macDraw->flags & TK_IS_PIXMAP)) {
 	isWin = (TkMacOSXDrawableWindow(d) != nil);
     }
     if (dc.context) {
@@ -1666,11 +1486,10 @@
 		dontDraw = ![view canDraw];
 	    }
 	    if (dontDraw) {
 		goto end;
 	    }
-	    [[view window] disableFlushWindow];
 	    dc.view = view;
 	    dc.context = [[NSGraphicsContext currentContext] graphicsPort];
 	    dc.portBounds = NSRectToCGRect([view bounds]);
 	    if (dc.clipRgn) {
 		clipBounds = CGContextGetClipBoundingBox(dc.context);
@@ -1692,17 +1511,17 @@
 	    CGContextSaveGState(dc.context);
 	}
 	CGContextSetTextDrawingMode(dc.context, kCGTextFill);
 	CGContextConcatCTM(dc.context, t);
 	if (dc.clipRgn) {
-	    #ifdef TK_MAC_DEBUG_DRAWING
+#ifdef TK_MAC_DEBUG_DRAWING
 	    CGContextSaveGState(dc.context);
 	    ChkErr(HIShapeReplacePathInCGContext, dc.clipRgn, dc.context);
 	    CGContextSetRGBFillColor(dc.context, 1.0, 0.0, 0.0, 0.1);
 	    CGContextEOFillPath(dc.context);
 	    CGContextRestoreGState(dc.context);
-	    #endif /* TK_MAC_DEBUG_DRAWING */
+#endif /* TK_MAC_DEBUG_DRAWING */
 	    CGRect r;
 	    if (!HIShapeIsRectangular(dc.clipRgn) || !CGRectContainsRect(
 		    *HIShapeGetBounds(dc.clipRgn, &r),
 		    CGRectApplyAffineTransform(clipBounds, t))) {
 		ChkErr(HIShapeReplacePathInCGContext, dc.clipRgn, dc.context);
@@ -1793,11 +1612,10 @@
     TkMacOSXDrawingContext *dcPtr)
 {
     if (dcPtr->context) {
 	CGContextSynchronize(dcPtr->context);
 	[[dcPtr->view window] setViewsNeedDisplay:YES];
-	[[dcPtr->view window] enableFlushWindow];
 	if (dcPtr->focusLocked) {
 	    [dcPtr->view unlockFocus];
 	} else {
 	    CGContextRestoreGState(dcPtr->context);
 	}

Index: macosx/tkMacOSXEmbed.c
==================================================================
--- macosx/tkMacOSXEmbed.c
+++ macosx/tkMacOSXEmbed.c
@@ -191,11 +191,11 @@
  */
 
 int
 TkpScanWindowId(
     Tcl_Interp *interp,
-    CONST char * string,
+    const char * string,
     Window *idPtr)
 {
     int code;
     Tcl_Obj obj;
 
@@ -625,11 +625,11 @@
 	    containerPtr = containerPtr->nextPtr) {
 	Tcl_DStringStartSublist(&dString);
 	if (containerPtr->parent == None) {
 	    Tcl_DStringAppendElement(&dString, "");
 	} else if (all) {
-	    sprintf(buffer, "0x%x", (int) containerPtr->parent);
+	    sprintf(buffer, "0x%" TCL_Z_MODIFIER "x", (size_t) containerPtr->parent);
 	    Tcl_DStringAppendElement(&dString, buffer);
 	} else {
 	    Tcl_DStringAppendElement(&dString, "XXX");
 	}
 	if (containerPtr->parentPtr == NULL) {
@@ -639,11 +639,11 @@
 		    containerPtr->parentPtr->pathName);
 	}
 	if (containerPtr->embedded == None) {
 	    Tcl_DStringAppendElement(&dString, "");
 	} else if (all) {
-	    sprintf(buffer, "0x%x", (int) containerPtr->embedded);
+	    sprintf(buffer, "0x%" TCL_Z_MODIFIER "x", (size_t) containerPtr->embedded);
 	    Tcl_DStringAppendElement(&dString, buffer);
 	} else {
 	    Tcl_DStringAppendElement(&dString, "XXX");
 	}
 	if (containerPtr->embeddedPtr == NULL) {
@@ -796,10 +796,17 @@
     XEvent *eventPtr)		/* ResizeRequest event. */
 {
     TkWindow *winPtr = clientData;
     Container *containerPtr;
     Tk_ErrorHandler errHandler;
+
+    if (!firstContainerPtr) {
+	/*
+	 * When the interpreter is being dismantled this can be nil.
+	 */
+	return;
+    }
 
     /*
      * Ignore any X protocol errors that happen in this procedure (almost any
      * operation could fail, for example, if the embedded application has
      * deleted its window).

Index: macosx/tkMacOSXEvent.c
==================================================================
--- macosx/tkMacOSXEvent.c
+++ macosx/tkMacOSXEvent.c
@@ -12,10 +12,11 @@
  */
 
 #include "tkMacOSXPrivate.h"
 #include "tkMacOSXEvent.h"
 #include "tkMacOSXDebug.h"
+#include "tkMacOSXConstants.h"
 
 #pragma mark TKApplication(TKEvent)
 
 enum {
     NSWindowWillMoveEventType = 20
@@ -86,19 +87,17 @@
 	win = [theEvent window];
 	break;
 	}
     case NSCursorUpdate:
         break;
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
     case NSEventTypeGesture:
     case NSEventTypeMagnify:
     case NSEventTypeRotate:
     case NSEventTypeSwipe:
     case NSEventTypeBeginGesture:
     case NSEventTypeEndGesture:
         break;
-#endif
 #endif
 
     default:
 	break; /* return theEvent */
     }
@@ -130,11 +129,11 @@
 {
     NSArray *macWindows = [NSApp orderedWindows];
 
     for (NSWindow *w in macWindows) {
 	if (TkMacOSXGetXWindow(w)) {
-	    [w flushWindow];
+	    [w displayIfNeeded];
 	}
     }
 }
 
 

Index: macosx/tkMacOSXFont.c
==================================================================
--- macosx/tkMacOSXFont.c
+++ macosx/tkMacOSXFont.c
@@ -257,11 +257,11 @@
     } else {
 	TkInitFontAttributes(faPtr);
     }
     fontPtr->nsFont = nsFont;
     // some don't like antialiasing on fixed-width even if bigger than limit
-//    dontAA = [nsFont isFixedPitch] && fontPtr->font.fa.size <= 10;
+    // dontAA = [nsFont isFixedPitch] && fontPtr->font.fa.size <= 10;
     if (antialiasedTextEnabled >= 0/* || dontAA*/) {
 	renderingMode = (antialiasedTextEnabled == 0/* || dontAA*/) ?
 		NSFontIntegerAdvancementsRenderingMode :
 		NSFontAntialiasedRenderingMode;
     }
@@ -513,11 +513,11 @@
     Tk_Window tkwin,		/* For display where font will be used. */
     const TkFontAttributes *faPtr)
 				/* Set of attributes to match. */
 {
     MacFont *fontPtr;
-    int points = TkFontGetPoints(tkwin, faPtr->size);
+    int points = (int)(TkFontGetPoints(tkwin, faPtr->size) + 0.5);
     NSFontTraitMask traits = GetNSFontTraitsFromTkFontAttributes(faPtr);
     NSInteger weight = (faPtr->weight == TK_FW_BOLD ? 9 : 5);
     NSFont *nsFont;
 
     nsFont = FindNSFont(faPtr->family, traits, weight, points, 0);
@@ -670,18 +670,18 @@
 
 void
 TkpGetFontAttrsForChar(
     Tk_Window tkwin,		/* Window on the font's display */
     Tk_Font tkfont,		/* Font to query */
-    Tcl_UniChar c,		/* Character of interest */
+    int c,         		/* Character of interest */
     TkFontAttributes* faPtr)	/* Output: Font attributes */
 {
     MacFont *fontPtr = (MacFont *) tkfont;
     NSFont *nsFont = fontPtr->nsFont;
     *faPtr = fontPtr->font.fa;
     if (nsFont && ![[nsFont coveredCharacterSet] characterIsMember:c]) {
-	UTF16Char ch = c;
+	UTF16Char ch = (UTF16Char) c;
 
 	nsFont = [nsFont bestMatchingFontForCharacters:&ch
 		length:1 attributes:nil actualCoveredLength:NULL];
 	if (nsFont) {
 	    GetTkFontAttributesForNSFont(nsFont, faPtr);
@@ -817,19 +817,10 @@
 	    rangeStart + rangeLength > numBytes ||
 	    (maxLength == 0 && !(flags & TK_AT_LEAST_ONE))) {
 	*lengthPtr = 0;
 	return 0;
     }
-#if 0
-    /* Back-compatibility with ATSUI renderer, appears not to be needed */
-    if (rangeStart == 0 && maxLength == 1 && (flags & TK_ISOLATE_END) &&
-	    !(flags & TK_AT_LEAST_ONE)) {
-	length = 0;
-	fit = 0;
-	goto done;
-    }
-#endif
     if (maxLength > 32767) {
 	maxLength = 32767;
     }
     string = [[NSString alloc] initWithBytesNoCopy:(void*)source
 		length:numBytes encoding:NSUTF8StringEncoding freeWhenDone:NO];
@@ -858,10 +849,14 @@
 	CFRelease(line);
     } else {
 	double maxWidth = maxLength + offset;
 	NSCharacterSet *cs;
 
+        /*
+         * Get a line breakpoint in the source string.
+         */
+
 	index = start;
 	if (flags & TK_WHOLE_WORDS) {
 	    index = CTTypesetterSuggestLineBreak(typesetter, start, maxWidth);
 	    if (index <= start && (flags & TK_AT_LEAST_ONE)) {
 		flags &= ~TK_WHOLE_WORDS;
@@ -868,19 +863,47 @@
 	    }
 	}
 	if (index <= start && !(flags & TK_WHOLE_WORDS)) {
 	    index = CTTypesetterSuggestClusterBreak(typesetter, start, maxWidth);
 	}
-	cs = (index < len || (flags & TK_WHOLE_WORDS)) ?
+
+        /*
+         * Trim right whitespace/lineending characters.
+         */
+
+	cs = (index <= len && (flags & TK_WHOLE_WORDS)) ?
 		whitespaceCharacterSet : lineendingCharacterSet;
 	while (index > start &&
 		[cs characterIsMember:[string characterAtIndex:(index - 1)]]) {
 	    index--;
 	}
+
+        /*
+         * If there is no line breakpoint in the source string between
+         * its start and the index position that fits in maxWidth, then
+         * CTTypesetterSuggestLineBreak() returns that very last index.
+         * However if the TK_WHOLE_WORDS flag is set, we want to break
+         * at a word boundary. In this situation, unless TK_AT_LEAST_ONE
+         * is set, we must report that zero chars actually fit (in other
+         * words the smallest word of the source string is still larger
+         * than maxWidth).
+         */
+
+        if ((index >= start) && (index < len) &&
+                (flags & TK_WHOLE_WORDS) && !(flags & TK_AT_LEAST_ONE) &&
+                ![cs characterIsMember:[string characterAtIndex:index]]) {
+            index = start;
+        }
+
 	if (index <= start && (flags & TK_AT_LEAST_ONE)) {
 	    index = start + 1;
 	}
+
+        /*
+         * Now measure the string width in pixels.
+         */
+
 	if (index > 0) {
 	    range.length = index;
 	    line = CTTypesetterCreateLine(typesetter, range);
 	    width = CTLineGetTypographicBounds(line, NULL, NULL, NULL);
 	    CFRelease(line);
@@ -919,11 +942,10 @@
 	    flags & TK_PARTIAL_OK   ? "partialOk "  : "",
 	    flags & TK_WHOLE_WORDS  ? "wholeWords " : "",
 	    flags & TK_AT_LEAST_ONE ? "atLeastOne " : "",
 	    flags & TK_ISOLATE_END  ? "isolateEnd " : "",
 	    length, fit);
-//if (!(rangeLength==1 && rangeStart == 0)) fprintf(stderr, "   measure len=%d (max=%d, w=%.0f) from %d (nb=%d): source=\"%s\": index=%d return %d\n",rangeLength,maxLength,width,rangeStart,numBytes, source+rangeStart, index, fit);
 #endif
     *lengthPtr = length;
     return fit;
 }
 

Index: macosx/tkMacOSXHLEvents.c
==================================================================
--- macosx/tkMacOSXHLEvents.c
+++ macosx/tkMacOSXHLEvents.c
@@ -34,11 +34,11 @@
  */
 
 static void tkMacOSXProcessFiles(NSAppleEventDescriptor* event,
 				 NSAppleEventDescriptor* replyEvent,
 				 Tcl_Interp *interp,
-				 char* procedure);
+				 const char* procedure);
 static int  MissedAnyParameters(const AppleEvent *theEvent);
 static int  ReallyKillMe(Tcl_Event *eventPtr, int flags);
 
 #pragma mark TKApplication(TKHLEvents)
 
@@ -275,13 +275,13 @@
 static void
 tkMacOSXProcessFiles(
     NSAppleEventDescriptor* event,
     NSAppleEventDescriptor* replyEvent,
     Tcl_Interp *interp,
-    char* procedure)
+    const char* procedure)
 {
-    Tcl_Encoding utf8 = Tcl_GetEncoding(NULL, "utf-8");
+    Tcl_Encoding utf8;
     const AEDesc *fileSpecDesc = nil;
     AEDesc contents;
     char URLString[1 + URL_MAX_LENGTH];
     NSURL *fileURL;
     DescType type;
@@ -329,10 +329,11 @@
      * paths contained in the AppleEvent as arguments.
      */
 
     Tcl_DStringInit(&command);
     Tcl_DStringAppend(&command, procedure, -1);
+    utf8 = Tcl_GetEncoding(NULL, "utf-8");
 
     for (index = 1; index <= count; index++) {
 	if (noErr != AEGetNthPtr(fileSpecDesc, index, typeFileURL, &keyword,
 				 &type, (Ptr) URLString, URL_MAX_LENGTH, &actual)) {
 	    continue;
@@ -347,10 +348,12 @@
 	}
 	Tcl_ExternalToUtfDString(utf8, [[fileURL path] UTF8String], -1, &pathName);
 	Tcl_DStringAppendElement(&command, Tcl_DStringValue(&pathName));
 	Tcl_DStringFree(&pathName);
     }
+
+    Tcl_FreeEncoding(utf8);
     AEDisposeDesc(&contents);
 
     /*
      * Handle the event by evaluating the Tcl expression we constructed.
      */
@@ -359,11 +362,10 @@
 	    Tcl_DStringLength(&command), TCL_EVAL_GLOBAL);
     if (code != TCL_OK) {
 	Tcl_BackgroundException(interp, code);
     }
     Tcl_DStringFree(&command);
-    return;
 }
 
 /*
  *----------------------------------------------------------------------
  *

ADDED   macosx/tkMacOSXImage.c
Index: macosx/tkMacOSXImage.c
==================================================================
--- /dev/null
+++ macosx/tkMacOSXImage.c
@@ -0,0 +1,580 @@
+/*
+ * tkMacOSXImage.c --
+ *
+ *	The code in this file provides an interface for XImages,
+ *
+ * Copyright (c) 1995-1997 Sun Microsystems, Inc.
+ * Copyright 2001-2009, Apple Inc.
+ * Copyright (c) 2005-2009 Daniel A. Steffen <das@users.sourceforge.net>
+ * Copyright 2017 Marc Culler.
+ *
+ * See the file "license.terms" for information on usage and redistribution
+ * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
+ */
+
+#include "tkMacOSXPrivate.h"
+#include "xbytes.h"
+
+#pragma mark XImage handling
+
+int
+_XInitImageFuncPtrs(
+    XImage *image)
+{
+    return 0;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * TkMacOSXCreateCGImageWithXImage --
+ *
+ *	Create CGImage from XImage, copying the image data.
+ *
+ * Results:
+ *	CGImage, release after use.
+ *
+ * Side effects:
+ *	None.
+ *
+ *----------------------------------------------------------------------
+ */
+
+static void ReleaseData(void *info, const void *data, size_t size) {
+    ckfree(info);
+}
+
+CGImageRef
+TkMacOSXCreateCGImageWithXImage(
+    XImage *image,
+    int use_ximage_alpha)
+{
+    CGImageRef img = NULL;
+    size_t bitsPerComponent, bitsPerPixel;
+    size_t len = image->bytes_per_line * image->height;
+    const CGFloat *decode = NULL;
+    CGBitmapInfo bitmapInfo;
+    CGDataProviderRef provider = NULL;
+    char *data = NULL;
+    CGDataProviderReleaseDataCallback releaseData = ReleaseData;
+
+    if (image->bits_per_pixel == 1) {
+	/*
+	 * BW image
+	 */
+
+	/* Reverses the sense of the bits */
+	static const CGFloat decodeWB[2] = {1, 0};
+	decode = decodeWB;
+
+	bitsPerComponent = 1;
+	bitsPerPixel = 1;
+	if (image->bitmap_bit_order != MSBFirst) {
+	    char *srcPtr = image->data + image->xoffset;
+	    char *endPtr = srcPtr + len;
+	    char *destPtr = (data = ckalloc(len));
+
+	    while (srcPtr < endPtr) {
+		*destPtr++ = xBitReverseTable[(unsigned char)(*(srcPtr++))];
+	    }
+	} else {
+	    data = memcpy(ckalloc(len), image->data + image->xoffset, len);
+	}
+	if (data) {
+	    provider = CGDataProviderCreateWithData(data, data, len, releaseData);
+	}
+	if (provider) {
+	    img = CGImageMaskCreate(image->width, image->height, bitsPerComponent,
+				    bitsPerPixel, image->bytes_per_line, provider, decode, 0);
+	}
+    } else if (image->format == ZPixmap && image->bits_per_pixel == 32) {
+	/*
+	 * Color image
+	 */
+
+	CGColorSpaceRef colorspace = CGColorSpaceCreateDeviceRGB();
+
+	bitsPerComponent = 8;
+	bitsPerPixel = 32;
+	bitmapInfo = (image->byte_order == MSBFirst ?
+		      kCGBitmapByteOrder32Big : kCGBitmapByteOrder32Little);
+	if (use_ximage_alpha) {
+	    bitmapInfo |= kCGImageAlphaPremultipliedFirst;
+	} else {
+	    bitmapInfo |= kCGImageAlphaNoneSkipFirst;
+	}
+	data = memcpy(ckalloc(len), image->data + image->xoffset, len);
+	if (data) {
+	    provider = CGDataProviderCreateWithData(data, data, len, releaseData);
+	}
+	if (provider) {
+	    img = CGImageCreate(image->width, image->height, bitsPerComponent,
+		    bitsPerPixel, image->bytes_per_line, colorspace, bitmapInfo,
+		    provider, decode, 0, kCGRenderingIntentDefault);
+	    CFRelease(provider);
+	}
+	if (colorspace) {
+	    CFRelease(colorspace);
+	}
+    } else {
+	TkMacOSXDbgMsg("Unsupported image type");
+    }
+    return img;
+}
+
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * XGetImage --
+ *
+ *	This function copies data from a pixmap or window into an XImage.
+ *
+ * Results:
+ *	Returns a newly allocated XImage containing the data from the given
+ *	rectangle of the given drawable, or NULL if the XImage could not be
+ *	constructed.  NOTE: If we are copying from a window on a Retina
+ *	display, the dimensions of the XImage will be 2*width x 2*height.
+ *
+ * Side effects:
+ *	None.
+ *
+ *----------------------------------------------------------------------
+ */
+struct pixel_fmt {int r; int g; int b; int a;};
+static struct pixel_fmt bgra = {2, 1, 0, 3};
+static struct pixel_fmt abgr = {3, 2, 1, 0};
+
+XImage *
+XGetImage(
+    Display *display,
+    Drawable drawable,
+    int x,
+    int y,
+    unsigned int width,
+    unsigned int height,
+    unsigned long plane_mask,
+    int format)
+{
+    NSBitmapImageRep* bitmap_rep = NULL;
+    NSUInteger bitmap_fmt = 0;
+    XImage* imagePtr = NULL;
+    char* bitmap = NULL;
+    char R, G, B, A;
+    int depth = 32, offset = 0, bitmap_pad = 0;
+    unsigned int bytes_per_row, size, row, n, m;
+    unsigned int scalefactor=1, scaled_height=height, scaled_width=width;
+    NSWindow *win = TkMacOSXDrawableWindow(drawable);
+    MacDrawable *macDraw = ((MacDrawable*)drawable);
+    static enum {unknown, no, yes} has_retina = unknown;
+
+    if (win && has_retina == unknown) {
+#ifdef __clang__
+	has_retina = [win respondsToSelector:@selector(backingScaleFactor)]?
+	    yes : no;
+#else
+	has_retina = no;
+#endif
+    }
+
+    if (has_retina == yes) {
+	/*
+	 * We only allow scale factors 1 or 2, as Apple currently does.
+	 */
+#ifdef __clang__
+	scalefactor = [win backingScaleFactor] == 2.0 ? 2 : 1;
+#endif
+	scaled_height *= scalefactor;
+	scaled_width *= scalefactor;
+    }
+
+    if (format == ZPixmap) {
+	if (width == 0 || height == 0) {
+	    return NULL;
+	}
+	bitmap_rep = TkMacOSXBitmapRepFromDrawableRect(drawable,
+		         x, y, width, height);
+	if (!bitmap_rep) {
+	    TkMacOSXDbgMsg("XGetImage: Failed to construct NSBitmapRep");
+	    return NULL;
+	}
+	bitmap_fmt = [bitmap_rep bitmapFormat];
+	size = [bitmap_rep bytesPerPlane];
+	bytes_per_row = [bitmap_rep bytesPerRow];
+	bitmap = ckalloc(size);
+	if (!bitmap                              ||
+	    (bitmap_fmt != 0 && bitmap_fmt != 1) ||
+	    [bitmap_rep samplesPerPixel] != 4    ||
+	    [bitmap_rep isPlanar] != 0           ||
+	    bytes_per_row != 4 * scaled_width    ||
+	    size != bytes_per_row*scaled_height  ) {
+	    TkMacOSXDbgMsg("XGetImage: Unrecognized bitmap format");
+	    CFRelease(bitmap_rep);
+	    return NULL;
+	}
+
+	if (macDraw->flags & TK_USE_XIMAGE_ALPHA) {
+	    /*
+	     * When called by TkImgPhotoDisplay we are being asked to return a
+	     * background image to be blended with the photoimage using its
+	     * alpha channel, if it has one.  Returning a black pixmap here
+	     * makes TkImgPhotoDisplay create an XImage with a premultiplied
+	     * alpha channel, as favored by Apple.  When TkImgPhotoDisplay
+	     * passes this XImage to TkPutImage, targeting a pixmap, it creates
+	     * an image with correct transparency.  This is used, for example,
+	     * when creating an iconphoto or a menu image from a PNG
+	     * photoimage.
+	     */
+	    bzero(bitmap, size);
+	} else {
+	    memcpy(bitmap, (char *)[bitmap_rep bitmapData], size);
+	}
+	CFRelease(bitmap_rep);
+
+	/*
+	 * When Apple extracts a bitmap from an NSView, it may be in
+	 * either BGRA or ABGR format.  For an XImage we need RGBA.
+	 */
+	struct pixel_fmt pixel = bitmap_fmt == 0 ? bgra : abgr;
+
+	for (row=0, n=0; row<scaled_height; row++, n+=bytes_per_row) {
+	    for (m=n; m<n+bytes_per_row; m+=4) {
+		R = *(bitmap + m + pixel.r);
+		G = *(bitmap + m + pixel.g);
+		B = *(bitmap + m + pixel.b);
+		A = *(bitmap + m + pixel.a);
+
+		*(bitmap + m)     = R;
+		*(bitmap + m + 1) = G;
+		*(bitmap + m + 2) = B;
+		*(bitmap + m + 3) = A;
+	    }
+	}
+	imagePtr = XCreateImage(display, NULL, depth, format, offset,
+				(char*)bitmap, scaled_width, scaled_height,
+				bitmap_pad, bytes_per_row);
+	if (scalefactor == 2) {
+	    imagePtr->pixelpower = 1;
+	}
+    } else {
+	/*
+	 * There are some calls to XGetImage in the generic Tk
+	 * code which pass an XYPixmap rather than a ZPixmap.
+	 * XYPixmaps should be handled here.
+	 */
+	TkMacOSXDbgMsg("XGetImage does not handle XYPixmaps at the moment.");
+    }
+    return imagePtr;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * DestroyImage --
+ *
+ *	Destroys storage associated with an image.
+ *
+ * Results:
+ *	None.
+ *
+ * Side effects:
+ *	Deallocates the image.
+ *
+ *----------------------------------------------------------------------
+ */
+
+static int
+DestroyImage(
+    XImage *image)
+{
+    if (image) {
+	if (image->data) {
+	    ckfree(image->data);
+	}
+	ckfree(image);
+    }
+    return 0;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * ImageGetPixel --
+ *
+ *	Get a single pixel from an image.
+ *
+ * Results:
+ *	Returns the 32 bit pixel value.
+ *
+ * Side effects:
+ *	None.
+ *
+ *----------------------------------------------------------------------
+ */
+
+static unsigned long
+ImageGetPixel(
+    XImage *image,
+    int x,
+    int y)
+{
+    unsigned char r = 0, g = 0, b = 0;
+
+    if (image && image->data) {
+	unsigned char *srcPtr = ((unsigned char*) image->data)
+		+ (y * image->bytes_per_line)
+		+ (((image->xoffset + x) * image->bits_per_pixel) / NBBY);
+
+	switch (image->bits_per_pixel) {
+	    case 32: {
+		r = (*((unsigned int*) srcPtr) >> 16) & 0xff;
+		g = (*((unsigned int*) srcPtr) >>  8) & 0xff;
+		b = (*((unsigned int*) srcPtr)      ) & 0xff;
+		/*if (image->byte_order == LSBFirst) {
+		    r = srcPtr[2]; g = srcPtr[1]; b = srcPtr[0];
+		} else {
+		    r = srcPtr[1]; g = srcPtr[2]; b = srcPtr[3];
+		}*/
+		break;
+	    }
+	    case 16:
+		r = (*((unsigned short*) srcPtr) >> 7) & 0xf8;
+		g = (*((unsigned short*) srcPtr) >> 2) & 0xf8;
+		b = (*((unsigned short*) srcPtr) << 3) & 0xf8;
+		break;
+	    case 8:
+		r = (*srcPtr << 2) & 0xc0;
+		g = (*srcPtr << 4) & 0xc0;
+		b = (*srcPtr << 6) & 0xc0;
+		r |= r >> 2 | r >> 4 | r >> 6;
+		g |= g >> 2 | g >> 4 | g >> 6;
+		b |= b >> 2 | b >> 4 | b >> 6;
+		break;
+	    case 4: {
+		unsigned char c = (x % 2) ? *srcPtr : (*srcPtr >> 4);
+		r = (c & 0x04) ? 0xff : 0;
+		g = (c & 0x02) ? 0xff : 0;
+		b = (c & 0x01) ? 0xff : 0;
+		break;
+		}
+	    case 1:
+		r = g = b = ((*srcPtr) & (0x80 >> (x % 8))) ? 0xff : 0;
+		break;
+	}
+    }
+    return (PIXEL_MAGIC << 24) | (r << 16) | (g << 8) | b;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * ImagePutPixel --
+ *
+ *	Set a single pixel in an image.
+ *
+ * Results:
+ *	None.
+ *
+ * Side effects:
+ *	None.
+ *
+ *----------------------------------------------------------------------
+ */
+
+static int
+ImagePutPixel(
+    XImage *image,
+    int x,
+    int y,
+    unsigned long pixel)
+{
+    if (image && image->data) {
+	unsigned char *dstPtr = ((unsigned char*) image->data)
+		+ (y * image->bytes_per_line)
+		+ (((image->xoffset + x) * image->bits_per_pixel) / NBBY);
+	if (image->bits_per_pixel == 32) {
+	    *((unsigned int*) dstPtr) = pixel;
+	} else {
+	    unsigned char r = ((pixel & image->red_mask)   >> 16) & 0xff;
+	    unsigned char g = ((pixel & image->green_mask) >>  8) & 0xff;
+	    unsigned char b = ((pixel & image->blue_mask)       ) & 0xff;
+	    switch (image->bits_per_pixel) {
+	    case 16:
+		*((unsigned short*) dstPtr) = ((r & 0xf8) << 7) |
+			((g & 0xf8) << 2) | ((b & 0xf8) >> 3);
+		break;
+	    case 8:
+		*dstPtr = ((r & 0xc0) >> 2) | ((g & 0xc0) >> 4) |
+			((b & 0xc0) >> 6);
+		break;
+	    case 4: {
+		unsigned char c = ((r & 0x80) >> 5) | ((g & 0x80) >> 6) |
+			((b & 0x80) >> 7);
+		*dstPtr = (x % 2) ? ((*dstPtr & 0xf0) | (c & 0x0f)) :
+			((*dstPtr & 0x0f) | ((c << 4) & 0xf0));
+		break;
+		}
+	    case 1:
+		*dstPtr = ((r|g|b) & 0x80) ? (*dstPtr | (0x80 >> (x % 8))) :
+			(*dstPtr & ~(0x80 >> (x % 8)));
+		break;
+	    }
+	}
+    }
+    return 0;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * XCreateImage --
+ *
+ *	Allocates storage for a new XImage.
+ *
+ * Results:
+ *	Returns a newly allocated XImage.
+ *
+ * Side effects:
+ *	None.
+ *
+ *----------------------------------------------------------------------
+ */
+
+XImage *
+XCreateImage(
+    Display* display,
+    Visual* visual,
+    unsigned int depth,
+    int format,
+    int offset,
+    char* data,
+    unsigned int width,
+    unsigned int height,
+    int bitmap_pad,
+    int bytes_per_line)
+{
+    XImage *ximage;
+    display->request++;
+    ximage = ckalloc(sizeof(XImage));
+
+    ximage->height = height;
+    ximage->width = width;
+    ximage->depth = depth;
+    ximage->xoffset = offset;
+    ximage->format = format;
+    ximage->data = data;
+    ximage->obdata = NULL;
+    /* The default pixelpower is 0.  This must be explicitly set to 1 in the
+     * case of an XImage extracted from a Retina display.
+     */
+    ximage->pixelpower = 0;
+
+    if (format == ZPixmap) {
+	ximage->bits_per_pixel = 32;
+	ximage->bitmap_unit = 32;
+    } else {
+	ximage->bits_per_pixel = 1;
+	ximage->bitmap_unit = 8;
+    }
+    if (bitmap_pad) {
+	ximage->bitmap_pad = bitmap_pad;
+    } else {
+	/* Use 16 byte alignment for best Quartz perfomance */
+	ximage->bitmap_pad = 128;
+    }
+    if (bytes_per_line) {
+	ximage->bytes_per_line = bytes_per_line;
+    } else {
+	ximage->bytes_per_line = ((width * ximage->bits_per_pixel +
+		(ximage->bitmap_pad - 1)) >> 3) &
+		~((ximage->bitmap_pad >> 3) - 1);
+    }
+#ifdef WORDS_BIGENDIAN
+    ximage->byte_order = MSBFirst;
+    ximage->bitmap_bit_order = MSBFirst;
+#else
+    ximage->byte_order = LSBFirst;
+    ximage->bitmap_bit_order = LSBFirst;
+#endif
+    ximage->red_mask = 0x00FF0000;
+    ximage->green_mask = 0x0000FF00;
+    ximage->blue_mask = 0x000000FF;
+    ximage->f.create_image = NULL;
+    ximage->f.destroy_image = DestroyImage;
+    ximage->f.get_pixel = ImageGetPixel;
+    ximage->f.put_pixel = ImagePutPixel;
+    ximage->f.sub_image = NULL;
+    ximage->f.add_pixel = NULL;
+
+    return ximage;
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * TkPutImage --
+ *
+ *	Copies a subimage from an in-memory image to a rectangle of
+ *	of the specified drawable.
+ *
+ * Results:
+ *	None.
+ *
+ * Side effects:
+ *	Draws the image on the specified drawable.
+ *
+ *----------------------------------------------------------------------
+ */
+
+int
+TkPutImage(
+    unsigned long *colors,	/* Unused on Macintosh. */
+    int ncolors,		/* Unused on Macintosh. */
+    Display* display,		/* Display. */
+    Drawable drawable,		/* Drawable to place image on. */
+    GC gc,			/* GC to use. */
+    XImage* image,		/* Image to place. */
+    int src_x,			/* Source X & Y. */
+    int src_y,
+    int dest_x,			/* Destination X & Y. */
+    int dest_y,
+    unsigned int width,	        /* Same width & height for both */
+    unsigned int height)	/* distination and source. */
+{
+    TkMacOSXDrawingContext dc;
+    MacDrawable *macDraw = ((MacDrawable*)drawable);
+
+    display->request++;
+    if (!TkMacOSXSetupDrawingContext(drawable, gc, 1, &dc)) {
+	return BadDrawable;
+    }
+    if (dc.context) {
+	CGImageRef img = TkMacOSXCreateCGImageWithXImage(image,
+			     macDraw->flags & TK_USE_XIMAGE_ALPHA);
+	if (img) {
+	    /* If the XImage has big pixels, rescale the source dimensions.*/
+	    int pp = image->pixelpower;
+	    TkMacOSXDrawCGImage(drawable, gc, dc.context,
+		    img, gc->foreground, gc->background,
+		    CGRectMake(0, 0, image->width<<pp, image->height<<pp),
+		    CGRectMake(src_x<<pp, src_y<<pp, width<<pp, height<<pp),
+		    CGRectMake(dest_x, dest_y, width, height));
+	    CFRelease(img);
+	} else {
+	    TkMacOSXDbgMsg("Invalid source drawable");
+	}
+    } else {
+	TkMacOSXDbgMsg("Invalid destination drawable");
+    }
+    TkMacOSXRestoreDrawingContext(&dc);
+    return Success;
+}
+
+/*
+ * Local Variables:
+ * mode: objc
+ * c-basic-offset: 4
+ * fill-column: 79
+ * coding: utf-8
+ * End:
+ */

Index: macosx/tkMacOSXInit.c
==================================================================
--- macosx/tkMacOSXInit.c
+++ macosx/tkMacOSXInit.c
@@ -5,10 +5,11 @@
  *	functions.
  *
  * Copyright (c) 1995-1997 Sun Microsystems, Inc.
  * Copyright 2001-2009, Apple Inc.
  * Copyright (c) 2005-2009 Daniel A. Steffen <das@users.sourceforge.net>
+ * Copyright (c) 2017 Marc Culler
  *
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
 
@@ -30,46 +31,53 @@
 
 long tkMacOSXMacOSXVersion = 0;
 
 #pragma mark TKApplication(TKInit)
 
-#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
-#define NSTextInputContextKeyboardSelectionDidChangeNotification @"NSTextInputContextKeyboardSelectionDidChangeNotification"
-static void keyboardChanged(CFNotificationCenterRef center, void *observer, CFStringRef name, const void *object, CFDictionaryRef userInfo) {
-    [[NSNotificationCenter defaultCenter] postNotificationName:NSTextInputContextKeyboardSelectionDidChangeNotification object:nil userInfo:nil];
-}
-#endif
-
 @interface TKApplication(TKKeyboard)
 - (void) keyboardChanged: (NSNotification *) notification;
 @end
 
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
 #define TKApplication_NSApplicationDelegate <NSApplicationDelegate>
-#else
-#define TKApplication_NSApplicationDelegate
-#endif
 @interface TKApplication(TKWindowEvent) TKApplication_NSApplicationDelegate
 - (void) _setupWindowNotifications;
 @end
 
 @interface TKApplication(TKMenus)
 - (void) _setupMenus;
 @end
 
 @implementation TKApplication
-@synthesize poolProtected = _poolProtected;
+@synthesize poolLock = _poolLock;
 @end
 
+/*
+ * #define this to see a message on stderr whenever _resetAutoreleasePool is
+ * called while the pool is locked.
+ */
+#undef DEBUG_LOCK
+
 @implementation TKApplication(TKInit)
 - (void) _resetAutoreleasePool
 {
-    if(![self poolProtected]) {
+    if([self poolLock] == 0) {
 	[_mainPool drain];
 	_mainPool = [NSAutoreleasePool new];
+    } else {
+#ifdef DEBUG_LOCK
+	fprintf(stderr, "Pool is locked with count %d!!!!\n", [self poolLock]);
+#endif
     }
 }
+- (void) _lockAutoreleasePool
+{
+    [self setPoolLock:[self poolLock] + 1];
+}
+- (void) _unlockAutoreleasePool
+{
+    [self setPoolLock:[self poolLock] - 1];
+}
 #ifdef TK_MAC_DEBUG_NOTIFICATIONS
 - (void) _postedNotification: (NSNotification *) notification
 {
     TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, notification);
 }
@@ -85,37 +93,92 @@
     observe(NSApplicationDidUnhideNotification, applicationShowHide:);
     observe(NSApplicationDidHideNotification, applicationShowHide:);
     observe(NSApplicationDidChangeScreenParametersNotification, displayChanged:);
     observe(NSTextInputContextKeyboardSelectionDidChangeNotification, keyboardChanged:);
 #undef observe
-#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
-    CFNotificationCenterAddObserver(CFNotificationCenterGetDistributedCenter(), NULL, &keyboardChanged, kTISNotifySelectedKeyboardInputSourceChanged, NULL, CFNotificationSuspensionBehaviorCoalesce);
-#endif
-}
-
-- (void) _setupEventLoop
-{
-    NSAutoreleasePool *pool = [NSAutoreleasePool new];
-    [self finishLaunching];
-    [self setWindowsNeedUpdate:YES];
-    [pool drain];
-}
-
-- (void) _setup: (Tcl_Interp *) interp
-{
-    _eventInterp = interp;
-    _mainPool = [NSAutoreleasePool new];
-    [NSApp setPoolProtected:NO];
-    _defaultMainMenu = nil;
-    [self _setupMenus];
-    [self setDelegate:self];
+}
+
+-(void)applicationWillFinishLaunching:(NSNotification *)aNotification
+{
+
+    /*
+     * Initialize notifications.
+     */
 #ifdef TK_MAC_DEBUG_NOTIFICATIONS
     [[NSNotificationCenter defaultCenter] addObserver:self
 	    selector:@selector(_postedNotification:) name:nil object:nil];
 #endif
     [self _setupWindowNotifications];
     [self _setupApplicationNotifications];
+
+    /*
+     * Construct the menu bar.
+     */
+    _defaultMainMenu = nil;
+    [self _setupMenus];
+
+    /*
+     * Initialize event processing.
+     */
+    TkMacOSXInitAppleEvents(_eventInterp);
+
+    /*
+     * Initialize the graphics context.
+     */
+    TkMacOSXUseAntialiasedText(_eventInterp, -1);
+    TkMacOSXInitCGDrawing(_eventInterp, TRUE, 0);
+}
+
+-(void)applicationDidFinishLaunching:(NSNotification *)notification
+{
+    /*
+     * It is not safe to force activation of the NSApp until this
+     * method is called.  Activating too early can cause the menu
+     * bar to be unresponsive.
+     */
+    [NSApp activateIgnoringOtherApps: YES];
+}
+
+- (void) _setup: (Tcl_Interp *) interp
+{
+    /*
+     * Remember our interpreter.
+     */
+    _eventInterp = interp;
+
+    /*
+     * Install the global autoreleasePool.
+     */
+    _mainPool = [NSAutoreleasePool new];
+    [NSApp setPoolLock:0];
+
+    /*
+     * Be our own delegate.
+     */
+    [self setDelegate:self];
+
+    /*
+     * Make sure we are allowed to open windows.
+     */
+    [NSApp setActivationPolicy:NSApplicationActivationPolicyRegular];
+
+    /*
+     * If no icon has been set from an Info.plist file, use the Wish icon from
+     * the Tk framework.
+     */
+    NSString *iconFile = [[NSBundle mainBundle] objectForInfoDictionaryKey:
+						    @"CFBundleIconFile"];
+    if (!iconFile) {
+	NSString *path = [NSApp tkFrameworkImagePath:@"Tk.icns"];
+	if (path) {
+	    NSImage *image = [[NSImage alloc] initWithContentsOfFile:path];
+	    if (image) {
+		[NSApp setApplicationIconImage:image];
+		[image release];
+	    }
+	}
+    }
 }
 
 - (NSString *) tkFrameworkImagePath: (NSString *) image
 {
     NSString *path = nil;
@@ -161,42 +224,10 @@
 #pragma mark -
 
 /*
  *----------------------------------------------------------------------
  *
- * DoWindowActivate --
- *
- *	Idle handler that sets the application icon to the generic Tk icon.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static void
-SetApplicationIcon(
-    ClientData clientData)
-{
-    NSAutoreleasePool *pool = [NSAutoreleasePool new];
-    NSString *path = [NSApp tkFrameworkImagePath:@"Tk.icns"];
-    if (path) {
-	NSImage *image = [[NSImage alloc] initWithContentsOfFile:path];
-	if (image) {
-	    [NSApp setApplicationIconImage:image];
-	    [image release];
-	}
-    }
-    [pool drain];
-}
-
-/*
- *----------------------------------------------------------------------
- *
  * TkpInit --
  *
  *	Performs Mac-specific interpreter initialization related to the
  *	tk_library variable.
  *
@@ -221,24 +252,21 @@
      * don't want to do the following initialization multiple times we protect
      * against doing it more than once.
      */
 
     if (!initialized) {
-	int bundledExecutable = 0;
-	CFBundleRef bundleRef;
-	CFURLRef bundleUrl = NULL;
 	struct utsname name;
 	struct stat st;
 
 	initialized = 1;
 
 	/*
 	 * Initialize/check OS version variable for runtime checks.
 	 */
 
-#if MAC_OS_X_VERSION_MIN_REQUIRED < 1050
-#   error Mac OS X 10.5 required
+#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
+#   error Mac OS X 10.6 required
 #endif
 
 	if (!uname(&name)) {
 	    tkMacOSXMacOSXVersion = (strtod(name.release, NULL) + 96) * 10;
 	}
@@ -261,92 +289,16 @@
 	 */
 
 	if (Tcl_MacOSXOpenVersionedBundleResources(interp,
 		"com.tcltk.tklibrary", TK_FRAMEWORK_VERSION, 0, PATH_MAX,
 		tkLibPath) != TCL_OK) {
+            # if 0 /* This is not really an error.  Wish still runs fine. */
 	    TkMacOSXDbgMsg("Tcl_MacOSXOpenVersionedBundleResources failed");
+	    # endif
 	}
 #endif
 
-	{
-	    NSAutoreleasePool *pool = [NSAutoreleasePool new];
-		[[NSUserDefaults standardUserDefaults] registerDefaults:
-		     [NSDictionary dictionaryWithObjectsAndKeys:
-		     [NSNumber numberWithBool:YES],
-		     @"_NSCanWrapButtonTitles",
-		     [NSNumber numberWithInt:-1],
-		     @"NSStringDrawingTypesetterBehavior",
-		     nil]];
-	    [TKApplication sharedApplication];
-	    [pool drain];
-	    [NSApp _setup:interp];
-	}
-
-	/* Check whether we are a bundled executable: */
-	bundleRef = CFBundleGetMainBundle();
-	if (bundleRef) {
-	    bundleUrl = CFBundleCopyBundleURL(bundleRef);
-	}
-	if (bundleUrl) {
-	    /*
-	     * A bundled executable is two levels down from its main bundle
-	     * directory (e.g. Wish.app/Contents/MacOS/Wish), whereas an
-	     * unbundled executable's main bundle directory is just the
-	     * directory containing the executable. So to check whether we are
-	     * bundled, we delete the last three path components of the
-	     * executable's url and compare the resulting url with the main
-	     * bundle url.
-	     */
-
-	    int j = 3;
-	    CFURLRef url = CFBundleCopyExecutableURL(bundleRef);
-
-	    while (url && j--) {
-		CFURLRef parent =
-			CFURLCreateCopyDeletingLastPathComponent(NULL, url);
-
-		CFRelease(url);
-		url = parent;
-	    }
-	    if (url) {
-		bundledExecutable = CFEqual(bundleUrl, url);
-		CFRelease(url);
-	    }
-	    CFRelease(bundleUrl);
-	}
-
-	if (!bundledExecutable) {
-	    /*
-	     * If we are loaded into an executable that is not a bundled
-	     * application, the window server does not let us come to the
-	     * foreground. For such an executable, notify the window server
-	     * that we are now a full GUI application.
-	     */
-
-	    OSStatus err = procNotFound;
-	    ProcessSerialNumber psn = { 0, kCurrentProcess };
-
-	    err = ChkErr(TransformProcessType, &psn,
-		    kProcessTransformToForegroundApplication);
-
-	    /*
-	     * Set application icon to generic Tk icon, do it at idle time
-	     * instead of now to ensure tk_library is setup.
-	     */
-
-	    Tcl_DoWhenIdle(SetApplicationIcon, NULL);
-	}
-
-	{
-	    NSAutoreleasePool *pool = [NSAutoreleasePool new];
-	    [NSApp _setupEventLoop];
-	    TkMacOSXInitAppleEvents(interp);
-	    TkMacOSXUseAntialiasedText(interp, -1);
-	    TkMacOSXInitCGDrawing(interp, TRUE, 0);
-	    [pool drain];
-	}
-
 	/*
 	 * FIXME: Close stdin & stdout for remote debugging otherwise we will
 	 * fight with gdb for stdin & stdout
 	 */
 
@@ -353,10 +305,28 @@
 	if (getenv("XCNOSTDIN") != NULL) {
 	    close(0);
 	    close(1);
 	}
 
+	/*
+	 * Instantiate our NSApplication object. This needs to be
+	 * done before we check whether to open a console window.
+	 */
+
+	NSAutoreleasePool *pool = [NSAutoreleasePool new];
+	[[NSUserDefaults standardUserDefaults] registerDefaults:
+		[NSDictionary dictionaryWithObjectsAndKeys:
+				  [NSNumber numberWithBool:YES],
+			      @"_NSCanWrapButtonTitles",
+				   [NSNumber numberWithInt:-1],
+			      @"NSStringDrawingTypesetterBehavior",
+			      nil]];
+	[TKApplication sharedApplication];
+	[pool drain];
+	[NSApp _setup:interp];
+	[NSApp finishLaunching];
+
 	/*
 	 * If we don't have a TTY and stdin is a special character file of
 	 * length 0, (e.g. /dev/null, which is what Finder sets when double
 	 * clicking Wish) then use the Tk based console interpreter.
 	 */
@@ -385,10 +355,11 @@
 	    }
 	    if (Tk_CreateConsoleWindow(interp) == TCL_ERROR) {
 		return TCL_ERROR;
 	    }
 	}
+
     }
 
     Tk_MacOSXSetupTkNotifier();
 
     if (tkLibPath[0] != '\0') {

Index: macosx/tkMacOSXInt.h
==================================================================
--- macosx/tkMacOSXInt.h
+++ macosx/tkMacOSXInt.h
@@ -85,10 +85,11 @@
 #define TK_DRAWN_UNDER_MENU	0x08
 #define TK_FOCUSED_VIEW		0x10
 #define TK_IS_PIXMAP		0x20
 #define TK_IS_BW_PIXMAP		0x40
 #define TK_DO_NOT_DRAW          0x80
+#define TK_USE_XIMAGE_ALPHA     0x100
 /*
  * I am reserving TK_EMBEDDED = 0x100 in the MacDrawable flags
  * This is defined in tk.h. We need to duplicate the TK_EMBEDDED flag in the
  * TkWindow structure for the window, but in the MacWin. This way we can
  * still tell what the correct port is after the TKWindow structure has been

Index: macosx/tkMacOSXKeyEvent.c
==================================================================
--- macosx/tkMacOSXKeyEvent.c
+++ macosx/tkMacOSXKeyEvent.c
@@ -13,10 +13,11 @@
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
 
 #include "tkMacOSXPrivate.h"
 #include "tkMacOSXEvent.h"
+#include "tkMacOSXConstants.h"
 
 /*
 #ifdef TK_MAC_DEBUG
 #define TK_MAC_DEBUG_KEYBOARD
 #endif
@@ -37,10 +38,12 @@
 
 static int caret_x = 0, caret_y = 0, caret_height = 0;
 
 static void setupXEvent(XEvent *xEvent, NSWindow *w, unsigned int state);
 static unsigned isFunctionKey(unsigned int code);
+
+unsigned short releaseCode;
 
 
 #pragma mark TKApplication(TKKeyEvent)
 
 @implementation TKApplication(TKKeyEvent)
@@ -65,16 +68,20 @@
         processingCompose = NO;
       }
 
     switch (type) {
     case NSKeyUp:
-      if (finishedCompose)
-        {
-          // if we were composing, swallow the last release since we already sent
-          finishedCompose = NO;
-          return theEvent;
-        }
+
+	/*Fix for bug #1ba71a86bb: key release firing on key press.*/
+	w = [theEvent window];
+	XEvent xEvent;
+	setupXEvent(&xEvent, w, 0);
+	TkWindow *winPtr = TkMacOSXGetTkWindow(w);
+	Tk_Window tkwin = (Tk_Window) winPtr;
+	xEvent.xany.type = KeyRelease;
+	xEvent.xkey.keycode = releaseCode;
+	xEvent.xany.serial = LastKnownRequestProcessed(Tk_Display(tkwin));
     case NSKeyDown:
 	repeat = [theEvent isARepeat];
 	characters = [theEvent characters];
 	charactersIgnoringModifiers = [theEvent charactersIgnoringModifiers];
         len = [charactersIgnoringModifiers length];
@@ -168,11 +175,11 @@
                */
 
               xEvent.xkey.keycode = (modifiers ^ savedModifiers);
             } else {
               if (type == NSKeyUp || repeat) {
-                xEvent.xany.type = KeyRelease;
+		  xEvent.xany.type = KeyRelease;
               } else {
                 xEvent.xany.type = KeyPress;
               }
 
               /* For command key, take input manager's word so things
@@ -235,12 +242,10 @@
          by doCommandBySelector: deleteBackward: */
 - (void)insertText: (id)aString
 {
   int i, len = [(NSString *)aString length];
   XEvent xEvent;
-  TkWindow *winPtr = TkMacOSXGetTkWindow([self window]);
-  Tk_Window tkwin = (Tk_Window) winPtr;
 
   if (NS_KEYLOG)
     NSLog (@"insertText '%@'\tlen = %d", aString, len);
   processingCompose = NO;
   finishedCompose = YES;
@@ -252,24 +257,21 @@
   /* now insert the string as keystrokes */
   setupXEvent(&xEvent, [self window], 0);
   xEvent.xany.type = KeyPress;
 
   for (i =0; i<len; i++)
-    {
-      xEvent.xkey.keycode = (UInt16) [aString characterAtIndex: i];
-      [[aString substringWithRange: NSMakeRange(i,1)]
-        getCString: xEvent.xkey.trans_chars
-         maxLength: XMaxTransChars encoding: NSUTF8StringEncoding];
-      xEvent.xkey.nbytes = strlen(xEvent.xkey.trans_chars);
-      xEvent.xany.type = KeyPress;
-      Tk_QueueWindowEvent(&xEvent, TCL_QUEUE_TAIL);
-
-      xEvent.xany.type = KeyRelease;
-      xEvent.xany.serial = LastKnownRequestProcessed(Tk_Display(tkwin));
-      Tk_QueueWindowEvent(&xEvent, TCL_QUEUE_TAIL);
-      xEvent.xany.serial = LastKnownRequestProcessed(Tk_Display(tkwin));
-    }
+      {
+	  xEvent.xkey.keycode = (UInt16) [aString characterAtIndex: i];
+	  [[aString substringWithRange: NSMakeRange(i,1)]
+	      getCString: xEvent.xkey.trans_chars
+	       maxLength: XMaxTransChars encoding: NSUTF8StringEncoding];
+	  xEvent.xkey.nbytes = strlen(xEvent.xkey.trans_chars);
+	  xEvent.xany.type = KeyPress;
+	  releaseCode =  (UInt16) [aString characterAtIndex: 0];
+	  Tk_QueueWindowEvent(&xEvent, TCL_QUEUE_TAIL);
+      }
+  releaseCode =  (UInt16) [aString characterAtIndex: 0];
 }
 
 
 /* <NSTextInput>: inserts display of composing characters */
 - (void)setMarkedText: (id)aString selectedRange: (NSRange)selRange

Index: macosx/tkMacOSXKeyboard.c
==================================================================
--- macosx/tkMacOSXKeyboard.c
+++ macosx/tkMacOSXKeyboard.c
@@ -11,11 +11,11 @@
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
 
 #include "tkMacOSXPrivate.h"
 #include "tkMacOSXEvent.h"
-
+#include "tkMacOSXConstants.h"
 /*
  * A couple of simple definitions to make code a bit more self-explaining.
  *
  * For the assignments of Mod1==meta==command and Mod2==alt==option, see also
  * tkMacOSXMouseEvent.c.
@@ -93,10 +93,28 @@
     {105,	XK_F13},
     {107,	XK_F14},
     {113,	XK_F15},
     {0,		0}
 };
+
+#define NUM_MOD_KEYCODES 14
+static KeyCode modKeyArray[NUM_MOD_KEYCODES] = {
+    XK_Shift_L,
+    XK_Shift_R,
+    XK_Control_L,
+    XK_Control_R,
+    XK_Caps_Lock,
+    XK_Shift_Lock,
+    XK_Meta_L,
+    XK_Meta_R,
+    XK_Alt_L,
+    XK_Alt_R,
+    XK_Super_L,
+    XK_Super_R,
+    XK_Hyper_L,
+    XK_Hyper_R,
+};
 
 static int initialized = 0;
 static Tcl_HashTable keycodeTable;	/* keyArray hashed by keycode value. */
 static Tcl_HashTable vkeyTable;		/* virtualkeyArray hashed by virtual
 					 * keycode value. */
@@ -160,17 +178,17 @@
 
     Tcl_InitHashTable(&keycodeTable, TCL_ONE_WORD_KEYS);
     for (kPtr = keyArray; kPtr->keycode != 0; kPtr++) {
 	hPtr = Tcl_CreateHashEntry(&keycodeTable, INT2PTR(kPtr->keycode),
 		&dummy);
-	Tcl_SetHashValue(hPtr, kPtr->keysym);
+	Tcl_SetHashValue(hPtr, INT2PTR(kPtr->keysym));
     }
     Tcl_InitHashTable(&vkeyTable, TCL_ONE_WORD_KEYS);
     for (kPtr = virtualkeyArray; kPtr->keycode != 0; kPtr++) {
 	hPtr = Tcl_CreateHashEntry(&vkeyTable, INT2PTR(kPtr->keycode),
 		&dummy);
-	Tcl_SetHashValue(hPtr, kPtr->keysym);
+	Tcl_SetHashValue(hPtr, INT2PTR(kPtr->keysym));
     }
     initialized = 1;
 }
 
 /*
@@ -455,11 +473,10 @@
 
     /*
      * MacOSX doesn't use the key codes for the modifiers for anything, and we
      * don't generate them either. So there is no modifier map.
      */
-
     modmap = ckalloc(sizeof(XModifierKeymap));
     modmap->max_keypermod = 0;
     modmap->modifiermap = NULL;
     return modmap;
 }
@@ -546,11 +563,10 @@
 XKeysymToMacKeycode(
     Display *display,
     KeySym keysym)
 {
     KeyInfo *kPtr;
-
     if (keysym <= LATIN1_MAX) {
 	/*
 	 * Handle keysyms in the Latin-1 range where keysym and Unicode
 	 * character code point are the same.
 	 */
@@ -576,10 +592,21 @@
     for (kPtr = virtualkeyArray; kPtr->keycode != 0; kPtr++) {
 	if (kPtr->keysym == keysym) {
 	    return kPtr->keycode;
 	}
     }
+
+    /*
+     * Modifier keycodes only come from generated events.  No translation
+     * is needed.
+     */
+
+    for (int i=0; i < NUM_MOD_KEYCODES; i++) {
+	if (keysym == modKeyArray[i]) {
+	    return keysym;
+	}
+    }
 
     /*
      * For other keysyms (not Latin-1 and not special keys), we'd need a
      * generic keysym-to-unicode table. We don't have that, so we give up here.
      */
@@ -659,18 +686,24 @@
     KeySym keysym,
     XEvent *eventPtr)
 {
     if (keysym == NoSymbol) {
 	eventPtr->xkey.keycode = 0;
+    } else if ( modKeyArray[0] <= keysym &&
+		keysym <= modKeyArray[NUM_MOD_KEYCODES - 1]) {
+	/*
+	 * Keysyms for pure modifiers only arise in generated events.
+	 * We should just copy them to the keycode.
+	 */
+	eventPtr->xkey.keycode = keysym;
     } else {
 	Display *display = Tk_Display(tkwin);
 	int macKeycode = XKeysymToMacKeycode(display, keysym);
 
 	/*
 	 * See also XKeysymToKeycode.
 	 */
-
 	if ((keysym >= XK_F1) && (keysym <= XK_F35)) {
 	    eventPtr->xkey.keycode = 0x0010;
 	} else {
 	    eventPtr->xkey.keycode = 0x00FF & keysym;
 	}
@@ -732,11 +765,10 @@
      * Handle pure modifier keys specially. We use -1 as a signal for
      * this.
      */
 
     if (eventPtr->xany.send_event == -1) {
-
 	int modifier = eventPtr->xkey.keycode & NSDeviceIndependentModifierFlagsMask;
 
 	if (modifier == NSCommandKeyMask) {
 	    return XK_Meta_L;
 	} else if (modifier == NSShiftKeyMask) {
@@ -889,22 +921,24 @@
     dispPtr->altModMask = 0;
     dispPtr->metaModMask = 0;
 #endif
 
     /*
-     * MacOSX doesn't use the keycodes for the modifiers for anything, and we
-     * don't generate them either (the keycodes actually given in the simulated
-     * modifier events are bogus). So there is no modifier map. If we ever want
-     * to simulate real modifier keycodes, the list will be constant in the
-     * Carbon implementation.
+     * MacOSX doesn't create a key event when a modifier key is pressed or
+     * released.  However, it is possible to generate key events for
+     * modifier keys, and this is done in the tests.  So we construct an array
+     * containing the keycodes of the standard modifier keys from static data.
      */
 
     if (dispPtr->modKeyCodes != NULL) {
 	ckfree(dispPtr->modKeyCodes);
     }
-    dispPtr->numModKeyCodes = 0;
-    dispPtr->modKeyCodes = NULL;
+    dispPtr->numModKeyCodes = NUM_MOD_KEYCODES;
+    dispPtr->modKeyCodes = (KeyCode *)ckalloc(NUM_MOD_KEYCODES * sizeof(KeyCode));
+    for (int i = 0; i < NUM_MOD_KEYCODES; i++) {
+	dispPtr->modKeyCodes[i] = modKeyArray[i];
+    }
 }
 
 /*
  * Local Variables:
  * mode: objc

Index: macosx/tkMacOSXMenu.c
==================================================================
--- macosx/tkMacOSXMenu.c
+++ macosx/tkMacOSXMenu.c
@@ -17,10 +17,11 @@
 #include "tkMenu.h"
 #include "tkColor.h"
 #include "tkFont.h"
 #include "tkMacOSXWm.h"
 #include "tkMacOSXDebug.h"
+#include "tkMacOSXConstants.h"
 
 /*
 #ifdef TK_MAC_DEBUG
 #define TK_MAC_DEBUG_MENUS
 #endif
@@ -114,15 +115,11 @@
 - (TkMenu *) tkMenu;
 - (int) tkIndexOfItem: (NSMenuItem *) menuItem;
 - (void) insertItem: (NSMenuItem *) newItem atTkIndex: (NSInteger) index;
 @end
 
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
 #define TKMenu_NSMenuDelegate <NSMenuDelegate>
-#else
-#define TKMenu_NSMenuDelegate
-#endif
 @interface TKMenu(TKMenuDelegate) TKMenu_NSMenuDelegate
 @end
 
 @implementation TKMenu
 - (void) setSpecial: (NSUInteger) special
@@ -771,12 +768,19 @@
     }
 
     Drawable d = Tk_WindowId(root);
     NSView *rootview = TkMacOSXGetRootControl(d);
     NSWindow *win = [rootview window];
+    int result;
 
     inPostMenu = 1;
+
+    result = TkPreprocessMenu(menuPtr);
+    if (result != TCL_OK) {
+        inPostMenu = 0;
+        return result;
+    }
 
     int oldMode = Tcl_SetServiceMode(TCL_SERVICE_NONE);
     NSView *view = [win contentView];
     NSRect frame = NSMakeRect(x + 9, tkMacOSXZeroScreenHeight - y - 9, 1, 1);
 
@@ -1133,11 +1137,11 @@
 		columnEntryPtr->width = maxIndicatorSpace + maxWidth
 			+ 2 * activeBorderWidth;
 		columnEntryPtr->x = x;
 		columnEntryPtr->entryFlags &= ~ENTRY_LAST_COLUMN;
 	    }
-	    x += maxIndicatorSpace + maxWidth + 2 * borderWidth;
+	    x += maxIndicatorSpace + maxWidth + 2 * activeBorderWidth;
 	    maxWidth = maxIndicatorSpace = 0;
 	    lastColumnBreak = i;
 	    y = borderWidth;
 	}
 	accelWidth = modifierWidth = indicatorSpace = 0;
@@ -1619,12 +1623,11 @@
     int y,			/* Y-coordinate of topleft of entry */
     int width,			/* Width of the entry rectangle */
     int height,			/* Height of the current rectangle */
     int strictMotif,		/* Boolean flag */
     int drawArrow)		/* Whether or not to draw the cascade arrow
-				 * for cascade items. Only applies to
-				 * Windows. */
+				 * for cascade items. */
 {
 }
 
 #pragma mark Obsolete
 

Index: macosx/tkMacOSXMenus.c
==================================================================
--- macosx/tkMacOSXMenus.c
+++ macosx/tkMacOSXMenus.c
@@ -11,10 +11,11 @@
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
 
 #include "tkMacOSXPrivate.h"
 #include "tkMenu.h"
+#include "tkMacOSXConstants.h"
 
 static void		GenerateEditEvent(const char *name);
 static Tcl_Obj *	GetWidgetDemoPath(Tcl_Interp *interp);
 
 #pragma mark TKApplication(TKMenus)

Index: macosx/tkMacOSXMouseEvent.c
==================================================================
--- macosx/tkMacOSXMouseEvent.c
+++ macosx/tkMacOSXMouseEvent.c
@@ -13,10 +13,11 @@
 
 #include "tkMacOSXPrivate.h"
 #include "tkMacOSXWm.h"
 #include "tkMacOSXEvent.h"
 #include "tkMacOSXDebug.h"
+#include "tkMacOSXConstants.h"
 
 typedef struct {
     unsigned int state;
     long delta;
     Window window;

Index: macosx/tkMacOSXNotify.c
==================================================================
--- macosx/tkMacOSXNotify.c
+++ macosx/tkMacOSXNotify.c
@@ -13,12 +13,12 @@
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
 
 #include "tkMacOSXPrivate.h"
 #include "tkMacOSXEvent.h"
+#include "tkMacOSXConstants.h"
 #include <tclInt.h>
-#include <pthread.h>
 #import <objc/objc-auto.h>
 
 /* This is not used for anything at the moment. */
 typedef struct ThreadSpecificData {
     int initialized;
@@ -138,21 +138,21 @@
 	/*
 	 * Install TkAqua event source in main event loop thread.
 	 */
 
 	if (CFRunLoopGetMain() == CFRunLoopGetCurrent()) {
-	    if (!pthread_main_np()) {
+	    if (![NSThread isMainThread]) {
 		/*
 		 * Panic if main runloop is not on the main application thread.
 		 */
 
 		Tcl_Panic("Tk_MacOSXSetupTkNotifier: %s",
 		    "first [load] of TkAqua has to occur in the main thread!");
 	    }
 	    Tcl_CreateEventSource(TkMacOSXEventsSetupProc,
 				  TkMacOSXEventsCheckProc,
-				  GetMainEventQueue());
+				  NULL);
 	    TkCreateExitHandler(TkMacOSXNotifyExitHandler, NULL);
 	    Tcl_SetServiceMode(TCL_SERVICE_ALL);
 	    TclMacOSXNotifierAddRunLoopMode(NSEventTrackingRunLoopMode);
 	    TclMacOSXNotifierAddRunLoopMode(NSModalPanelRunLoopMode);
 	}
@@ -182,11 +182,11 @@
 {
     TSD_INIT();
 
     Tcl_DeleteEventSource(TkMacOSXEventsSetupProc,
 			  TkMacOSXEventsCheckProc,
-			  GetMainEventQueue());
+			  NULL);
     tsdPtr->initialized = 0;
 }
 
 /*
  *----------------------------------------------------------------------
@@ -214,13 +214,14 @@
 TkMacOSXEventsSetupProc(
     ClientData clientData,
     int flags)
 {
     NSString *runloopMode = [[NSRunLoop currentRunLoop] currentMode];
-    /* runloopMode will be nil if we are in the Tcl event loop. */
+    /* runloopMode will be nil if we are in a Tcl event loop. */
     if (flags & TCL_WINDOW_EVENTS && !runloopMode) {
 	static const Tcl_Time zeroBlockTime = { 0, 0 };
+	[NSApp _resetAutoreleasePool];
 	/* Call this with dequeue=NO -- just checking if the queue is empty. */
 	NSEvent *currentEvent = [NSApp nextEventMatchingMask:NSAnyEventMask
 				       untilDate:[NSDate distantPast]
 				       inMode:GetRunLoopMode(TkMacOSXGetModalSession())
 				       dequeue:NO];
@@ -254,33 +255,32 @@
 TkMacOSXEventsCheckProc(
     ClientData clientData,
     int flags)
 {
     NSString *runloopMode = [[NSRunLoop currentRunLoop] currentMode];
-    /* runloopMode will be nil if we are in the Tcl event loop. */
+    /* runloopMode will be nil if we are in a Tcl event loop. */
     if (flags & TCL_WINDOW_EVENTS && !runloopMode) {
 	NSEvent *currentEvent = nil;
 	NSEvent *testEvent = nil;
 	NSModalSession modalSession;
-
+	/* It is possible for the SetupProc to be called before this function
+	 * returns.  This happens, for example, when we process an event which
+	 * opens a modal window.  To prevent premature release of our
+	 * application-wide autorelease pool by a nested call to the SetupProc,
+	 * we must lock it here.
+	 */
+	[NSApp _lockAutoreleasePool];
 	do {
-	    [NSApp _resetAutoreleasePool];
 	    modalSession = TkMacOSXGetModalSession();
-	    testEvent = [NSApp nextEventMatchingMask:NSAnyEventMask
+	    	    testEvent = [NSApp nextEventMatchingMask:NSAnyEventMask
 					      untilDate:[NSDate distantPast]
 						 inMode:GetRunLoopMode(modalSession)
 						dequeue:NO];
 	    /* We must not steal any events during LiveResize. */
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
 	    if (testEvent && [[testEvent window] inLiveResize]) {
 		break;
 	    }
-#else
-	    if (testEvent && [[[testEvent window] contentView] inLiveResize]) {
-		break;
-	    }
-#endif
 	    currentEvent = [NSApp nextEventMatchingMask:NSAnyEventMask
 					      untilDate:[NSDate distantPast]
 						 inMode:GetRunLoopMode(modalSession)
 						dequeue:YES];
 	    if (currentEvent) {
@@ -301,10 +301,12 @@
 		[currentEvent release];
 	    } else {
 		break;
 	    }
 	} while (1);
+	/* Now we can unlock the pool. */
+	[NSApp _unlockAutoreleasePool];
     }
 }
 
 
 /*

Index: macosx/tkMacOSXPort.h
==================================================================
--- macosx/tkMacOSXPort.h
+++ macosx/tkMacOSXPort.h
@@ -51,11 +51,10 @@
 #include <X11/cursorfont.h>
 #include <X11/keysym.h>
 #include <X11/Xatom.h>
 #include <X11/Xfuncproto.h>
 #include <X11/Xutil.h>
-#include "tkIntXlibDecls.h"
 
 /*
  * The following macro defines the type of the mask arguments to
  * select:
  */

Index: macosx/tkMacOSXPrivate.h
==================================================================
--- macosx/tkMacOSXPrivate.h
+++ macosx/tkMacOSXPrivate.h
@@ -57,31 +57,10 @@
 	} else { __VA_ARGS__
 #define tk_if_mac_os_x_no(chk, cond, ...) \
 	if (0) {
 #define tk_else_mac_os_x_no(...) \
 	} else { __VA_ARGS__
-/* Private mapping macros defined according to Mac OS X version requirements */
-/* 10.5 Leopard */
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
-#define tk_if_mac_os_x_min_10_5		tk_if_mac_os_x_yes
-#define tk_else_mac_os_x_min_10_5	tk_else_mac_os_x_yes
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1050
-#define tk_if_mac_os_x_10_5		tk_if_mac_os_x_yes
-#define tk_else_mac_os_x_10_5		tk_else_mac_os_x_yes
-#endif /* MAC_OS_X_VERSION_MAX_ALLOWED */
-#else /* MAC_OS_X_VERSION_MIN_REQUIRED */
-#define tk_if_mac_os_x_min_10_5		tk_if_mac_os_x_chk
-#define tk_else_mac_os_x_min_10_5	tk_else_mac_os_x_chk
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1050
-#define tk_if_mac_os_x_10_5		tk_if_mac_os_x_chk
-#define tk_else_mac_os_x_10_5		tk_else_mac_os_x_chk
-#endif /* MAC_OS_X_VERSION_MAX_ALLOWED */
-#endif /* MAC_OS_X_VERSION_MIN_REQUIRED */
-#if MAC_OS_X_VERSION_MAX_ALLOWED < 1050
-#define tk_if_mac_os_x_10_5		tk_if_mac_os_x_no
-#define tk_else_mac_os_x_10_5		tk_else_mac_os_x_no
-#endif /* MAC_OS_X_VERSION_MAX_ALLOWED */
 
 /*
  * Macros for DEBUG_ASSERT_MESSAGE et al from Debugging.h.
  */
 
@@ -207,12 +186,18 @@
 			    int activeFlag);
 MODULE_SCOPE WindowClass TkMacOSXWindowClass(TkWindow *winPtr);
 MODULE_SCOPE int	TkMacOSXIsWindowZoomed(TkWindow *winPtr);
 MODULE_SCOPE int	TkGenerateButtonEventForXPointer(Window window);
 MODULE_SCOPE EventModifiers TkMacOSXModifierState(void);
-MODULE_SCOPE NSBitmapImageRep* BitmapRepFromDrawableRect(Drawable drawable,
+MODULE_SCOPE NSBitmapImageRep* TkMacOSXBitmapRepFromDrawableRect(Drawable drawable,
 			    int x, int y, unsigned int width, unsigned int height);
+MODULE_SCOPE CGImageRef TkMacOSXCreateCGImageWithXImage(XImage *image,
+			    int use_ximage_alpha);
+MODULE_SCOPE void       TkMacOSXDrawCGImage(Drawable d, GC gc, CGContextRef context,
+			    CGImageRef image, unsigned long imageForeground,
+			    unsigned long imageBackground, CGRect imageBounds,
+			    CGRect srcBounds, CGRect dstBounds);
 MODULE_SCOPE int	TkMacOSXSetupDrawingContext(Drawable d, GC gc,
 			    int useCG, TkMacOSXDrawingContext *dcPtr);
 MODULE_SCOPE void	TkMacOSXRestoreDrawingContext(
 			    TkMacOSXDrawingContext *dcPtr);
 MODULE_SCOPE void	TkMacOSXSetColorInContext(GC gc, unsigned long pixel,
@@ -226,10 +211,11 @@
 MODULE_SCOPE NSView*	TkMacOSXDrawableView(MacDrawable *macWin);
 MODULE_SCOPE void	TkMacOSXWinCGBounds(TkWindow *winPtr, CGRect *bounds);
 MODULE_SCOPE HIShapeRef	TkMacOSXGetClipRgn(Drawable drawable);
 MODULE_SCOPE void	TkMacOSXInvalidateViewRegion(NSView *view,
 			    HIShapeRef rgn);
+MODULE_SCOPE CGContextRef TkMacOSXGetCGContextForDrawable(Drawable drawable);
 MODULE_SCOPE CGImageRef	TkMacOSXCreateCGImageWithDrawable(Drawable drawable);
 MODULE_SCOPE NSImage*	TkMacOSXGetNSImageWithTkImage(Display *display,
 			    Tk_Image image, int width, int height);
 MODULE_SCOPE NSImage*	TkMacOSXGetNSImageWithBitmap(Display *display,
 			    Pixmap bitmap, GC gc, int width, int height);
@@ -276,18 +262,21 @@
     NSArray *_defaultHelpMenuItems;
     NSWindow *_windowWithMouse;
     NSAutoreleasePool *_mainPool;
 #ifdef __i386__
     /* The Objective C runtime used on i386 requires this. */
-    BOOL _poolProtected;
+    int _poolLock;
 #endif
 }
-@property BOOL poolProtected;
+@property int poolLock;
+
 @end
 @interface TKApplication(TKInit)
 - (NSString *)tkFrameworkImagePath:(NSString*)image;
 - (void)_resetAutoreleasePool;
+- (void)_lockAutoreleasePool;
+- (void)_unlockAutoreleasePool;
 @end
 @interface TKApplication(TKEvent)
 - (NSEvent *)tkProcessEvent:(NSEvent *)theEvent;
 @end
 @interface TKApplication(TKMouseEvent)
@@ -339,12 +328,12 @@
 @end
 
 @interface TKContentView(TKWindowEvent)
 - (void) drawRect: (NSRect) rect;
 - (void) generateExposeEvents: (HIShapeRef) shape;
-- (void) generateExposeEvents: (HIShapeRef) shape childrenOnly: (int) childrenOnly;
-- (void) viewDidEndLiveResize;
+- (void) viewDidChangeEffectiveAppearance;
+- (void) updateAppearanceEvent;
 - (void) tkToolbarButton: (id) sender;
 - (BOOL) isOpaque;
 - (BOOL) wantsDefaultClipping;
 - (BOOL) acceptsFirstResponder;
 - (void) keyDown: (NSEvent *) theEvent;

Index: macosx/tkMacOSXScale.c
==================================================================
--- macosx/tkMacOSXScale.c
+++ macosx/tkMacOSXScale.c
@@ -169,11 +169,14 @@
      */
 
     Tcl_Preserve((ClientData) scalePtr);
     if ((scalePtr->flags & INVOKE_COMMAND) && (scalePtr->command != NULL)) {
 	Tcl_Preserve((ClientData) interp);
-	sprintf(string, scalePtr->format, scalePtr->value);
+        if (snprintf(string, TCL_DOUBLE_SPACE, scalePtr->format,
+                scalePtr->value) < 0) {
+            string[TCL_DOUBLE_SPACE - 1] = '\0';
+        }
 	Tcl_DStringInit(&buf);
 	Tcl_DStringAppend(&buf, scalePtr->command, -1);
 	Tcl_DStringAppend(&buf, " ", -1);
 	Tcl_DStringAppend(&buf, string, -1);
 	result = Tcl_EvalEx(interp, Tcl_DStringValue(&buf), -1, 0);

Index: macosx/tkMacOSXScrlbr.c
==================================================================
--- macosx/tkMacOSXScrlbr.c
+++ macosx/tkMacOSXScrlbr.c
@@ -17,10 +17,17 @@
 #include "tkMacOSXPrivate.h"
 
 
 #define MIN_SCROLLBAR_VALUE		0
 
+/*
+ * Minimum slider length, in pixels (designed to make sure that the slider is
+ * always easy to grab with the mouse).
+ */
+
+#define MIN_SLIDER_LENGTH	5
+
 /*Borrowed from ttkMacOSXTheme.c to provide appropriate scaling of scrollbar values.*/
 #ifdef __LP64__
 #define RangeToFactor(maximum) (((double) (INT_MAX >> 1)) / (maximum))
 #else
 #define RangeToFactor(maximum) (((double) (LONG_MAX >> 1)) / (maximum))
@@ -57,21 +64,20 @@
     SInt32 width, minThumbHeight;
     int minHeight, topArrowHeight, bottomArrowHeight;
     NSControlSize controlSize;
 } ScrollbarMetrics;
 
-static ScrollbarMetrics metrics[2] = {
-    {15, 54, 26, 14, 14, NSRegularControlSize}, /* kThemeScrollBarMedium */
-    {11, 40, 20, 10, 10, NSSmallControlSize},  /* kThemeScrollBarSmall  */
+
+static ScrollbarMetrics metrics = {
+  15, 54, 26, 14, 14, kControlSizeNormal /* kThemeScrollBarMedium */
 };
 
 HIThemeTrackDrawInfo info = {
     .version = 0,
     .min = 0.0,
     .max = 100.0,
     .attributes = kThemeTrackShowThumb,
-    .kind = kThemeScrollBarMedium,
 };
 
 
 /*
  * Forward declarations for procedures defined later in this file:
@@ -105,11 +111,11 @@
     MacScrollbar *scrollPtr = (MacScrollbar *)ckalloc(sizeof(MacScrollbar));
 
     scrollPtr->troughGC = None;
     scrollPtr->copyGC = None;
 
-    Tk_CreateEventHandler(tkwin,ExposureMask|StructureNotifyMask|FocusChangeMask|ButtonPressMask|VisibilityChangeMask, ScrollbarEventProc, scrollPtr);
+    Tk_CreateEventHandler(tkwin,ExposureMask|StructureNotifyMask|FocusChangeMask|ButtonPressMask|ButtonReleaseMask|EnterWindowMask|LeaveWindowMask|VisibilityChangeMask, ScrollbarEventProc, scrollPtr);
 
     return (TkScrollbar *) scrollPtr;
 }
 
 /*
@@ -209,78 +215,84 @@
  * Side effects:
  *	The scrollbar will be displayed differently.
  *
  *----------------------------------------------------------------------
  */
+
+
 
 extern void
 TkpComputeScrollbarGeometry(
-			    register TkScrollbar *scrollPtr)
-/* Scrollbar whose geometry may have
- * changed. */
+    register TkScrollbar *scrollPtr)
+                           /* Scrollbar whose geometry may have
+                           * changed. */
 {
 
-    int variant, fieldLength;
+   /*
+    * Using code from tkUnixScrlbr.c because Unix scroll bindings are
+    * driving the display at the script level. All the Mac scrollbar
+    * has to do is re-draw itself.
+    * There is a difference with Unix however: on macOS later than 10.6
+    * (Snow Leopard) the scrollbars have no arrows at all. This is
+    * handled by having scrollPtr->arrowLength set to zero.
+    */
+
+    int fieldLength;
 
     if (scrollPtr->highlightWidth < 0) {
-    	scrollPtr->highlightWidth = 0;
+       scrollPtr->highlightWidth = 0;
     }
     scrollPtr->inset = scrollPtr->highlightWidth + scrollPtr->borderWidth;
-    variant = ((scrollPtr->vertical ? Tk_Width(scrollPtr->tkwin) :
-		Tk_Height(scrollPtr->tkwin)) - 2 * scrollPtr->inset
-	       < metrics[0].width) ? 1 : 0;
-    scrollPtr->arrowLength = (metrics[variant].topArrowHeight +
-			      metrics[variant].bottomArrowHeight) / 2;
+    scrollPtr->arrowLength = 0;
     fieldLength = (scrollPtr->vertical ? Tk_Height(scrollPtr->tkwin)
-		   : Tk_Width(scrollPtr->tkwin))
-	- 2 * (scrollPtr->arrowLength + scrollPtr->inset);
+           : Tk_Width(scrollPtr->tkwin))
+           - 2*(scrollPtr->arrowLength + scrollPtr->inset);
     if (fieldLength < 0) {
-    	fieldLength = 0;
+       fieldLength = 0;
     }
-    scrollPtr->sliderFirst = fieldLength * scrollPtr->firstFraction;
-    scrollPtr->sliderLast = fieldLength * scrollPtr->lastFraction;
+    scrollPtr->sliderFirst = fieldLength*scrollPtr->firstFraction;
+    scrollPtr->sliderLast = fieldLength*scrollPtr->lastFraction;
 
     /*
-     * Adjust the slider so that some piece of it is always
-     * displayed in the scrollbar and so that it has at least
-     * a minimal width (so it can be grabbed with the mouse).
+     * Adjust the slider so that some piece of it is always displayed in the
+     * scrollbar and so that it has at least a minimal width (so it can be
+     * grabbed with the mouse).
      */
 
-    if (scrollPtr->sliderFirst > (fieldLength - 2*scrollPtr->borderWidth)) {
-    	scrollPtr->sliderFirst = fieldLength - 2*scrollPtr->borderWidth;
+    if (scrollPtr->sliderFirst > fieldLength - MIN_SLIDER_LENGTH) {
+       scrollPtr->sliderFirst = fieldLength - MIN_SLIDER_LENGTH;
     }
     if (scrollPtr->sliderFirst < 0) {
-    	scrollPtr->sliderFirst = 0;
+       scrollPtr->sliderFirst = 0;
     }
-    if (scrollPtr->sliderLast < (scrollPtr->sliderFirst +
-				 metrics[variant].minThumbHeight)) {
-    	scrollPtr->sliderLast = scrollPtr->sliderFirst +
-	    metrics[variant].minThumbHeight;
+    if (scrollPtr->sliderLast < scrollPtr->sliderFirst + MIN_SLIDER_LENGTH) {
+       scrollPtr->sliderLast = scrollPtr->sliderFirst + MIN_SLIDER_LENGTH;
     }
     if (scrollPtr->sliderLast > fieldLength) {
-    	scrollPtr->sliderLast = fieldLength;
-    }
-    if (!(MOUNTAIN_LION_STYLE)) {
-      scrollPtr->sliderFirst += scrollPtr->inset +
-	metrics[variant].topArrowHeight;
-      scrollPtr->sliderLast += scrollPtr->inset +
-	metrics[variant].bottomArrowHeight;
-    }
+       scrollPtr->sliderLast = fieldLength;
+    }
+    scrollPtr->sliderFirst += scrollPtr->arrowLength + scrollPtr->inset;
+    scrollPtr->sliderLast += scrollPtr->arrowLength + scrollPtr->inset;
+
     /*
-     * Register the desired geometry for the window (leave enough space
-     * for the two arrows plus a minimum-size slider, plus border around
-     * the whole window, if any). Then arrange for the window to be
-     * redisplayed.
+     * Register the desired geometry for the window (leave enough space for
+     * the two arrows plus a minimum-size slider, plus border around the whole
+     * window, if any). Then arrange for the window to be redisplayed.
      */
 
-    if (scrollPtr->vertical) {
-    	Tk_GeometryRequest(scrollPtr->tkwin, scrollPtr->width + 2 * scrollPtr->inset, 2 * (scrollPtr->arrowLength + scrollPtr->borderWidth + scrollPtr->inset) +  metrics[variant].minThumbHeight);
+      if (scrollPtr->vertical) {
+       Tk_GeometryRequest(scrollPtr->tkwin,
+              scrollPtr->width + 2*scrollPtr->inset,
+              2*(scrollPtr->arrowLength + scrollPtr->borderWidth
+              + scrollPtr->inset) + metrics.minThumbHeight);
     } else {
-    	Tk_GeometryRequest(scrollPtr->tkwin, 2 * (scrollPtr->arrowLength + scrollPtr->borderWidth + scrollPtr->inset) + metrics[variant].minThumbHeight, scrollPtr->width + 2 * scrollPtr->inset);
+       Tk_GeometryRequest(scrollPtr->tkwin,
+              2*(scrollPtr->arrowLength + scrollPtr->borderWidth
+              + scrollPtr->inset) + metrics.minThumbHeight,
+              scrollPtr->width + 2*scrollPtr->inset);
     }
     Tk_SetInternalBorder(scrollPtr->tkwin, scrollPtr->inset);
-
 }
 
 /*
  *----------------------------------------------------------------------
  *
@@ -363,66 +375,64 @@
     register TkScrollbar *scrollPtr,
 				/* Scrollbar widget record. */
     int x, int y)		/* Coordinates within scrollPtr's window. */
 {
 
-  /*
+   /*
    * Using code from tkUnixScrlbr.c because Unix scroll bindings are
    * driving the display at the script level. All the Mac scrollbar
    * has to do is re-draw itself.
    */
 
-    int length, fieldlength, width, tmp;
+    int length, width, tmp;
     register const int inset = scrollPtr->inset;
-    register const int arrowSize = scrollPtr->arrowLength + inset;
 
     if (scrollPtr->vertical) {
-	length = Tk_Height(scrollPtr->tkwin);
-	fieldlength = length - 2 * arrowSize;
-	width = Tk_Width(scrollPtr->tkwin);
+  	length = Tk_Height(scrollPtr->tkwin);
+  	width = Tk_Width(scrollPtr->tkwin);
     } else {
-	tmp = x;
-	x = y;
-	y = tmp;
-	length = Tk_Width(scrollPtr->tkwin);
-	fieldlength = length - 2 * arrowSize;
-	width = Tk_Height(scrollPtr->tkwin);
-    }
-    fieldlength = fieldlength < 0 ? 0 : fieldlength;
+  	tmp = x;
+  	x = y;
+  	y = tmp;
+  	length = Tk_Width(scrollPtr->tkwin);
+  	width = Tk_Height(scrollPtr->tkwin);
+    }
 
     if (x<inset || x>=width-inset || y<inset || y>=length-inset) {
-	return OUTSIDE;
+  	return OUTSIDE;
     }
 
     /*
      * All of the calculations in this procedure mirror those in
      * TkpDisplayScrollbar. Be sure to keep the two consistent.
      */
 
+    if (y < inset + scrollPtr->arrowLength) {
+  	return TOP_ARROW;
+    }
     if (y < scrollPtr->sliderFirst) {
-	return TOP_GAP;
+  	return TOP_GAP;
     }
     if (y < scrollPtr->sliderLast) {
-	return SLIDER;
-    }
-    if (y < fieldlength){
-	return BOTTOM_GAP;
-    }
-    if (y < fieldlength + arrowSize) {
-	return TOP_ARROW;
-    }
-    return BOTTOM_ARROW;
+  	return SLIDER;
+    }
+    if (y >= length - (scrollPtr->arrowLength + inset)) {
+  	return BOTTOM_ARROW;
+    }
+
+    return BOTTOM_GAP;
+
 }
 
 /*
  *--------------------------------------------------------------
  *
  * UpdateControlValues --
  *
  *	This procedure updates the Macintosh scrollbar control to
  *	display the values defined by the Tk scrollbar. This is the
- *	key interface to the Mac-native * scrollbar; the Unix bindings
+ *	key interface to the Mac-native  scrollbar; the Unix bindings
  *	drive scrolling in the Tk window and all the Mac scrollbar has
  *	to do is redraw itself.
  *
  * Results:
  *	None.
@@ -439,11 +449,10 @@
 {
     Tk_Window tkwin = scrollPtr->tkwin;
     MacDrawable *macWin = (MacDrawable *) Tk_WindowId(scrollPtr->tkwin);
     double dViewSize;
     HIRect  contrlRect;
-    int variant;
     short width, height;
 
     NSView *view = TkMacOSXDrawableView(macWin);
     CGFloat viewHeight = [view bounds].size.height;
     NSRect frame;
@@ -456,12 +465,10 @@
     info.bounds = contrlRect;
 
     width = contrlRect.size.width;
     height = contrlRect.size.height;
 
-    variant = contrlRect.size.width < metrics[0].width ? 1 : 0;
-
     /*
      * Ensure we set scrollbar control bounds only once all size adjustments
      * have been computed.
      */
 
@@ -498,11 +505,11 @@
     } else {
 	 info.value =  MIN_SCROLLBAR_VALUE + factor * scrollPtr->firstFraction;
     }
 
     if((scrollPtr->firstFraction <= 0.0 && scrollPtr->lastFraction >= 1.0)
-       || height <= metrics[variant].minHeight) {
+       || height <= metrics.minHeight) {
     	info.enableState = kThemeTrackHideTrack;
     } else {
     	info.enableState = kThemeTrackActive;
     	info.attributes = kThemeTrackShowThumb |  kThemeTrackThumbRgnIsNotGhost;
     }
@@ -512,12 +519,12 @@
 /*
  *--------------------------------------------------------------
  *
  * ScrollbarPress --
  *
- *	This procedure is invoked in response to <ButtonPress> events.
- *	Enters a modal loop to handle scrollbar interactions.
+ *	This procedure is invoked in response to <ButtonPress>, <ButtonRelease>,
+ *      <EnterNotify>, and <LeaveNotify> events. Scrollbar appearance is modified.
  *
  *--------------------------------------------------------------
  */
 
 static int
@@ -524,10 +531,17 @@
 ScrollbarPress(TkScrollbar *scrollPtr, XEvent *eventPtr)
 {
 
   if (eventPtr->type == ButtonPress) {
     UpdateControlValues(scrollPtr);
+    info.trackInfo.scrollbar.pressState = 1;
+  }
+   if (eventPtr->type == EnterNotify) {
+    info.trackInfo.scrollbar.pressState = 1;
+  }
+  if (eventPtr->type == ButtonRelease || eventPtr->type == LeaveNotify) {
+    info.trackInfo.scrollbar.pressState = 0;
   }
   return TCL_OK;
 }
 
 
@@ -564,11 +578,14 @@
     case ActivateNotify:
     case DeactivateNotify:
 	TkScrollbarEventuallyRedraw(scrollPtr);
 	break;
     case ButtonPress:
+    case ButtonRelease:
+    case EnterNotify:
+    case LeaveNotify:
     	ScrollbarPress(clientData, eventPtr);
 	break;
     default:
 	TkScrollbarEventProc(clientData, eventPtr);
     }
 }

Index: macosx/tkMacOSXSubwindows.c
==================================================================
--- macosx/tkMacOSXSubwindows.c
+++ macosx/tkMacOSXSubwindows.c
@@ -147,15 +147,31 @@
     display->request++;
     macWin->winPtr->flags |= TK_MAPPED;
     if (Tk_IsTopLevel(macWin->winPtr)) {
 	if (!Tk_IsEmbedded(macWin->winPtr)) {
 	    NSWindow *win = TkMacOSXDrawableWindow(window);
-	    [NSApp activateIgnoringOtherApps:YES];
+	    /*
+	     * We want to activate Tk when a toplevel is mapped
+	     * but we must not supply YES here.  This is because
+	     * during Tk initialization the root window is mapped
+	     * before applicationDidFinishLaunching returns. Forcing
+	     * the app to activate too early can make the menu bar
+	     * unresponsive.
+	     */
+	    [NSApp activateIgnoringOtherApps:NO];
 	    if ( [win canBecomeKeyWindow] ) {
 		[win makeKeyAndOrderFront:NSApp];
 	    }
 	    TkMacOSXApplyWindowAttributes(macWin->winPtr, win);
+	} else {
+	    /*
+	     * Rebuild the container's clipping region and display
+	     * the window.
+	     */
+	    TkWindow *contWinPtr = TkpGetOtherWindow(macWin->winPtr);
+	    TkMacOSXInvalClipRgns((Tk_Window)contWinPtr);
+	    TkMacOSXInvalidateWindow(macWin, TK_PARENT_WINDOW);
 	}
 	TkMacOSXInvalClipRgns((Tk_Window) macWin->winPtr);
 
 	/*
 	 * We only need to send the MapNotify event for toplevel windows.
@@ -170,11 +186,12 @@
 	event.xmap.event = window;
 	event.xmap.override_redirect = macWin->winPtr->atts.override_redirect;
 	Tk_QueueWindowEvent(&event, TCL_QUEUE_TAIL);
     } else {
 	/*
-	 * Generate damage for that area of the window.
+	 * Rebuild the parent's clipping region and display the window.
+	 *
 	 */
 
 	TkMacOSXInvalClipRgns((Tk_Window) macWin->winPtr->parentPtr);
 	TkMacOSXInvalidateWindow(macWin, TK_PARENT_WINDOW);
     }
@@ -186,10 +203,17 @@
     event.xany.send_event = False;
     event.xany.display = display;
     event.xvisibility.type = VisibilityNotify;
     event.xvisibility.state = VisibilityUnobscured;
     NotifyVisibility(macWin->winPtr, &event);
+
+    /*
+     * Make sure that subwindows get displayed.
+     */
+
+    GenerateConfigureNotify(macWin->winPtr, 1);
+
 }
 
 /*
  *----------------------------------------------------------------------
  *
@@ -245,25 +269,26 @@
 XUnmapWindow(
     Display *display,		/* Display. */
     Window window)		/* Window. */
 {
     MacDrawable *macWin = (MacDrawable *) window;
+    TkWindow *winPtr = macWin->winPtr;
+    TkWindow *parentPtr = winPtr->parentPtr;
     XEvent event;
 
     display->request++;
-    macWin->winPtr->flags &= ~TK_MAPPED;
-    if (Tk_IsTopLevel(macWin->winPtr)) {
-	if (!Tk_IsEmbedded(macWin->winPtr) &&
-		macWin->winPtr->wmInfoPtr->hints.initial_state!=IconicState) {
+    if (Tk_IsTopLevel(winPtr)) {
+	if (!Tk_IsEmbedded(winPtr) &&
+		winPtr->wmInfoPtr->hints.initial_state!=IconicState) {
 	    NSWindow *win = TkMacOSXDrawableWindow(window);
 
 	    if ([win isVisible]) {
 		[[win parentWindow] removeChildWindow:win];
 		[win orderOut:NSApp];
 	    }
 	}
-	TkMacOSXInvalClipRgns((Tk_Window) macWin->winPtr);
+	TkMacOSXInvalClipRgns((Tk_Window) winPtr);
 
 	/*
 	 * We only need to send the UnmapNotify event for toplevel windows.
 	 */
 
@@ -275,17 +300,24 @@
 	event.xunmap.window = window;
 	event.xunmap.event = window;
 	event.xunmap.from_configure = false;
 	Tk_QueueWindowEvent(&event, TCL_QUEUE_TAIL);
     } else {
+
 	/*
-	 * Generate damage for that area of the window.
+	 * Rebuild the visRgn clip region for the parent so it will be allowed
+	 * to draw in the space from which this subwindow was removed.
 	 */
 
-	TkMacOSXInvalidateWindow(macWin, TK_PARENT_WINDOW);
-	TkMacOSXInvalClipRgns((Tk_Window) macWin->winPtr->parentPtr);
+	if (parentPtr && parentPtr->privatePtr->visRgn) {
+	    TkMacOSXInvalidateViewRegion(TkMacOSXDrawableView(parentPtr->privatePtr),
+					 parentPtr->privatePtr->visRgn);
+	}
+	TkMacOSXInvalClipRgns((Tk_Window) parentPtr);
+	TkMacOSXUpdateClipRgn(parentPtr);
     }
+    winPtr->flags &= ~TK_MAPPED;
 }
 
 /*
  *----------------------------------------------------------------------
  *
@@ -355,19 +387,21 @@
 
     display->request++;
     if (Tk_IsTopLevel(macWin->winPtr) && !Tk_IsEmbedded(macWin->winPtr)) {
 	NSWindow *w = macWin->winPtr->wmInfoPtr->window;
 	if (w) {
+
 	    /* We explicitly convert everything to doubles so we don't get
 	     * surprised (again) by what happens when you do arithmetic with
 	     * unsigned ints.
 	     */
+
 	    CGFloat X = (CGFloat)x;
 	    CGFloat Y = (CGFloat)y;
 	    CGFloat Width = (CGFloat)width;
 	    CGFloat Height = (CGFloat)height;
-	    CGFloat XOff = (CGFloat)macWin->winPtr->wmInfoPtr->xInParent; 
+	    CGFloat XOff = (CGFloat)macWin->winPtr->wmInfoPtr->xInParent;
 	    CGFloat YOff = (CGFloat)macWin->winPtr->wmInfoPtr->yInParent;
 	    NSRect r = NSMakeRect(X + XOff,
 	    			  tkMacOSXZeroScreenHeight - Y - YOff - Height,
 	    			  Width, Height);
 	    [w setFrame:[w frameRectForContentRect:r] display:YES];
@@ -445,18 +479,20 @@
 	TkWindow *contWinPtr = TkpGetOtherWindow(macWin->winPtr);
 
 	if (contWinPtr) {
 	    macParent = contWinPtr->privatePtr;
 	} else {
+
 	    /*
 	     * Here we should handle out of process embedding. At this point,
 	     * we are assuming that the changes.x,y is not maintained, if you
 	     * need the info get it from Tk_GetRootCoords, and that the
 	     * toplevel sits at 0,0 when it is drawn.
 	     */
 	}
     } else {
+
 	/*
 	 * TODO: update all xOff & yOffs
 	 */
 
 	macParent = macWin->winPtr->parentPtr->privatePtr;
@@ -544,10 +580,11 @@
 
     display->request++;
     if (Tk_IsTopLevel(macWin->winPtr) && !Tk_IsEmbedded(macWin->winPtr)) {
 	TkWmRestackToplevel(macWin->winPtr, Above, NULL);
     } else {
+
 	/*
 	 * TODO: this should generate damage
 	 */
     }
 }
@@ -578,11 +615,12 @@
 
     display->request++;
     if (Tk_IsTopLevel(macWin->winPtr) && !Tk_IsEmbedded(macWin->winPtr)) {
 	TkWmRestackToplevel(macWin->winPtr, Below, NULL);
     } else {
-	/*
+
+        /*
 	 * TODO: this should generate damage
 	 */
     }
 }
 #endif
@@ -767,12 +805,12 @@
 	     * contained window in a frame, and don't support any other widgets
 	     * in the frame either. This is not currently enforced, however.
 	     */
 
 	    if (!Tk_IsTopLevel(winPtr)) {
-		TkMacOSXUpdateClipRgn(winPtr->parentPtr);
 		if (winPtr->parentPtr) {
+		    TkMacOSXUpdateClipRgn(winPtr->parentPtr);
 		    ChkErr(HIShapeIntersect,
 			    winPtr->parentPtr->privatePtr->aboveVisRgn,
 			    rgn, rgn);
 		}
 		win2Ptr = winPtr;
@@ -849,10 +887,11 @@
 		}
 		CFRelease(diffRgn);
 	    }
 	    CFRelease(rgn);
 	} else {
+
 	    /*
 	     * An unmapped window has empty clip regions to prevent any
 	     * (erroneous) drawing into it or its children from becoming
 	     * visible. [Bug 940117]
 	     */
@@ -1109,10 +1148,11 @@
 
 void *
 TkMacOSXGetRootControl(
     Drawable drawable)
 {
+
     /*
      * will probably need to fix this up for embedding
      */
 
     return TkMacOSXDrawableView((MacDrawable *) drawable);
@@ -1289,10 +1329,11 @@
     int deltaY)
 {
     TkWindow *childPtr;
 
     if (winPtr->privatePtr == NULL) {
+
 	/*
 	 * We haven't called Tk_MakeWindowExist for this window yet. The offset
 	 * information will be postponed and calulated at that time. (This will
 	 * usually only happen when a mapped parent is being moved but has
 	 * child windows that have yet to be mapped.)

Index: macosx/tkMacOSXWindowEvent.c
==================================================================
--- macosx/tkMacOSXWindowEvent.c
+++ macosx/tkMacOSXWindowEvent.c
@@ -15,10 +15,11 @@
 
 #include "tkMacOSXPrivate.h"
 #include "tkMacOSXWm.h"
 #include "tkMacOSXEvent.h"
 #include "tkMacOSXDebug.h"
+#include "tkMacOSXConstants.h"
 
 /*
 #ifdef TK_MAC_DEBUG
 #define TK_MAC_DEBUG_EVENTS
 #define TK_MAC_DEBUG_DRAWING
@@ -39,18 +40,12 @@
 
 #ifdef TK_MAC_DEBUG_NOTIFICATIONS
 extern NSString *NSWindowWillOrderOnScreenNotification;
 extern NSString *NSWindowDidOrderOnScreenNotification;
 extern NSString *NSWindowDidOrderOffScreenNotification;
-
-#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
-#define NSWindowWillStartLiveResizeNotification @"NSWindowWillStartLiveResizeNotification"
-#define NSWindowDidEndLiveResizeNotification  @"NSWindowDidEndLiveResizeNotification"
-#endif
-#endif
-
-extern BOOL opaqueTag;
+#endif
+
 
 @implementation TKApplication(TKWindowEvent)
 
 - (void) windowActivation: (NSNotification *) notification
 {
@@ -71,15 +66,11 @@
 {
 #ifdef TK_MAC_DEBUG_NOTIFICATIONS
     TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, notification);
 #endif
     BOOL movedOnly = [[notification name]
-	    isEqualToString:NSWindowDidMoveNotification];
-
-    if (movedOnly) {
-	/* constraining to screen after move not needed with AppKit */
-    }
+			 isEqualToString:NSWindowDidMoveNotification];
 
     NSWindow *w = [notification object];
     TkWindow *winPtr = TkMacOSXGetTkWindow(w);
 
     if (winPtr) {
@@ -99,10 +90,11 @@
 	    width = bounds.size.width - wmPtr->xInParent;
 	    height = bounds.size.height - wmPtr->yInParent;
 	    flags |= TK_SIZE_CHANGED;
 	}
 	if (Tcl_GetServiceMode() != TCL_SERVICE_NONE) {
+
 	    /*
 	     * Propagate geometry changes immediately.
 	     */
 
 	    flags |= TK_MACOSX_HANDLE_EVENT_IMMEDIATELY;
@@ -122,10 +114,11 @@
     if (winPtr) {
 	winPtr->wmInfoPtr->hints.initial_state =
 		TkMacOSXIsWindowZoomed(winPtr) ? ZoomState : NormalState;
 	Tk_MapWindow((Tk_Window) winPtr);
 	if (Tcl_GetServiceMode() != TCL_SERVICE_NONE) {
+
 	    /*
 	     * Process all Tk events generated by Tk_MapWindow().
 	     */
 
 	    while (Tcl_ServiceEvent(0)) {}
@@ -176,10 +169,11 @@
      * so can always return NO from -windowShouldClose: for a Tk window.
      */
 
     return (winPtr ? NO : YES);
 }
+
 
 #ifdef TK_MAC_DEBUG_NOTIFICATIONS
 
 - (void) windowDragStart: (NSNotification *) notification
 {
@@ -216,10 +210,12 @@
 
     if (winPtr) {
 	//Tk_UnmapWindow((Tk_Window) winPtr);
     }
 }
+
+
 #endif /* TK_MAC_DEBUG_NOTIFICATIONS */
 
 - (void) _setupWindowNotifications
 {
     NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
@@ -239,10 +235,11 @@
     observe(NSWindowWillOrderOnScreenNotification, windowMapped:);
     observe(NSWindowDidOrderOnScreenNotification, windowBecameVisible:);
     observe(NSWindowDidOrderOffScreenNotification, windowUnmapped:);
 #endif
 #undef observe
+
 }
 @end
 
 #pragma mark TKApplication(TKApplicationEvent)
 
@@ -259,11 +256,10 @@
 - (void) applicationDeactivate: (NSNotification *) notification
 {
 #ifdef TK_MAC_DEBUG_NOTIFICATIONS
     TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, notification);
 #endif
-    TkSuspendClipboard();
 }
 
 - (void) applicationShowHide: (NSNotification *) notification
 {
 #ifdef TK_MAC_DEBUG_NOTIFICATIONS
@@ -302,11 +298,11 @@
  *----------------------------------------------------------------------
  *
  * GenerateUpdates --
  *
  *	Given a Macintosh update region and a Tk window this function geneates
- *	a X Expose event for the window if it is within the update region. The
+ *	an X Expose event for the window if it meets the update region. The
  *	function will then recursivly have each damaged window generate Expose
  *	events for its child windows.
  *
  * Results:
  *	True if event(s) are generated - false otherwise.
@@ -335,11 +331,11 @@
     if (!HIShapeIntersectsRect(updateRgn, &bounds)) {
 	return 0;
     }
 
     /*
-     * Compute the bounding box of the area that the damage occured in.
+     * Compute the bounding box of the area that the damage occurred in.
      */
 
     boundsRgn = HIShapeCreateWithRect(&bounds);
     damageRgn = HIShapeCreateIntersection(updateRgn, boundsRgn);
     if (HIShapeIsEmpty(damageRgn)) {
@@ -360,16 +356,16 @@
     event.xexpose.x = damageBounds.origin.x - bounds.origin.x;
     event.xexpose.y = damageBounds.origin.y - bounds.origin.y;
     event.xexpose.width = damageBounds.size.width;
     event.xexpose.height = damageBounds.size.height;
     event.xexpose.count = 0;
-    Tk_HandleEvent(&event);
+    Tk_QueueWindowEvent(&event, TCL_QUEUE_TAIL);
 
-    #ifdef TK_MAC_DEBUG_DRAWING
+#ifdef TK_MAC_DEBUG_DRAWING
     NSLog(@"Expose %p {{%d, %d}, {%d, %d}}", event.xany.window, event.xexpose.x,
 	event.xexpose.y, event.xexpose.width, event.xexpose.height);
-    #endif
+#endif
 
     /*
      * Generate updates for the children of this window
      */
 
@@ -582,14 +578,16 @@
 	    wmPtr->flags &= ~(WM_NEGATIVE_X | WM_NEGATIVE_Y);
 	}
 	if ((flags & TK_SIZE_CHANGED) && !(wmPtr->flags & WM_SYNC_PENDING) &&
 		((width != Tk_Width(tkwin)) || (height != Tk_Height(tkwin)))) {
 	    if ((wmPtr->width == -1) && (width == winPtr->reqWidth)) {
+
 		/*
 		 * Don't set external width, since the user didn't change it
 		 * from what the widgets asked for.
 		 */
+
 	    } else if (wmPtr->gridWin != NULL) {
 		wmPtr->width = wmPtr->reqGridWidth
 			+ (width - winPtr->reqWidth)/wmPtr->widthInc;
 		if (wmPtr->width < 0) {
 		    wmPtr->width = 0;
@@ -597,14 +595,16 @@
 	    } else {
 		wmPtr->width = width;
 	    }
 
 	    if ((wmPtr->height == -1) && (height == winPtr->reqHeight)) {
+
 		/*
 		 * Don't set external height, since the user didn't change it
 		 * from what the widgets asked for.
 		 */
+
 	    } else if (wmPtr->gridWin != NULL) {
 		wmPtr->height = wmPtr->reqGridHeight
 			+ (height - winPtr->reqHeight)/wmPtr->heightInc;
 		if (wmPtr->height < 0) {
 		    wmPtr->height = 0;
@@ -747,21 +747,11 @@
  */
 
 int
 Tk_MacOSXIsAppInFront(void)
 {
-    Boolean isFrontProcess = true;
-#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
-    ProcessSerialNumber frontPsn, ourPsn = {0, kCurrentProcess};
-
-    if (noErr == GetFrontProcess(&frontPsn)){
-	SameProcess(&frontPsn, &ourPsn, &isFrontProcess);
-    }
-#else
-    isFrontProcess = [NSRunningApplication currentApplication].active;
-#endif
-    return (isFrontProcess == true);
+    return ([NSRunningApplication currentApplication].active == true);
 }
 
 #pragma mark TKContentView
 
 #import <ApplicationServices/ApplicationServices.h>
@@ -826,21 +816,11 @@
     while (rectsBeingDrawnCount--) {
 	CGRect r = NSRectToCGRect(*rectsBeingDrawn++);
 	r.origin.y = height - (r.origin.y + r.size.height);
 	HIShapeUnionWithRect(drawShape, &r);
     }
-    if (CFRunLoopGetMain() == CFRunLoopGetCurrent()) {
-	[self generateExposeEvents:(HIShapeRef)drawShape];
-    } else {
-	[self performSelectorOnMainThread:@selector(generateExposeEvents:)
-		withObject:(id)drawShape waitUntilDone:NO
-		modes:[NSArray arrayWithObjects:NSRunLoopCommonModes,
-
-			NSEventTrackingRunLoopMode, NSModalPanelRunLoopMode,
-			nil]];
-    }
-
+    [self generateExposeEvents:(HIShapeRef)drawShape];
     CFRelease(drawShape);
 }
 
 -(void) setFrameSize: (NSSize)newsize
 {
@@ -852,105 +832,162 @@
 	unsigned int width = (unsigned int)newsize.width;
 	unsigned int height=(unsigned int)newsize.height;
 	ClientData oldArg;
     	Tk_RestrictProc *oldProc;
 
-	/* This can be called from outside the Tk event loop.
-	 * Since it calls Tcl_DoOneEvent, we need to make sure we
-	 * don't clobber the AutoreleasePool set up by the caller.
-	 */
-	[NSApp setPoolProtected:YES];
-
-	/*
-	 * Try to prevent flickers and flashes.
-	 */
-	[w disableFlushWindow];
-	NSDisableScreenUpdates();
-
-	/* Disable Tk drawing until the window has been completely configured.*/
-	TkMacOSXSetDrawingEnabled(winPtr, 0);
-
-	 /* Generate and handle a ConfigureNotify event for the new size.*/
-	TkGenWMConfigureEvent(tkwin, Tk_X(tkwin), Tk_Y(tkwin), width, height,
-			      TK_SIZE_CHANGED | TK_MACOSX_HANDLE_EVENT_IMMEDIATELY);
-    	oldProc = Tk_RestrictEvents(ConfigureRestrictProc, NULL, &oldArg);
-	while (Tk_DoOneEvent(TK_X_EVENTS|TK_DONT_WAIT)) {}
-    	Tk_RestrictEvents(oldProc, oldArg, &oldArg);
-
-	/* Now that Tk has configured all subwindows we can create the clip regions. */
-	TkMacOSXSetDrawingEnabled(winPtr, 1);
-	TkMacOSXInvalClipRgns(tkwin);
-	TkMacOSXUpdateClipRgn(winPtr);
-
-	 /* Finally, generate and process expose events to redraw the window. */
-	HIRect bounds = NSRectToCGRect([self bounds]);
-	HIShapeRef shape = HIShapeCreateWithRect(&bounds);
-	[self generateExposeEvents: shape];
-	while (Tk_DoOneEvent(TK_ALL_EVENTS|TK_DONT_WAIT)) {}
-	[w enableFlushWindow];
-	[w flushWindowIfNeeded];
-	NSEnableScreenUpdates();
-	[NSApp setPoolProtected:NO];
-    }
-}
-
-/*
- * As insurance against bugs that might cause layout glitches during a live
- * resize, we redraw the window one more time at the end of the resize
- * operation.
- */
-
-- (void)viewDidEndLiveResize
-{
-    HIRect bounds = NSRectToCGRect([self bounds]);
-    HIShapeRef shape = HIShapeCreateWithRect(&bounds);
-    [super viewDidEndLiveResize];
-    [self generateExposeEvents: shape];
-}
-
-/* Core method of this class: generates expose events for redrawing.  If the
- * Tcl_ServiceMode is set to TCL_SERVICE_ALL then the expose events will be
- * immediately removed from the Tcl event loop and processed.  Typically, they
- * should be queued, however.
- */
-- (void) generateExposeEvents: (HIShapeRef) shape
-{
-    [self generateExposeEvents:shape childrenOnly:0];
-}
-
-- (void) generateExposeEvents: (HIShapeRef) shape
-		 childrenOnly: (int) childrenOnly
-{
-    TkWindow *winPtr = TkMacOSXGetTkWindow([self window]);
-    unsigned long serial;
-    CGRect updateBounds;
-    int updatesNeeded;
+	/*
+	 * This can be called from outside the Tk event loop.
+	 * Since it calls Tcl_DoOneEvent, we need to make sure we
+	 * don't clobber the AutoreleasePool set up by the caller.
+	 */
+
+	[NSApp _lockAutoreleasePool];
+
+	/*
+	 * Disable Tk drawing until the window has been completely configured.
+	 */
+
+	TkMacOSXSetDrawingEnabled(winPtr, 0);
+
+	 /*
+	  * Generate and handle a ConfigureNotify event for the new size.
+	  */
+
+	TkGenWMConfigureEvent(tkwin, Tk_X(tkwin), Tk_Y(tkwin), width, height,
+			      TK_SIZE_CHANGED | TK_MACOSX_HANDLE_EVENT_IMMEDIATELY);
+    	oldProc = Tk_RestrictEvents(ConfigureRestrictProc, NULL, &oldArg);
+    	Tk_RestrictEvents(oldProc, oldArg, &oldArg);
+
+	/*
+	 * Now that Tk has configured all subwindows, create the clip regions.
+	 */
+
+	TkMacOSXSetDrawingEnabled(winPtr, 1);
+	TkMacOSXInvalClipRgns(tkwin);
+	TkMacOSXUpdateClipRgn(winPtr);
+
+	 /*
+	  * Finally, generate and process expose events to redraw the window.
+	  */
+
+	HIRect bounds = NSRectToCGRect([self bounds]);
+	HIShapeRef shape = HIShapeCreateWithRect(&bounds);
+	[self generateExposeEvents: shape];
+	[w displayIfNeeded];
+	[NSApp _unlockAutoreleasePool];
+    }
+}
+
+/*
+ * Core method of this class: generates expose events for redrawing.  The
+ * expose events are immediately removed from the Tcl event loop and processed.
+ * This causes drawing procedures to be scheduled as idle events.  Then all
+ * pending idle events are processed so the drawing will actually take place.
+ */
+
+- (void) generateExposeEvents: (HIShapeRef) shape
+{
+    unsigned long serial;
+    CGRect updateBounds;
+    int updatesNeeded;
+    TkWindow *winPtr = TkMacOSXGetTkWindow([self window]);
 
     if (!winPtr) {
 		return;
     }
 
-    /* Generate Tk Expose events. */
+    /*
+     * Generate Tk Expose events.
+     */
+
     HIShapeGetBounds(shape, &updateBounds);
-    /* All of these events will share the same serial number. */
+
+    /*
+     * All of these events will share the same serial number.
+     */
+
     serial = LastKnownRequestProcessed(Tk_Display(winPtr));
     updatesNeeded = GenerateUpdates(shape, &updateBounds, winPtr);
 
-    /* Process the Expose events if the service mode is TCL_SERVICE_ALL */
-    if (updatesNeeded && Tcl_GetServiceMode() == TCL_SERVICE_ALL) {
+    if (updatesNeeded) {
+
+	/*
+	 * First process all of the Expose events.
+	 */
+
 	ClientData oldArg;
     	Tk_RestrictProc *oldProc = Tk_RestrictEvents(ExposeRestrictProc,
 						     UINT2PTR(serial), &oldArg);
-    	while (Tcl_ServiceEvent(TCL_WINDOW_EVENTS)) {}
+    	while (Tcl_ServiceEvent(TCL_WINDOW_EVENTS)) {};
     	Tk_RestrictEvents(oldProc, oldArg, &oldArg);
+
+	/*
+	 * Starting with OSX 10.14, which uses Core Animation to draw windows,
+	 * all drawing must be done within the drawRect method.  (The CGContext
+	 * which draws to the backing CALayer is created by the NSView before
+	 * calling drawRect, and destroyed when drawRect returns.  Drawing done
+	 * with the current CGContext outside of the drawRect method has no
+	 * effect.)
+	 *
+	 * Fortunately, Tk schedules all drawing to be done while Tcl is idle.
+	 * So we can do the drawing by processing all of the idle events that
+	 * were created when the expose events were processed.
+	 */
+
+	while (Tcl_DoOneEvent(TCL_IDLE_EVENTS)) {}
+    }
+}
+
+
+/*
+ * These two methods allow Tk to register a virtual event which fires when the
+ * appearance changes on 10.14.
+ */
+
+- (void) viewDidChangeEffectiveAppearance
+{
+    [self updateAppearanceEvent];
+}
+
+- (void) updateAppearanceEvent
+{
+    NSString *osxMode = [[NSUserDefaults standardUserDefaults] stringForKey:@"AppleInterfaceStyle"];
+    NSWindow *w = [self window];
+    TkWindow *winPtr = TkMacOSXGetTkWindow(w);
+    XVirtualEvent event;
+    int x, y;
+    Tk_Window tkwin = (Tk_Window) winPtr;
+    bzero(&event, sizeof(XVirtualEvent));
+    event.type = VirtualEvent;
+    event.serial = LastKnownRequestProcessed(Tk_Display(tkwin));
+    event.send_event = false;
+    event.display = Tk_Display(tkwin);
+    event.event = Tk_WindowId(tkwin);
+    event.root = XRootWindow(Tk_Display(tkwin), 0);
+    event.subwindow = None;
+    event.time = TkpGetMS();
+    XQueryPointer(NULL, winPtr->window, NULL, NULL,
+    		  &event.x_root, &event.y_root, &x, &y, &event.state);
+    Tk_TopCoordsToWindow(tkwin, x, y, &event.x, &event.y);
+    event.same_screen = true;
+    if (osxMode == nil) {
+	event.name = Tk_GetUid("LightAqua");
+	Tk_QueueWindowEvent((XEvent *) &event, TCL_QUEUE_TAIL);
+	return;
+    }
+    if ([osxMode isEqual:@"Dark"]) {
+	event.name = Tk_GetUid("DarkAqua");
+	Tk_QueueWindowEvent((XEvent *) &event, TCL_QUEUE_TAIL);
+	return;
     }
 }
 
 /*
  * This is no-op on 10.7 and up because Apple has removed this widget,
  * but we are leaving it here for backwards compatibility.
  */
+
 - (void) tkToolbarButton: (id) sender
 {
 #ifdef TK_MAC_DEBUG_EVENTS
     TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd);
 #endif
@@ -976,18 +1013,12 @@
 }
 
 - (BOOL) isOpaque
 {
     NSWindow *w = [self window];
-
-    if (opaqueTag) {
-      return YES;
-	} else {
-
-     return (w && (([w styleMask] & NSTexturedBackgroundWindowMask) ||
+      return (w && (([w styleMask] & NSTexturedBackgroundWindowMask) ||
     	    ![w isOpaque]) ? NO : YES);
-    }
 }
 
 - (BOOL) wantsDefaultClipping
 {
     return NO;

Index: macosx/tkMacOSXWm.c
==================================================================
--- macosx/tkMacOSXWm.c
+++ macosx/tkMacOSXWm.c
@@ -8,10 +8,11 @@
  *
  * Copyright (c) 1994-1997 Sun Microsystems, Inc.
  * Copyright 2001-2009, Apple Inc.
  * Copyright (c) 2006-2009 Daniel A. Steffen <das@users.sourceforge.net>
  * Copyright (c) 2010 Kevin Walzer/WordTech Communications LLC.
+ * Copyright (c) 2017 Marc Culler.
  *
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
 
@@ -18,10 +19,11 @@
 #include "tkMacOSXPrivate.h"
 #include "tkScrollbar.h"
 #include "tkMacOSXWm.h"
 #include "tkMacOSXEvent.h"
 #include "tkMacOSXDebug.h"
+#include "tkMacOSXConstants.h"
 
 #define DEBUG_ZOMBIES 0
 
 /*
 #ifdef TK_MAC_DEBUG
@@ -51,13 +53,10 @@
 	| kWindowOpaqueForEventsAttribute   | kWindowIgnoreClicksAttribute \
 	| kWindowDoesNotCycleAttribute	    | tkWindowDoesNotHideAttribute \
 	| tkCanJoinAllSpacesAttribute	    | tkMoveToActiveSpaceAttribute \
 	| tkNonactivatingPanelAttribute	    | tkHUDWindowAttribute)
 
-/*Objects for use in setting background color and opacity of window.*/
-NSColor *colorName = NULL;
-BOOL opaqueTag = FALSE;
 
 static const struct {
     const UInt64 validAttrs, defaultAttrs, forceOnAttrs, forceOffAttrs;
     int flags; NSUInteger styleMask;
 } macClassAttrs[] = {
@@ -195,11 +194,10 @@
 
 static Tcl_HashTable windowTable;
 static int windowHashInit = false;
 
 
-
 #pragma mark NSWindow(TKWm)
 
 /*
  * Conversion of coordinates between window and screen.
  */
@@ -212,11 +210,10 @@
 }
 - (NSPoint) convertPointFromScreen: (NSPoint)point
 {
     return [self convertScreenToBase:point];
 }
-@end
 #else
 - (NSPoint) convertPointToScreen: (NSPoint) point
 {
     NSRect pointrect;
     pointrect.origin = point;
@@ -230,12 +227,28 @@
     pointrect.origin = point;
     pointrect.size.width = 0;
     pointrect.size.height = 0;
     return [self convertRectFromScreen:pointrect].origin;
 }
-@end
 #endif
+
+- (NSSize)windowWillResize:(NSWindow *)sender
+                    toSize:(NSSize)frameSize
+{
+    NSRect currentFrame = [sender frame];
+    TkWindow *winPtr = TkMacOSXGetTkWindow(sender);
+    if (winPtr) {
+	if (winPtr->wmInfoPtr->flags & WM_WIDTH_NOT_RESIZABLE) {
+	    frameSize.width = currentFrame.size.width;
+	}
+	if (winPtr->wmInfoPtr->flags & WM_HEIGHT_NOT_RESIZABLE) {
+	    frameSize.height = currentFrame.size.height;
+	}
+    }
+    return frameSize;
+}
+@end
 
 #pragma mark -
 
 
 /*
@@ -362,29 +375,51 @@
 static void		GetMaxSize(TkWindow *winPtr, int *maxWidthPtr,
 			    int *maxHeightPtr);
 static void		RemapWindows(TkWindow *winPtr,
 			    MacDrawable *parentWin);
 
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
-#define TK_GOT_AT_LEAST_SNOW_LEOPARD 1
-#endif
-
 #pragma mark TKWindow(TKWm)
 
-#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
-@interface NSWindow(TkWm)
-- (void) setCanCycle: (BOOL) canCycleFlag;
-@end
-#endif
-
 @interface NSDrawerWindow : NSWindow
 {
     id _i1, _i2;
 }
 @end
 
-@implementation TKWindow
+
+@implementation TKWindow: NSWindow
+#if MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_12
+/*
+ * Override automatic fullscreen button on >10.12 because system fullscreen API
+ * confuses Tk window geometry. Custom implementation setting fullscreen status using
+ * Tk API and NSStatusItem in menubar to exit fullscreen status.
+ */
+
+NSStatusItem *exitFullScreen;
+
+- (void)toggleFullScreen:(id)sender
+{
+    TkWindow *winPtr = TkMacOSXGetTkWindow(self);
+    Tcl_Interp *interp = Tk_Interp((Tk_Window)winPtr);
+
+    if (([self styleMask] & NSFullScreenWindowMask) == NSFullScreenWindowMask) {
+    	TkMacOSXMakeFullscreen(winPtr, self, 0, interp);
+    } else {
+    	TkMacOSXMakeFullscreen(winPtr, self, 1, interp);
+    }
+}
+
+-(void)restoreOldScreen:(id)sender {
+
+    TkWindow *winPtr = TkMacOSXGetTkWindow(self);
+    Tcl_Interp *interp = Tk_Interp((Tk_Window)winPtr);
+
+    TkMacOSXMakeFullscreen(winPtr, self, 0, interp);
+    [[NSStatusBar systemStatusBar] removeStatusItem: exitFullScreen];
+}
+
+#endif
 @end
 
 @implementation TKWindow(TKWm)
 
 - (BOOL) canBecomeKeyWindow
@@ -393,10 +428,12 @@
 
     return (winPtr && winPtr->wmInfoPtr && (winPtr->wmInfoPtr->macClass ==
 	    kHelpWindowClass || winPtr->wmInfoPtr->attributes &
 	    kWindowNoActivatesAttribute)) ? NO : YES;
 }
+
+
 
 #if DEBUG_ZOMBIES
 - (id) retain
 {
     id result = [super retain];
@@ -410,11 +447,10 @@
     return result;
 }
 
 - (id) autorelease
 {
-    static int xcount = 0;
     id result = [super autorelease];
     const char *title = [[self title] UTF8String];
     if (title == nil) {
 	title = "unnamed window";
     }
@@ -765,10 +801,14 @@
      * Map the window.
      */
 
     XMapWindow(winPtr->display, winPtr->window);
 
+    /*Add window to Window menu.*/
+    NSWindow *win = TkMacOSXDrawableWindow(winPtr->window);
+    [win setExcludedFromWindowsMenu:NO];
+
 }
 
 /*
  *----------------------------------------------------------------------
  *
@@ -875,35 +915,55 @@
     if (window && !Tk_IsEmbedded(winPtr) ) {
 	NSWindow *parent = [window parentWindow];
 	if (parent) {
 	    [parent removeChildWindow:window];
 	}
-	[window close];
-	TkMacOSXUnregisterMacWindow(window);
-        if (winPtr->window) {
-            ((MacDrawable *) winPtr->window)->view = nil;
-        }
 #if DEBUG_ZOMBIES > 0
 	{
 	    const char *title = [[window title] UTF8String];
 	    if (title == nil) {
 		title = "unnamed window";
 	    }
 	    printf(">>>> Closing <%s>. Count is: %lu\n", title, [window retainCount]);
 	}
 #endif
-        [window release];
+	[window close];
+	TkMacOSXUnregisterMacWindow(window);
+        if (winPtr->window) {
+            ((MacDrawable *) winPtr->window)->view = nil;
+        }
 	wmPtr->window = NULL;
+        [window release];
 
 	/* Activate the highest window left on the screen. */
 	NSArray *windows = [NSApp orderedWindows];
-	if ( [windows count] > 0 ) {
-	    NSWindow *front = [windows objectAtIndex:0];
-	    if ( front && [front canBecomeKeyWindow] ) {
-		[front makeKeyAndOrderFront:NSApp];
+	for (id nswindow in windows) {
+	    TkWindow *winPtr2 = TkMacOSXGetTkWindow(nswindow);
+	    if (winPtr2 && nswindow != window) {
+		WmInfo *wmPtr = winPtr2->wmInfoPtr;
+		BOOL minimized = (wmPtr->hints.initial_state == IconicState ||
+				  wmPtr->hints.initial_state == WithdrawnState);
+		/*
+		 * If no windows are left on the screen and the next
+		 * window is iconified or withdrawn, we don't want to
+		 * make it be the KeyWindow because that would cause
+		 * it to be displayed on the screen.
+		 */
+		if ([nswindow canBecomeKeyWindow] && !minimized) {
+		    [nswindow makeKeyAndOrderFront:NSApp];
+		    break;
+		}
 	    }
 	}
+	/*
+	 * Process all window events immediately to force the closed window to
+	 * be deallocated.  But don't do this for the root window as that is
+	 * unnecessary and can lead to segfaults.
+	 */
+	if (winPtr->parentPtr) {
+	    while (Tk_DoOneEvent(TK_WINDOW_EVENTS|TK_DONT_WAIT)) {}
+	}
 	[NSApp _resetAutoreleasePool];
 
 #if DEBUG_ZOMBIES > 0
 	fprintf(stderr, "================= Pool dump ===================\n");
 	[NSAutoreleasePool showPools];
@@ -1933,11 +1993,11 @@
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
     register WmInfo *wmPtr = winPtr->wmInfoPtr;
     int reqWidth, reqHeight, widthInc, heightInc;
-    char *errorMsg;
+    const char *errorMsg;
 
     if ((objc != 3) && (objc != 7)) {
 	Tcl_WrongNumArgs(interp, 2, objv,
 		"window ?baseWidth baseHeight widthInc heightInc?");
 	return TCL_ERROR;
@@ -2312,18 +2372,18 @@
  *----------------------------------------------------------------------
  *
  * WmIconphotoCmd --
  *
  *	This procedure is invoked to process the "wm iconphoto" Tcl command.
- *	See the user documentation for details on what it does. Not yet
- *	implemented for OS X.
+ *	See the user documentation for details on what it does.
  *
  * Results:
  *	A standard Tcl result.
  *
  * Side effects:
  *	See the user documentation.
+ *
  *
  *----------------------------------------------------------------------
  */
 
 static int
@@ -2332,49 +2392,56 @@
     TkWindow *winPtr,		/* Toplevel to work with */
     Tcl_Interp *interp,		/* Current interpreter. */
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
-    Tk_PhotoHandle photo;
-    int i, width, height, isDefault = 0;
+    Tk_Image tk_icon;
+    int width, height, isDefault = 0;
 
     if (objc < 4) {
 	Tcl_WrongNumArgs(interp, 2, objv,
-		"window ?-default? image1 ?image2 ...?");
+			 "window ?-default? image1 ?image2 ...?");
 	return TCL_ERROR;
     }
+
+     /*Parse args.*/
     if (strcmp(Tcl_GetString(objv[3]), "-default") == 0) {
 	isDefault = 1;
 	if (objc == 4) {
 	    Tcl_WrongNumArgs(interp, 2, objv,
-		    "window ?-default? image1 ?image2 ...?");
+			     "window ?-default? image1 ?image2 ...?");
 	    return TCL_ERROR;
 	}
     }
 
-    /*
-     * Iterate over all images to retrieve their sizes, in order to allocate a
-     * buffer large enough to hold all images.
-     */
-
-    for (i = 3 + isDefault; i < objc; i++) {
-	photo = Tk_FindPhoto(interp, Tcl_GetString(objv[i]));
-	if (photo == NULL) {
-	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-		    "can't use \"%s\" as iconphoto: not a photo image",
-		    Tcl_GetString(objv[i])));
-	    Tcl_SetErrorCode(interp, "TK", "WM", "ICONPHOTO", "PHOTO", NULL);
-	    return TCL_ERROR;
-	}
-	Tk_PhotoGetSize(photo, &width, &height);
-    }
-
-    /*
-     * TODO: This requires implementation for OS X, but we silently return for
-     * now.
-     */
-
+     /*Get icon name. We only use the first icon name because macOS does not
+     support multiple images in Tk photos.*/
+    char *icon;
+    if (strcmp(Tcl_GetString(objv[3]), "-default") == 0) {
+	icon = Tcl_GetString(objv[4]);
+    }	else {
+	icon = Tcl_GetString(objv[3]);
+    }
+
+    /*Get image and convert to NSImage that can be displayed as icon.*/
+    tk_icon = Tk_GetImage(interp, tkwin, icon, NULL, NULL);
+    if (tk_icon == NULL) {
+    	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+	      "can't use \"%s\" as iconphoto: not a photo image",
+	      icon));
+	Tcl_SetErrorCode(interp, "TK", "WM", "ICONPHOTO", "PHOTO", NULL);
+	return TCL_ERROR;
+    }
+
+    NSImage *newIcon;
+    Tk_SizeOfImage(tk_icon, &width, &height);
+    newIcon = TkMacOSXGetNSImageWithTkImage(winPtr->display, tk_icon, width, height);
+    Tk_FreeImage(tk_icon);
+    if (newIcon == NULL) {
+	return TCL_ERROR;
+    }
+    [NSApp setApplicationIconImage: newIcon];
     return TCL_OK;
 }
 
 /*
  *----------------------------------------------------------------------
@@ -2891,21 +2958,24 @@
 	    if (prevPtr == NULL) {
 		wmPtr->protPtr = protPtr->nextPtr;
 	    } else {
 		prevPtr->nextPtr = protPtr->nextPtr;
 	    }
+	    if (protPtr->command)
+		ckfree(protPtr->command);
 	    Tcl_EventuallyFree(protPtr, TCL_DYNAMIC);
 	    break;
 	}
     }
     cmd = Tcl_GetStringFromObj(objv[4], &cmdLength);
     if (cmdLength > 0) {
-	protPtr = ckalloc(HANDLER_SIZE(cmdLength));
+	protPtr = ckalloc(sizeof(ProtocolHandler));
 	protPtr->protocol = protocol;
 	protPtr->nextPtr = wmPtr->protPtr;
 	wmPtr->protPtr = protPtr;
 	protPtr->interp = interp;
+	protPtr->command = ckalloc(cmdLength+1);
 	strcpy(protPtr->command, cmd);
     }
     return TCL_OK;
 }
 
@@ -3390,40 +3460,48 @@
 	wmPtr->masterWindowName = NULL;
     } else {
 	if (TkGetWindowFromObj(interp, tkwin, objv[3], &master) != TCL_OK) {
 	    return TCL_ERROR;
 	}
-	Tk_MakeWindowExist(master);
+	TkWindow* masterPtr = (TkWindow*) master;
+	while (!Tk_TopWinHierarchy(masterPtr)) {
+            /*
+             * Ensure that the master window is actually a Tk toplevel.
+             */
+
+            masterPtr = masterPtr->parentPtr;
+        }
+	Tk_MakeWindowExist((Tk_Window)masterPtr);
 
 	if (wmPtr->iconFor != NULL) {
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "can't make \"%s\" a transient: it is an icon for %s",
 		    Tcl_GetString(objv[2]), Tk_PathName(wmPtr->iconFor)));
 	    Tcl_SetErrorCode(interp, "TK", "WM", "TRANSIENT", "ICON", NULL);
 	    return TCL_ERROR;
 	}
 
-	wmPtr2 = ((TkWindow *) master)->wmInfoPtr;
-
+	wmPtr2 = masterPtr->wmInfoPtr;
 	/* Under some circumstances, wmPtr2 is NULL here */
 	if (wmPtr2 != NULL && wmPtr2->iconFor != NULL) {
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "can't make \"%s\" a master: it is an icon for %s",
 		    Tcl_GetString(objv[3]), Tk_PathName(wmPtr2->iconFor)));
 	    Tcl_SetErrorCode(interp, "TK", "WM", "TRANSIENT", "ICON", NULL);
 	    return TCL_ERROR;
 	}
 
-	if ((TkWindow *) master == winPtr) {
+	if (masterPtr == winPtr) {
 	    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		    "can't make \"%s\" its own master", Tk_PathName(winPtr)));
 	    Tcl_SetErrorCode(interp, "TK", "WM", "TRANSIENT", "SELF", NULL);
 	    return TCL_ERROR;
 	}
 
-	wmPtr->master = Tk_WindowId(master);
-	masterWindowName = Tcl_GetStringFromObj(objv[3], &length);
+	wmPtr->master = Tk_WindowId(masterPtr);
+	masterWindowName = masterPtr->pathName;
+	length = strlen(masterWindowName);
 	if (wmPtr->masterWindowName != NULL) {
 	    ckfree(wmPtr->masterWindowName);
 	}
 	wmPtr->masterWindowName = ckalloc(length+1);
 	strcpy(wmPtr->masterWindowName, masterWindowName);
@@ -3470,10 +3548,14 @@
 		Tcl_GetString(objv[2]), Tk_PathName(wmPtr->iconFor)));
 	Tcl_SetErrorCode(interp, "TK", "WM", "WITHDRAW", "ICON", NULL);
 	return TCL_ERROR;
     }
     TkpWmSetState(winPtr, WithdrawnState);
+    /*Remove window from Window menu.*/
+    NSWindow *win = TkMacOSXDrawableWindow(winPtr->window);
+    [win setExcludedFromWindowsMenu:YES];
+
     return TCL_OK;
 }
 
 /*
  * Invoked by those wm subcommands that affect geometry.
@@ -4207,19 +4289,11 @@
 	     * The container window is in the same application. Query its
 	     * coordinates.
 	     */
 
 	    winPtr = otherPtr;
-
-	    /*
-	     * Remember to offset by the container window here, since at the
-	     * end of this if branch, we will pop out to the container's
-	     * parent...
-	     */
-
-	    x += winPtr->changes.x + winPtr->changes.border_width;
-	    y += winPtr->changes.y + winPtr->changes.border_width;
+            continue;
 	}
 	winPtr = winPtr->parentPtr;
     }
     *xPtr = x;
     *yPtr = y;
@@ -4630,48 +4704,54 @@
     TkWindow *otherPtr)		/* Window relative to which to restack; if
 				 * NULL, then winPtr gets restacked above or
 				 * below *all* siblings. */
 {
     NSWindow *macWindow;
-    NSInteger otherMacWindowNumber;
-
-    /*
-     * Get the mac window. Make sure it exists & is mapped.
-     */
-
-    if (winPtr->window == None) {
-	Tk_MakeWindowExist((Tk_Window) winPtr);
-    }
-    if (winPtr->wmInfoPtr->flags & WM_NEVER_MAPPED) {
-	/*
-	 * Can't set stacking order properly until the window is on the screen
-	 * (mapping it may give it a reparent window), so make sure it's on
-	 * the screen.
-	 */
-
-	TkWmMapWindow(winPtr);
+    NSWindow *otherMacWindow;
+    WmInfo *wmPtr = winPtr->wmInfoPtr;
+    int macAboveBelow = (aboveBelow == Above ? NSWindowAbove : NSWindowBelow);
+    int otherNumber = 0; /* 0 will be used when otherPtr is NULL. */
+
+    /*
+     * If the Tk windows has no drawable, or is withdrawn do nothing.
+     */
+    if (winPtr->window == None ||
+	wmPtr == NULL          ||
+	wmPtr->hints.initial_state == WithdrawnState) {
+	return;
     }
     macWindow = TkMacOSXDrawableWindow(winPtr->window);
+    if (macWindow == nil) {
+	return;
+    }
+    if (otherPtr) {
+	/*
+	 * When otherPtr is non-NULL, if the other window has no
+	 * drawable or is withdrawn, do nothing.
+	 */
+	WmInfo *otherWmPtr = otherPtr->wmInfoPtr;
+	if (winPtr->window == None ||
+	    otherWmPtr == NULL     ||
+	    otherWmPtr->hints.initial_state == WithdrawnState) {
+	return;
+	}
+	otherMacWindow = TkMacOSXDrawableWindow(otherPtr->window);
+	if (otherMacWindow == nil) {
+	    return;
+	} else {
+	    /*
+	     * If the other window is OK, get its number.
+	     */
+	    otherNumber = [otherMacWindow windowNumber];
+	}
+    }
 
     /*
-     * Get the window in which a raise or lower is in relation to.
+     * Just let the Mac window manager deal with all the subtleties
+     * of keeping track of off-screen windows, etc.
      */
-
-    if (otherPtr != NULL) {
-	if (otherPtr->window == None) {
-	    Tk_MakeWindowExist((Tk_Window) otherPtr);
-	}
-	if (otherPtr->wmInfoPtr->flags & WM_NEVER_MAPPED) {
-	    TkWmMapWindow(otherPtr);
-	}
-	otherMacWindowNumber = [TkMacOSXDrawableWindow(otherPtr->window)
-		windowNumber];
-    } else {
-	otherMacWindowNumber = 0;
-    }
-    [macWindow orderWindow:(aboveBelow == Above ? NSWindowAbove : NSWindowBelow)
-	    relativeTo:otherMacWindowNumber];
+    [macWindow orderWindow:macAboveBelow relativeTo:otherNumber];
 }
 
 /*
  *----------------------------------------------------------------------
  *
@@ -5087,12 +5167,12 @@
 /*
  *----------------------------------------------------------------------
  *
  * TkMacOSXIsWindowZoomed --
  *
- *	Ask Carbon if the given window is in the zoomed out state. Because
- *	dragging & growing a window can change the Carbon zoom state, we
+ *	Ask Cocoa if the given window is in the zoomed out state. Because
+ *	dragging & growing a window can change the Cocoa zoom state, we
  *	cannot rely on wmInfoPtr->hints.initial_state for this information.
  *
  * Results:
  *	True if window is zoomed out, false otherwise.
  *
@@ -5106,10 +5186,11 @@
 TkMacOSXIsWindowZoomed(
     TkWindow *winPtr)
 {
     return [TkMacOSXDrawableWindow(winPtr->window) isZoomed];
 }
+
 
 /*
  *----------------------------------------------------------------------
  *
  * TkMacOSXZoomToplevel --
@@ -5148,16 +5229,17 @@
 
     /*
      * Do nothing if already in desired zoom state.
      */
 
-    if (![window isZoomed] == (zoomPart == inZoomIn)) {
+    if ((![window isZoomed] == (zoomPart == inZoomIn))) {
 	return false;
     }
-    [window zoom:NSApp];
-    wmPtr->hints.initial_state =
-	    (zoomPart == inZoomIn ? NormalState : ZoomState);
+      [window zoom:NSApp];
+
+     wmPtr->hints.initial_state =
+    	    (zoomPart == inZoomIn ? NormalState : ZoomState);
     return true;
 }
 
 /*
  *----------------------------------------------------------------------
@@ -5191,58 +5273,17 @@
     enum SubCmds {
 	TKMWS_STYLE
     };
     Tk_Window tkwin = clientData;
     TkWindow *winPtr;
-    int index, i;
+    int index;
 
     if (objc < 3) {
 	Tcl_WrongNumArgs(interp, 1, objv, "option window ?arg ...?");
 	return TCL_ERROR;
     }
 
-    /*
-     * Iterate through objc/objv to set correct background color and toggle
-     * opacity of window.
-     */
-
-    for (i= 0; i < objc; i++) {
-    	if (Tcl_StringMatch(Tcl_GetString(objv[i]), "*black*")) {
-    	    colorName = [NSColor blackColor];	// use #000000 in Tk scripts to match
-    	} else if (Tcl_StringMatch(Tcl_GetString(objv[i]), "*dark*")) {
-    	    colorName = [NSColor darkGrayColor]; //use #545454 in Tk scripts to match
-    	} else if (Tcl_StringMatch(Tcl_GetString(objv[i]), "*light*")) {
-    	    colorName = [NSColor lightGrayColor]; //use #ababab in Tk scripts to match
-    	} else if (Tcl_StringMatch(Tcl_GetString(objv[i]), "*white*")) {
-    	    colorName = [NSColor whiteColor];	//use #ffffff in Tk scripts to match
-    	} else if (Tcl_StringMatch(Tcl_GetString(objv[i]), "gray*")) {
-    	    colorName = [NSColor grayColor];	//use #7f7f7f in Tk scripts to match
-    	} else if (Tcl_StringMatch(Tcl_GetString(objv[i]), "*red*")) {
-    	    colorName = [NSColor redColor];	//use #ff0000 in Tk scripts to match
-    	} else if (Tcl_StringMatch(Tcl_GetString(objv[i]), "*green*")) {
-    	    colorName = [NSColor greenColor];	//use #00ff00 in Tk scripts to match
-    	} else if (Tcl_StringMatch(Tcl_GetString(objv[i]), "*blue*")) {
-    	    colorName = [NSColor blueColor];	//use #0000ff in Tk scripts to match
-    	} else if (Tcl_StringMatch(Tcl_GetString(objv[i]), "*cyan*")) {
-    	    colorName = [NSColor cyanColor];	//use #00ffff in Tk scripts to match
-    	} else if (Tcl_StringMatch(Tcl_GetString(objv[i]), "*yellow*")) {
-    	    colorName = [NSColor yellowColor];	//use #ffff00 in Tk scripts to match
-    	} else if (Tcl_StringMatch(Tcl_GetString(objv[i]), "*magenta*")) {
-    	    colorName = [NSColor magentaColor];	//use #ff00ff in Tk scripts to match
-    	} else if (Tcl_StringMatch(Tcl_GetString(objv[i]), "*orange*")) {
-    	    colorName = [NSColor orangeColor];	//use #ff8000 in Tk scripts to match
-    	} else if (Tcl_StringMatch(Tcl_GetString(objv[i]), "*purple*")) {
-    	    colorName = [NSColor purpleColor];	//use #800080 in Tk scripts to match
-    	} else if (Tcl_StringMatch(Tcl_GetString(objv[i]), "*brown*")){
-    	    colorName = [NSColor brownColor];	//use #996633 in Tk scripts to match
-    	} else if (Tcl_StringMatch(Tcl_GetString(objv[i]), "*clear*")) {
-    	    colorName = [NSColor clearColor];	//use systemTransparent in Tk scripts to match
-    	}
-    	if (Tcl_StringMatch(Tcl_GetString(objv[i]), "*opacity*")) {
-    	    opaqueTag = YES;
-    	}
-    }
 
     winPtr = (TkWindow *)
 	    Tk_NameToWindow(interp, Tcl_GetString(objv[2]), tkwin);
     if (winPtr == NULL) {
 	return TCL_ERROR;
@@ -5613,30 +5654,16 @@
 	[(NSPanel*)window setFloatingPanel:YES];
     }
     if ((styleMask & (NSTexturedBackgroundWindowMask|NSHUDWindowMask)) &&
 	    !(styleMask & NSDocModalWindowMask)) {
         /*
-	 * Workaround for [Bug 2824538]: Texured windows are draggable
+	 * Workaround for [Bug 2824538]: Textured windows are draggable
 	 *                               from opaque content.
 	 */
 	[window setMovableByWindowBackground:NO];
     }
 
-
-    /* Set background color and opacity of window if those flags are set.  */
-    if (colorName != NULL) {
-    	[window setBackgroundColor: colorName];
-    }
-
-    if (opaqueTag) {
-#ifdef TK_GOT_AT_LEAST_SNOW_LEOPARD
-    	[window setOpaque: opaqueTag];
-#else
-	[window setOpaque: YES];
-#endif
-    }
-
     [window setDocumentEdited:NO];
     wmPtr->window = window;
     macWin->view = window.contentView;
     TkMacOSXApplyWindowAttributes(winPtr, window);
 
@@ -6270,16 +6297,19 @@
 	    [macWindow setShowsResizeIndicator:
 		    !!(newAttributes & kWindowResizableAttribute)];
 	    [[macWindow standardWindowButton:NSWindowZoomButton]
 		    setEnabled:(newAttributes & kWindowResizableAttribute) &&
 		    (newAttributes & kWindowFullZoomAttribute)];
-	    if (newAttributes & kWindowResizableAttribute) {
-		wmPtr->flags &= ~(WM_WIDTH_NOT_RESIZABLE |
-			WM_HEIGHT_NOT_RESIZABLE);
+	    if (newAttributes & kWindowHorizontalZoomAttribute) {
+		wmPtr->flags &= ~(WM_WIDTH_NOT_RESIZABLE);
+	    } else {
+		wmPtr->flags |= (WM_WIDTH_NOT_RESIZABLE);
+	    }
+	    if (newAttributes & kWindowVerticalZoomAttribute) {
+		wmPtr->flags &= ~(WM_HEIGHT_NOT_RESIZABLE);
 	    } else {
-		wmPtr->flags |= (WM_WIDTH_NOT_RESIZABLE |
-			WM_HEIGHT_NOT_RESIZABLE);
+		wmPtr->flags |= (WM_HEIGHT_NOT_RESIZABLE);
 	    }
 	    WmUpdateGeom(wmPtr, winPtr);
 	}
 	if ((changedAttributes & kWindowToolbarButtonAttribute) || initial) {
 	    [macWindow setShowsToolbarButton:
@@ -6323,28 +6353,16 @@
 	    if (newAttributes & tkCanJoinAllSpacesAttribute) {
 		b |= NSWindowCollectionBehaviorCanJoinAllSpaces;
 	    } else if (newAttributes & tkMoveToActiveSpaceAttribute) {
 		b |= NSWindowCollectionBehaviorMoveToActiveSpace;
 	    }
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
 	    if (newAttributes & kWindowDoesNotCycleAttribute) {
 		b |= NSWindowCollectionBehaviorIgnoresCycle;
 	    } else {
 		b |= NSWindowCollectionBehaviorParticipatesInCycle;
 	    }
-#endif
 	    [macWindow setCollectionBehavior:b];
-#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
-	    if (((changedAttributes & kWindowDoesNotCycleAttribute) || initial)
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1060
-		    && tkMacOSXMacOSXVersion < 1060
-#endif
-	    ) {
-		[macWindow setCanCycle:
-			!(newAttributes & kWindowDoesNotCycleAttribute)];
-	    }
-#endif
 	}
 	if ((wmPtr->flags & WM_TOPMOST) != (oldFlags & WM_TOPMOST)) {
 	    [macWindow setLevel:(wmPtr->flags & WM_TOPMOST) ?
 		    kCGUtilityWindowLevel : ([macWindow isKindOfClass:
 		    [NSPanel class]] && [macWindow isFloatingPanel] ?
@@ -6472,13 +6490,12 @@
     int fullscreen,
     Tcl_Interp *interp)
 {
     WmInfo *wmPtr = winPtr->wmInfoPtr;
     int result = TCL_OK, wasFullscreen = (wmPtr->flags & WM_FULLSCREEN);
-#ifdef TK_GOT_AT_LEAST_SNOW_LEOPARD
     static unsigned long prevMask = 0, prevPres = 0;
-#endif /*TK_GOT_AT_LEAST_SNOW_LEOPARD*/
+
 
     if (fullscreen) {
 	int screenWidth =  WidthOfScreen(Tk_Screen(winPtr));
 	int screenHeight = HeightOfScreen(Tk_Screen(winPtr));
 
@@ -6496,10 +6513,11 @@
 			"CONSTRAINT_FAILURE", NULL);
 	    }
 	    result = TCL_ERROR;
 	    wmPtr->flags &= ~WM_FULLSCREEN;
 	} else {
+	    Tk_UnmapWindow((Tk_Window) winPtr);
 	    NSRect bounds = [window contentRectForFrameRect:[window frame]];
 	    NSRect screenBounds = NSMakeRect(0, 0, screenWidth, screenHeight);
 
 	    if (!NSEqualRects(bounds, screenBounds) && !wasFullscreen) {
 		wmPtr->configX = wmPtr->x;
@@ -6508,40 +6526,42 @@
 		wmPtr->attributes &= ~kWindowResizableAttribute;
 		ApplyWindowAttributeFlagChanges(winPtr, window,
 			wmPtr->configAttributes, wmPtr->flags, 1, 0);
 		wmPtr->flags |= WM_SYNC_PENDING;
 		[window setFrame:[window frameRectForContentRect:
-			screenBounds] display:YES];
+					   screenBounds] display:YES];
 		wmPtr->flags &= ~WM_SYNC_PENDING;
 	    }
 	    wmPtr->flags |= WM_FULLSCREEN;
 	}
 
-#ifdef TK_GOT_AT_LEAST_SNOW_LEOPARD
-	/*
-	 * We can't set these features on Leopard or earlier, as they don't
-	 * exist (neither options nor API that uses them). This formally means
-	 * that there's a bug with full-screen windows with Tk on old OSX, but
-	 * it isn't worth blocking a build just for this.
-	 */
-
 	prevMask = [window styleMask];
 	prevPres = [NSApp presentationOptions];
-	[window setStyleMask: NSBorderlessWindowMask];
-	[NSApp setPresentationOptions: NSApplicationPresentationAutoHideDock
-	                          | NSApplicationPresentationAutoHideMenuBar];
-#endif /*TK_GOT_AT_LEAST_SNOW_LEOPARD*/
+	[window setStyleMask: NSFullScreenWindowMask];
+	[NSApp setPresentationOptions: NSApplicationPresentationAutoHideDock | NSApplicationPresentationAutoHideMenuBar];
+
+	/*Fullscreen implementation for 10.13 and later.*/
+	#if MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_12
+	exitFullScreen = [[[NSStatusBar systemStatusBar]
+				   statusItemWithLength:NSVariableStatusItemLength] retain];
+	NSImage *exitIcon = [NSImage imageNamed:@"NSExitFullScreenTemplate"];
+	[exitFullScreen setImage:exitIcon];
+	[exitFullScreen setHighlightMode:YES];
+	[exitFullScreen setToolTip:@"Exit Full Screen"];
+	[exitFullScreen setTarget:window];
+	[exitFullScreen setAction:@selector(restoreOldScreen:)];
+	#endif
+
+	Tk_MapWindow((Tk_Window) winPtr);
     } else {
 	wmPtr->flags &= ~WM_FULLSCREEN;
-
-#ifdef TK_GOT_AT_LEAST_SNOW_LEOPARD
 	[NSApp setPresentationOptions: prevPres];
 	[window setStyleMask: prevMask];
-#endif /*TK_GOT_AT_LEAST_SNOW_LEOPARD*/
     }
 
     if (wasFullscreen && !(wmPtr->flags & WM_FULLSCREEN)) {
+	Tk_UnmapWindow((Tk_Window) winPtr);
 	UInt64 oldAttributes = wmPtr->attributes;
 	NSRect bounds = NSMakeRect(wmPtr->configX, tkMacOSXZeroScreenHeight -
 		(wmPtr->configY + wmPtr->yInParent + wmPtr->configHeight),
 		wmPtr->xInParent + wmPtr->configWidth,
 		wmPtr->yInParent + wmPtr->configHeight);
@@ -6551,10 +6571,11 @@
 	ApplyWindowAttributeFlagChanges(winPtr, window, oldAttributes,
 		wmPtr->flags, 1, 0);
 	wmPtr->flags |= WM_SYNC_PENDING;
 	[window setFrame:[window frameRectForContentRect:bounds] display:YES];
 	wmPtr->flags &= ~WM_SYNC_PENDING;
+       Tk_MapWindow((Tk_Window) winPtr);
     }
     return result;
 }
 
 /*

Index: macosx/tkMacOSXWm.h
==================================================================
--- macosx/tkMacOSXWm.h
+++ macosx/tkMacOSXWm.h
@@ -27,19 +27,17 @@
     struct ProtocolHandler *nextPtr;
 				/* Next in list of protocol handlers for the
 				 * same top-level window, or NULL for end of
 				 * list. */
     Tcl_Interp *interp;		/* Interpreter in which to invoke command. */
-    char command[4];		/* Tcl command to invoke when a client message
+    char* command;		/* Tcl command to invoke when a client message
 				 * for this protocol arrives. The actual size
 				 * of the structure varies to accommodate the
 				 * needs of the actual command. THIS MUST BE
 				 * THE LAST FIELD OF THE STRUCTURE. */
 } ProtocolHandler;
 
-#define HANDLER_SIZE(cmdLength) \
-((unsigned) (sizeof(ProtocolHandler) - 3 + cmdLength))
 
 /*
  * A data structure of the following type holds window-manager-related
  * information for each top-level window in an application.
  */

Index: macosx/tkMacOSXXStubs.c
==================================================================
--- macosx/tkMacOSXXStubs.c
+++ macosx/tkMacOSXXStubs.c
@@ -38,31 +38,26 @@
 
 /*
  * Declarations of static variables used in this file.
  */
 
+/* The unique Macintosh display. */
 static TkDisplay *gMacDisplay = NULL;
-				/* Macintosh display. */
+/* The default name of the Macintosh display. */
 static const char *macScreenName = ":0";
-				/* Default name of macintosh display. */
+/* Timestamp showing the last reset of the inactivity timer. */
+static Time lastInactivityReset = 0;
+
 
 /*
  * Forward declarations of procedures used in this file.
  */
 
 static XID		MacXIdAlloc(Display *display);
 static int		DefaultErrorHandler(Display *display,
 			    XErrorEvent *err_evt);
 
-/*
- * Other declarations
- */
-
-static int		DestroyImage(XImage *image);
-static unsigned long	ImageGetPixel(XImage *image, int x, int y);
-static int		ImagePutPixel(XImage *image, int x, int y,
-			    unsigned long pixel);
 
 /*
  *----------------------------------------------------------------------
  *
  * TkMacOSXDisplayChanged --
@@ -181,11 +176,11 @@
     }
     display->vendor = vendor;
     {
 	int major, minor, patch;
 
-#if MAC_OS_X_VERSION_MIN_REQUIRED < 10100
+#if MAC_OS_X_VERSION_MIN_REQUIRED < 1080
 	Gestalt(gestaltSystemVersionMajor, (SInt32*)&major);
 	Gestalt(gestaltSystemVersionMinor, (SInt32*)&minor);
 	Gestalt(gestaltSystemVersionBugFix, (SInt32*)&patch);
 #else
 	NSOperatingSystemVersion systemVersion = [[NSProcessInfo processInfo] operatingSystemVersion];
@@ -206,10 +201,11 @@
     screen->ext_data	= (XExtData *) &maxBounds;
 
     screen->root_visual = ckalloc(sizeof(Visual));
     screen->root_visual->visualid     = 0;
     screen->root_visual->class	      = TrueColor;
+    screen->root_visual->alpha_mask   = 0xFF000000;
     screen->root_visual->red_mask     = 0x00FF0000;
     screen->root_visual->green_mask   = 0x0000FF00;
     screen->root_visual->blue_mask    = 0x000000FF;
     screen->root_visual->bits_per_rgb = 24;
     screen->root_visual->map_entries  = 256;
@@ -381,17 +377,10 @@
 {
     display->request++;
     return NULL;
 }
 
-int
-_XInitImageFuncPtrs(
-    XImage *image)
-{
-    return 0;
-}
-
 XErrorHandler
 XSetErrorHandler(
     XErrorHandler handler)
 {
     return DefaultErrorHandler;
@@ -526,21 +515,21 @@
     Window w)
 {
 }
 
 /*
-void
+int
 XDrawPoint(
     Display* display,
     Drawable d,
     GC gc,
     int x,
     int y)
 {
 }
 
-void
+int
 XDrawPoints(
     Display* display,
     Drawable d,
     GC gc,
     XPoint* points,
@@ -679,18 +668,10 @@
      */
 
     display->request++;
 }
 
-void
-Tk_FreeXId(
-    Display *display,
-    XID xid)
-{
-    /* no-op function needed for stubs implementation. */
-}
-
 int
 XSync(
     Display *display,
     Bool flag)
 {
@@ -760,390 +741,10 @@
     snprintf(buffer2, sizeof(buffer2), " Mac OS X %x",
 	    VendorRelease(Tk_Display(tkwin)));
     Tcl_AppendResult(interp, buffer, ServerVendor(Tk_Display(tkwin)),
 	    buffer2, NULL);
 }
-
-#pragma mark XImage handling
-
-/*
- *----------------------------------------------------------------------
- *
- * XCreateImage --
- *
- *	Allocates storage for a new XImage.
- *
- * Results:
- *	Returns a newly allocated XImage.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-XImage *
-XCreateImage(
-    Display* display,
-    Visual* visual,
-    unsigned int depth,
-    int format,
-    int offset,
-    char* data,
-    unsigned int width,
-    unsigned int height,
-    int bitmap_pad,
-    int bytes_per_line)
-{
-    XImage *ximage;
-    display->request++;
-    ximage = ckalloc(sizeof(XImage));
-
-    ximage->height = height;
-    ximage->width = width;
-    ximage->depth = depth;
-    ximage->xoffset = offset;
-    ximage->format = format;
-    ximage->data = data;
-    ximage->obdata = NULL;
-    /* The default pixelpower is 0.  This must be explicitly set to 1 in the
-     * case of an XImage extracted from a Retina display.
-     */
-    ximage->pixelpower = 0;
-
-    if (format == ZPixmap) {
-	ximage->bits_per_pixel = 32;
-	ximage->bitmap_unit = 32;
-    } else {
-	ximage->bits_per_pixel = 1;
-	ximage->bitmap_unit = 8;
-    }
-    if (bitmap_pad) {
-	ximage->bitmap_pad = bitmap_pad;
-    } else {
-	/* Use 16 byte alignment for best Quartz perfomance */
-	ximage->bitmap_pad = 128;
-    }
-    if (bytes_per_line) {
-	ximage->bytes_per_line = bytes_per_line;
-    } else {
-	ximage->bytes_per_line = ((width * ximage->bits_per_pixel +
-		(ximage->bitmap_pad - 1)) >> 3) &
-		~((ximage->bitmap_pad >> 3) - 1);
-    }
-#ifdef WORDS_BIGENDIAN
-    ximage->byte_order = MSBFirst;
-    ximage->bitmap_bit_order = MSBFirst;
-#else
-    ximage->byte_order = LSBFirst;
-    ximage->bitmap_bit_order = LSBFirst;
-#endif
-    ximage->red_mask = 0x00FF0000;
-    ximage->green_mask = 0x0000FF00;
-    ximage->blue_mask = 0x000000FF;
-    ximage->f.create_image = NULL;
-    ximage->f.destroy_image = DestroyImage;
-    ximage->f.get_pixel = ImageGetPixel;
-    ximage->f.put_pixel = ImagePutPixel;
-    ximage->f.sub_image = NULL;
-    ximage->f.add_pixel = NULL;
-
-    return ximage;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * XGetImage --
- *
- *	This function copies data from a pixmap or window into an XImage.
- *
- * Results:
- *	Returns a newly allocated XImage containing the data from the given
- *	rectangle of the given drawable, or NULL if the XImage could not be
- *	constructed.  NOTE: If we are copying from a window on a Retina
- *	display, the dimensions of the XImage will be 2*width x 2*height.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-XImage *
-XGetImage(
-    Display *display,
-    Drawable d,
-    int x,
-    int y,
-    unsigned int width,
-    unsigned int height,
-    unsigned long plane_mask,
-    int format)
-{
-    NSBitmapImageRep *bitmap_rep;
-    NSUInteger         bitmap_fmt;
-    XImage *       imagePtr = NULL;
-    char *           bitmap = NULL;
-    char *           image_data=NULL;
-    int	        depth = 32;
-    int	        offset = 0;
-    int	        bitmap_pad = 0;
-    int	        bytes_per_row = 4*width;
-    int                size;
-    MacDrawable *macDraw = (MacDrawable *) d;
-    NSWindow *win = TkMacOSXDrawableWindow(d);
-    /* This code assumes that backing scale factors are integers.  Currently
-     * Retina displays use a scale factor of 2.0 and normal displays use 1.0.
-     * We do not support any other values here.
-     */
-    int scalefactor = 1;
-    if (win && [win respondsToSelector:@selector(backingScaleFactor)]) { 
-	scalefactor = ([win backingScaleFactor] == 2.0) ? 2 : 1;
-    }
-    int scaled_height = height * scalefactor;
-    int scaled_width = width * scalefactor;
-
-    if (format == ZPixmap) {
-	if (width == 0 || height == 0) {
-	    /* This happens all the time.
-	    TkMacOSXDbgMsg("XGetImage: empty image requested");
-	    */
-	    return NULL;
-	}
-
-	bitmap_rep =  BitmapRepFromDrawableRect(d, x, y, width, height);
-	bitmap_fmt = [bitmap_rep bitmapFormat];
-
-	if ( bitmap_rep == Nil                        ||
-	     (bitmap_fmt != 0 && bitmap_fmt != 1)     ||
-	     [bitmap_rep samplesPerPixel] != 4 ||
-	     [bitmap_rep isPlanar] != 0               ) {
-	    TkMacOSXDbgMsg("XGetImage: Failed to construct NSBitmapRep");
-	    return NULL;
-	}
-
-	NSSize image_size = NSMakeSize(width, height);
-	NSImage* ns_image = [[NSImage alloc]initWithSize:image_size];
-	[ns_image addRepresentation:bitmap_rep];
-
-	/* Assume premultiplied nonplanar data with 4 bytes per pixel.*/
-	if ( [bitmap_rep isPlanar ] == 0 &&
-	     [bitmap_rep samplesPerPixel] == 4 ) {
-	    bytes_per_row = [bitmap_rep bytesPerRow];
-	    assert(bytes_per_row == 4 * scaled_width);
-	    assert([bitmap_rep bytesPerPlane] == bytes_per_row * scaled_height);
-	    size = bytes_per_row*scaled_height;
-	    image_data = (char*)[bitmap_rep bitmapData];
-	    if ( image_data ) {
-		int row, n, m;
-		bitmap = ckalloc(size);
-		/*
-		  Oddly enough, the bitmap has the top row at the beginning,
-		  and the pixels are in BGRA or ABGR format.
-		*/
-		if (bitmap_fmt == 0) {
-		    /* BGRA */
-		    for (row=0, n=0; row<scaled_height; row++, n+=bytes_per_row) {
-			for (m=n; m<n+bytes_per_row; m+=4) {
-			    *(bitmap+m)   = *(image_data+m+2);
-			    *(bitmap+m+1) = *(image_data+m+1);
-			    *(bitmap+m+2) = *(image_data+m);
-			    *(bitmap+m+3) = *(image_data+m+3);
-			}
-		    }
-		} else {
-		    /* ABGR */
-		    for (row=0, n=0; row<scaled_height; row++, n+=bytes_per_row) {
-			for (m=n; m<n+bytes_per_row; m+=4) {
-			    *(bitmap+m)   = *(image_data+m+3);
-			    *(bitmap+m+1) = *(image_data+m+2);
-			    *(bitmap+m+2) = *(image_data+m+1);
-			    *(bitmap+m+3) = *(image_data+m);
-			}
-		    }
-		}
-	    }
-	}
-	if (bitmap) {
-	    imagePtr = XCreateImage(display, NULL, depth, format, offset,
-				    (char*)bitmap, scaled_width, scaled_height,
-				    bitmap_pad, bytes_per_row);
-	    if (scalefactor == 2) {
-	    	imagePtr->pixelpower = 1;
-	     }
-	    [ns_image removeRepresentation:bitmap_rep]; /*releases the rep*/
-	    [ns_image release];
-	}
-    } else {
-	TkMacOSXDbgMsg("Could not extract image from drawable.");
-    }
-    return imagePtr;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * DestroyImage --
- *
- *	Destroys storage associated with an image.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	Deallocates the image.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-DestroyImage(
-    XImage *image)
-{
-    if (image) {
-	if (image->data) {
-	    ckfree(image->data);
-	}
-	ckfree(image);
-    }
-    return 0;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ImageGetPixel --
- *
- *	Get a single pixel from an image.
- *
- * Results:
- *	Returns the 32 bit pixel value.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static unsigned long
-ImageGetPixel(
-    XImage *image,
-    int x,
-    int y)
-{
-    unsigned char r = 0, g = 0, b = 0;
-
-    if (image && image->data) {
-	unsigned char *srcPtr = ((unsigned char*) image->data)
-		+ (y * image->bytes_per_line)
-		+ (((image->xoffset + x) * image->bits_per_pixel) / NBBY);
-
-	switch (image->bits_per_pixel) {
-	    case 32: {
-		r = (*((unsigned int*) srcPtr) >> 16) & 0xff;
-		g = (*((unsigned int*) srcPtr) >>  8) & 0xff;
-		b = (*((unsigned int*) srcPtr)      ) & 0xff;
-		/*if (image->byte_order == LSBFirst) {
-		    r = srcPtr[2]; g = srcPtr[1]; b = srcPtr[0];
-		} else {
-		    r = srcPtr[1]; g = srcPtr[2]; b = srcPtr[3];
-		}*/
-		break;
-	    }
-	    case 16:
-		r = (*((unsigned short*) srcPtr) >> 7) & 0xf8;
-		g = (*((unsigned short*) srcPtr) >> 2) & 0xf8;
-		b = (*((unsigned short*) srcPtr) << 3) & 0xf8;
-		break;
-	    case 8:
-		r = (*srcPtr << 2) & 0xc0;
-		g = (*srcPtr << 4) & 0xc0;
-		b = (*srcPtr << 6) & 0xc0;
-		r |= r >> 2 | r >> 4 | r >> 6;
-		g |= g >> 2 | g >> 4 | g >> 6;
-		b |= b >> 2 | b >> 4 | b >> 6;
-		break;
-	    case 4: {
-		unsigned char c = (x % 2) ? *srcPtr : (*srcPtr >> 4);
-		r = (c & 0x04) ? 0xff : 0;
-		g = (c & 0x02) ? 0xff : 0;
-		b = (c & 0x01) ? 0xff : 0;
-		break;
-		}
-	    case 1:
-		r = g = b = ((*srcPtr) & (0x80 >> (x % 8))) ? 0xff : 0;
-		break;
-	}
-    }
-    return (PIXEL_MAGIC << 24) | (r << 16) | (g << 8) | b;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * ImagePutPixel --
- *
- *	Set a single pixel in an image.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-static int
-ImagePutPixel(
-    XImage *image,
-    int x,
-    int y,
-    unsigned long pixel)
-{
-    if (image && image->data) {
-	unsigned char r = ((pixel & image->red_mask)   >> 16) & 0xff;
-	unsigned char g = ((pixel & image->green_mask) >>  8) & 0xff;
-	unsigned char b = ((pixel & image->blue_mask)       ) & 0xff;
-	unsigned char *dstPtr = ((unsigned char*) image->data)
-		+ (y * image->bytes_per_line)
-		+ (((image->xoffset + x) * image->bits_per_pixel) / NBBY);
-
-	switch (image->bits_per_pixel) {
-	    case 32:
-		*((unsigned int*) dstPtr) = (0xff << 24) | (r << 16) |
-			(g << 8) | b;
-		/*if (image->byte_order == LSBFirst) {
-		    dstPtr[3] = 0xff; dstPtr[2] = r; dstPtr[1] = g; dstPtr[0] = b;
-		} else {
-		    dstPtr[0] = 0xff; dstPtr[1] = r; dstPtr[2] = g; dstPtr[3] = b;
-		}*/
-		break;
-	    case 16:
-		*((unsigned short*) dstPtr) = ((r & 0xf8) << 7) |
-			((g & 0xf8) << 2) | ((b & 0xf8) >> 3);
-		break;
-	    case 8:
-		*dstPtr = ((r & 0xc0) >> 2) | ((g & 0xc0) >> 4) |
-			((b & 0xc0) >> 6);
-		break;
-	    case 4: {
-		unsigned char c = ((r & 0x80) >> 5) | ((g & 0x80) >> 6) |
-			((b & 0x80) >> 7);
-		*dstPtr = (x % 2) ? ((*dstPtr & 0xf0) | (c & 0x0f)) :
-			((*dstPtr & 0x0f) | ((c << 4) & 0xf0));
-		break;
-		}
-	    case 1:
-		*dstPtr = ((r|g|b) & 0x80) ? (*dstPtr | (0x80 >> (x % 8))) :
-			(*dstPtr & ~(0x80 >> (x % 8)));
-		break;
-	}
-    }
-    return 0;
-}
 
 /*
  *----------------------------------------------------------------------
  *
  * XChangeWindowAttributes, XSetWindowBackground,
@@ -1266,17 +867,14 @@
 const char *
 TkGetDefaultScreenName(
     Tcl_Interp *interp,		/* Not used. */
     const char *screenName)		/* If NULL, use default string. */
 {
-#if 0
     if ((screenName == NULL) || (screenName[0] == '\0')) {
 	screenName = macScreenName;
     }
     return screenName;
-#endif
-    return macScreenName;
 }
 
 /*
  *----------------------------------------------------------------------
  *
@@ -1320,30 +918,26 @@
     }
 
     timeObj = CFDictionaryGetValue(props, CFSTR("HIDIdleTime"));
 
     if (timeObj) {
-	CFTypeID type = CFGetTypeID(timeObj);
-
-	if (type == CFDataGetTypeID()) { /* Jaguar */
-	    CFDataGetBytes((CFDataRef) timeObj,
-		    CFRangeMake(0, sizeof(time)), (UInt8 *) &time);
-	    /* Convert nanoseconds to milliseconds. */
-	    /* ret /= kMillisecondScale; */
-	    ret = (long) (time/kMillisecondScale);
-	} else if (type == CFNumberGetTypeID()) { /* Panther+ */
 	    CFNumberGetValue((CFNumberRef)timeObj,
 		    kCFNumberSInt64Type, &time);
 	    /* Convert nanoseconds to milliseconds. */
-	    /* ret /= kMillisecondScale; */
 	    ret = (long) (time/kMillisecondScale);
-	} else {
-	    ret = -1l;
-	}
     }
     /* Cleanup */
     CFRelease(props);
+
+    /*
+     * If the idle time reported by the system is larger than the elapsed
+     * time since the last reset, return the elapsed time.
+     */
+    long elapsed = (long)(TkpGetMS() - lastInactivityReset);
+    if (ret > elapsed) {
+    	ret = elapsed;
+    }
 
     return ret;
 }
 
 /*
@@ -1365,32 +959,11 @@
 
 void
 Tk_ResetUserInactiveTime(
     Display *dpy)
 {
-    IOGPoint loc;
-    kern_return_t kr;
-    NXEvent nullEvent = {NX_NULLEVENT, {0, 0}, 0, -1, 0};
-    enum { kNULLEventPostThrottle = 10 };
-    static io_connect_t io_connection = MACH_PORT_NULL;
-
-    if (io_connection == MACH_PORT_NULL) {
-	io_service_t service = IOServiceGetMatchingService(
-		kIOMasterPortDefault, IOServiceMatching(kIOHIDSystemClass));
-
-	if (service == MACH_PORT_NULL) {
-	    return;
-	}
-	kr = IOServiceOpen(service, mach_task_self(), kIOHIDParamConnectType,
-		&io_connection);
-	IOObjectRelease(service);
-	if (kr != KERN_SUCCESS) {
-	    return;
-	}
-    }
-    kr = IOHIDPostEvent(io_connection, NX_NULLEVENT, loc, &nullEvent.data,
-	    FALSE, 0, FALSE);
+    lastInactivityReset = TkpGetMS();
 }
 
 /*
  * Local Variables:
  * mode: objc

Index: tests/bell.test
==================================================================
--- tests/bell.test
+++ tests/bell.test
@@ -13,11 +13,11 @@
 test bell-1.1 {bell command} -body {
     bell a
 } -returnCodes {error} -result {bad option "a": must be -displayof or -nice}
 
 test bell-1.2 {bell command} -body {
-    bell a b 
+    bell a b
 } -returnCodes {error} -result {bad option "a": must be -displayof or -nice}
 
 test bell-1.3 {bell command} -body {
     bell -displayof gorp
 } -returnCodes {error} -result {bad window path name "gorp"}

Index: tests/bind.test
==================================================================
--- tests/bind.test
+++ tests/bind.test
@@ -31,10 +31,23 @@
     bind Toplevel <Enter> {}
     bind xyz <Enter> {}
     bind {a b} <Enter> {}
     bind .t <Enter> {}
 }
+
+# This function fills the pattern matcher's ring buffer with events of
+# the specified type.  This can be used when testing with generated
+# events to make sure that there are no stray events in the ring
+# buffer which might cause the pattern matcher to find unintended
+# matches.  The size of the ring buffer is EVENT_BUFFER_SIZE, which is
+# currently set to 30.  If this changes, the code below will need to
+# change.
+proc clearRingBuffer {{event}} {
+    for {set i 0} {$i < 30} {incr i} {
+	event generate . $event
+    }
+}
 
 # move the mouse pointer away of the testing area
 # otherwise some spurious events may pollute the tests
 toplevel .top
 wm geometry .top 50x50-50-50
@@ -75,14 +88,14 @@
 } -cleanup {
     destroy .t.f
 } -result {test script
 more text}
 test bind-1.8 {bind command} -body {
-    bind .t <gorp-> {test script} 
+    bind .t <gorp-> {test script}
 } -returnCodes error -result {bad event type or keysym "gorp"}
 test bind-1.9 {bind command} -body {
-    catch {bind .t <gorp-> {test script}} 
+    catch {bind .t <gorp-> {test script}}
     bind .t
 } -result {}
 test bind-1.10 {bind command} -body {
     bind .t <gorp->
 } -returnCodes ok -result {}
@@ -139,14 +152,14 @@
     destroy .t.f
 } -result {a b c d}
 test bind-2.9 {bindtags command} -body {
     frame .t.f
     bindtags .t.f {a b c}
-    bindtags .t.f "\{" 
+    bindtags .t.f "\{"
 } -cleanup {
     destroy .t.f
-} -returnCodes error -result {unmatched open brace in list} 
+} -returnCodes error -result {unmatched open brace in list}
 test bind-2.10 {bindtags command} -body {
     frame .t.f
     bindtags .t.f {a b c}
     catch {bindtags .t.f "\{"}
     bindtags .t.f
@@ -154,14 +167,14 @@
     destroy .t.f
 } -result {.t.f Frame .t all}
 test bind-2.11 {bindtags command} -body {
     frame .t.f
     bindtags .t.f {a b c}
-    bindtags .t.f "a .gorp b" 
+    bindtags .t.f "a .gorp b"
 } -cleanup {
     destroy .t.f
-} -returnCodes ok  
+} -returnCodes ok
 test bind-2.12 {bindtags command} -body {
     frame .t.f
     bindtags .t.f {a b c}
     catch {bindtags .t.f "a .gorp b"}
     bindtags .t.f
@@ -197,11 +210,11 @@
     bind Toplevel <Enter> {lappend x "%W enter toplevel"}
     bind xyz <Enter> {lappend x "%W enter xyz"}
     bind {a b} <Enter> {lappend x "%W enter {a b}"}
     bind .t <Enter>  {lappend x "%W enter .t"}
     bind .t.f <Enter> {lappend x "%W enter .t.f"}
-    
+
     event generate .t.f <Enter>
     return $x
 } -cleanup {
     destroy .t.f
     unsetBindings
@@ -217,13 +230,13 @@
     bind Toplevel <Enter> {lappend x "%W enter toplevel"}
     bind xyz <Enter> {lappend x "%W enter xyz"}
     bind {a b} <Enter> {lappend x "%W enter {a b}"}
     bind .t <Enter>  {lappend x "%W enter .t"}
     bind .t.f <Enter> {lappend x "%W enter .t.f"}
-    
+
     bindtags .t.f {.t.f {a b} xyz}
-    event generate .t.f <Enter> 
+    event generate .t.f <Enter>
     return $x
 } -cleanup {
     destroy .t.f
     unsetBindings
 } -result {{.t.f enter .t.f} {.t.f enter {a b}} {.t.f enter xyz}}
@@ -233,11 +246,11 @@
     bind Test <Enter> {lappend x "%W enter frame"}
     bind Toplevel <Enter> {lappend x "%W enter toplevel"}
     bind xyz <Enter> {lappend x "%W enter xyz"}
     bind {a b} <Enter> {lappend x "%W enter {a b}"}
     bind .t <Enter>  {lappend x "%W enter .t"}
-    
+
     event generate .t <Enter>
     return $x
 } -cleanup {
     unsetBindings
 }  -result {{.t enter .t} {.t enter toplevel} {.t enter all}}
@@ -253,11 +266,11 @@
     bind Test <Enter> {lappend x "%W enter frame"}
     bind Toplevel <Enter> {lappend x "%W enter toplevel"}
     bind xyz <Enter> {lappend x "%W enter xyz"}
     bind {a b} <Enter> {lappend x "%W enter {a b}"}
     bind .t <Enter>  {lappend x "%W enter .t"}
-    
+
     bindtags .t.f {.t.f .t.f2 .t.f3}
     bind .t.f <Enter> {lappend x "%W enter .t.f"}
     bind .t.f3 <Enter> {lappend x "%W enter .t.f3"}
     event generate .t.f <Enter>
     return $x
@@ -277,11 +290,11 @@
     bind Toplevel <Enter> {lappend x "%W enter toplevel"}
     bind xyz <Enter> {lappend x "%W enter xyz"}
     bind {a b} <Enter> {lappend x "%W enter {a b}"}
     bind .t <Enter>  {lappend x "%W enter .t"}
     bindtags .t.f {a b c d e f g h i j k l m n o p q r s t u v w x y z}
-    
+
     event generate .t.f <Enter>
 } -cleanup {
     destroy .t.f
     unsetBindings
 } -result {}
@@ -381,29 +394,29 @@
 } -cleanup {
     destroy .t.c
 } -result {Test}
 
 test bind-11.1 {Tk_GetAllBindings procedure} -body {
-    frame .t.f 
+    frame .t.f
     foreach i "! a \\\{ ~ <Delete> <space> <<Paste>> <Tab> <Linefeed> <less> <Meta-a> <Acircumflex>" {
 	   bind .t.f $i Test
     }
     lsort [bind .t.f]
 } -cleanup {
     destroy .t.f
 } -result {! <<Paste>> <Key-Acircumflex> <Key-Delete> <Key-Linefeed> <Key-Tab> <Key-less> <Key-space> <Meta-Key-a> a \{ ~}
 test bind-11.2 {Tk_GetAllBindings procedure} -body {
-    frame .t.f 
+    frame .t.f
     foreach i "<Double-1> <Triple-1> <Meta-Control-a> <Double-Alt-Enter> <1>" {
 	   bind .t.f $i Test
     }
     lsort [bind .t.f]
 } -cleanup {
     destroy .t.f
 } -result {<Button-1> <Control-Meta-Key-a> <Double-Alt-Enter> <Double-Button-1> <Triple-Button-1>}
 test bind-11.3 {Tk_GetAllBindings procedure} -body {
-    frame .t.f 
+    frame .t.f
     foreach i "<Double-Triple-1> abcd a<Leave>b" {
 	   bind .t.f $i Test
     }
     lsort [bind .t.f]
 } -cleanup {
@@ -433,11 +446,11 @@
     bind Test <KeyPress> {lappend x "%W %K Test KeyPress"}
     bind all <KeyPress> {lappend x "%W %K all KeyPress"}
     bind Test : {lappend x "%W %K Test :"}
     bind all  _ {lappend x "%W %K all _"}
     bind .t.f : {lappend x "%W %K .t.f :"}
-    
+
     event generate .t.f <Key-colon>
     event generate .t.f <Key-plus>
     event generate .t.f <Key-underscore>
     return $x
 } -cleanup {
@@ -456,11 +469,11 @@
     set x {}
 } -body {
     bind Test <KeyPress> {lappend x "%W %K Test press any"; break}
     bind all <KeyPress> {continue; lappend x "%W %K all press any"}
     bind .t.f : {lappend x "%W %K .t.f pressed colon"}
-    
+
     event generate .t.f <Key-colon>
     return $x
 } -cleanup {
     destroy .t.f
     bind all <KeyPress> {}
@@ -512,15 +525,15 @@
     bind all <Destroy> {lappend x "%W destroyed"}
     set x {}
     frame .t.g -gorp foo
 } -cleanup {
     bind all <Destroy> {}
-} -returnCodes error -result {unknown option "-gorp"} 
+} -returnCodes error -result {unknown option "-gorp"}
 test bind-13.6 {Tk_BindEvent procedure} -body {
     bind all <Destroy> {lappend x "%W destroyed"}
     set x {}
-    catch {frame .t.g -gorp foo} 
+    catch {frame .t.g -gorp foo}
     return $x
 } -cleanup {
     bind all <Destroy> {}
 } -result {{.t.g destroyed}}
 
@@ -597,14 +610,14 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Motion> "lappend x Motion%#(%x,%y)"
-    event generate .t.f <Motion> -serial 100 -x 100 -y 200 -when tail 
+    event generate .t.f <Motion> -serial 100 -x 100 -y 200 -when tail
     update
     event generate .t.f <Motion> -serial 101 -x 200 -y 300 -when tail
-    event generate .t.f <Motion> -serial 102 -x 300 -y 400 -when tail 
+    event generate .t.f <Motion> -serial 102 -x 300 -y 400 -when tail
     update
     return $x
 } -cleanup {
     destroy .t.f
 } -result {Motion100(100,200) Motion102(300,400)}
@@ -614,14 +627,14 @@
     focus -force .t.f
     update
 } -body {
     bind .t.f <Key> "lappend x %K%#"
     bind .t.f <KeyRelease> "lappend x %K%#"
-    event generate .t.f <Key-Shift_L> -serial 100 -when tail 
-    event generate .t.f <KeyRelease-Shift_L> -serial 101 -when tail 
-    event generate .t.f <Key-Shift_L> -serial 102 -when tail 
-    event generate .t.f <KeyRelease-Shift_L> -serial 103 -when tail 
+    event generate .t.f <Key-Shift_L> -serial 100 -when tail
+    event generate .t.f <KeyRelease-Shift_L> -serial 101 -when tail
+    event generate .t.f <Key-Shift_L> -serial 102 -when tail
+    event generate .t.f <KeyRelease-Shift_L> -serial 103 -when tail
     update
 } -cleanup {
     destroy .t.f
 } -result {}
 test bind-13.13 {Tk_BindEvent procedure: valid key detail} -setup {
@@ -646,12 +659,12 @@
     update
     set x {}
 } -body {
     bind .t.f <Key> "lappend x Key%K"
     bind .t.f <KeyRelease> "lappend x Release%K"
-    event generate .t.f <Key> -keycode 0
-    event generate .t.f <KeyRelease> -keycode 0
+    event generate .t.f <Key> -keycode -1
+    event generate .t.f <KeyRelease> -keycode -1
     return $x
 } -cleanup {
     destroy .t.f
 } -result {Key?? Release??}
 test bind-13.15 {Tk_BindEvent procedure: button detail} -setup {
@@ -853,11 +866,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Button-2> {set x Button-2}
-    event generate .t.f <Button-2> 
+    event generate .t.f <Button-2>
     return $x
 } -cleanup {
     destroy .t.f
 } -result {Button-2}
 test bind-13.28 {Tk_BindEvent procedure: detail virtual pattern list} -setup {
@@ -1017,11 +1030,11 @@
     destroy .t.f
     bind Test <Button-2> {}
 } -result  {b1}
 test bind-13.45 {Tk_BindEvent procedure: error in script} -setup {
     proc bgerror msg {
-        global x 
+        global x
         lappend x $msg
     }
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
     focus -force .t.f
@@ -1206,11 +1219,11 @@
     event generate .t.f <Key-a> -state 0x8
     return $x
 } -cleanup {
     destroy .t.f
 } -result {0}
-test bind-15.12 {MatchPatterns procedure, ignore modifier presses and releases} -constraints { 
+test bind-15.12 {MatchPatterns procedure, ignore modifier presses and releases} -constraints {
     nonPortable
 } -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
     focus -force .t.f
@@ -1247,11 +1260,11 @@
     focus -force .t.f
     update
 } -body {
     bind .t.f <Double-1> {set x 1}
     set x 0
-    event generate .t.f <Button-2> 
+    event generate .t.f <Button-2>
     event generate .t.f <ButtonRelease-2>
     event generate .t.f <Button-1> -x 30 -y 40
     event generate .t.f <Button-1> -x 31 -y 39
     event generate .t.f <ButtonRelease-1>
     return $x
@@ -1264,11 +1277,11 @@
     focus -force .t.f
     update
 } -body {
     bind .t.f <Double-1> {set x 1}
     set x 0
-    event generate .t.f <Button-2> 
+    event generate .t.f <Button-2>
     event generate .t.f <ButtonRelease-2>
     event generate .t.f <Button-1> -x 30 -y 40
     event generate .t.f <Button-1> -x 29 -y 41
     event generate .t.f <ButtonRelease-1>
     return $x
@@ -1281,11 +1294,11 @@
     focus -force .t.f
     update
 } -body {
     bind .t.f <Double-1> {set x 1}
     set x 0
-    event generate .t.f <Button-2> 
+    event generate .t.f <Button-2>
     event generate .t.f <ButtonRelease-2>
     event generate .t.f <Button-1> -x 30 -y 40
     event generate .t.f <Button-1> -x 40 -y 40
     event generate .t.f <ButtonRelease-2>
     return $x
@@ -1298,11 +1311,11 @@
     focus -force .t.f
     update
 } -body {
     bind .t.f <Double-1> {set x 1}
     set x 0
-    event generate .t.f <Button-2> 
+    event generate .t.f <Button-2>
     event generate .t.f <ButtonRelease-2>
     event generate .t.f <Button-1> -x 30 -y 40
     event generate .t.f <Button-1> -x 20 -y 40
     event generate .t.f <ButtonRelease-1>
     return $x
@@ -1315,11 +1328,11 @@
     focus -force .t.f
     update
 } -body {
     bind .t.f <Double-1> {set x 1}
     set x 0
-    event generate .t.f <Button-2> 
+    event generate .t.f <Button-2>
     event generate .t.f <ButtonRelease-2>
     event generate .t.f <Button-1> -x 30 -y 40
     event generate .t.f <Button-1> -x 30 -y 30
     event generate .t.f <ButtonRelease-1>
     return $x
@@ -1332,11 +1345,11 @@
     focus -force .t.f
     update
 } -body {
     bind .t.f <Double-1> {set x 1}
     set x 0
-    event generate .t.f <Button-2> 
+    event generate .t.f <Button-2>
     event generate .t.f <ButtonRelease-2>
     event generate .t.f <Button-1> -x 30 -y 40
     event generate .t.f <Button-1> -x 30 -y 50
     event generate .t.f <ButtonRelease-1>
     return $x
@@ -1349,11 +1362,11 @@
     focus -force .t.f
     update
 } -body {
     bind .t.f <Double-1> {set x 1}
     set x 0
-    event generate .t.f <Button-2> 
+    event generate .t.f <Button-2>
     event generate .t.f <ButtonRelease-2>
     event generate .t.f <Button-1> -time 300
     event generate .t.f <Button-1> -time 700
     event generate .t.f <ButtonRelease-1>
     return $x
@@ -1366,11 +1379,11 @@
     focus -force .t.f
     update
 } -body {
     bind .t.f <Double-1> {set x 1}
     set x 0
-    event generate .t.f <Button-2> 
+    event generate .t.f <Button-2>
     event generate .t.f <ButtonRelease-2>
     event generate .t.f <Button-1> -time 300
     event generate .t.f <Button-1> -time 900
     event generate .t.f <ButtonRelease-1>
     return $x
@@ -1380,14 +1393,15 @@
 test bind-15.22 {MatchPatterns procedure, time wrap-around} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
     focus -force .t.f
     update
+    clearRingBuffer <Key>
 } -body {
     bind .t.f <Double-1> {set x 1}
     set x 0
-    event generate .t.f <Button-1> -time [expr -100]
+    event generate .t.f <Button-1> -time -100
     event generate .t.f <Button-1> -time 200
     event generate .t.f <ButtonRelease-1>
     return $x
 } -cleanup {
     destroy .t.f
@@ -1395,10 +1409,11 @@
 test bind-15.23 {MatchPatterns procedure, time wrap-around} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
     focus -force .t.f
     update
+    clearRingBuffer <Key>
 } -body {
     bind .t.f <Double-1> {set x 1}
     set x 0
     event generate .t.f <Button-1> -time -100
     event generate .t.f <Button-1> -time 500
@@ -1405,17 +1420,17 @@
     event generate .t.f <ButtonRelease-1>
     return $x
 } -cleanup {
     destroy .t.f
 } -result {0}
-
 test bind-15.24 {MatchPatterns procedure, virtual event} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
     focus -force .t.f
     update
     set x {}
+    clearRingBuffer <Key>
 } -body {
     event add <<Paste>> <Button-1>
     bind .t.f <<Paste>> {lappend x paste}
     event generate .t.f <Button-1>
     event generate .t.f <ButtonRelease-1>
@@ -1428,10 +1443,11 @@
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
     focus -force .t.f
     update
     set x {}
+    clearRingBuffer <Key>
 } -body {
     event add <<Paste>> <Shift-Button-1>
     bind .t.f <<Paste>> {lappend x paste}
     event generate .t.f <Button-1>
     event generate .t.f <ButtonRelease-1>
@@ -1444,10 +1460,11 @@
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
     focus -force .t.f
     update
     set x {}
+    clearRingBuffer <Key>
 } -body {
     event add <<V1>> <Button>
     event add <<V2>> <Button-1>
     event add <<V3>> <Shift-Button-1>
     bind .t.f <<V2>> "lappend x V2%#"
@@ -1470,10 +1487,11 @@
 test bind-15.27 {MatchPatterns procedure, conflict resolution} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
     focus -force .t.f
     update
+    clearRingBuffer <Button>
 } -body {
     bind .t.f <KeyPress> {set x 0}
     bind .t.f 1 {set x 1}
     set x none
     event generate .t.f <Key-1>
@@ -1484,10 +1502,11 @@
 test bind-15.28 {MatchPatterns procedure, conflict resolution} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
     focus -force .t.f
     update
+    clearRingBuffer <Button>
 } -body {
     bind .t.f <KeyPress> {set x 0}
     bind .t.f 1 {set x 1}
     set x none
     event generate .t.f <Key-2>
@@ -1498,10 +1517,11 @@
 test bind-15.29 {MatchPatterns procedure, conflict resolution} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
     focus -force .t.f
     update
+    clearRingBuffer <Button>
 } -body {
     bind .t.f <KeyPress> {lappend x 0}
     bind .t.f 1 {lappend x 1}
     bind .t.f 21 {lappend x 2}
     set x none
@@ -1515,10 +1535,11 @@
 test bind-15.30 {MatchPatterns procedure, conflict resolution} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
     focus -force .t.f
     update
+    clearRingBuffer <Key>
 } -body {
     bind .t.f <ButtonPress> {set x 0}
     bind .t.f <1> {set x 1}
     set x none
     event generate .t.f <Button-1>
@@ -1531,10 +1552,11 @@
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
     focus -force .t.f
     update
     set x {}
+    clearRingBuffer <Button>
 } -body {
     bind .t.f <M1-Key> {set x 0}
     bind .t.f <M2-Key> {set x 1}
     event generate .t.f <Key-a> -state 0x18
     return $x
@@ -1544,10 +1566,11 @@
 test bind-15.32 {MatchPatterns procedure, conflict resolution} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
     focus -force .t.f
     update
+    clearRingBuffer <Button>
 } -body {
     bind .t.f <M2-Key> {set x 0}
     bind .t.f <M1-Key> {set x 1}
     set x none
     event generate .t.f <Key-a> -state 0x18
@@ -1559,10 +1582,11 @@
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
     focus -force .t.f
     update
     set x {}
+    clearRingBuffer <Key>
 } -body {
     bind .t.f <1> {lappend x single}
     bind Test <1> {lappend x single(Test)}
     bind Test <Double-1> {lappend x double(Test)}
     event generate .t.f <Button-1>
@@ -2023,11 +2047,11 @@
     set x
 } -cleanup {
     destroy .t.f
 } -result {781 632}
 test bind-16.35 {ExpandPercents procedure} -constraints {
-    nonPortable 
+    nonPortable
 } -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
     focus -force .t.f
     update
@@ -2206,10 +2230,11 @@
     entry .t.e
     pack .t.e
     focus -force .t.e
     foreach p [event info] {event delete $p}
     update
+    clearRingBuffer <Button>
 } -body {
     bind all <Key> {set z "%M"}
     bind Entry <Key> {set y "%M"}
     bind .t.e <Key> {set x "%M"}
     set x none; set y none; set z none
@@ -2248,11 +2273,11 @@
 
 test bind-17.6 {event command: add with error} -body {
     event add <<Paste>> <Control-v> <Button-2> abc <xyz> <1>
 } -cleanup {
     event delete <<Paste>>
-} -returnCodes error -result {bad event type or keysym "xyz"} 
+} -returnCodes error -result {bad event type or keysym "xyz"}
 test bind-17.7 {event command: add with error} -body {
     event delete <<Paste>>
     catch {event add <<Paste>> <Control-v> <Button-2> abc <xyz> <1>}
     lsort [event info <<Paste>>]
 } -cleanup {
@@ -2341,20 +2366,20 @@
     event add asd <Ctrl-v>
 } -returnCodes error -result {virtual event "asd" is badly formed}
 test bind-18.2 {CreateVirtualEvent procedure: FindSequence} -body {
     event add <<asd>> <Ctrl-v>
 } -returnCodes error -result {bad event type or keysym "Ctrl"}
-test bind-18.3 {CreateVirtualEvent procedure: new physical} -body { 
+test bind-18.3 {CreateVirtualEvent procedure: new physical} -body {
     event delete <<xyz>>
     event add <<xyz>> <Control-v>
     event info <<xyz>>
 } -cleanup {
     event delete <<xyz>>
 } -result {<Control-Key-v>}
 test bind-18.4 {CreateVirtualEvent procedure: duplicate physical} -body {
     event delete <<xyz>>
-    event add <<xyz>> <Control-v> 
+    event add <<xyz>> <Control-v>
     event add <<xyz>> <Control-v>
     event info <<xyz>>
 } -cleanup {
     event delete <<xyz>>
 } -result {<Control-Key-v>}
@@ -2421,17 +2446,17 @@
 } -returnCodes error -result {virtual event not allowed in definition of another virtual event}
 test bind-19.7 {DeleteVirtualEvent procedure: owns 1, delete all} -body {
     foreach p [event info] {event delete $p}
     event add <<xyz>> <Control-v>
     event delete <<xyz>>
-    event info 
+    event info
 } -result {}
 test bind-19.8 {DeleteVirtualEvent procedure: owns 1, delete 1} -body {
     foreach p [event info] {event delete $p}
     event add <<xyz>> <Control-v>
     event delete <<xyz>> <Control-v>
-    event info 
+    event info
 } -result {}
 test bind-19.9 {DeleteVirtualEvent procedure: owns many, delete all} -body {
     foreach p [event info] {event delete $p}
     event add <<xyz>> <Control-v> <Control-w> <Control-x>
     event delete <<xyz>>
@@ -2479,11 +2504,11 @@
     bind .t.f <<abc>> {lappend x abc}
     event generate .t.f <Button-2>
     event generate .t.f <ButtonRelease-2>
     event generate .t.f <Control-Button-2>
     event generate .t.f <Control-ButtonRelease-2>
-    event delete <<xyz>> 
+    event delete <<xyz>>
     event generate .t.f <Button-2>
     event generate .t.f <ButtonRelease-2>
     event generate .t.f <Control-Button-2>
     event generate .t.f <Control-ButtonRelease-2>
     list $x [event info <<abc>>]
@@ -2546,11 +2571,11 @@
     event generate .t.f <ButtonRelease-2>
     event generate .t.f <Control-Button-2>
     event generate .t.f <Control-ButtonRelease-2>
     event generate .t.f <Shift-Button-2>
     event generate .t.f <Shift-ButtonRelease-2>
-    event delete <<xyz>> 
+    event delete <<xyz>>
     event generate .t.f <Button-2>
     event generate .t.f <ButtonRelease-2>
     event generate .t.f <Control-Button-2>
     event generate .t.f <Control-ButtonRelease-2>
     event generate .t.f <Shift-Button-2>
@@ -2582,11 +2607,11 @@
     event generate .t.f <ButtonRelease-2>
     event generate .t.g <Button-2>
     event generate .t.g <ButtonRelease-2>
     event generate .t.h <Button-2>
     event generate .t.h <ButtonRelease-2>
-    event delete <<xyz>> 
+    event delete <<xyz>>
     event generate .t.f <Button-2>
     event generate .t.f <ButtonRelease-2>
     event generate .t.g <Button-2>
     event generate .t.g <ButtonRelease-2>
     event generate .t.h <Button-2>
@@ -2654,11 +2679,11 @@
     event generate .t.f <ButtonRelease-2>
     event generate .t.g <Button-2>
     event generate .t.g <ButtonRelease-2>
     event generate .t.h <Button-2>
     event generate .t.h <ButtonRelease-2>
-    event delete <<def>> 
+    event delete <<def>>
     event generate .t.f <Button-2>
     event generate .t.f <ButtonRelease-2>
     event generate .t.g <Button-2>
     event generate .t.g <ButtonRelease-2>
     event generate .t.h <Button-2>
@@ -3391,11 +3416,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Map> "lappend x %o"
-    event generate .t.f <Map> -override xyz 
+    event generate .t.f <Map> -override xyz
 } -cleanup {
     destroy .t.f
 } -returnCodes error -result {expected boolean value but got "xyz"}
 
 test bind-22.56 {HandleEventGenerate: options <Map> -override 1} -setup {
@@ -3404,11 +3429,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Map> "lappend x %o"
-    event generate .t.f <Map> -override 1 
+    event generate .t.f <Map> -override 1
     return $x
 } -cleanup {
     destroy .t.f
 } -result {1}
 
@@ -3418,11 +3443,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Reparent> "lappend x %o"
-    event generate .t.f <Reparent> -override 1 
+    event generate .t.f <Reparent> -override 1
     return $x
 } -cleanup {
     destroy .t.f
 } -result {1}
 
@@ -3432,11 +3457,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Configure> "lappend x %o"
-    event generate .t.f <Configure> -override 1 
+    event generate .t.f <Configure> -override 1
     return $x
 } -cleanup {
     destroy .t.f
 } -result {1}
 
@@ -3446,11 +3471,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Key> "lappend x %k"
-    event generate .t.f <Key> -override 1 
+    event generate .t.f <Key> -override 1
 } -cleanup {
     destroy .t.f
 } -returnCodes error -result {<Key> event doesn't accept "-override" option}
 
 test bind-22.60 {HandleEventGenerate: options <Circulate> -place xyz} -setup {
@@ -3459,11 +3484,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Circulate> "lappend x %p"
-    event generate .t.f <Circulate> -place xyz 
+    event generate .t.f <Circulate> -place xyz
 } -cleanup {
     destroy .t.f
 } -returnCodes error -result {bad -place value "xyz": must be PlaceOnTop, or PlaceOnBottom}
 
 test bind-22.61 {HandleEventGenerate: options <Circulate> -place PlaceOnTop} -setup {
@@ -3472,11 +3497,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Circulate> "lappend x %p"
-    event generate .t.f <Circulate> -place PlaceOnTop 
+    event generate .t.f <Circulate> -place PlaceOnTop
     return $x
 } -cleanup {
     destroy .t.f
 } -result {PlaceOnTop}
 
@@ -3486,11 +3511,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Key> "lappend x %k"
-    event generate .t.f <Key> -place PlaceOnTop 
+    event generate .t.f <Key> -place PlaceOnTop
 } -cleanup {
     destroy .t.f
 } -returnCodes error -result {<Key> event doesn't accept "-place" option}
 
 test bind-22.63 {HandleEventGenerate: options <Key> -root .xyz} -setup {
@@ -3499,11 +3524,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Key> "lappend x %R"
-    event generate .t.f <Key> -root .xyz 
+    event generate .t.f <Key> -root .xyz
 } -cleanup {
     destroy .t.f
 } -returnCodes error -result {bad window path name ".xyz"}
 
 test bind-22.64 {HandleEventGenerate: options <Key> -root .t} -setup {
@@ -3512,11 +3537,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Key> "lappend x %R"
-    event generate .t.f <Key> -root .t 
+    event generate .t.f <Key> -root .t
     expr {[winfo id .t] eq $x}
 } -cleanup {
     destroy .t.f
 } -result {1}
 
@@ -3526,11 +3551,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Key> "lappend x %R"
-    event generate .t.f <Key> -root xyz 
+    event generate .t.f <Key> -root xyz
 } -cleanup {
     destroy .t.f
 } -returnCodes error -result {bad window name/identifier "xyz"}
 
 test bind-22.66 {HandleEventGenerate: options <Key> -root [winfo id .t]} -setup {
@@ -3539,11 +3564,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Key> "lappend x %R"
-    event generate .t.f <Key> -root [winfo id .t] 
+    event generate .t.f <Key> -root [winfo id .t]
     expr {[winfo id .t] eq $x}
 } -cleanup {
     destroy .t.f
 } -result {1}
 
@@ -3553,11 +3578,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Button> "lappend x %R"
-    event generate .t.f <Button> -root .t 
+    event generate .t.f <Button> -root .t
     expr {[winfo id .t] eq $x}
 } -cleanup {
     destroy .t.f
 } -result {1}
 
@@ -3567,11 +3592,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <ButtonRelease> "lappend x %R"
-    event generate .t.f <ButtonRelease> -root .t 
+    event generate .t.f <ButtonRelease> -root .t
     expr {[winfo id .t] eq $x}
 } -cleanup {
     destroy .t.f
 } -result {1}
 
@@ -3581,11 +3606,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Motion> "lappend x %R"
-    event generate .t.f <Motion> -root .t 
+    event generate .t.f <Motion> -root .t
     expr {[winfo id .t] eq $x}
 } -cleanup {
     destroy .t.f
 } -result {1}
 
@@ -3595,11 +3620,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <<Paste>> "lappend x %R"
-    event generate .t.f <<Paste>> -root .t 
+    event generate .t.f <<Paste>> -root .t
     expr {[winfo id .t] eq $x}
 } -cleanup {
     destroy .t.f
 } -result {1}
 
@@ -3609,11 +3634,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Enter> "lappend x %R"
-    event generate .t.f <Enter> -root .t 
+    event generate .t.f <Enter> -root .t
     expr {[winfo id .t] eq $x}
 } -cleanup {
     destroy .t.f
 } -result {1}
 
@@ -3623,11 +3648,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Configure> "lappend x %R"
-    event generate .t.f <Configure> -root .t 
+    event generate .t.f <Configure> -root .t
 } -cleanup {
     destroy .t.f
 } -returnCodes error -result {<Configure> event doesn't accept "-root" option}
 
 test bind-22.73 {HandleEventGenerate: options <Key> -rootx xyz} -setup {
@@ -3636,11 +3661,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Key> "lappend x %X"
-    event generate .t.f <Key> -rootx xyz 
+    event generate .t.f <Key> -rootx xyz
 } -cleanup {
     destroy .t.f
 } -returnCodes error -result {bad screen distance "xyz"}
 
 test bind-22.74 {HandleEventGenerate: options <Key> -rootx 2i} -setup {
@@ -3649,11 +3674,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Key> "lappend x %X"
-    event generate .t.f <Key> -rootx 2i 
+    event generate .t.f <Key> -rootx 2i
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
 } -result {1}
 
@@ -3663,11 +3688,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Button> "lappend x %X"
-    event generate .t.f <Button> -rootx 2i 
+    event generate .t.f <Button> -rootx 2i
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
 } -result {1}
 
@@ -3677,11 +3702,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <ButtonRelease> "lappend x %X"
-    event generate .t.f <ButtonRelease> -rootx 2i 
+    event generate .t.f <ButtonRelease> -rootx 2i
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
 } -result {1}
 
@@ -3691,11 +3716,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Motion> "lappend x %X"
-    event generate .t.f <Motion> -rootx 2i 
+    event generate .t.f <Motion> -rootx 2i
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
 } -result {1}
 
@@ -3705,11 +3730,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <<Paste>> "lappend x %X"
-    event generate .t.f <<Paste>> -rootx 2i 
+    event generate .t.f <<Paste>> -rootx 2i
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
 } -result {1}
 
@@ -3719,11 +3744,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Enter> "lappend x %X"
-    event generate .t.f <Enter> -rootx 2i 
+    event generate .t.f <Enter> -rootx 2i
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
 } -result {1}
 
@@ -3733,11 +3758,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Configure> "lappend x %X"
-    event generate .t.f <Configure> -rootx 2i 
+    event generate .t.f <Configure> -rootx 2i
 } -cleanup {
     destroy .t.f
 } -returnCodes error -result {<Configure> event doesn't accept "-rootx" option}
 
 test bind-22.81 {HandleEventGenerate: options <Key> -rooty xyz} -setup {
@@ -3746,11 +3771,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Key> "lappend x %Y"
-    event generate .t.f <Key> -rooty xyz 
+    event generate .t.f <Key> -rooty xyz
 } -cleanup {
     destroy .t.f
 } -returnCodes error -result {bad screen distance "xyz"}
 
 test bind-22.82 {HandleEventGenerate: options <Key> -rooty 2i} -setup {
@@ -3759,11 +3784,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Key> "lappend x %Y"
-    event generate .t.f <Key> -rooty 2i 
+    event generate .t.f <Key> -rooty 2i
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
 } -result {1}
 
@@ -3773,11 +3798,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Button> "lappend x %Y"
-    event generate .t.f <Button> -rooty 2i 
+    event generate .t.f <Button> -rooty 2i
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
 } -result {1}
 
@@ -3787,11 +3812,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <ButtonRelease> "lappend x %Y"
-    event generate .t.f <ButtonRelease> -rooty 2i 
+    event generate .t.f <ButtonRelease> -rooty 2i
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
 } -result {1}
 
@@ -3801,11 +3826,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Motion> "lappend x %Y"
-    event generate .t.f <Motion> -rooty 2i 
+    event generate .t.f <Motion> -rooty 2i
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
 } -result {1}
 
@@ -3815,11 +3840,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <<Paste>> "lappend x %Y"
-    event generate .t.f <<Paste>> -rooty 2i 
+    event generate .t.f <<Paste>> -rooty 2i
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
 } -result {1}
 
@@ -3829,11 +3854,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Enter> "lappend x %Y"
-    event generate .t.f <Enter> -rooty 2i 
+    event generate .t.f <Enter> -rooty 2i
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
 } -result {1}
 
@@ -3843,11 +3868,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Configure> "lappend x %Y"
-    event generate .t.f <Configure> -rooty 2i 
+    event generate .t.f <Configure> -rooty 2i
 } -cleanup {
     destroy .t.f
 } -returnCodes error -result {<Configure> event doesn't accept "-rooty" option}
 
 test bind-22.89 {HandleEventGenerate: options <Key> -sendevent xyz} -setup {
@@ -3856,11 +3881,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Key> "lappend x %E"
-    event generate .t.f <Key> -sendevent xyz 
+    event generate .t.f <Key> -sendevent xyz
 } -cleanup {
     destroy .t.f
 } -returnCodes error -result {expected boolean value but got "xyz"}
 
 test bind-22.90 {HandleEventGenerate: options <Key> -sendevent 1} -setup {
@@ -3869,11 +3894,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Key> "lappend x %E"
-    event generate .t.f <Key> -sendevent 1 
+    event generate .t.f <Key> -sendevent 1
     return $x
 } -cleanup {
     destroy .t.f
 } -result {1}
 
@@ -3883,11 +3908,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Key> "lappend x %E"
-    event generate .t.f <Key> -sendevent yes 
+    event generate .t.f <Key> -sendevent yes
     return $x
 } -cleanup {
     destroy .t.f
 } -result {1}
 
@@ -3897,11 +3922,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Key> "lappend x %E"
-    event generate .t.f <Key> -sendevent 43 
+    event generate .t.f <Key> -sendevent 43
     return $x
 } -cleanup {
     destroy .t.f
 } -result {43}
 
@@ -3911,11 +3936,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Key> "lappend x %#"
-    event generate .t.f <Key> -serial xyz 
+    event generate .t.f <Key> -serial xyz
 } -cleanup {
     destroy .t.f
 } -returnCodes error -result {expected integer but got "xyz"}
 
 test bind-22.94 {HandleEventGenerate: options <Key> -serial 100} -setup {
@@ -3924,11 +3949,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Key> "lappend x %#"
-    event generate .t.f <Key> -serial 100 
+    event generate .t.f <Key> -serial 100
     return $x
 } -cleanup {
     destroy .t.f
 } -result {100}
 
@@ -3938,11 +3963,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Key> "lappend x %s"
-    event generate .t.f <Key> -state xyz 
+    event generate .t.f <Key> -state xyz
 } -cleanup {
     destroy .t.f
 } -returnCodes error -result {expected integer but got "xyz"}
 
 test bind-22.96 {HandleEventGenerate: options <Key> -state 1} -setup {
@@ -3951,11 +3976,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Key> "lappend x %s"
-    event generate .t.f <Key> -state 1 
+    event generate .t.f <Key> -state 1
     return $x
 } -cleanup {
     destroy .t.f
 } -result {1}
 
@@ -3965,11 +3990,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Button> "lappend x %s"
-    event generate .t.f <Button> -state 1025 
+    event generate .t.f <Button> -state 1025
     return $x
 } -cleanup {
     destroy .t.f
 } -result {1025}
 
@@ -3979,11 +4004,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <ButtonRelease> "lappend x %s"
-    event generate .t.f <ButtonRelease> -state 1025 
+    event generate .t.f <ButtonRelease> -state 1025
     return $x
 } -cleanup {
     destroy .t.f
 } -result {1025}
 
@@ -3993,11 +4018,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Motion> "lappend x %s"
-    event generate .t.f <Motion> -state 1 
+    event generate .t.f <Motion> -state 1
     return $x
 } -cleanup {
     destroy .t.f
 } -result {1}
 
@@ -4007,11 +4032,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <<Paste>> "lappend x %s"
-    event generate .t.f <<Paste>> -state 1 
+    event generate .t.f <<Paste>> -state 1
     return $x
 } -cleanup {
     destroy .t.f
 } -result {1}
 
@@ -4021,11 +4046,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Enter> "lappend x %s"
-    event generate .t.f <Enter> -state 1 
+    event generate .t.f <Enter> -state 1
     return $x
 } -cleanup {
     destroy .t.f
 } -result {1}
 
@@ -4035,11 +4060,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Visibility> "lappend x %s"
-    event generate .t.f <Visibility> -state xyz 
+    event generate .t.f <Visibility> -state xyz
 } -cleanup {
     destroy .t.f
 } -returnCodes error -result {bad -state value "xyz": must be VisibilityUnobscured, VisibilityPartiallyObscured, or VisibilityFullyObscured}
 
 test bind-22.103 {HandleEventGenerate: options <Visibility> -state VisibilityUnobscured} -setup {
@@ -4048,11 +4073,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Visibility> "lappend x %s"
-    event generate .t.f <Visibility> -state VisibilityUnobscured 
+    event generate .t.f <Visibility> -state VisibilityUnobscured
     return $x
 } -cleanup {
     destroy .t.f
 } -result {VisibilityUnobscured}
 
@@ -4062,11 +4087,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Configure> "lappend x %s"
-    event generate .t.f <Configure> -state xyz 
+    event generate .t.f <Configure> -state xyz
 } -cleanup {
     destroy .t.f
 } -returnCodes error -result {<Configure> event doesn't accept "-state" option}
 
 test bind-22.105 {HandleEventGenerate: options <Key> -subwindow .xyz} -setup {
@@ -4075,11 +4100,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Key> "lappend x %S"
-    event generate .t.f <Key> -subwindow .xyz 
+    event generate .t.f <Key> -subwindow .xyz
 } -cleanup {
     destroy .t.f
 } -returnCodes error -result {bad window path name ".xyz"}
 
 test bind-22.106 {HandleEventGenerate: options <Key> -subwindow .t} -setup {
@@ -4088,11 +4113,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Key> "lappend x %S"
-    event generate .t.f <Key> -subwindow .t 
+    event generate .t.f <Key> -subwindow .t
     expr {[winfo id .t] eq $x}
 } -cleanup {
     destroy .t.f
 } -result {1}
 
@@ -4102,11 +4127,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Key> "lappend x %S"
-    event generate .t.f <Key> -subwindow xyz 
+    event generate .t.f <Key> -subwindow xyz
 } -cleanup {
     destroy .t.f
 } -returnCodes error -result {bad window name/identifier "xyz"}
 
 test bind-22.108 {HandleEventGenerate: options <Key> -subwindow [winfo id .t]} -setup {
@@ -4115,11 +4140,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Key> "lappend x %S"
-    event generate .t.f <Key> -subwindow [winfo id .t] 
+    event generate .t.f <Key> -subwindow [winfo id .t]
     expr {[winfo id .t] eq $x}
 } -cleanup {
     destroy .t.f
 } -result {1}
 
@@ -4129,11 +4154,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Button> "lappend x %S"
-    event generate .t.f <Button> -subwindow .t 
+    event generate .t.f <Button> -subwindow .t
     expr {[winfo id .t] eq $x}
 } -cleanup {
     destroy .t.f
 } -result {1}
 
@@ -4143,11 +4168,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <ButtonRelease> "lappend x %S"
-    event generate .t.f <ButtonRelease> -subwindow .t 
+    event generate .t.f <ButtonRelease> -subwindow .t
     expr {[winfo id .t] eq $x}
 } -cleanup {
     destroy .t.f
 } -result {1}
 
@@ -4157,11 +4182,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Motion> "lappend x %S"
-    event generate .t.f <Motion> -subwindow .t 
+    event generate .t.f <Motion> -subwindow .t
     expr {[winfo id .t] eq $x}
 } -cleanup {
     destroy .t.f
 } -result {1}
 
@@ -4171,11 +4196,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <<Paste>> "lappend x %S"
-    event generate .t.f <<Paste>> -subwindow .t 
+    event generate .t.f <<Paste>> -subwindow .t
     expr {[winfo id .t] eq $x}
 } -cleanup {
     destroy .t.f
 } -result {1}
 
@@ -4185,11 +4210,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Enter> "lappend x %S"
-    event generate .t.f <Enter> -subwindow .t 
+    event generate .t.f <Enter> -subwindow .t
     expr {[winfo id .t] eq $x}
 } -cleanup {
     destroy .t.f
 } -result {1}
 
@@ -4199,11 +4224,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Configure> "lappend x %S"
-    event generate .t.f <Configure> -subwindow .t 
+    event generate .t.f <Configure> -subwindow .t
 } -cleanup {
     destroy .t.f
 } -returnCodes error -result {<Configure> event doesn't accept "-subwindow" option}
 
 test bind-22.115 {HandleEventGenerate: options <Key> -time xyz} -setup {
@@ -4212,11 +4237,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Key> "lappend x %t"
-    event generate .t.f <Key> -time xyz 
+    event generate .t.f <Key> -time xyz
 } -cleanup {
     destroy .t.f
 } -returnCodes error -result {expected integer but got "xyz"}
 
 test bind-22.116 {HandleEventGenerate: options <Key> -time 100} -setup {
@@ -4225,11 +4250,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Key> "lappend x %t"
-    event generate .t.f <Key> -time 100 
+    event generate .t.f <Key> -time 100
     return $x
 } -cleanup {
     destroy .t.f
 } -result {100}
 
@@ -4239,11 +4264,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Button> "lappend x %t"
-    event generate .t.f <Button> -time 100 
+    event generate .t.f <Button> -time 100
     return $x
 } -cleanup {
     destroy .t.f
 } -result {100}
 
@@ -4253,11 +4278,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <ButtonRelease> "lappend x %t"
-    event generate .t.f <ButtonRelease> -time 100 
+    event generate .t.f <ButtonRelease> -time 100
     return $x
 } -cleanup {
     destroy .t.f
 } -result {100}
 
@@ -4267,11 +4292,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Motion> "lappend x %t"
-    event generate .t.f <Motion> -time 100 
+    event generate .t.f <Motion> -time 100
     return $x
 } -cleanup {
     destroy .t.f
 } -result {100}
 
@@ -4281,11 +4306,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <<Paste>> "lappend x %t"
-    event generate .t.f <<Paste>> -time 100 
+    event generate .t.f <<Paste>> -time 100
     return $x
 } -cleanup {
     destroy .t.f
 } -result {100}
 
@@ -4295,11 +4320,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Enter> "lappend x %t"
-    event generate .t.f <Enter> -time 100 
+    event generate .t.f <Enter> -time 100
     return $x
 } -cleanup {
     destroy .t.f
 } -result {100}
 
@@ -4309,11 +4334,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Property> "lappend x %t"
-    event generate .t.f <Property> -time 100 
+    event generate .t.f <Property> -time 100
     return $x
 } -cleanup {
     destroy .t.f
 } -result {100}
 
@@ -4323,11 +4348,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Configure> "lappend x %t"
-    event generate .t.f <Configure> -time 100 
+    event generate .t.f <Configure> -time 100
 } -cleanup {
     destroy .t.f
 } -returnCodes error -result {<Configure> event doesn't accept "-time" option}
 
 test bind-22.124 {HandleEventGenerate: options <Expose> -width xyz} -setup {
@@ -4336,11 +4361,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Expose> "lappend x %w"
-    event generate .t.f <Expose> -width xyz 
+    event generate .t.f <Expose> -width xyz
 } -cleanup {
     destroy .t.f
 } -returnCodes error -result {bad screen distance "xyz"}
 
 test bind-22.125 {HandleEventGenerate: options <Expose> -width 2i} -setup {
@@ -4349,11 +4374,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Expose> "lappend x %w"
-    event generate .t.f <Expose> -width 2i 
+    event generate .t.f <Expose> -width 2i
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
 } -result {1}
 
@@ -4363,11 +4388,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Configure> "lappend x %w"
-    event generate .t.f <Configure> -width 2i 
+    event generate .t.f <Configure> -width 2i
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
 } -result {1}
 
@@ -4377,11 +4402,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Key> "lappend x %k"
-    event generate .t.f <Key> -width 2i 
+    event generate .t.f <Key> -width 2i
 } -cleanup {
     destroy .t.f
 } -returnCodes error -result {<Key> event doesn't accept "-width" option}
 
 test bind-22.128 {HandleEventGenerate: options <Unmap> -window .xyz} -setup {
@@ -4390,11 +4415,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Unmap> "lappend x %W"
-    event generate .t.f <Unmap> -window .xyz 
+    event generate .t.f <Unmap> -window .xyz
 } -cleanup {
     destroy .t.f
 } -returnCodes error -result {bad window path name ".xyz"}
 
 test bind-22.129 {HandleEventGenerate: options <Unmap> -window .t.f} -setup {
@@ -4403,11 +4428,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Unmap> "lappend x %W"
-    event generate .t.f <Unmap> -window .t.f 
+    event generate .t.f <Unmap> -window .t.f
     return $x
 } -cleanup {
     destroy .t.f
 } -result {.t.f}
 
@@ -4417,11 +4442,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Unmap> "lappend x %W"
-    event generate .t.f <Unmap> -window xyz 
+    event generate .t.f <Unmap> -window xyz
 } -cleanup {
     destroy .t.f
 } -returnCodes error -result {bad window name/identifier "xyz"}
 
 test bind-22.131 {HandleEventGenerate: options <Unmap> -window [winfo id .t.f]} -setup {
@@ -4430,11 +4455,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Unmap> "lappend x %W"
-    event generate .t.f <Unmap> -window [winfo id .t.f] 
+    event generate .t.f <Unmap> -window [winfo id .t.f]
     return $x
 } -cleanup {
     destroy .t.f
 } -result {.t.f}
 
@@ -4444,11 +4469,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Unmap> "lappend x %W"
-    event generate .t.f <Unmap> -window .t.f 
+    event generate .t.f <Unmap> -window .t.f
     return $x
 } -cleanup {
     destroy .t.f
 } -result {.t.f}
 
@@ -4458,11 +4483,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Map> "lappend x %W"
-    event generate .t.f <Map> -window .t.f 
+    event generate .t.f <Map> -window .t.f
     return $x
 } -cleanup {
     destroy .t.f
 } -result {.t.f}
 
@@ -4472,11 +4497,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Reparent> "lappend x %W"
-    event generate .t.f <Reparent> -window .t.f 
+    event generate .t.f <Reparent> -window .t.f
     return $x
 } -cleanup {
     destroy .t.f
 } -result {.t.f}
 
@@ -4486,11 +4511,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Configure> "lappend x %W"
-    event generate .t.f <Configure> -window .t.f 
+    event generate .t.f <Configure> -window .t.f
     return $x
 } -cleanup {
     destroy .t.f
 } -result {.t.f}
 
@@ -4500,11 +4525,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Gravity> "lappend x %W"
-    event generate .t.f <Gravity> -window .t.f 
+    event generate .t.f <Gravity> -window .t.f
     return $x
 } -cleanup {
     destroy .t.f
 } -result {.t.f}
 
@@ -4514,11 +4539,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Circulate> "lappend x %W"
-    event generate .t.f <Circulate> -window .t.f 
+    event generate .t.f <Circulate> -window .t.f
     return $x
 } -cleanup {
     destroy .t.f
 } -result {.t.f}
 
@@ -4528,11 +4553,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Key> "lappend x %W"
-    event generate .t.f <Key> -window .t.f 
+    event generate .t.f <Key> -window .t.f
 } -cleanup {
     destroy .t.f
 } -returnCodes error -result {<Key> event doesn't accept "-window" option}
 
 test bind-22.139 {HandleEventGenerate: options <Key> -x xyz} -setup {
@@ -4541,11 +4566,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Key> "lappend x %x"
-    event generate .t.f <Key> -x xyz 
+    event generate .t.f <Key> -x xyz
 } -cleanup {
     destroy .t.f
 } -returnCodes error -result {bad screen distance "xyz"}
 
 test bind-22.140 {HandleEventGenerate: options <Key> -x 2i} -setup {
@@ -4554,11 +4579,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Key> "lappend x %x"
-    event generate .t.f <Key> -x 2i 
+    event generate .t.f <Key> -x 2i
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
 } -result {1}
 
@@ -4568,11 +4593,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Button> "lappend x %x"
-    event generate .t.f <Button> -x 2i 
+    event generate .t.f <Button> -x 2i
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
 } -result {1}
 
@@ -4582,11 +4607,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <ButtonRelease> "lappend x %x"
-    event generate .t.f <ButtonRelease> -x 2i 
+    event generate .t.f <ButtonRelease> -x 2i
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
 } -result {1}
 
@@ -4596,11 +4621,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Motion> "lappend x %x"
-    event generate .t.f <Motion> -x 2i 
+    event generate .t.f <Motion> -x 2i
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
 } -result {1}
 
@@ -4610,11 +4635,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <<Paste>> "lappend x %x"
-    event generate .t.f <<Paste>> -x 2i 
+    event generate .t.f <<Paste>> -x 2i
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
 } -result {1}
 
@@ -4624,11 +4649,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Enter> "lappend x %x"
-    event generate .t.f <Enter> -x 2i 
+    event generate .t.f <Enter> -x 2i
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
 } -result {1}
 
@@ -4638,11 +4663,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Expose> "lappend x %x"
-    event generate .t.f <Expose> -x 2i 
+    event generate .t.f <Expose> -x 2i
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
 } -result {1}
 
@@ -4652,11 +4677,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Configure> "lappend x %x"
-    event generate .t.f <Configure> -x 2i 
+    event generate .t.f <Configure> -x 2i
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
 } -result {1}
 
@@ -4666,11 +4691,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Gravity> "lappend x %x"
-    event generate .t.f <Gravity> -x 2i 
+    event generate .t.f <Gravity> -x 2i
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
 } -result {1}
 
@@ -4680,11 +4705,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Reparent> "lappend x %x"
-    event generate .t.f <Reparent> -x 2i 
+    event generate .t.f <Reparent> -x 2i
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
 } -result {1}
 
@@ -4694,11 +4719,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Map> "lappend x %x"
-    event generate .t.f <Map> -x 2i 
+    event generate .t.f <Map> -x 2i
 } -cleanup {
     destroy .t.f
 } -returnCodes error -result {<Map> event doesn't accept "-x" option}
 
 test bind-22.151 {HandleEventGenerate: options <Key> -y xyz} -setup {
@@ -4707,11 +4732,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Key> "lappend x %y"
-    event generate .t.f <Key> -y xyz 
+    event generate .t.f <Key> -y xyz
 } -cleanup {
     destroy .t.f
 } -returnCodes error -result {bad screen distance "xyz"}
 
 test bind-22.152 {HandleEventGenerate: options <Key> -y 2i} -setup {
@@ -4720,11 +4745,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Key> "lappend x %y"
-    event generate .t.f <Key> -y 2i 
+    event generate .t.f <Key> -y 2i
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
 } -result {1}
 
@@ -4734,11 +4759,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Button> "lappend x %y"
-    event generate .t.f <Button> -y 2i 
+    event generate .t.f <Button> -y 2i
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
 } -result {1}
 
@@ -4748,11 +4773,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <ButtonRelease> "lappend x %y"
-    event generate .t.f <ButtonRelease> -y 2i 
+    event generate .t.f <ButtonRelease> -y 2i
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
 } -result {1}
 
@@ -4762,11 +4787,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Motion> "lappend x %y"
-    event generate .t.f <Motion> -y 2i 
+    event generate .t.f <Motion> -y 2i
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
 } -result {1}
 
@@ -4776,11 +4801,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <<Paste>> "lappend x %y"
-    event generate .t.f <<Paste>> -y 2i 
+    event generate .t.f <<Paste>> -y 2i
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
 } -result {1}
 
@@ -4790,11 +4815,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Enter> "lappend x %y"
-    event generate .t.f <Enter> -y 2i 
+    event generate .t.f <Enter> -y 2i
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
 } -result {1}
 
@@ -4804,11 +4829,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Expose> "lappend x %y"
-    event generate .t.f <Expose> -y 2i 
+    event generate .t.f <Expose> -y 2i
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
 } -result {1}
 
@@ -4818,11 +4843,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Configure> "lappend x %y"
-    event generate .t.f <Configure> -y 2i 
+    event generate .t.f <Configure> -y 2i
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
 } -result {1}
 
@@ -4832,11 +4857,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Gravity> "lappend x %y"
-    event generate .t.f <Gravity> -y 2i 
+    event generate .t.f <Gravity> -y 2i
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
 } -result {1}
 
@@ -4846,11 +4871,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Reparent> "lappend x %y"
-    event generate .t.f <Reparent> -y 2i 
+    event generate .t.f <Reparent> -y 2i
     expr {[winfo pixels .t.f 2i] eq $x}
 } -cleanup {
     destroy .t.f
 } -result {1}
 
@@ -4860,11 +4885,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Map> "lappend x %y"
-    event generate .t.f <Map> -y 2i 
+    event generate .t.f <Map> -y 2i
 } -cleanup {
     destroy .t.f
 } -returnCodes error -result {<Map> event doesn't accept "-y" option}
 
 test bind-22.163 {HandleEventGenerate: options <Key> -xyz 1} -setup {
@@ -4873,11 +4898,11 @@
     focus -force .t.f
     update
     set x {}
 } -body {
     bind .t.f <Key> "lappend x %k"
-    event generate .t.f <Key> -xyz 1 
+    event generate .t.f <Key> -xyz 1
 } -cleanup {
     destroy .t.f
 } -returnCodes error -result {bad option "-xyz": must be -when, -above, -borderwidth, -button, -count, -data, -delta, -detail, -focus, -height, -keycode, -keysym, -mode, -override, -place, -root, -rootx, -rooty, -sendevent, -serial, -state, -subwindow, -time, -warp, -width, -window, -x, or -y}
 # Note that the -data option is tested in bind-32.* because it has
 # more demanding requirements in memory handling
@@ -5763,12 +5788,12 @@
 
 test bind-27.1 {button names} -body {
     bind .t <Expose-1> foo
 } -returnCodes error -result {specified button "1" for non-button event}
 test bind-27.2 {button names} -body {
-    bind .t <Button-6> foo
-} -returnCodes error -result {specified keysym "6" for non-key event}
+    bind .t <Button-10> foo
+} -returnCodes error -result {bad event type or keysym "10"}
 test bind-27.3 {button names} -setup {
     frame .t.f -class Test -width 150 -height 100
     pack .t.f
     focus -force .t.f
     update
@@ -5835,10 +5860,66 @@
     event generate .t.f <ButtonRelease-5>
     set x
 } -cleanup {
     destroy .t.f
 } -result {<Button-5> {button 5}}
+test bind-27.8 {button names} -setup {
+    frame .t.f -class Test -width 150 -height 100
+    pack .t.f
+    focus -force .t.f
+    update
+} -body {
+    bind .t.f <Button-6> {lappend x "button 6"}
+    set x [bind .t.f]
+    event generate .t.f <Button-6>
+    event generate .t.f <ButtonRelease-6>
+    set x
+} -cleanup {
+    destroy .t.f
+} -result {<Button-6> {button 6}}
+test bind-27.9 {button names} -setup {
+    frame .t.f -class Test -width 150 -height 100
+    pack .t.f
+    focus -force .t.f
+    update
+} -body {
+    bind .t.f <Button-7> {lappend x "button 7"}
+    set x [bind .t.f]
+    event generate .t.f <Button-7>
+    event generate .t.f <ButtonRelease-7>
+    set x
+} -cleanup {
+    destroy .t.f
+} -result {<Button-7> {button 7}}
+test bind-27.10 {button names} -setup {
+    frame .t.f -class Test -width 150 -height 100
+    pack .t.f
+    focus -force .t.f
+    update
+} -body {
+    bind .t.f <Button-8> {lappend x "button 8"}
+    set x [bind .t.f]
+    event generate .t.f <Button-8>
+    event generate .t.f <ButtonRelease-8>
+    set x
+} -cleanup {
+    destroy .t.f
+} -result {<Button-8> {button 8}}
+test bind-27.11 {button names} -setup {
+    frame .t.f -class Test -width 150 -height 100
+    pack .t.f
+    focus -force .t.f
+    update
+} -body {
+    bind .t.f <Button-9> {lappend x "button 9"}
+    set x [bind .t.f]
+    event generate .t.f <Button-9>
+    event generate .t.f <ButtonRelease-9>
+    set x
+} -cleanup {
+    destroy .t.f
+} -result {<Button-9> {button 9}}
 
 test bind-28.1 {keysym names} -body {
     bind .t <Expose-a> foo
 } -returnCodes error -result {specified keysym "a" for non-key event}
 test bind-28.2 {keysym names} -body {
@@ -5934,11 +6015,11 @@
     rename bgerror {}
 } -result {{This is a test} {This is a test
     while executing
 "error "This is a test""
     (command bound to event)}}
-    
+
 test bind-29.2 {Tk_BackgroundError procedure} -setup {
     proc do {} {
         event generate .t.f <Button>
         event generate .t.f <ButtonRelease>
     }

Index: tests/bitmap.test
==================================================================
--- tests/bitmap.test
+++ tests/bitmap.test
@@ -13,11 +13,11 @@
 
 test bitmap-1.1 {Tk_AllocBitmapFromObj - converting internal reps} -constraints {
     testbitmap
 } -body {
     set x gray25
-    lindex $x 0             
+    lindex $x 0
     button .b -bitmap $x
     lindex $x 0
     testbitmap gray25
 } -cleanup {
     destroy .b
@@ -52,16 +52,16 @@
 } -result {{{1 1}} {{2 1}}}
 
 test bitmap-2.1 {Tk_GetBitmap procedure} -body {
     button .b1 -bitmap bad_name
 } -cleanup {
-    destroy .b1 
+    destroy .b1
 } -returnCodes error -result {bitmap "bad_name" not defined}
 test bitmap-2.2 {Tk_GetBitmap procedure} -body {
     button .b1 -bitmap @xyzzy
 } -cleanup {
-    destroy .b1 
+    destroy .b1
 } -returnCodes error -result {error reading bitmap file "xyzzy"}
 
 test bitmap-3.1 {Tk_FreeBitmapFromObj - reference counts} -constraints {
     testbitmap
 } -setup {
@@ -82,16 +82,18 @@
     destroy .b1 .b2 .b3     ;# destroying just in case
 } -result {{{3 1}} {{2 1}} {{1 1}} {}}
 
 test bitmap-4.1 {FreeBitmapObjProc} -constraints {
     testbitmap
+} -setup {
+    proc copy {s} {return [string index $s 0][string range $s 1 end]}
 } -body {
-    set x [join questhead]
+    set x [copy questhead]
     button .b -bitmap $x
-    set y [join questhead]
+    set y [copy questhead]
     .b configure -bitmap $y
-    set z [join questhead]
+    set z [copy questhead]
     .b configure -bitmap $z
     set result {}
     lappend result [testbitmap questhead]
     set x red
     lappend result [testbitmap questhead]
@@ -100,12 +102,13 @@
     destroy .b
     lappend result [testbitmap questhead]
     set y bogus
     return $result
 } -cleanup {
+    rename copy {}
     destroy .b
 } -result {{{1 3}} {{1 2}} {{1 1}} {}}
 
 
 # cleanup
 cleanupTests
 return

Index: tests/border.test
==================================================================
--- tests/border.test
+++ tests/border.test
@@ -8,23 +8,23 @@
 package require tcltest 2.2
 namespace import ::tcltest::*
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 
-test border-1.1 {Tk_AllocBorderFromObj - converting internal reps} -constraints {  
-    testborder 
+test border-1.1 {Tk_AllocBorderFromObj - converting internal reps} -constraints {
+    testborder
 } -body {
     set x orange
     lindex $x 0
     button .b1 -bg $x -text .b1
     lindex $x 0
     testborder orange
 } -cleanup {
     destroy .b1
 } -result {{1 0}}
-test border-1.2 {Tk_AllocBorderFromObj - discard stale border} -constraints {  
-    testborder 
+test border-1.2 {Tk_AllocBorderFromObj - discard stale border} -constraints {
+    testborder
 } -setup {
     set result {}
 } -body {
     set x orange
     button .b1 -bg $x -text First
@@ -33,12 +33,12 @@
     button .b2 -bg $x -text Second
     lappend result [testborder orange]
 } -cleanup {
     destroy .b1 .b2
 } -result {{} {{1 1}}}
-test border-1.3 {Tk_AllocBorderFromObj - reuse existing border} -constraints {  
-    testborder 
+test border-1.3 {Tk_AllocBorderFromObj - reuse existing border} -constraints {
+    testborder
 } -setup {
     set result {}
 } -body {
     set x orange
     button .b1 -bg $x -text First
@@ -47,11 +47,11 @@
     pack .b1 .b2 -side top
     lappend result [testborder orange]
 } -cleanup {
     destroy .b1 .b2
 } -result {{{1 1}} {{2 1}}}
-test border-1.4 {Tk_AllocBorderFromObj - try other borders in list} -constraints {  
+test border-1.4 {Tk_AllocBorderFromObj - try other borders in list} -constraints {
     testborder pseudocolor8
 } -setup {
     toplevel .t -visual {pseudocolor 8} -colormap new
     wm geom .t +0+0
     set result {}
@@ -68,11 +68,11 @@
     lappend result [testborder purple]
 } -cleanup {
     destroy .b1 .b2 .t
 } -result {{{1 1}} {{1 1} {1 0}} {{1 0} {2 1}}}
 
-test border-2.1 {Tk_Free3DBorder - reference counts} -constraints {  
+test border-2.1 {Tk_Free3DBorder - reference counts} -constraints {
     testborder pseudocolor8
 } -setup {
     toplevel .t -visual {pseudocolor 8} -colormap new
     wm geom .t +0+0
     set result {}
@@ -92,11 +92,11 @@
     destroy .t.b
     lappend result [testborder purple]
 } -cleanup {
     destroy .b1 .b2 .t
 } -result {{{1 0} {2 1}} {{1 0} {1 1}} {{1 0}} {}}
-test border-2.2 {Tk_Free3DBorder - unlinking from list} -constraints {  
+test border-2.2 {Tk_Free3DBorder - unlinking from list} -constraints {
     testborder pseudocolor8
 } -setup {
     toplevel .t -visual {pseudocolor 8} -colormap new
     wm geom .t +0+0
     toplevel .t2 -visual {pseudocolor 8} -colormap new
@@ -125,20 +125,22 @@
     lappend result [testborder purple]
 } -cleanup {
     destroy .b .t2 .t3 .t
 } -result {{{4 1} {3 0} {2 0} {1 0}} {{4 1} {2 0} {1 0}} {{4 1} {2 0}} {{2 0}} {}}
 
-test border-3.1 {FreeBorderObjProc} -constraints {  
-    testborder 
+
+test border-3.1 {FreeBorderObjProc} -constraints {
+    testborder
 } -setup {
     set result {}
+    proc copy {s} {return [string index $s 0][string range $s 1 end]}
 } -body {
-    set x [join purple]
+    set x [copy purple]
     button .b -bg $x -text .b1
-    set y [join purple]
+    set y [copy purple]
     .b configure -bg $y
-    set z [join purple]
+    set z [copy purple]
     .b configure -bg $z
     lappend result [testborder purple]
     set x red
     lappend result [testborder purple]
     set z 32
@@ -146,10 +148,11 @@
     destroy .b
     lappend result [testborder purple]
     set y bogus
     return $result
 } -cleanup {
+    rename copy {}
     destroy .b
 } -result {{{1 3}} {{1 2}} {{1 1}} {}}
 
 test border-4.1 {Tk_GetReliefFromObj} -body {
     button .b -relief flat

Index: tests/busy.test
==================================================================
--- tests/busy.test
+++ tests/busy.test
@@ -21,99 +21,107 @@
 
 test busy-2.1 {tk busy hold} -returnCodes error -body {
     tk busy hold
 } -result {wrong # args: should be "tk busy hold window ?option value ...?"}
 test busy-2.2 {tk busy hold root window} -body {
-    tk busy hold .
+    set res [tk busy hold .]
     update
+    set res
 } -cleanup {
     tk busy forget .
-} -result {}
+} -result {._Busy}
 test busy-2.3 {tk busy hold root window with shortcut} -body {
-    tk busy .
+    set res [tk busy .]
     update
+    set res
 } -cleanup {
     tk busy forget .
-} -result {}
+} -result {._Busy}
 test busy-2.4 {tk busy hold nested window} -setup {
     pack [frame .f]
 } -body {
-    tk busy hold .f
+    set res [tk busy hold .f]
     update
+    set res
 } -cleanup {
     tk busy forget .f
     destroy .f
-} -result {}
+} -result {.f_Busy}
 test busy-2.5 {tk busy hold nested window with shortcut} -setup {
     pack [frame .f]
 } -body {
-    tk busy .f
+    set res [tk busy .f]
     update
+    set res
 } -cleanup {
     tk busy forget .f
     destroy .f
-} -result {}
+} -result {.f_Busy}
 test busy-2.6 {tk busy hold toplevel window} -setup {
     toplevel .f
 } -body {
-    tk busy hold .f
+    set res [tk busy hold .f]
     update
+    set res
 } -cleanup {
     tk busy forget .f
     destroy .f
-} -result {}
+} -result {.f._Busy}
 test busy-2.7 {tk busy hold toplevel window with shortcut} -setup {
     toplevel .f
 } -body {
-    tk busy .f
+    set res [tk busy .f]
     update
+    set res
 } -cleanup {
     tk busy forget .f
     destroy .f
-} -result {}
+} -result {.f._Busy}
 test busy-2.8 {tk busy hold non existing window} -body {
     tk busy hold .f
     update
 } -returnCodes error -result {bad window path name ".f"}
 test busy-2.9 {tk busy hold (shortcut) non existing window} -body {
     tk busy .f
     update
 } -returnCodes {error} -result {bad window path name ".f"}
 test busy-2.10 {tk busy hold root window with cursor} -body {
-    tk busy hold . -cursor arrow
+    set res [tk busy hold . -cursor arrow]
     update
+    set res
 } -cleanup {
     tk busy forget .
-} -result {}
+} -result {._Busy}
 test busy-2.11 {tk busy hold (shortcut) root window, cursor} -body {
-    tk busy . -cursor arrow
+    set res [tk busy . -cursor arrow]
     update
+    set res
 } -cleanup {
     tk busy forget .
-} -result {}
+} -result {._Busy}
 test busy-2.12 {tk busy hold root window, invalid cursor} -body {
     tk busy hold . -cursor nonExistingCursor
     update
-} -constraints tempNotMac -returnCodes error -cleanup {
+} -returnCodes error -cleanup {
     tk busy forget .
 } -result {bad cursor spec "nonExistingCursor"}
 test busy-2.13 {tk busy hold (shortcut) root window, invalid cursor} -body {
     tk busy . -cursor nonExistingCursor
     update
-} -constraints tempNotMac -returnCodes error -cleanup {
+} -returnCodes error -cleanup {
     tk busy forget .
 } -result {bad cursor spec "nonExistingCursor"}
 test busy-2.14 {tk busy hold root window, invalid option} -body {
     tk busy hold . -invalidOption 1
     update
-} -constraints tempNotMac -returnCodes error -cleanup {
+} -returnCodes error -cleanup {
     tk busy forget .
 } -result {unknown option "-invalidOption"}
 test busy-2.15 {tk busy hold (shortcut) root window, invalid option} -body {
     tk busy . -invalidOption 1
     update
-} -constraints tempNotMac -returnCodes error -cleanup {
+} -returnCodes error -cleanup {
     tk busy forget .
 } -result {unknown option "-invalidOption"}
 
 test busy-3.1 {tk busy cget no window} -returnCodes error -body {
     tk busy cget
@@ -168,11 +176,11 @@
 } -body {
     tk busy cget .f -cursor
 } -cleanup {
     tk busy forget .f
     destroy .f
-} -result {hand1} -constraints tempNotMac
+} -result {hand1}
 
 test busy-4.1 {tk busy configure no window} -returnCodes error -body {
     tk busy configure
 } -result {wrong # args: should be "tk busy configure window ?option? ?value ...?"}
 
@@ -208,11 +216,11 @@
 } -cleanup {
     tk busy forget .f
     destroy .f
 } -result {{-cursor cursor Cursor wait wait}}
 
-test busy-4.5 {tk busy configure} -constraints {nonwin tempNotMac} -setup {
+test busy-4.5 {tk busy configure} -constraints {nonwin} -setup {
     pack [frame .f]
     tk busy hold .f -cursor hand2
     update
 } -body {
     tk busy configure .f
@@ -264,11 +272,11 @@
     tk busy forget .f
     destroy .f
 } -result {-cursor cursor Cursor wait wait}
 
 test busy-4.8 {tk busy configure valid option} -constraints {
-    nonwin tempNotMac
+    nonwin
 } -setup {
     pack [frame .f]
     tk busy hold .f -cursor circle
     update
 } -body {
@@ -297,19 +305,19 @@
     tk busy configure .f -cursor pencil
     tk busy cget .f -cursor
 } -cleanup {
     tk busy forget .f
     destroy .f
-} -result {pencil} -constraints tempNotMac
+} -result {pencil}
 
 test busy-4.10 {tk busy configure valid option with invalid value} -setup {
     pack [frame .f]
     tk busy hold .f
     update
 } -body {
     tk busy configure .f -cursor nonExistingCursor
-} -constraints tempNotMac -returnCodes error -cleanup {
+} -returnCodes error -cleanup {
     tk busy forget .f
     destroy .f
 } -result {bad cursor spec "nonExistingCursor"}
 
 test busy-5.1 {tk busy forget} -returnCodes error -body {
@@ -470,8 +478,32 @@
     lsort [tk busy current *3*]
 } -cleanup {
     tk busy forget .f2
     destroy .f1 .f2
 } -result {}
+
+test busy-8.1 {tk busy busywindow with a busy toplevel} -body {
+    toplevel .top
+    tk busy .top
+    tk busy busywindow .top
+} -cleanup {
+    tk busy forget .top
+    destroy .top
+} -result {.top._Busy}
+test busy-8.2 {tk busy busywindow with a busy widget} -body {
+    pack [frame .f]
+    tk busy .f
+    tk busy busywindow .f
+} -cleanup {
+    tk busy forget .f
+    destroy .f
+} -result {.f_Busy}
+test busy-8.3 {tk busy busywindow with a nonexisting widget} -body {
+    tk busy .
+    tk busy busywindow .nonExistingWidget
+} -cleanup {
+    tk busy forget .
+} -result {}
+
 
 ::tcltest::cleanupTests
 return

Index: tests/button.test
==================================================================
--- tests/button.test
+++ tests/button.test
@@ -560,11 +560,11 @@
     label .l -highlightthickness 2 -font {Helvetica -12 bold}
     pack .l
     update
 } -body {
     .l configure -borderwidth 1.3
-    .l cget -borderwidth 
+    .l cget -borderwidth
 } -cleanup {
     destroy .l
 } -result {1.3}
 test button-1.58 {configuration option: "borderwidth" for label} -setup {
     label .l -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
@@ -579,11 +579,11 @@
     button .b -highlightthickness 2 -font {Helvetica -12 bold}
     pack .b
     update
 } -body {
     .b configure -borderwidth 1.3
-    .b cget -borderwidth 
+    .b cget -borderwidth
 } -cleanup {
     destroy .b
 } -result {1.3}
 test button-1.60 {configuration option: "borderwidth" for button} -setup {
     button .b -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
@@ -598,11 +598,11 @@
     checkbutton .c -highlightthickness 2 -font {Helvetica -12 bold}
     pack .c
     update
 } -body {
     .c configure -borderwidth 1.3
-    .c cget -borderwidth 
+    .c cget -borderwidth
 } -cleanup {
     destroy .c
 } -result {1.3}
 test button-1.62 {configuration option: "borderwidth" for checkbutton} -setup {
     checkbutton .c -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
@@ -617,11 +617,11 @@
     radiobutton .r -highlightthickness 2 -font {Helvetica -12 bold}
     pack .r
     update
 } -body {
     .r configure -borderwidth 1.3
-    .r cget -borderwidth 
+    .r cget -borderwidth
 } -cleanup {
     destroy .r
 } -result {1.3}
 test button-1.64 {configuration option: "borderwidth" for radiobutton} -setup {
     radiobutton .r -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
@@ -1001,78 +1001,78 @@
 } -cleanup {
     destroy .r
 } -returnCodes {error} -result {unknown color name "non-existent"}
 
 test button-1.103 {configuration option: "font" for label} -setup {
-    label .l -borderwidth 2 -highlightthickness 2 
+    label .l -borderwidth 2 -highlightthickness 2
     pack .l
     update
 } -body {
     .l configure -font {Helvetica -12}
     .l cget -font
 } -cleanup {
     destroy .l
 } -result {Helvetica -12}
 test button-1.104 {configuration option: "activebackground" for label} -setup {
-    label .l -borderwidth 2 -highlightthickness 2 
+    label .l -borderwidth 2 -highlightthickness 2
     pack .l
     update
 } -body {
     .l configure -font {}
 } -cleanup {
     destroy .l
 } -returnCodes {error} -result {font "" doesn't exist}
 test button-1.105 {configuration option: "font" for button} -setup {
-    button .b -borderwidth 2 -highlightthickness 2 
+    button .b -borderwidth 2 -highlightthickness 2
     pack .b
     update
 } -body {
     .b configure -font {Helvetica -12}
     .b cget -font
 } -cleanup {
     destroy .b
 } -result {Helvetica -12}
 test button-1.106 {configuration option: "activebackground" for button} -setup {
-    button .b -borderwidth 2 -highlightthickness 2 
+    button .b -borderwidth 2 -highlightthickness 2
     pack .b
     update
 } -body {
     .b configure -font {}
 } -cleanup {
     destroy .b
 } -returnCodes {error} -result {font "" doesn't exist}
 test button-1.107 {configuration option: "font" for checkbutton} -setup {
-    checkbutton .c -borderwidth 2 -highlightthickness 2 
+    checkbutton .c -borderwidth 2 -highlightthickness 2
     pack .c
     update
 } -body {
     .c configure -font {Helvetica -12}
     .c cget -font
 } -cleanup {
     destroy .c
 } -result {Helvetica -12}
 test button-1.108 {configuration option: "activebackground" for checkbutton} -setup {
-    checkbutton .c -borderwidth 2 -highlightthickness 2 
+    checkbutton .c -borderwidth 2 -highlightthickness 2
     pack .c
     update
 } -body {
     .c configure -font {}
 } -cleanup {
     destroy .c
 } -returnCodes {error} -result {font "" doesn't exist}
 test button-1.109 {configuration option: "font" for radiobutton} -setup {
-    radiobutton .r -borderwidth 2 -highlightthickness 2 
+    radiobutton .r -borderwidth 2 -highlightthickness 2
     pack .r
     update
 } -body {
     .r configure -font {Helvetica -12}
     .r cget -font
 } -cleanup {
     destroy .r
 } -result {Helvetica -12}
 test button-1.110 {configuration option: "activebackground" for radiobutton} -setup {
-    radiobutton .r -borderwidth 2 -highlightthickness 2 
+    radiobutton .r -borderwidth 2 -highlightthickness 2
     pack .r
     update
 } -body {
     .r configure -font {}
 } -cleanup {
@@ -2667,11 +2667,11 @@
 } -cleanup {
     destroy .c
 } -result {}
 
 # ex-tests 3.*
-test button-2.1 {ButtonCreate - not enough arguments} -body {   
+test button-2.1 {ButtonCreate - not enough arguments} -body {
     button
 } -returnCodes {error} -result {wrong # args: should be "button pathName ?-option value ...?"}
 
 test button-2.2 {ButtonCreate procedure - setting label class} -body {
     label .x
@@ -2707,20 +2707,20 @@
 } -result {Button}
 
 test button-2.7 {ButtonCreate - bad window name} -body {
     button foo
 } -cleanup {
-    destroy foo             
+    destroy foo
 } -returnCodes {error} -result {bad window path name "foo"}
-######### test ex 3.8 
-test button-2.8 {ButtonCreate procedure - error in default option value} -body { 
+######### test ex 3.8
+test button-2.8 {ButtonCreate procedure - error in default option value} -body {
     option add *funny.background bogus
     button .funny
 } -cleanup {
     option clear
     destroy .funny
-} -returnCodes {error} -result {unknown color name "bogus"} 
+} -returnCodes {error} -result {unknown color name "bogus"}
 test button-2.9 {ButtonCreate procedure - error in default option value} -body {
    option add *funny.background bogus
     catch {button .funny}
     return $errorInfo
 } -cleanup {
@@ -2729,17 +2729,17 @@
 } -result {unknown color name "bogus"
     (database entry for "-background" in widget ".funny")
     invoked from within
 "button .funny"}
 
-test button-2.10 {ButtonCreate procedure - option error} -body {    
+test button-2.10 {ButtonCreate procedure - option error} -body {
     button .x -gorp foo
 }  -cleanup {
     destroy .x
-} -returnCodes {error} -result {unknown option "-gorp"} 
+} -returnCodes {error} -result {unknown option "-gorp"}
 test button-2.11 {ButtonCreate procedure - option error} -body {
-    catch {button .x -gorp foo} 
+    catch {button .x -gorp foo}
     winfo exists .x
 }  -cleanup {
     destroy .x
 } -result 0
 ######### ex 3.10
@@ -2786,17 +2786,17 @@
 test button-3.6 {ButtonWidgetCmd procedure, "cget" option} -body {
     label .l
     .l cget -disabledforeground
 } -cleanup {
     destroy .l
-} -returnCodes {ok} -match {glob} -result {*} 
+} -returnCodes {ok} -match {glob} -result {*}
 test button-3.7 {ButtonWidgetCmd procedure, "cget" option} -body {
     button .b
     .b cget -disabledforeground
 } -cleanup {
     destroy .b
-} -returnCodes {ok} -match {glob} -result {*} 
+} -returnCodes {ok} -match {glob} -result {*}
 test button-3.8 {ButtonWidgetCmd procedure, "cget" option} -body {
     button .b
     .b cget -variable
 } -cleanup {
     destroy .b
@@ -2805,11 +2805,11 @@
 test button-3.9 {ButtonWidgetCmd procedure, "cget" option} -body {
     checkbutton .c
     .c cget -variable
 } -cleanup {
     destroy .c
-} -returnCodes {ok} -match {glob} -result {*} 
+} -returnCodes {ok} -match {glob} -result {*}
 test button-3.10 {ButtonWidgetCmd procedure, "cget" option} -body {
     checkbutton .c
     .c cget -value
 } -cleanup {
     destroy .c
@@ -2818,11 +2818,11 @@
 test button-3.11 {ButtonWidgetCmd procedure, "cget" option} -body {
     radiobutton .r
     .r cget -value
 } -cleanup {
     destroy .r
-} -returnCodes {ok} -match {glob} -result {*} 
+} -returnCodes {ok} -match {glob} -result {*}
 test button-3.12 {ButtonWidgetCmd procedure, "cget" option} -body {
     radiobutton .r
     .r cget -onvalue
 } -cleanup {
     destroy .r
@@ -2838,11 +2838,11 @@
 test button-3.14 {ButtonWidgetCmd procedure, "configure" option} -body {
     checkbutton .c
     llength [.c configure]
 } -cleanup {
     destroy .c
-} -result {41} 
+} -result {41}
 test button-3.15 {ButtonWidgetCmd procedure, "configure" option} -body {
     button .b
     .b configure -gorp
 } -cleanup {
     destroy .b
@@ -2887,37 +2887,37 @@
     set checkvar 1
     .c d
     return $checkvar
 } -cleanup {
     destroy .c
-} -result {0} 
+} -result {0}
 test button-3.22 {ButtonWidgetCmd procedure, "deselect" option} -body {
     radiobutton .r -variable radiovar -value red
     set radiovar green
     .r deselect
     return $radiovar
 } -cleanup {
     destroy .r
-} -result {green} 
+} -result {green}
 test button-3.23 {ButtonWidgetCmd procedure, "deselect" option} -body {
     radiobutton .r -variable radiovar -value red
     set radiovar red
     .r deselect
     return $radiovar
 } -cleanup {
     destroy .r
-} -result {} 
+} -result {}
 
-test button-3.24 {ButtonWidgetCmd procedure, "deselect" option} -body {  
+test button-3.24 {ButtonWidgetCmd procedure, "deselect" option} -body {
     checkbutton .c -variable checkvar -onvalue 1 -offvalue 0
     set checkvar 1
     trace variable checkvar w bogusTrace
     .c deselect
 } -cleanup {
     destroy .c
     trace vdelete checkvar w bogusTrace
-} -returnCodes {error} -result {can't set "checkvar": trace aborted} 
+} -returnCodes {error} -result {can't set "checkvar": trace aborted}
 test button-3.25 {ButtonWidgetCmd procedure, "deselect" option} -body {
     checkbutton .c -variable checkvar -onvalue 1 -offvalue 0
     set checkvar 1
     trace variable checkvar w bogusTrace
     catch {.c deselect}
@@ -2935,11 +2935,11 @@
     trace variable radiovar w bogusTrace
     .r deselect
 } -cleanup {
     destroy .r
     trace vdelete radiovar w bogusTrace
-} -match {glob} -returnCodes {error} -result {can't set "radiovar": trace aborted} 
+} -match {glob} -returnCodes {error} -result {can't set "radiovar": trace aborted}
 test button-3.27 {ButtonWidgetCmd procedure, "deselect" option} -body {
     radiobutton .r -variable radiovar -value red
     set radiovar red
     trace variable radiovar w bogusTrace
     catch {.r deselect}
@@ -2962,23 +2962,23 @@
     label .l
     .l flash
 } -cleanup {
     destroy .l
 } -returnCodes {error} -result {bad option "flash": must be cget or configure}
-test button-3.30 {ButtonWidgetCmd procedure, "flash" option} -body {                    
+test button-3.30 {ButtonWidgetCmd procedure, "flash" option} -body {
     button .b
     catch {.b flash}
 } -cleanup {
     destroy .b
 } -returnCodes {ok} -match {glob} -result {*}
-test button-3.31 {ButtonWidgetCmd procedure, "flash" option} -body {                    
+test button-3.31 {ButtonWidgetCmd procedure, "flash" option} -body {
     checkbutton .c
     catch {.c flash}
 } -cleanup {
     destroy .c
 } -returnCodes {ok} -match {glob} -result {*}
-test button-3.32 {ButtonWidgetCmd procedure, "flash" option} -body {                    
+test button-3.32 {ButtonWidgetCmd procedure, "flash" option} -body {
     radiobutton .r
     catch {.r f}
 } -cleanup {
     destroy .r
 } -returnCodes {ok} -match {glob} -result {*}
@@ -3058,26 +3058,26 @@
     return $checkvar
 } -cleanup {
     destroy .c
 } -result  {lovely}
 test button-3.43 {ButtonWidgetCmd procedure, "select" option} -body {
-    radiobutton .r -variable radiovar -value red    
+    radiobutton .r -variable radiovar -value red
     set radiovar green
     .r select
     return $radiovar
 } -cleanup {
     destroy .r
 } -result  {red}
-test button-3.44 {ButtonWidgetCmd procedure, "select" option} -body { 
+test button-3.44 {ButtonWidgetCmd procedure, "select" option} -body {
     radiobutton .r -variable radiovar -value red
     set radiovar yellow
     trace variable radiovar w bogusTrace
     .r select
 } -cleanup {
     destroy .r
     trace vdelete radiovar w bogusTrace
-} -returnCodes {error} -result {can't set "radiovar": trace aborted} 
+} -returnCodes {error} -result {can't set "radiovar": trace aborted}
 test button-3.45 {ButtonWidgetCmd procedure, "select" option} -body {
     radiobutton .r -variable radiovar -value red
     set radiovar yellow
     trace variable radiovar w bogusTrace
     catch {.r select}
@@ -3126,46 +3126,46 @@
     lappend result $checkvar
     return $result
 } -cleanup {
     destroy .c
 } -result {sunshine rain sunshine}
-test button-3.51 {ButtonWidgetCmd procedure, "toggle" option} -body {  
+test button-3.51 {ButtonWidgetCmd procedure, "toggle" option} -body {
     checkbutton .c -variable checkvar -onvalue xyz -offvalue abc
     set checkvar xyz
     trace variable checkvar w bogusTrace
     .c toggle
 } -cleanup {
     destroy .c
     trace vdelete checkvar w bogusTrace
-} -returnCodes {error} -result {can't set "checkvar": trace aborted} 
+} -returnCodes {error} -result {can't set "checkvar": trace aborted}
 test button-3.52 {ButtonWidgetCmd procedure, "toggle" option} -body {
     checkbutton .c -variable checkvar -onvalue xyz -offvalue abc
     set checkvar xyz
     trace variable checkvar w bogusTrace
-    catch {.c toggle} 
+    catch {.c toggle}
     list $errorInfo $checkvar
 } -cleanup {
     trace vdelete checkvar w bogusTrace
     destroy .c
 } -match {glob} -result {{*trace aborted
     while executing
 *
 ".c toggle"} abc}
-test button-3.53 {ButtonWidgetCmd procedure, "toggle" option} -body {   
+test button-3.53 {ButtonWidgetCmd procedure, "toggle" option} -body {
     checkbutton .c -variable checkvar -onvalue xyz -offvalue abc
     set checkvar abc
     trace variable checkvar w bogusTrace
     .c toggle
 } -cleanup {
     trace vdelete checkvar w bogusTrace
     destroy .c
-} -returnCodes {error} -result {can't set "checkvar": trace aborted} 
+} -returnCodes {error} -result {can't set "checkvar": trace aborted}
 test button-3.54 {ButtonWidgetCmd procedure, "toggle" option} -body {
     checkbutton .c -variable checkvar -onvalue xyz -offvalue abc
     set checkvar abc
     trace variable checkvar w bogusTrace
-    catch {.c toggle} 
+    catch {.c toggle}
     list $errorInfo $checkvar
 } -cleanup {
     trace vdelete checkvar w bogusTrace
     destroy .c
 } -match {glob} -result {{*trace aborted
@@ -3172,21 +3172,21 @@
     while executing
 *
 ".c toggle"} xyz}
 test button-3.55 {ButtonWidgetCmd procedure, "toggle" option} -setup {
     unset -nocomplain checkvar
-} -body { 
+} -body {
     checkbutton .c -variable checkvar -onvalue xyz -offvalue abc
     unset checkvar
     set checkvar(1) 1
     .c toggle
 } -cleanup {
     destroy .c
-} -returnCodes {error} -result {can't set "checkvar": variable is array} 
+} -returnCodes {error} -result {can't set "checkvar": variable is array}
 test button-3.56 {ButtonWidgetCmd procedure, "toggle" option} -setup {
     unset -nocomplain checkvar
-} -body { 
+} -body {
     checkbutton .c -variable checkvar -onvalue xyz -offvalue abc
     unset checkvar
     set checkvar(1) 1
     catch {.c toggle}
     return $errorInfo
@@ -3207,26 +3207,26 @@
     button .b3 -state active -text "Button 3"
     button .b4 -disabledforeground #0000ff -state disabled -text "Button 4"
     checkbutton .b5 -variable x -text "Checkbutton 5"
     set x 1
     pack .b1 .b2 .b3 .b4 .b5
-    update 
-    deleteWindows  
+    update
+    deleteWindows
 } -cleanup {
     destroy .b1 .b2 .b3 .b4 .b5
     image delete image1
-} -result {} 
+} -result {}
 
 test button-5.1 {ConfigureButton - textvariable trace} -body {
     button .b -bd 4 -bg green
     .b configure -bd 7 -bg red -fg bogus
 } -cleanup {
     destroy .b
-} -returnCodes {error} -result {unknown color name "bogus"} 
+} -returnCodes {error} -result {unknown color name "bogus"}
 test button-5.2 {ConfigureButton - textvariable trace} -body {
     button .b -bd 4 -bg green
-    catch {.b configure -bd 7 -bg red -fg bogus} 
+    catch {.b configure -bd 7 -bg red -fg bogus}
     list [.b cget -bd] [.b cget -bg]
 } -cleanup {
     destroy .b
 } -result {4 green}
 test button-5.3 {ConfigureButton - textvariable trace} -body {
@@ -3269,11 +3269,11 @@
 
 test button-5.6 {ConfigureButton - default value for variable} -body {
     checkbutton .c
     .c cget -variable
 } -cleanup {
-    destroy .c 
+    destroy .c
 } -result {c}
 test button-5.7 {ConfigureButton - setting selected state from variable} -body {
     set x 0
     set y Shiny
     checkbutton .c -variable x
@@ -3303,11 +3303,11 @@
 
 test button-5.10 {ConfigureButton - error in setting variable} -setup {
     unset -nocomplain x
 } -body {
     trace variable x w bogusTrace
-    radiobutton .r -variable x 
+    radiobutton .r -variable x
 } -cleanup {
     destroy .r
     trace vdelete x w bogusTrace
 } -returnCodes {error} -result {can't set "x": trace aborted}
 
@@ -3340,11 +3340,11 @@
     trace variable x w bogusTrace
     radiobutton .r -text foo -textvariable x
 } -cleanup {
     trace vdelete x w bogusTrace
     destroy .r
-} -returnCodes {error} -result {can't set "x": trace aborted} 
+} -returnCodes {error} -result {can't set "x": trace aborted}
 test button-5.15 {ConfigureButton - variable handling} -setup {
     unset -nocomplain x
 } -body {
     trace variable x w bogusTrace
     catch {radiobutton .r -text foo -textvariable x}
@@ -3353,16 +3353,16 @@
     trace vdelete x w bogusTrace
     destroy .r
 } -result {foo}
 
 #ex 6.14
-test button-5.16 {ConfigureButton - -width option} -body { 
+test button-5.16 {ConfigureButton - -width option} -body {
     button .b -text "Button 1"
     .b configure -width 1i
 } -cleanup {
     destroy .b
-} -returnCodes {error} -result {expected integer but got "1i"} 
+} -returnCodes {error} -result {expected integer but got "1i"}
 test button-5.17 {ConfigureButton - -width option} -body {
     button .b -text "Button 1"
     catch {.b configure -width 1i}
     return $errorInfo
 } -cleanup {
@@ -3369,19 +3369,19 @@
     destroy .b
 } -result  {expected integer but got "1i"
     (processing -width option)
     invoked from within
 ".b configure -width 1i"}
-test button-5.18 {ConfigureButton - -height option} -body { 
+test button-5.18 {ConfigureButton - -height option} -body {
     button .b -text "Button 1"
     .b configure -height 0.5c
 } -cleanup {
     destroy .b
-} -returnCodes {error} -result {expected integer but got "0.5c"} 
-test button-5.19 {ConfigureButton - -height option} -body { 
+} -returnCodes {error} -result {expected integer but got "0.5c"}
+test button-5.19 {ConfigureButton - -height option} -body {
     button .b -text "Button 1"
-    catch {.b configure -height 0.5c} 
+    catch {.b configure -height 0.5c}
     return $errorInfo
 } -cleanup {
     destroy .b
 } -result {expected integer but got "0.5c"
     (processing -height option)
@@ -3391,14 +3391,14 @@
 test button-5.20 {ConfigureButton - -width option} -body {
     button .b -bitmap questhead
     .b configure -width abc
 } -cleanup {
     destroy .b
-} -returnCodes {error} -result  {bad screen distance "abc"} 
+} -returnCodes {error} -result  {bad screen distance "abc"}
 test button-5.21 {ConfigureButton - -width option} -body {
     button .b -bitmap questhead
-    catch {.b configure -width abc} 
+    catch {.b configure -width abc}
     return $errorInfo
 } -cleanup {
     destroy .b
 } -result {bad screen distance "abc"
     (processing -width option)
@@ -3412,19 +3412,19 @@
     button .b -image image1
     .b configure -height 0.5x
 } -cleanup {
     destroy .b
     image delete image1
-} -returnCodes {error} -result {bad screen distance "0.5x"} 
+} -returnCodes {error} -result {bad screen distance "0.5x"}
 test button-5.23 {ConfigureButton - -height option} -constraints {
     testImageType
 } -setup {
     image create test image1
 } -body {
 #ztestImageType
     button .b -image image1
-    catch {.b configure -height 0.5x} 
+    catch {.b configure -height 0.5x}
     return $errorInfo
 } -cleanup {
     destroy .b
     image delete image1
 } -result  {bad screen distance "0.5x"
@@ -3521,11 +3521,11 @@
     destroy .b
 } -result {{} {}}
 
 test button-8.1 {TkInvokeButton procedure} -setup {
     set x 0
-} -body { 
+} -body {
     checkbutton .c -variable x
     set result $x
     .c invoke
     lappend result $x
     .c invoke
@@ -3532,44 +3532,44 @@
     lappend result $x
 } -cleanup {
     destroy .c
 } -result {0 1 0}
 
-test button-8.2 {TkInvokeButton procedure} -setup {     
+test button-8.2 {TkInvokeButton procedure} -setup {
     set x 0
-} -body { 
+} -body {
     checkbutton .c -variable x
     trace variable x w bogusTrace
     .c invoke
 } -cleanup {
     destroy .c
     trace vdelete x w bogusTrace
 } -returnCodes {error} -result {can't set "x": trace aborted}
 test button-8.3 {TkInvokeButton procedure} -setup {
     set x 0
-} -body { 
+} -body {
     checkbutton .c -variable x
     trace variable x w bogusTrace
     catch {.c invoke}
     return $x
 } -cleanup {
     destroy .c
     trace vdelete x w bogusTrace
 } -result {1}
-test button-8.4 {TkInvokeButton procedure} -setup {   
+test button-8.4 {TkInvokeButton procedure} -setup {
     set x 1
-} -body { 
+} -body {
     checkbutton .c -variable x
     trace variable x w bogusTrace
     .c invoke
 } -cleanup {
     destroy .c
     trace vdelete x w bogusTrace
 } -returnCodes {error} -result {can't set "x": trace aborted}
 test button-8.5 {TkInvokeButton procedure} -setup {
     set x 1
-} -body { 
+} -body {
     checkbutton .c -variable x
     trace variable x w bogusTrace
     catch {.c invoke}
     return $x
 } -cleanup {
@@ -3577,11 +3577,11 @@
     trace vdelete x w bogusTrace
 } -result {0}
 
 test button-8.6 {TkInvokeButton procedure} -setup {
     set x 0
-} -body { 
+} -body {
     radiobutton .r -variable x -value red
     set result $x
     .r invoke
     lappend result $x
     .r invoke
@@ -3588,20 +3588,20 @@
     lappend result $x
 } -cleanup {
     destroy .r
 } -result {0 red red}
 
-test button-8.7 {TkInvokeButton procedure} -body {  
+test button-8.7 {TkInvokeButton procedure} -body {
     radiobutton .r -variable x -value red
     set x green
     trace variable x w bogusTrace
     .r invoke
 } -cleanup {
     destroy .r
     trace vdelete x w bogusTrace
 } -returnCodes {error} -result {can't set "x": trace aborted}
-test button-8.8 {TkInvokeButton procedure} -body { 
+test button-8.8 {TkInvokeButton procedure} -body {
     radiobutton .r -variable x -value red
     set x green
     trace variable x w bogusTrace
     catch {.r invoke}
     list $errorInfo $x
@@ -3752,11 +3752,11 @@
 } -cleanup {
     destroy .b
 } -result {0}
 
 test button-11.1 {ButtonImageProc procedure} -constraints {
-    testImageType 
+    testImageType
 } -setup {
     label .l -highlightthickness 0 -font {Helvetica -12 bold}
     image create test image1
 } -body {
     .l configure -image image1 -padx 0 -pady 0 -bd 0
@@ -3786,11 +3786,89 @@
     label .a -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     label .b -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     label .c -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     set result {}
 } -body {
-	.a configure -text Hej 
+	.a configure -text Hej
+	.b configure -text Hej -width 10 -height 1
+	.c configure -text "" -width 10 -height 1
+
+# With -width, width should not be affected by text change
+	lappend result [expr {[winfo reqwidth .b] == [winfo reqwidth .c]}]
+# With -height, height should not be affected by text change
+	lappend result [expr {[winfo reqheight .b] == [winfo reqheight .c]}]
+# A one line text should be as high as -height 1
+	lappend result [expr {[winfo reqheight .a] == [winfo reqheight .b]}]
+} -cleanup {
+    destroy .a .b .c
+} -result {1 1 1}
+test button-13.2 {size behavior: label} -setup {
+    label .a -borderwidth 2 -highlightthickness 2 -font {Arial 20}
+    label .b -borderwidth 2 -highlightthickness 2 -font {Arial 20}
+    label .c -borderwidth 2 -highlightthickness 2 -font {Arial 20}
+    set result {}
+} -body {
+	.a configure -text Hej
+	.b configure -text Hej -width 10 -height 1
+	.c configure -text "" -width 10 -height 1
+
+# With -width, width should not be affected by text change
+	lappend result [expr {[winfo reqwidth .b] == [winfo reqwidth .c]}]
+# With -height, height should not be affected by text change
+	lappend result [expr {[winfo reqheight .b] == [winfo reqheight .c]}]
+# A one line text should be as high as -height 1
+	lappend result [expr {[winfo reqheight .a] == [winfo reqheight .b]}]
+} -cleanup {
+    destroy .a .b .c
+} -result {1 1 1}
+
+test button-13.3 {size behavior: button} -setup {
+    button .a -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
+    button .b -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
+    button .c -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
+    set result {}
+} -body {
+	.a configure -text Hej
+	.b configure -text Hej -width 10 -height 1
+	.c configure -text "" -width 10 -height 1
+
+# With -width, width should not be affected by text change
+	lappend result [expr {[winfo reqwidth .b] == [winfo reqwidth .c]}]
+# With -height, height should not be affected by text change
+	lappend result [expr {[winfo reqheight .b] == [winfo reqheight .c]}]
+# A one line text should be as high as -height 1
+	lappend result [expr {[winfo reqheight .a] == [winfo reqheight .b]}]
+} -cleanup {
+    destroy .a .b .c
+} -result {1 1 1}
+test button-13.4 {size behavior: button} -setup {
+    button .a -borderwidth 2 -highlightthickness 2 -font {Arial 20}
+    button .b -borderwidth 2 -highlightthickness 2 -font {Arial 20}
+    button .c -borderwidth 2 -highlightthickness 2 -font {Arial 20}
+    set result {}
+} -body {
+	.a configure -text Hej
+	.b configure -text Hej -width 10 -height 1
+	.c configure -text "" -width 10 -height 1
+
+# With -width, width should not be affected by text change
+	lappend result [expr {[winfo reqwidth .b] == [winfo reqwidth .c]}]
+# With -height, height should not be affected by text change
+	lappend result [expr {[winfo reqheight .b] == [winfo reqheight .c]}]
+# A one line text should be as high as -height 1
+	lappend result [expr {[winfo reqheight .a] == [winfo reqheight .b]}]
+} -cleanup {
+    destroy .a .b .c
+} -result {1 1 1}
+
+test button-13.5 {size behavior: radiobutton} -setup {
+    radiobutton .a -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
+    radiobutton .b -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
+    radiobutton .c -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
+    set result {}
+} -body {
+	.a configure -text Hej
 	.b configure -text Hej -width 10 -height 1
 	.c configure -text "" -width 10 -height 1
 
 # With -width, width should not be affected by text change
 	lappend result [expr {[winfo reqwidth .b] == [winfo reqwidth .c]}]
@@ -3798,18 +3876,19 @@
 	lappend result [expr {[winfo reqheight .b] == [winfo reqheight .c]}]
 # A one line text should be as high as -height 1
 	lappend result [expr {[winfo reqheight .a] == [winfo reqheight .b]}]
 } -cleanup {
     destroy .a .b .c
-} -result {1 1 1} 
-test button-13.2 {size behavior: label} -setup {
-    label .a -borderwidth 2 -highlightthickness 2 -font {Arial 20}
-    label .b -borderwidth 2 -highlightthickness 2 -font {Arial 20}
-    label .c -borderwidth 2 -highlightthickness 2 -font {Arial 20}
+} -result {1 1 1}
+
+test button-13.6 {size behavior: radiobutton} -setup {
+    radiobutton .a -borderwidth 2 -highlightthickness 2 -font {Arial 20}
+    radiobutton .b -borderwidth 2 -highlightthickness 2 -font {Arial 20}
+    radiobutton .c -borderwidth 2 -highlightthickness 2 -font {Arial 20}
     set result {}
 } -body {
-	.a configure -text Hej 
+	.a configure -text Hej
 	.b configure -text Hej -width 10 -height 1
 	.c configure -text "" -width 10 -height 1
 
 # With -width, width should not be affected by text change
 	lappend result [expr {[winfo reqwidth .b] == [winfo reqwidth .c]}]
@@ -3817,19 +3896,19 @@
 	lappend result [expr {[winfo reqheight .b] == [winfo reqheight .c]}]
 # A one line text should be as high as -height 1
 	lappend result [expr {[winfo reqheight .a] == [winfo reqheight .b]}]
 } -cleanup {
     destroy .a .b .c
-} -result {1 1 1} 
+} -result {1 1 1}
 
-test button-13.3 {size behavior: button} -setup {
-    button .a -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
-    button .b -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
-    button .c -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
+test button-13.7 {size behavior: checkbutton} -setup {
+    checkbutton .a -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
+    checkbutton .b -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
+    checkbutton .c -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     set result {}
 } -body {
-	.a configure -text Hej 
+	.a configure -text Hej
 	.b configure -text Hej -width 10 -height 1
 	.c configure -text "" -width 10 -height 1
 
 # With -width, width should not be affected by text change
 	lappend result [expr {[winfo reqwidth .b] == [winfo reqwidth .c]}]
@@ -3837,38 +3916,19 @@
 	lappend result [expr {[winfo reqheight .b] == [winfo reqheight .c]}]
 # A one line text should be as high as -height 1
 	lappend result [expr {[winfo reqheight .a] == [winfo reqheight .b]}]
 } -cleanup {
     destroy .a .b .c
-} -result {1 1 1} 
-test button-13.4 {size behavior: button} -setup {
-    button .a -borderwidth 2 -highlightthickness 2 -font {Arial 20}
-    button .b -borderwidth 2 -highlightthickness 2 -font {Arial 20}
-    button .c -borderwidth 2 -highlightthickness 2 -font {Arial 20}
-    set result {}
-} -body {
-	.a configure -text Hej 
-	.b configure -text Hej -width 10 -height 1
-	.c configure -text "" -width 10 -height 1
-
-# With -width, width should not be affected by text change
-	lappend result [expr {[winfo reqwidth .b] == [winfo reqwidth .c]}]
-# With -height, height should not be affected by text change
-	lappend result [expr {[winfo reqheight .b] == [winfo reqheight .c]}]
-# A one line text should be as high as -height 1
-	lappend result [expr {[winfo reqheight .a] == [winfo reqheight .b]}]
-} -cleanup {
-    destroy .a .b .c
-} -result {1 1 1} 
-
-test button-13.5 {size behavior: radiobutton} -setup {
-    radiobutton .a -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
-    radiobutton .b -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
-    radiobutton .c -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
-    set result {}
-} -body {
-	.a configure -text Hej 
+} -result {1 1 1}
+
+test button-13.8 {size behavior: checkbutton} -setup {
+    checkbutton .a -borderwidth 2 -highlightthickness 2 -font {Arial 20}
+    checkbutton .b -borderwidth 2 -highlightthickness 2 -font {Arial 20}
+    checkbutton .c -borderwidth 2 -highlightthickness 2 -font {Arial 20}
+    set result {}
+} -body {
+	.a configure -text Hej
 	.b configure -text Hej -width 10 -height 1
 	.c configure -text "" -width 10 -height 1
 
 # With -width, width should not be affected by text change
 	lappend result [expr {[winfo reqwidth .b] == [winfo reqwidth .c]}]
@@ -3876,71 +3936,11 @@
 	lappend result [expr {[winfo reqheight .b] == [winfo reqheight .c]}]
 # A one line text should be as high as -height 1
 	lappend result [expr {[winfo reqheight .a] == [winfo reqheight .b]}]
 } -cleanup {
     destroy .a .b .c
-} -result {1 1 1} 
-
-test button-13.6 {size behavior: radiobutton} -setup {
-    radiobutton .a -borderwidth 2 -highlightthickness 2 -font {Arial 20}
-    radiobutton .b -borderwidth 2 -highlightthickness 2 -font {Arial 20}
-    radiobutton .c -borderwidth 2 -highlightthickness 2 -font {Arial 20}
-    set result {}
-} -body {
-	.a configure -text Hej 
-	.b configure -text Hej -width 10 -height 1
-	.c configure -text "" -width 10 -height 1
-
-# With -width, width should not be affected by text change
-	lappend result [expr {[winfo reqwidth .b] == [winfo reqwidth .c]}]
-# With -height, height should not be affected by text change
-	lappend result [expr {[winfo reqheight .b] == [winfo reqheight .c]}]
-# A one line text should be as high as -height 1
-	lappend result [expr {[winfo reqheight .a] == [winfo reqheight .b]}]
-} -cleanup {
-    destroy .a .b .c
-} -result {1 1 1} 
-
-test button-13.7 {size behavior: checkbutton} -setup {
-    checkbutton .a -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
-    checkbutton .b -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
-    checkbutton .c -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
-    set result {}
-} -body {
-	.a configure -text Hej 
-	.b configure -text Hej -width 10 -height 1
-	.c configure -text "" -width 10 -height 1
-
-# With -width, width should not be affected by text change
-	lappend result [expr {[winfo reqwidth .b] == [winfo reqwidth .c]}]
-# With -height, height should not be affected by text change
-	lappend result [expr {[winfo reqheight .b] == [winfo reqheight .c]}]
-# A one line text should be as high as -height 1
-	lappend result [expr {[winfo reqheight .a] == [winfo reqheight .b]}]
-} -cleanup {
-    destroy .a .b .c
-} -result {1 1 1} 
-
-test button-13.8 {size behavior: checkbutton} -setup {
-    checkbutton .a -borderwidth 2 -highlightthickness 2 -font {Arial 20}
-    checkbutton .b -borderwidth 2 -highlightthickness 2 -font {Arial 20}
-    checkbutton .c -borderwidth 2 -highlightthickness 2 -font {Arial 20}
-    set result {}
-} -body {
-	.a configure -text Hej 
-	.b configure -text Hej -width 10 -height 1
-	.c configure -text "" -width 10 -height 1
-
-# With -width, width should not be affected by text change
-	lappend result [expr {[winfo reqwidth .b] == [winfo reqwidth .c]}]
-# With -height, height should not be affected by text change
-	lappend result [expr {[winfo reqheight .b] == [winfo reqheight .c]}]
-# A one line text should be as high as -height 1
-	lappend result [expr {[winfo reqheight .a] == [winfo reqheight .b]}]
-} -cleanup {
-    destroy .a .b .c
-} -result {1 1 1} 
+} -result {1 1 1}
 
 test button-14.1 {bug fix: [011706ec42] tk::ButtonInvoke unsafe wrt widget destruction} -body {
     proc destroy_button {} {
         if {[winfo exists .top.b]} {
             destroy .top.b
@@ -3954,14 +3954,14 @@
     update
     event generate .top.b <space>
     update  ; # shall not trigger error  invalid command name ".top.b"
 } -cleanup {
     destroy .top.b .top
-} -result {} 
+} -result {}
 
 imageFinish
 cleanupTests
 return
 
 # Local variables:
 # mode: tcl
 # End:

Index: tests/canvImg.test
==================================================================
--- tests/canvImg.test
+++ tests/canvImg.test
@@ -171,11 +171,11 @@
     list $x $y [.c bbox i1]
 } -cleanup {
 	.c delete all
 	image delete foo
 	image delete foo2
-} -result {{{foo free}} {{foo2 get} {foo2 display 0 0 80 60 30 30}} {50 100 130 160}}
+} -result {{{foo free}} {{foo2 get} {foo2 display 0 0 80 60}} {50 100 130 160}}
 test canvImg-4.3 {ConfiugreImage procedure} -constraints testImageType -setup {
     .c delete all
 } -body {
 	image create test foo -variable x
     image create test foo2 -variable y
@@ -313,11 +313,11 @@
 } -cleanup {
     .c delete all
     imageCleanup
 } -result {5 15 35 30}
 test canvImg-6.10 {ComputeImageBbox procedure} -constraints {
-    testImageType 
+    testImageType
 } -setup {
     image create test foo
     .c delete all
 } -body {
     .c delete all
@@ -326,11 +326,11 @@
 } -cleanup {
     .c delete all
     image delete foo
 } -result {20 15 50 30}
 test canvImg-6.11 {ComputeImageBbox procedure} -constraints {
-    testImageType 
+    testImageType
 } -setup {
     image create test foo
     .c delete all
 } -body {
     .c delete all
@@ -339,11 +339,11 @@
 } -cleanup {
     .c delete all
     image delete foo
 } -result {20 23 50 38}
 test canvImg-6.12 {ComputeImageBbox procedure} -constraints {
-	testImageType 
+	testImageType
 } -setup {
     image create test foo
     .c delete all
 } -body {
     .c delete all
@@ -731,11 +731,11 @@
     update
     return $x
 } -cleanup {
 	.c delete all
 	image delete foo
-} -result {{foo display 2 4 6 8 30 30}}
+} -result {{foo display 2 4 6 8}}
 
 test canvImg-11.1 {TranslateImage procedure} -constraints testImageType -setup {
     .c delete all
 } -body {
 	image create test foo -variable x
@@ -746,13 +746,13 @@
     update
     return $x
 } -cleanup {
 	.c delete all
 	image delete foo
-} -result {{foo display 0 0 40 50 30 30}}
+} -result {{foo display 0 0 40 50}}
 test canvImg-11.2 {ImageChangedProc procedure} -constraints {
-	testImageType 
+	testImageType
 } -setup {
     .c delete all
 } -body {
     image create test foo -variable x
     .c create image 50 100 -image foo -tags image -anchor center
@@ -763,11 +763,11 @@
 } -cleanup {
 	.c delete all
 	image delete foo
 } -result {30 75 70 125}
 test canvImg-11.3 {ImageChangedProc procedure} -constraints {
-	testImageType 
+	testImageType
 } -setup {
     .c delete all
 } -body {
     image create test foo -variable x
 	image create test foo2 -variable y
@@ -782,15 +782,15 @@
     update
     return $y
 } -cleanup {
 	.c delete all
 	image delete foo foo2
-} -result {{foo2 display 0 0 20 40 50 40}}
+} -result {{foo2 display 0 0 20 40}}
 
 # cleanup
 imageFinish
 cleanupTests
 return
 
 # Local variables:
 # mode: tcl
 # End:

Index: tests/canvMoveto.test
==================================================================
--- tests/canvMoveto.test
+++ tests/canvMoveto.test
@@ -31,11 +31,11 @@
 } -returnCodes error -result {wrong # args: should be ".c moveto tagOrId x y"}
 
 test canvMoveto-2.1 {Canvas "moveto" command coordinates} {
     .c moveto test 200 150
     .c bbox test
-} {200 150 272 232} 
+} {200 150 272 232}
 test canvMoveto-2.2 {Canvas "moveto" command, blank y coordinate} {
     .c moveto test 200 150
     .c moveto test 150 {}
     .c bbox test
 } {150 150 222 232}

Index: tests/canvRect.test
==================================================================
--- tests/canvRect.test
+++ tests/canvRect.test
@@ -226,11 +226,11 @@
     .c itemconfigure y -outline {}
     list [expr {[.c find closest 20 24.9] eq $xId}] \
 		 [expr {[.c find closest 20 25.1] eq $yId}] \
 	    [expr {[.c find closest 20 29.9] eq $yId}] \
 		 [expr {[.c find closest 20 30.1] eq $xId}]
-		
+
 } -cleanup {
 	.c delete all
 } -result {1 1 1 1}
 test canvRect-6.3 {RectToPoint procedure} -body {
 	set xId  [.c create rectangle 10 20 30 35 -tags x -fill green]
@@ -248,11 +248,11 @@
 	set yId [.c create rectangle 15 25 25 30  -tags y -fill red]
     .c itemconfigure  y -width 1 -outline black
     list [expr {[.c find closest 20 24.4] eq $xId}] \
 		 [expr {[.c find closest 20 24.6] eq $yId}] \
 	    [expr {[.c find closest 20 30.4] eq $yId}] \
-		 [expr {[.c find closest 20 30.6] eq $xId}]		
+		 [expr {[.c find closest 20 30.6] eq $xId}]
 } -cleanup {
 	.c delete all
 } -result {1 1 1 1}
 
 test canvRect-6.5 {RectToPoint procedure} -body {
@@ -273,22 +273,22 @@
 	.c itemconfigure x -fill {} -outline black -width 3
 	.c itemconfigure y -outline {}
     list [expr {[.c find closest 20 23.2] eq $xId}] \
 		 [expr {[.c find closest 20 23.3] eq $yId}] \
 	    [expr {[.c find closest 20 31.7] eq $yId}] \
-		 [expr {[.c find closest 20 31.8] eq $xId}] 
+		 [expr {[.c find closest 20 31.8] eq $xId}]
 } -cleanup {
 	.c delete all
 } -result {1 1 1 1}
-		
+
 test canvRect-6.7 {RectToPoint procedure} -body {
-	set xId [.c create rectangle 10 20 30 40 -outline {} -fill black]		
+	set xId [.c create rectangle 10 20 30 40 -outline {} -fill black]
 	set yId [.c create rectangle 40 40 50 50 -outline {} -fill black]
     list [expr {[.c find closest 35 35] eq $xId}] \
 		 [expr {[.c find closest 36 36] eq $yId}] \
 	    [expr {[.c find closest 37 37] eq $yId}] \
-		 [expr {[.c find closest 38 38] eq $yId}] 
+		 [expr {[.c find closest 38 38] eq $yId}]
 } -cleanup {
 	.c delete all
 } -result {1 1 1 1}
 
 

Index: tests/canvText.test
==================================================================
--- tests/canvText.test
+++ tests/canvText.test
@@ -53,12 +53,12 @@
 test canvText-1.10 {configuration options: good value for "stipple"} -body {
     .c itemconfigure test -stipple gray50
     list [lindex [.c itemconfigure test -stipple] 4] [.c itemcget test -stipple]
 } -result {gray50 gray50}
 test canvasText-1.11 {configuration options: bad value for "stipple"} -body {
-    .c itemconfigure test -stipple xyz
-} -returnCodes error -result {bitmap "xyz" not defined}
+    .c itemconfigure test -stipple abcxyz
+} -returnCodes error -result {bitmap "abcxyz" not defined}
 test canvText-1.12 {configuration options: good value for "underline"} -body {
     .c itemconfigure test -underline 0
     list [lindex [.c itemconfigure test -underline] 4] [.c itemcget test -underline]
 } -result {0 0}
 test canvasText-1.13 {configuration options: bad value for "underline"} -body {

Index: tests/canvas.test
==================================================================
--- tests/canvas.test
+++ tests/canvas.test
@@ -535,25 +535,25 @@
 
 test canvas-12.1 {canvas mm obj, patch SF-403327, 102471} -setup {
     destroy .c
     pack [canvas .c]
 } -body {
-    set qx [expr {1.+1.}] 
-    # qx has type double and no string representation 
+    set qx [expr {1.+1.}]
+    # qx has type double and no string representation
     .c scale all $qx 0 1. 1.
-    # qx has now type MMRep and no string representation 
+    # qx has now type MMRep and no string representation
     list $qx [string length $qx]
 } -result {2.0 3}
 test canvas-12.2 {canvas mm obj, patch SF-403327, 102471} -setup {
     destroy .c
     pack [canvas .c]
 } -body {
     set val 10
     incr val
-    # qx has type double and no string representation 
+    # qx has type double and no string representation
     .c scale all $val 0 1 1
-    # qx has now type MMRep and no string representation 
+    # qx has now type MMRep and no string representation
     incr val
 } -result 12
 
 # procedure used in 13.1 test case
 proc kill_canvas {w} {
@@ -725,11 +725,11 @@
 } -result {wrong # coordinates: expected 2, got 1}
 test canvas-15.19 "basic coords check: centimeters are larger than pixels" -setup {
     destroy .c
     canvas .c
 } -body {
-    set id [.c create rect 0 0 1cm 1cm] 
+    set id [.c create rect 0 0 1cm 1cm]
     expr {[lindex [.c coords $id] 2]>1}
 } -result {1}
 destroy .c
 
 test canvas-16.1 {arc coords check} -setup {
@@ -947,14 +947,102 @@
     set id [.c create line 0 0 1 1]
     .c rchars $id 1 foo {2 2}
 } -cleanup {
     destroy .c
 } -returnCodes error -result {bad index "foo"}
+
+# Procedure used in test cases 20.1 20.2 20.3
+proc matchPixels {pixels expected} {
+    set matched 1
+    foreach pline $pixels eline $expected {
+        foreach ppixel $pline epixel $eline {
+            if {$ppixel != $epixel} {
+                set matched 0
+                break
+            }
+        }
+    }
+    return $matched
+}
+
+test canvas-20.1 {canvas image} -setup {
+    canvas .c
+    image create photo testimage
+} -body  {
+    .c configure -background #c0c0c0 -scrollregion {0 0 9 9}
+    .c create rectangle 0 0 0 9 -fill #000080 -outline #000080
+    .c image testimage
+    matchPixels [testimage data] { \
+            {#000080 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
+            {#000080 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
+            {#000080 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
+            {#000080 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
+            {#000080 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
+            {#000080 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
+            {#000080 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
+            {#000080 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
+            {#000080 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
+            {#000080 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0}}
+} -cleanup {
+    destroy .c
+    image delete testimage
+} -result 1
+
+test canvas-20.2 {canvas image with subsample} -setup {
+    canvas .c
+    image create photo testimage
+} -body  {
+    .c configure -background #c0c0c0 -scrollregion {0 0 9 9}
+    .c create rectangle 0 0 1 9 -fill #008000 -outline #008000
+    .c image testimage 2
+    matchPixels [testimage data] { \
+        {#008000 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
+        {#008000 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
+        {#008000 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
+        {#008000 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
+        {#008000 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0}}
+} -cleanup {
+    destroy .c
+    image delete testimage
+} -result 1
+
+test canvas-20.3 {canvas image with subsample and zoom} -setup {
+    canvas .c
+    image create photo testimage
+} -body  {
+    .c configure -background #c0c0c0 -scrollregion {0 0 9 9}
+    .c create rectangle 0 0 9 0 -fill #800000 -outline #800000
+    .c image testimage 1 2
+    matchPixels [testimage data] { \
+        {#800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000} \
+        {#800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000 #800000} \
+        {#c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
+        {#c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
+        {#c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
+        {#c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
+        {#c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
+        {#c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
+        {#c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
+        {#c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
+        {#c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
+        {#c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
+        {#c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
+        {#c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
+        {#c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
+        {#c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
+        {#c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
+        {#c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
+        {#c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0} \
+        {#c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0 #c0c0c0}}
+} -cleanup {
+    destroy .c
+    image delete testimage
+} -result 1
 
 # cleanup
 imageCleanup
 cleanupTests
 return
 
 # Local Variables:
 # mode: tcl
 # End:

Index: tests/choosedir.test
==================================================================
--- tests/choosedir.test
+++ tests/choosedir.test
@@ -83,27 +83,29 @@
 set dir [file dirname $real]
 set fake [file join $dir non-existant]
 
 set parent .
 
-test choosedir-1.1 {tk_chooseDirectory command} -constraints unix -body {
+test choosedir-1.1 {tk_chooseDirectory command} -body {
     tk_chooseDirectory -initialdir
 } -returnCodes error -result {value for "-initialdir" missing}
-test choosedir-1.2 {tk_chooseDirectory command} -constraints unix -body {
+test choosedir-1.2 {tk_chooseDirectory command} -body {
     tk_chooseDirectory -mustexist
 } -returnCodes error -result {value for "-mustexist" missing}
-test choosedir-1.3 {tk_chooseDirectory command} -constraints unix -body {
+test choosedir-1.3 {tk_chooseDirectory command} -body {
     tk_chooseDirectory -parent
 } -returnCodes error -result {value for "-parent" missing}
-test choosedir-1.4 {tk_chooseDirectory command} -constraints unix -body {
+test choosedir-1.4 {tk_chooseDirectory command} -body {
     tk_chooseDirectory -title
 } -returnCodes error -result {value for "-title" missing}
-
-test choosedir-1.5 {tk_chooseDirectory command} -constraints unix -body {
+test choosedir-1.5.1 {tk_chooseDirectory command} -constraints notAqua -body {
     tk_chooseDirectory -foo bar
 } -returnCodes error -result {bad option "-foo": must be -initialdir, -mustexist, -parent, or -title}
-test choosedir-1.6 {tk_chooseDirectory command} -constraints unix -body {
+test choosedir-1.5.2 {tk_chooseDirectory command} -constraints aqua -body {
+    tk_chooseDirectory -foo bar
+} -returnCodes error -result {bad option "-foo": must be -initialdir, -message, -mustexist, -parent, -title, or -command}
+test choosedir-1.6 {tk_chooseDirectory command} -body {
     tk_chooseDirectory -parent foo.bar
 } -returnCodes error -result {bad window path name "foo.bar"}
 
 
 test choosedir-2.1 {tk_chooseDirectory command, cancel gives null} -constraints {

Index: tests/clipboard.test
==================================================================
--- tests/clipboard.test
+++ tests/clipboard.test
@@ -159,12 +159,11 @@
     clipboard clear
 } -body {
     clipboard append "Test"
     clipboard append -t TEST "Test2"
     selection clear -s CLIPBOARD
-    catch {clipboard get}
-	clipboard get -t TEST
+    clipboard get -t TEST
 } -cleanup {
     clipboard clear
 }  -returnCodes error -result {CLIPBOARD selection doesn't exist or form "TEST" not defined}
 test clipboard-4.4 {ClipboardLostSel procedure} -setup {
     clipboard clear
@@ -174,20 +173,19 @@
     clipboard append "Test3"
     selection clear -s CLIPBOARD
     clipboard get
 } -cleanup {
     clipboard clear
-}  -returnCodes error -result {CLIPBOARD selection doesn't exist or form "STRING" not defined} 
+}  -returnCodes error -result {CLIPBOARD selection doesn't exist or form "STRING" not defined}
 test clipboard-4.5 {ClipboardLostSel procedure} -setup {
     clipboard clear
 } -body {
     clipboard append "Test"
     clipboard append -t TEST "Test2"
     clipboard append "Test3"
     selection clear -s CLIPBOARD
-    catch {clipboard get}
-	clipboard get -t TEST
+    clipboard get -t TEST
 } -cleanup {
     clipboard clear
 }  -returnCodes error -result {CLIPBOARD selection doesn't exist or form "TEST" not defined}
 
 
@@ -228,11 +226,11 @@
 	clipboard append " second chunk"
 	clipboard get
 } -cleanup {
     clipboard clear
 }  -returnCodes ok -result {first chunk second chunk}
-test clipboard-6.2 {Tk_ClipboardAppend procedure} -constraints unix -setup {
+test clipboard-6.2 {Tk_ClipboardAppend procedure} -constraints x11 -setup {
     clipboard clear
 } -body {
     setupbg
     clipboard append -f INTEGER -t TEST "16"
     set result [dobg {clipboard get TEST}]

Index: tests/clrpick.test
==================================================================
--- tests/clrpick.test
+++ tests/clrpick.test
@@ -76,11 +76,11 @@
 
 
 # tests 3.1 and 3.2 fail when individually run
 # if there is no catch {tk_chooseColor -foo 1} msg
 # before settin isNative
-catch {tk_chooseColor -foo 1} msg 
+catch {tk_chooseColor -foo 1} msg
 set isNative [expr {[info commands tk::dialog::color::] eq ""}]
 
 proc ToPressButton {parent btn} {
     global isNative
     if {!$isNative} {

Index: tests/cmds.test
==================================================================
--- tests/cmds.test
+++ tests/cmds.test
@@ -37,11 +37,11 @@
     pack .f.b
     set x init
 } -body {
     after 100 {set x deleted; destroy .f}
     tkwait visibility .f.b
-} -returnCodes {error} -result {window ".f.b" was deleted before its visibility changed} 
+} -returnCodes {error} -result {window ".f.b" was deleted before its visibility changed}
 test cmds-1.6 {tkwait visibility, window gets deleted} -setup {
     frame .f
     button .f.b -text "Test"
     pack .f.b
     set x init

Index: tests/color.test
==================================================================
--- tests/color.test
+++ tests/color.test
@@ -88,11 +88,21 @@
     set vals [winfo rgb $w [format #%02x%02x%02x $red $green $blue]]
     expr ([lindex $vals 0]/256 == $red) && ([lindex $vals 1]/256 == $green) \
 	    && ([lindex $vals 2]/256 == $blue)
 }
 
-if {[testConstraint psuedocolor8]} {
+# -- WARNING (SB, 6.4.2017) --
+#
+# The if block below looks _very_ outdated. It didn't get any
+# substantial changes as far back as the fossil history goes. It might
+# be from a time, when 256 color was the best you could get! :-o.
+#
+# The problem is, on machines with a fancy 24 truecolor display, the
+# 'colorsFree' constraint doesn't get set, turning off pretty much every test
+# in this file.
+
+if {[testConstraint pseudocolor8]} {
     toplevel .t -visual {pseudocolor 8} -colormap new
     wm geom .t +0+0
     mkColors .t.c 40 6 0 0 0 0 6 0 0 0 40
     pack .t.c
     update
@@ -156,11 +166,11 @@
     	if {[string index $line 0] == "!"} continue
 	set rgb [c255 [winfo rgb . [lrange $line 3 end]]]
 	if {$rgb != [lrange $line 0 2] } {
 		append result $line\n
 	}
-	
+
     }
     return $result
 } {}
 
 test color-2.1 {Tk_GetColor procedure} colorsFree {
@@ -183,10 +193,22 @@
     winfo rgb .t red
 } {65535 0 0}
 test color-2.7 {Tk_GetColor procedure} colorsFree {
     winfo rgb .t #ff0000
 } {65535 0 0}
+test color-2.8 {Tk_GetColor, invalid char after 3 valid hex digits} -body {
+    winfo rgb . #abcg
+} -returnCodes error -result {invalid color name "#abcg"}
+test color-2.9 {Tk_GetColor, invalid char after 6 vaild hex digits} -body {
+    winfo rgb . #aabbccz
+} -returnCodes error -result {invalid color name "#aabbccz"}
+test color-2.10 {Tk_GetColor, 3 hex digits, last one invalid} -body {
+    winfo rgb . #abz
+} -returnCodes error -result {invalid color name "#abz"}
+test color-2.11 {Tk_GetColor, 6 hex digits, last one invalid} -body {
+    winfo rgb . #12345g
+} -returnCodes error -result {invalid color name "#12345g"}
 
 test color-3.1 {Tk_FreeColor procedure, reference counting} colorsFree {
     eval destroy [winfo child .t]
     mkColors .t.c 40 6 0 240 240 0 -6 0 0 0 -40
     pack .t.c
@@ -253,17 +275,21 @@
     lappend result [testcolor purple]
     destroy .t
     lappend result [testcolor purple]
 } {{{4 1} {3 0} {2 0} {1 0}} {{4 1} {2 0} {1 0}} {{4 1} {2 0}} {{2 0}} {}}
 
-test color-4.1 {FreeColorObjProc} colorsFree {
+test color-4.1 {FreeColorObjProc} -constraints {
+    colorsFree
+} -setup {
+    proc copy {s} {return [string index $s 0][string range $s 1 end]}
+} -body {
     destroy .b
-    set x [format purple]
+    set x [copy purple]
     button .b -foreground $x -text .b1
-    set y [format purple]
+    set y [copy purple]
     .b configure -foreground $y
-    set z [format purple]
+    set z [copy purple]
     .b configure -foreground $z
     set result {}
     lappend result [testcolor purple]
     set x red
     lappend result [testcolor purple]
@@ -271,12 +297,14 @@
     lappend result [testcolor purple]
     destroy .b
     lappend result [testcolor purple]
     set y bogus
     set result
-} {{{1 3}} {{1 2}} {{1 1}} {}}
+} -cleanup {
+    rename copy {}
+} -result {{{1 3}} {{1 2}} {{1 1}} {}}
 
 destroy .t
 
 # cleanup
 cleanupTests
 return

Index: tests/config.test
==================================================================
--- tests/config.test
+++ tests/config.test
@@ -194,11 +194,11 @@
 } -returnCodes error -result {unknown color name "non-existent"}
 test config-3.7 {Tk_InitOptions - bad initial value} -constraints {
     testobjconfig
 } -body {
     option add *a.color non-existent
-    catch {testobjconfig alltypes .a} 
+    catch {testobjconfig alltypes .a}
     return $errorInfo
 } -cleanup {
     killTables
     option clear
 } -result {unknown color name "non-existent"
@@ -556,28 +556,28 @@
     rename .foo {}
 } -cleanup {
     killTables
 } -returnCodes ok
 test config-4.42 {DoObjConfig - getting rid of old color} -constraints {
-    testobjconfig 
+    testobjconfig
 } -body {
     testobjconfig alltypes .foo -color #333333
     .foo configure -color #444444
 } -cleanup {
     killTables
 } -returnCodes ok -result {32}
 test config-4.43 {DoObjConfig - getting rid of old color} -constraints {
-    testobjconfig 
+    testobjconfig
 } -body {
     testobjconfig alltypes .foo -color #333333
     .foo configure -color #444444
     .foo cget -color
 } -cleanup {
     killTables
 } -returnCodes ok -result {#444444}
 test config-4.44 {DoObjConfig - getting rid of old color} -constraints {
-    testobjconfig 
+    testobjconfig
 } -body {
     testobjconfig alltypes .foo -color #333333
     .foo configure -color #444444
     .foo cget -color
     rename .foo {}
@@ -663,28 +663,28 @@
 } -cleanup {
     killTables
 } -returnCodes ok -result {gray75}
 test config-4.55 {DoObjConfig - new bitmap} -constraints testobjconfig -body {
     testobjconfig alltypes .foo -bitmap gray75
-    .foo configure -bitmap gray50 
+    .foo configure -bitmap gray50
 } -cleanup {
     killTables
 } -returnCodes ok -result {128}
 test config-4.56 {DoObjConfig - new bitmap} -constraints testobjconfig -body {
     testobjconfig alltypes .foo -bitmap gray75
-    .foo configure -bitmap gray50 
+    .foo configure -bitmap gray50
     .foo cget -bitmap
 } -cleanup {
     killTables
 } -returnCodes ok -result {gray50}
 test config-4.57 {DoObjConfig - invalid bitmap} -constraints {
     testobjconfig
 } -body {
-    testobjconfig alltypes .foo -bitmap foo
+    testobjconfig alltypes .foo -bitmap foobar
 } -cleanup {
     killTables
-} -returnCodes error -result {bitmap "foo" not defined}
+} -returnCodes error -result {bitmap "foobar" not defined}
 test config-4.58 {DoObjConfig - null bitmap} -constraints testobjconfig -body {
     testobjconfig alltypes .foo -bitmap {}
 } -cleanup {
     killTables
 } -returnCodes ok -result {.foo}
@@ -743,19 +743,19 @@
     .foo cget -border
 } -cleanup {
     killTables
 } -result {#123456}
 test config-4.67 {DoObjConfig - getting rid of old border} -constraints {
-    testobjconfig 
+    testobjconfig
 } -body {
     testobjconfig alltypes .foo -border #333333
     .foo configure -border #444444
 } -cleanup {
     killTables
 } -returnCodes ok -result {256}
 test config-4.68 {DoObjConfig - getting rid of old border} -constraints {
-    testobjconfig 
+    testobjconfig
 } -body {
     testobjconfig alltypes .foo -border #333333
     .foo configure -border #444444
     .foo cget -border
 } -cleanup {
@@ -788,17 +788,17 @@
 } -cleanup {
     killTables
 } -result {ridge}
 test config-4.73 {DoObjConfig - new relief} -constraints testobjconfig -body {
     testobjconfig alltypes .foo -relief raised
-    .foo configure -relief flat 
+    .foo configure -relief flat
 } -cleanup {
     killTables
 } -returnCodes ok -result {512}
 test config-4.74 {DoObjConfig - new relief} -constraints testobjconfig -body {
     testobjconfig alltypes .foo -relief raised
-    .foo configure -relief flat 
+    .foo configure -relief flat
     .foo cget -relief
 } -cleanup {
     killTables
 } -returnCodes ok -result {flat}
 
@@ -913,11 +913,11 @@
 } -cleanup {
     killTables
 } -returnCodes error -result {bad anchor "foo": must be n, ne, e, se, s, sw, w, nw, or center}
 test config-4.92 {DoObjConfig - new anchor} -constraints testobjconfig -body {
     testobjconfig alltypes .foo -anchor e
-    .foo configure -anchor n 
+    .foo configure -anchor n
 } -cleanup {
     killTables
 } -returnCodes ok -result {4096}
 test config-4.93 {DoObjConfig - new anchor} -constraints testobjconfig -body {
     testobjconfig alltypes .foo -anchor e
@@ -991,11 +991,11 @@
 } -cleanup {
     killTables
 } -returnCodes ok -result {.bar}
 test config-4.103 {DoObjConfig - invalid window} -constraints testobjconfig -body {
     toplevel .bar
-    testobjconfig twowindows .foo -window foo 
+    testobjconfig twowindows .foo -window foo
 } -cleanup {
     killTables
 } -returnCodes error -result {bad window path name "foo"}
 test config-4.104 {DoObjConfig - null window} -constraints testobjconfig -body {
     toplevel .bar
@@ -1203,23 +1203,23 @@
     .a cget -color
 } -result {blue}
 test config-7.4 {Tk_SetOptions - missing value} -constraints {
     testobjconfig
 } -body {
-    .a configure -color green -relief 
+    .a configure -color green -relief
 } -returnCodes error -result {value for "-relief" missing}
 test config-7.5 {Tk_SetOptions - missing value} -constraints {
     testobjconfig
 } -body {
-    catch {.a configure -color green -relief} 
+    catch {.a configure -color green -relief}
     .a cget -color
 } -result {green}
 test config-7.6 {Tk_SetOptions - saving old values} -constraints {
     testobjconfig
 } -body {
     .a configure -color red -int 7 -relief raised -double 3.14159
-    .a csave -color green -int 432 -relief sunken -double 2.0 -color bogus 
+    .a csave -color green -int 432 -relief sunken -double 2.0 -color bogus
 } -returnCodes error -result {unknown color name "bogus"}
 test config-7.7 {Tk_SetOptions - saving old values} -constraints {
     testobjconfig
 } -body {
     .a configure -color red -int 7 -relief raised -double 3.14159
@@ -1228,11 +1228,11 @@
 } -result {red 7 raised 3.14159}
 
 test config-7.8 {Tk_SetOptions - error in DoObjConfig call} -constraints {
     testobjconfig
 } -body {
-    .a configure -color bogus 
+    .a configure -color bogus
 } -returnCodes error -result {unknown color name "bogus"}
 test config-7.9 {Tk_SetOptions - error in DoObjConfig call} -constraints {
     testobjconfig
 } -body {
     catch {.a configure -color bogus}
@@ -1260,11 +1260,11 @@
     format %x [.a configure -color red -int 7 -relief raised -double 3.14159]
 } -result {226}
 test config-7.13 {Tk_SetOptions - error in DoObjConfig with custom option} -constraints {
     testobjconfig
 } -body {
-    .a configure -custom bad 
+    .a configure -custom bad
 } -returnCodes error -result {expected good value, got "BAD"}
 test config-7.14 {Tk_SetOptions - error in DoObjConfig with custom option} -constraints {
     testobjconfig
 } -body {
     catch {.a configure -custom bad}

Index: tests/constraints.tcl
==================================================================
--- tests/constraints.tcl
+++ tests/constraints.tcl
@@ -178,11 +178,15 @@
 namespace import -force tk::test::*
 
 namespace import -force tcltest::testConstraint
 testConstraint notAqua [expr {[tk windowingsystem] ne "aqua"}]
 testConstraint aqua [expr {[tk windowingsystem] eq "aqua"}]
+testConstraint x11 [expr {[tk windowingsystem] eq "x11"}]
 testConstraint nonwin [expr {[tk windowingsystem] ne "win32"}]
+testConstraint aquaOrWin32 [expr {
+    ([tk windowingsystem] eq "win32") || [testConstraint aqua]
+}]
 testConstraint userInteraction 0
 testConstraint nonUnixUserInteraction [expr {
     [testConstraint userInteraction] ||
     ([testConstraint unix] && [testConstraint notAqua])
 }]

ADDED   tests/corruptMangled.gif
Index: tests/corruptMangled.gif
==================================================================
--- /dev/null
+++ tests/corruptMangled.gif
cannot compute difference between binary files

ADDED   tests/corruptMangled4G.gif
Index: tests/corruptMangled4G.gif
==================================================================
--- /dev/null
+++ tests/corruptMangled4G.gif
@@ -0,0 +1,2 @@
+GIF89aÂf3ÿÿ33ÿ3ÿ3ÿ33ÿÿÿÿ3ÿÿÿ!ù
+,!xºÜ-0Bw¤ïÚ¥µê×Jâ8Uæªkir/3Re7  ;

ADDED   tests/corruptTruncated.gif
Index: tests/corruptTruncated.gif
==================================================================
--- /dev/null
+++ tests/corruptTruncated.gif
cannot compute difference between binary files

Index: tests/cursor.test
==================================================================
--- tests/cursor.test
+++ tests/cursor.test
@@ -106,11 +106,11 @@
 	setWincur wincur
     button .b -cursor [list @$wincur(file)]
 } -cleanup {
     destroy .b
 	removeDirectory $wincur(dir)
-	unset wincur	
+	unset wincur
 } -result {.b}
 test cursor-2.4 {Tk_GetCursor procedure: cursor specs are lists} -constraints {
     win
 } -setup {
 	unset -nocomplain wincur
@@ -142,16 +142,18 @@
     lappend result [testcursor heart]
 } -result {{{3 1}} {{2 1}} {{1 1}} {}}
 
 test cursor-4.1 {FreeCursorObjProc} -constraints {
     testcursor
+} -setup {
+    proc copy {s} {return [string index $s 0][string range $s 1 end]}
 } -body {
-    set x [join heart]
+    set x [copy heart]
     button .b -cursor $x
-    set y [join heart]
+    set y [copy heart]
     .b configure -cursor $y
-    set z [join heart]
+    set z [copy heart]
     .b configure -cursor $z
     set result {}
     lappend result [testcursor heart]
     set x red
     lappend result [testcursor heart]
@@ -160,10 +162,11 @@
     destroy .b
     lappend result [testcursor heart]
     set y bogus
     set result
 } -cleanup {
+    rename copy {}
     destroy .b
 } -result {{{1 3}} {{1 2}} {{1 1}} {}}
 
 # -------------------------------------------------------------------------
 test cursor-5.1 {assert consistent cursor configuration command} -setup {

ADDED   tests/deferredClearCode.gif
Index: tests/deferredClearCode.gif
==================================================================
--- /dev/null
+++ tests/deferredClearCode.gif
cannot compute difference between binary files

Index: tests/entry.test
==================================================================
--- tests/entry.test
+++ tests/entry.test
@@ -14,11 +14,11 @@
 # For xscrollcommand
 proc scroll args {
         global scrollInfo
         set scrollInfo $args
 }
-# For trace variable 
+# For trace variable
 proc override args {
         global x
         set x 12345
 }
 
@@ -104,11 +104,11 @@
     entry .e -highlightthickness 2 -font {Helvetica -12 bold}
     pack .e
     update
 } -body {
     .e configure -borderwidth 1.3
-    .e cget -borderwidth 
+    .e cget -borderwidth
 } -cleanup {
     destroy .e
 } -result {1}
 test entry-1.8 {configuration option: "borderwidth" for entry} -setup {
     entry .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
@@ -219,21 +219,21 @@
 } -cleanup {
     destroy .e
 } -returnCodes {error} -result {unknown color name "non-existent"}
 
 test entry-1.19 {configuration option: "font" for entry} -setup {
-    entry .e -borderwidth 2 -highlightthickness 2 
+    entry .e -borderwidth 2 -highlightthickness 2
     pack .e
     update
 } -body {
     .e configure -font {Helvetica -12}
     .e cget -font
 } -cleanup {
     destroy .e
 } -result {Helvetica -12}
 test entry-1.20 {configuration option: "font" for entry} -setup {
-    entry .e -borderwidth 2 -highlightthickness 2 
+    entry .e -borderwidth 2 -highlightthickness 2
     pack .e
     update
 } -body {
     .e configure -font {}
 } -cleanup {
@@ -349,11 +349,11 @@
 } -cleanup {
     destroy .e
 } -returnCodes {error} -result {unknown color name "non-existent"}
 
 test entry-1.32 {configuration option: "insertborderwidth" for entry} -setup {
-    entry .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
+    entry .e -borderwidth 2 -insertwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .e
     update
 } -body {
     .e configure -insertborderwidth 1.3
     .e cget -insertborderwidth
@@ -625,10 +625,27 @@
     .e cget -xscrollcommand
 } -cleanup {
     destroy .e
 } -result {Some command}
 
+test entry-1.59 {configuration option: "-placeholder"} -setup {
+    pack [entry .e]
+} -body {
+    .e configure -placeholder {Some text}
+    .e cget -placeholder
+} -cleanup {
+    destroy .e
+} -result {Some text}
+
+test entry-1.60 {configuration option: "-placeholderforeground"} -setup {
+    pack [entry .e]
+} -body {
+    .e configure -placeholder {Some text} -placeholderforeground red
+    .e cget -placeholderforeground
+} -cleanup {
+    destroy .e
+} -result {red}
 
 
 test entry-2.1 {Tk_EntryCmd procedure} -body {
     entry
 } -returnCodes error -result {wrong # args: should be "entry pathName ?-option value ...?"}
@@ -660,56 +677,56 @@
     destroy .e
 } -result {.e}
 
 
 test entry-3.1 {EntryWidgetCmd procedure} -setup {
-    entry .e 
+    entry .e
     pack .e
     update
 } -body {
     .e
 } -cleanup {
     destroy .e
 } -returnCodes error -result {wrong # args: should be ".e option ?arg ...?"}
 test entry-3.2 {EntryWidgetCmd procedure, "bbox" widget command} -setup {
-    entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
     update
 } -body {
     .e bbox
 } -cleanup {
     destroy .e
 } -returnCodes error -result {wrong # args: should be ".e bbox index"}
 test entry-3.3 {EntryWidgetCmd procedure, "bbox" widget command} -setup {
-    entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
     update
 } -body {
     .e bbox a b
 } -cleanup {
     destroy .e
 } -returnCodes error -result {wrong # args: should be ".e bbox index"}
 test entry-3.4 {EntryWidgetCmd procedure, "bbox" widget command} -setup {
-    entry .e 
+    entry .e
     pack .e
     update
 } -body {
     .e bbox bogus
 } -cleanup {
     destroy .e
 } -returnCodes error -result {bad entry index "bogus"}
 test entry-3.5 {EntryWidgetCmd procedure, "bbox" widget command} -setup {
-    entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
     update
 } -body {
    .e bbox 0
 } -cleanup {
     destroy .e
 } -result [list 5 5 0 $cy]
 
-# Previously the result was count using previousli counted font measurements 
+# Previously the result was count using previousli counted font measurements
 # and metrics. It was changed to less verbose solution - the result is the one
 # that passes fonts constraint (this concerns tests 3.6, 3.7, 3.8, 3.10)
 test entry-3.6 {EntryWidgetCmd procedure, "bbox" widget command} -constraints {
 	fonts
 } -setup {
@@ -724,11 +741,11 @@
     destroy .e
 } -result {{19 5 7 13} {19 5 7 13}}
 test entry-3.7 {EntryWidgetCmd procedure, "bbox" widget command} -constraints {
 	fonts
 } -setup {
-    entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
     update
 } -body {
 # Tcl_UtfAtIndex(): utf at end
     .e insert 0 "ab\u4e4e"
@@ -737,11 +754,11 @@
     destroy .e
 } -result {19 5 12 13}
 test entry-3.8 {EntryWidgetCmd procedure, "bbox" widget command} -constraints {
 	fonts
 } -setup {
-    entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
     update
 } -body {
 # Tcl_UtfAtIndex(): utf before index
     .e insert 0 "ab\u4e4ec"
@@ -748,11 +765,11 @@
     .e bbox 3
 } -cleanup {
     destroy .e
 } -result {31 5 7 13}
 test entry-3.9 {EntryWidgetCmd procedure, "bbox" widget command} -setup {
-    entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
     update
 } -body {
 # Tcl_UtfAtIndex(): no chars
     .e bbox end
@@ -760,114 +777,114 @@
     destroy .e
 } -result "5 5 0 $cy"
 test entry-3.10 {EntryWidgetCmd procedure, "bbox" widget command} -constraints {
 	fonts
 } -setup {
-    entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
     update
 } -body {
     .e insert 0 "abcdefghij\u4e4eklmnop"
     list [.e bbox 0] [.e bbox 1] [.e bbox 10] [.e bbox end]
 } -cleanup {
     destroy .e
 } -result {{5 5 7 13} {12 5 7 13} {75 5 12 13} {122 5 7 13}}
 test entry-3.11 {EntryWidgetCmd procedure, "cget" widget command} -setup {
-    entry .e 
+    entry .e
 } -body {
     .e cget
 } -cleanup {
     destroy .e
 } -returnCodes error -result {wrong # args: should be ".e cget option"}
 test entry-3.12 {EntryWidgetCmd procedure, "cget" widget command} -setup {
-    entry .e 
+    entry .e
 } -body {
     .e cget a b
 } -cleanup {
     destroy .e
 } -returnCodes error -result {wrong # args: should be ".e cget option"}
 test entry-3.13 {EntryWidgetCmd procedure, "cget" widget command} -setup {
-    entry .e 
+    entry .e
 } -body {
     .e cget -gorp
 } -cleanup {
     destroy .e
 } -returnCodes error -result {unknown option "-gorp"}
 test entry-3.14 {EntryWidgetCmd procedure, "cget" widget command} -setup {
-    entry .e 
+    entry .e
 } -body {
     .e configure -bd 4
     .e cget -bd
 } -cleanup {
     destroy .e
 } -result {4}
 test entry-3.15 {EntryWidgetCmd procedure, "configure" widget command} -setup {
-    entry .e 
+    entry .e
     pack .e
     update
 } -body {
     llength [.e configure]
 } -cleanup {
     destroy .e
-} -result {36}
+} -result {38}
 test entry-3.16 {EntryWidgetCmd procedure, "configure" widget command} -setup {
-    entry .e 
+    entry .e
 } -body {
     .e configure -foo
 } -cleanup {
     destroy .e
 } -returnCodes error -result {unknown option "-foo"}
 test entry-3.17 {EntryWidgetCmd procedure, "configure" widget command} -setup {
-    entry .e 
+    entry .e
 } -body {
     .e configure -bd 4
     .e configure -bg #ffffff
     lindex [.e configure -bd] 4
 } -cleanup {
     destroy .e
 } -result {4}
 test entry-3.18 {EntryWidgetCmd procedure, "delete" widget command} -setup {
-    entry .e 
+    entry .e
 } -body {
     .e delete
 } -cleanup {
     destroy .e
 } -returnCodes error -result {wrong # args: should be ".e delete firstIndex ?lastIndex?"}
 test entry-3.19 {EntryWidgetCmd procedure, "delete" widget command} -setup {
-    entry .e 
+    entry .e
 } -body {
     .e delete a b c
 } -cleanup {
     destroy .e
 } -returnCodes error -result {wrong # args: should be ".e delete firstIndex ?lastIndex?"}
 test entry-3.20 {EntryWidgetCmd procedure, "delete" widget command} -setup {
-    entry .e 
+    entry .e
 } -body {
     .e delete foo
 } -cleanup {
     destroy .e
 } -returnCodes error -result {bad entry index "foo"}
 test entry-3.21 {EntryWidgetCmd procedure, "delete" widget command} -setup {
-    entry .e 
+    entry .e
 } -body {
     .e delete 0 bar
 } -cleanup {
     destroy .e
 } -returnCodes error -result {bad entry index "bar"}
 test entry-3.22 {EntryWidgetCmd procedure, "delete" widget command} -setup {
     entry .e
     pack .e
-    update 
+    update
 } -body {
     .e insert end "01234567890"
     .e delete 2 4
     .e get
 } -cleanup {
     destroy .e
 } -result {014567890}
 test entry-3.23 {EntryWidgetCmd procedure, "delete" widget command} -setup {
-    entry .e 
+    entry .e
 } -body {
     .e insert end "01234567890"
     .e delete 6
     .e get
 } -cleanup {
@@ -874,11 +891,11 @@
     destroy .e
 } -result {0123457890}
 test entry-3.24 {EntryWidgetCmd procedure, "delete" widget command} -setup {
     entry .e
     pack .e
-    update 
+    update
     set x {}
 } -body {
 # UTF
     .e insert end "01234\u4e4e67890"
     .e delete 6
@@ -895,11 +912,11 @@
     destroy .e
 } -result [list "01234\u4e4e7890" "0123457890" "012345\u4e4e890"]
 test entry-3.25 {EntryWidgetCmd procedure, "delete" widget command} -setup {
     entry .e
     pack .e
-    update  
+    update
 } -body {
     .e insert end "01234567890"
     .e delete 6 5
     .e get
 } -cleanup {
@@ -906,11 +923,11 @@
     destroy .e
 } -result {01234567890}
 test entry-3.26 {EntryWidgetCmd procedure, "delete" widget command} -setup {
     entry .e
     pack .e
-    update  
+    update
 } -body {
     .e insert end "01234567890"
     .e configure -state disabled
     .e delete 2 8
     .e configure -state normal
@@ -919,11 +936,11 @@
     destroy .e
 } -result {01234567890}
 test entry-3.26a {EntryWidgetCmd procedure, "delete" widget command} -setup {
     entry .e
     pack .e
-    update  
+    update
 } -body {
     .e insert end "01234567890"
     .e configure -state readonly
     .e delete 2 8
     .e configure -state normal
@@ -930,105 +947,105 @@
     .e get
 } -cleanup {
     destroy .e
 } -result {01234567890}
 test entry-3.27 {EntryWidgetCmd procedure, "get" widget command} -setup {
-    entry .e 
+    entry .e
 } -body {
     .e get foo
 } -cleanup {
     destroy .e
 } -returnCodes error -result {wrong # args: should be ".e get"}
 test entry-3.28 {EntryWidgetCmd procedure, "icursor" widget command} -setup {
-    entry .e 
+    entry .e
 } -body {
     .e icursor
 } -cleanup {
     destroy .e
 } -returnCodes error -result {wrong # args: should be ".e icursor pos"}
 test entry-3.29 {EntryWidgetCmd procedure, "icursor" widget command} -setup {
-    entry .e 
+    entry .e
 } -body {
     .e icursor foo
 } -cleanup {
     destroy .e
 } -returnCodes error -result {bad entry index "foo"}
 test entry-3.30 {EntryWidgetCmd procedure, "icursor" widget command} -setup {
-    entry .e 
+    entry .e
 } -body {
     .e insert end "01234567890"
     .e icursor 4
     .e index insert
 } -cleanup {
     destroy .e
 } -result {4}
 test entry-3.31 {EntryWidgetCmd procedure, "index" widget command} -setup {
-    entry .e 
+    entry .e
 } -body {
     .e in
 } -cleanup {
     destroy .e
 } -returnCodes error -result {ambiguous option "in": must be bbox, cget, configure, delete, get, icursor, index, insert, scan, selection, validate, or xview}
 test entry-3.32 {EntryWidgetCmd procedure, "index" widget command} -setup {
-    entry .e 
+    entry .e
 } -body {
     .e index
 } -cleanup {
     destroy .e
 } -returnCodes error -result {wrong # args: should be ".e index string"}
 test entry-3.33 {EntryWidgetCmd procedure, "index" widget command} -setup {
-    entry .e 
+    entry .e
 } -body {
     .e index foo
 } -cleanup {
     destroy .e
 } -returnCodes error -result {bad entry index "foo"}
 test entry-3.34 {EntryWidgetCmd procedure, "index" widget command} -setup {
     entry .e
     pack .e
-    update  
+    update
 } -body {
     .e index 0
 } -cleanup {
     destroy .e
 } -returnCodes {ok} -match glob -result {*}
 test entry-3.35 {EntryWidgetCmd procedure, "index" widget command} -setup {
     entry .e
     pack .e
-    update  
+    update
 } -body {
 # UTF
     .e insert 0 abc\u4e4e\u0153def
     list [.e index 3] [.e index 4] [.e index end]
 } -cleanup {
     destroy .e
 } -result {3 4 8}
 test entry-3.36 {EntryWidgetCmd procedure, "insert" widget command} -setup {
-    entry .e 
+    entry .e
 } -body {
     .e insert a
 } -cleanup {
     destroy .e
 } -returnCodes error -result {wrong # args: should be ".e insert index text"}
 test entry-3.37 {EntryWidgetCmd procedure, "insert" widget command} -setup {
-    entry .e 
+    entry .e
 } -body {
     .e insert a b c
 } -cleanup {
     destroy .e
 } -returnCodes error -result {wrong # args: should be ".e insert index text"}
 test entry-3.38 {EntryWidgetCmd procedure, "insert" widget command} -setup {
-    entry .e 
+    entry .e
 } -body {
     .e insert foo Text
 } -cleanup {
     destroy .e
 } -returnCodes error -result {bad entry index "foo"}
 test entry-3.39 {EntryWidgetCmd procedure, "insert" widget command} -setup {
     entry .e
     pack .e
-    update  
+    update
 } -body {
     .e insert end "01234567890"
     .e insert 3 xxx
     .e get
 } -cleanup {
@@ -1035,11 +1052,11 @@
     destroy .e
 } -result {012xxx34567890}
 test entry-3.40 {EntryWidgetCmd procedure, "insert" widget command} -setup {
     entry .e
     pack .e
-    update  
+    update
 } -body {
     .e insert end "01234567890"
     .e configure -state disabled
     .e insert 3 xxx
     .e configure -state normal
@@ -1048,11 +1065,11 @@
     destroy .e
 } -result {01234567890}
 test entry-3.40a {EntryWidgetCmd procedure, "insert" widget command} -setup {
     entry .e
     pack .e
-    update  
+    update
 } -body {
     .e insert end "01234567890"
     .e configure -state readonly
     .e insert 3 xxx
     .e configure -state normal
@@ -1059,18 +1076,18 @@
     .e get
 } -cleanup {
     destroy .e
 } -result {01234567890}
 test entry-3.41 {EntryWidgetCmd procedure, "insert" widget command} -setup {
-    entry .e 
+    entry .e
 } -body {
     .e insert a b c
 } -cleanup {
     destroy .e
 } -returnCodes error -result {wrong # args: should be ".e insert index text"}
 test entry-3.42 {EntryWidgetCmd procedure, "scan" widget command} -setup {
-    entry .e 
+    entry .e
     pack .e
     update
 } -body {
     .e scan a
 } -cleanup {
@@ -1077,29 +1094,29 @@
     destroy .e
 } -returnCodes error -result {wrong # args: should be ".e scan mark|dragto x"}
 test entry-3.43 {EntryWidgetCmd procedure, "scan" widget command} -setup {
     entry .e
     pack .e
-    update 
+    update
 } -body {
     .e scan a b c
 } -cleanup {
     destroy .e
 } -returnCodes error -result {wrong # args: should be ".e scan mark|dragto x"}
 test entry-3.44 {EntryWidgetCmd procedure, "scan" widget command} -setup {
     entry .e
     pack .e
-    update 
+    update
 } -body {
     .e scan foobar 20
 } -cleanup {
     destroy .e
 } -returnCodes error -result {bad scan option "foobar": must be mark or dragto}
 test entry-3.45 {EntryWidgetCmd procedure, "scan" widget command} -setup {
     entry .e
     pack .e
-    update 
+    update
 } -body {
     .e scan mark 20.1
 } -cleanup {
     destroy .e
 } -returnCodes error -result {expected integer but got "20.1"}
@@ -1106,11 +1123,11 @@
 
 # This test is non-portable because character sizes vary.
 test entry-3.46 {EntryWidgetCmd procedure, "scan" widget command} -constraints {
     fonts
 } -setup {
-    entry .e -font {Helvetica -12} -borderwidth 2 -highlightthickness 2 
+    entry .e -font {Helvetica -12} -borderwidth 2 -highlightthickness 2
     pack .e
     update
 } -body {
     .e insert end "This is quite a long string, in fact a "
     .e insert end "very very long string"
@@ -1119,47 +1136,47 @@
     .e index @0
 } -cleanup {
     destroy .e
 } -result {2}
 test entry-3.47 {EntryWidgetCmd procedure, "select" widget command} -setup {
-    entry .e 
+    entry .e
 } -body {
     .e select
 } -cleanup {
     destroy .e
 } -returnCodes error -result {wrong # args: should be ".e selection option ?index?"}
 test entry-3.48 {EntryWidgetCmd procedure, "select" widget command} -setup {
-    entry .e 
+    entry .e
 } -body {
     .e select foo
 } -cleanup {
     destroy .e
 } -returnCodes error -result {bad selection option "foo": must be adjust, clear, from, present, range, or to}
 
 test entry-3.49 {EntryWidgetCmd procedure, "select clear" widget command} -setup {
-    entry .e 
+    entry .e
 } -body {
     .e select clear gorp
 } -cleanup {
     destroy .e
 } -returnCodes error -result {wrong # args: should be ".e selection clear"}
 test entry-3.50 {EntryWidgetCmd procedure, "select clear" widget command} -setup {
-    entry .e 
+    entry .e
 } -body {
     .e insert end "0123456789"
     .e select from 1
     .e select to 4
     update
     .e select clear
-    selection get 
+    selection get
 } -cleanup {
     destroy .e
 } -returnCodes error -result {PRIMARY selection doesn't exist or form "STRING" not defined}
 test entry-3.50.1 {EntryWidgetCmd procedure, "select clear" widget command} -setup {
     entry .e
     pack .e
-    update  
+    update
 } -body {
     .e insert end "0123456789"
     .e select from 1
     .e select to 4
     update
@@ -1169,20 +1186,20 @@
 } -cleanup {
     destroy .e
 } -result {.e}
 
 test entry-3.51 {EntryWidgetCmd procedure, "selection present" widget command} -setup {
-    entry .e 
+    entry .e
 } -body {
     .e selection present foo
 } -cleanup {
     destroy .e
 } -returnCodes error -result {wrong # args: should be ".e selection present"}
 test entry-3.52 {EntryWidgetCmd procedure, "selection present" widget command} -setup {
     entry .e
     pack .e
-    update  
+    update
 } -body {
     .e insert end 0123456789
     .e select from 3
     .e select to 6
     .e selection present
@@ -1190,11 +1207,11 @@
     destroy .e
 } -result {1}
 test entry-3.53 {EntryWidgetCmd procedure, "selection present" widget command} -setup {
     entry .e
     pack .e
-    update  
+    update
 } -body {
     .e insert end 0123456789
     .e select from 3
     .e select to 6
     .e configure -exportselection false
@@ -1203,11 +1220,11 @@
     destroy .e
 } -result {1}
 test entry-3.54 {EntryWidgetCmd procedure, "selection present" widget command} -setup {
     entry .e
     pack .e
-    update 
+    update
 } -body {
     .e insert end 0123456789
     .e select from 3
     .e select to 6
     .e delete 0 end
@@ -1342,11 +1359,11 @@
 } -cleanup {
     destroy .e
 } -returnCodes error -result {wrong # args: should be ".e selection to index"}
 
 test entry-3.65 {EntryWidgetCmd procedure, "xview" widget command} -setup {
-    entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
     update
 } -body {
     .e insert end "This is quite a long text string, so long that it "
     .e insert end "runs off the end of the window quite a bit."
@@ -1354,20 +1371,20 @@
     format {%.7f %.7f} {*}[.e xview]
 } -cleanup {
     destroy .e
 } -result {0.0537634 0.2688172}
 test entry-3.66 {EntryWidgetCmd procedure, "xview" widget command} -setup {
-    entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
     update
 } -body {
     .e xview gorp
 } -cleanup {
     destroy .e
 } -returnCodes error -result {bad entry index "gorp"}
 test entry-3.67 {EntryWidgetCmd procedure, "xview" widget command} -setup {
-    entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
     update
 } -body {
     .e insert end "This is quite a long text string, so long that it "
     .e insert end "runs off the end of the window quite a bit."
@@ -1377,29 +1394,29 @@
     format {%.6f %.6f} {*}[.e xview]
 } -cleanup {
     destroy .e
 } -result {0.107527 0.322581}
 test entry-3.68 {EntryWidgetCmd procedure, "xview" widget command} -setup {
-    entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
     update
 } -body {
     .e xview moveto foo bar
 } -cleanup {
     destroy .e
 } -returnCodes error -result {wrong # args: should be ".e xview moveto fraction"}
 test entry-3.69 {EntryWidgetCmd procedure, "xview" widget command} -setup {
-    entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
     update
 } -body {
     .e xview moveto foo
 } -cleanup {
     destroy .e
 } -returnCodes error -result {expected floating-point number but got "foo"}
 test entry-3.70 {EntryWidgetCmd procedure, "xview" widget command} -setup {
-    entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
     update
 } -body {
     .e insert end "This is quite a long text string, so long that it "
     .e insert end "runs off the end of the window quite a bit."
@@ -1407,11 +1424,11 @@
     format {%.6f %.6f} {*}[.e xview]
 } -cleanup {
     destroy .e
 } -result {0.505376 0.720430}
 test entry-3.71 {EntryWidgetCmd procedure, "xview" widget command} -setup {
-    entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
     update
 } -body {
     .e insert end "This is quite a long text string, so long that it "
     .e insert end "runs off the end of the window quite a bit."
@@ -1418,11 +1435,11 @@
     .e xview scroll 24
 } -cleanup {
     destroy .e
 } -returnCodes error -result {wrong # args: should be ".e xview scroll number units|pages"}
 test entry-3.72 {EntryWidgetCmd procedure, "xview" widget command} -setup {
-    entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
 } -body {
     .e insert end "This is quite a long text string, so long that it "
     .e insert end "runs off the end of the window quite a bit."
     update
@@ -1429,11 +1446,11 @@
     .e xview scroll gorp units
 } -cleanup {
     destroy .e
 } -returnCodes error -result {expected integer but got "gorp"}
 test entry-3.73 {EntryWidgetCmd procedure, "xview" widget command} -setup {
-    entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
 } -body {
     .e insert end "This is quite a long text string, so long that it "
     .e insert end "runs off the end of the window quite a bit."
     update
@@ -1442,11 +1459,11 @@
     format {%.6f %.6f} {*}[.e xview]
 } -cleanup {
     destroy .e
 } -result {0.193548 0.408602}
 test entry-3.74 {EntryWidgetCmd procedure, "xview" widget command} -setup {
-    entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
     update
 } -body {
     .e insert end "This is quite a long text string, so long that it "
     .e insert end "runs off the end of the window quite a bit."
@@ -1456,39 +1473,39 @@
     format {%.6f %.6f} {*}[.e xview]
 } -cleanup {
     destroy .e
 } -result {0.397849 0.612903}
 test entry-3.75 {EntryWidgetCmd procedure, "xview" widget command} -setup {
-    entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
 } -body {
     .e insert end "This is quite a long text string, so long that it "
     .e insert end "runs off the end of the window quite a bit."
     update
     .e xview 30
     update
-    .e xview scroll 2 units 
+    .e xview scroll 2 units
     .e index @0
 } -cleanup {
     destroy .e
 } -result {32}
 test entry-3.76 {EntryWidgetCmd procedure, "xview" widget command} -setup {
-    entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
 } -body {
     .e insert end "This is quite a long text string, so long that it "
     .e insert end "runs off the end of the window quite a bit."
     update
     .e xview 30
     update
-    .e xview scroll -1 units 
+    .e xview scroll -1 units
     .e index @0
 } -cleanup {
     destroy .e
 } -result {29}
 test entry-3.77 {EntryWidgetCmd procedure, "xview" widget command} -setup {
-    entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
 } -body {
     .e insert end "This is quite a long text string, so long that it "
     .e insert end "runs off the end of the window quite a bit."
     update
@@ -1495,11 +1512,11 @@
     .e xview scroll 23 foobars
 } -cleanup {
     destroy .e
 } -returnCodes error -result {bad argument "foobars": must be units or pages}
 test entry-3.78 {EntryWidgetCmd procedure, "xview" widget command} -setup {
-    entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
 } -body {
     .e insert end "This is quite a long text string, so long that it "
     .e insert end "runs off the end of the window quite a bit."
     update
@@ -1506,11 +1523,11 @@
     .e xview eat 23 hamburgers
 } -cleanup {
     destroy .e
 } -returnCodes error -result {unknown option "eat": must be moveto or scroll}
 test entry-3.79 {EntryWidgetCmd procedure, "xview" widget command} -setup {
-    entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
     update
 } -body {
     .e insert end "This is quite a long text string, so long that it "
     .e insert end "runs off the end of the window quite a bit."
@@ -1520,11 +1537,11 @@
     .e index @0
 } -cleanup {
     destroy .e
 } -result {0}
 test entry-3.80 {EntryWidgetCmd procedure, "xview" widget command} -setup {
-    entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
 } -body {
     .e insert end "This is quite a long text string, so long that it "
     .e insert end "runs off the end of the window quite a bit."
     update
@@ -1532,11 +1549,11 @@
     .e index @0
 } -cleanup {
     destroy .e
 } -result {73}
 test entry-3.86 {EntryWidgetCmd procedure, "xview" widget command} -setup {
-    entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
 } -body {
     .e insert end "This is quite a long text string, so long that it "
     .e insert end "runs off the end of the window quite a bit."
     .e insert 10 \u4e4e
@@ -1554,11 +1571,11 @@
 } -cleanup {
     destroy .e
 } -result {0.095745 0.106383 0.117021}
 
 test entry-3.82 {EntryWidgetCmd procedure} -setup {
-    entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    entry .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
     update
 } -body {
     .e gorp
 } -cleanup {
@@ -1613,11 +1630,11 @@
     .e configure -textvariable x
     list $x [.e get]
 } -cleanup {
     destroy .e
     trace vdelete x w override
-    unset x;  
+    unset x;
 } -result {12345 12345}
 
 test entry-5.5 {ConfigureEntry procedure} -setup {
     set x {}
     entry .e1
@@ -1638,18 +1655,18 @@
     return $x
 } -cleanup {
     destroy .e1 .e2
 } -result {{This is so} {This is so} 1234}
 test entry-5.6 {ConfigureEntry procedure} -setup {
-    entry .e 
+    entry .e
     pack .e
 } -body {
     .e insert end "0123456789"
     .e select from 1
     .e select to 5
     .e configure -exportselection 0
-    selection get 
+    selection get
 } -cleanup {
     destroy .e
 } -returnCodes error -result {PRIMARY selection doesn't exist or form "STRING" not defined}
 test entry-5.6.1 {ConfigureEntry procedure} -setup {
     entry .e
@@ -1657,18 +1674,18 @@
 } -body {
     .e insert end "0123456789"
     .e select from 1
     .e select to 5
     .e configure -exportselection 0
-    catch {selection get} 
+    catch {selection get}
     list [.e index sel.first] [.e index sel.last]
 } -cleanup {
     destroy .e
 } -result {1 5}
 
 test entry-5.7 {ConfigureEntry procedure} -setup {
-    entry .e -font {Helvetica -12} -borderwidth 2 -highlightthickness 2 
+    entry .e -font {Helvetica -12} -borderwidth 2 -highlightthickness 2
     pack .e
 } -body {
     .e configure -font {Courier -12} -width 4 -xscrollcommand scroll
     .e insert end "01234567890"
     update
@@ -1680,11 +1697,11 @@
 
 
 test entry-5.8 {ConfigureEntry procedure} -constraints {
     fonts
 } -setup {
-    entry .e -borderwidth 2 -highlightthickness 2 
+    entry .e -borderwidth 2 -highlightthickness 2
     pack .e
 } -body {
     .e configure -width 0 -font {Helvetica -12}
     .e insert end "0123"
     update
@@ -1735,11 +1752,11 @@
 # No tests for DisplayEntry.
 
 test entry-6.1 {EntryComputeGeometry procedure} -constraints {
     fonts
 } -setup {
-    entry .e 
+    entry .e
     pack .e
 } -body {
     .e configure -font {Courier -12} -bd 2 -relief raised -width 20 \
         -highlightthickness 3
     .e insert end 012\t45
@@ -1749,11 +1766,11 @@
     destroy .e
 } -result {3 4}
 test entry-6.2 {EntryComputeGeometry procedure} -constraints {
     fonts
 } -setup {
-    entry .e 
+    entry .e
     pack .e
 } -body {
     .e configure -font {Courier -12} -bd 2 -relief raised -width 20 \
         -justify center -highlightthickness 3
     .e insert end 012\t45
@@ -1763,11 +1780,11 @@
     destroy .e
 } -result {3 4}
 test entry-6.3 {EntryComputeGeometry procedure} -constraints {
     fonts
 } -setup {
-    entry .e 
+    entry .e
     pack .e
 } -body {
     .e configure -font {Courier -12} -bd 2 -relief raised -width 20 \
         -justify right -highlightthickness 3
     .e insert end 012\t45
@@ -1775,11 +1792,11 @@
     list [.e index @131] [.e index @132]
 } -cleanup {
     destroy .e
 } -result {3 4}
 test entry-6.4 {EntryComputeGeometry procedure} -setup {
-    entry .e 
+    entry .e
     pack .e
 } -body {
     .e configure -font {Courier -12} -bd 2 -relief raised -width 5
     .e insert end "01234567890"
     update
@@ -1790,11 +1807,11 @@
 } -result {6}
 test entry-6.5 {EntryComputeGeometry procedure} -setup {
     entry .e -highlightthickness 2
     pack .e
 } -body {
-    .e configure -font {Courier -12} -bd 2 -relief raised -width 5 	    
+    .e configure -font {Courier -12} -bd 2 -relief raised -width 5
     .e insert end "01234567890"
     update
     .e xview 7
     .e index @0
 } -cleanup {
@@ -1804,11 +1821,11 @@
     fonts
 } -setup {
     entry .e -highlightthickness 2
     pack .e
 } -body {
-    .e configure -font {Courier -12} -bd 2 -relief raised -width 10 
+    .e configure -font {Courier -12} -bd 2 -relief raised -width 10
     .e insert end "01234\t67890"
     update
     .e xview 3
     list [.e index @39] [.e index @40]
 } -cleanup {
@@ -1844,18 +1861,18 @@
     fonts
 } -setup {
     entry .e -highlightthickness 2
     pack .e
 } -body {
-    .e configure -font {Helvetica -24} -bd 3 -relief raised -width 0 
+    .e configure -font {Helvetica -24} -bd 3 -relief raised -width 0
     update
     list [winfo reqwidth .e] [winfo reqheight .e]
 } -cleanup {
     destroy .e
 } -result {25 39}
 test entry-6.10 {EntryComputeGeometry procedure} -constraints {
-    unix fonts 
+    unix fonts
 } -setup {
     entry .e -highlightthickness 2 -font {Helvetica -12}
     pack .e
 } -body {
     .e configure -bd 1 -relief raised -width 0 -show .
@@ -1906,11 +1923,11 @@
     destroy .e
 } -result {6 7 7 8}
 
 
 test entry-7.1 {InsertChars procedure} -setup {
-    unset -nocomplain contents 
+    unset -nocomplain contents
     entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
     focus .e
 } -body {
     .e configure -textvariable contents -xscrollcommand scroll
@@ -1921,12 +1938,12 @@
 } -cleanup {
     destroy .e
 } -result {abXXXcde abXXXcde {0.000000 1.000000}}
 
 test entry-7.2 {InsertChars procedure} -setup {
-    unset -nocomplain contents 
-    entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    unset -nocomplain contents
+    entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
     focus .e
 } -body {
     .e configure -textvariable contents -xscrollcommand scroll
     .e insert 0 abcde
@@ -1991,11 +2008,11 @@
     lappend x [.e index sel.first] [.e index sel.last]
 } -cleanup {
     destroy .e
 } -result {2 6 2 5}
 test entry-7.7 {InsertChars procedure} -setup {
-    entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
 } -body {
     .e configure -xscrollcommand scroll
     .e insert 0 0123456789
     .e icursor 4
@@ -2003,11 +2020,11 @@
     .e index insert
 } -cleanup {
     destroy .e
 } -result {7}
 test entry-7.8 {InsertChars procedure} -setup {
-    entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
 } -body {
     .e insert 0 0123456789
     .e icursor 4
     .e insert 5 XXX
@@ -2014,11 +2031,11 @@
     .e index insert
 } -cleanup {
     destroy .e
 } -result {4}
 test entry-7.9 {InsertChars procedure} -setup {
-    entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
 } -body {
     .e insert 0 "This is a very long string"
     update
     .e xview 4
@@ -2026,11 +2043,11 @@
     .e index @0
 } -cleanup {
     destroy .e
 } -result {7}
 test entry-7.10 {InsertChars procedure} -setup {
-    entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
 } -body {
     .e insert 0 "This is a very long string"
     update
     .e xview 4
@@ -2041,11 +2058,11 @@
 } -result {4}
 
 test entry-7.11 {InsertChars procedure} -constraints {
     fonts
 } -setup {
-    entry .e -width 0 -font {Courier -12} -highlightthickness 2 -bd 2 
+    entry .e -width 0 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
 } -body {
     .e insert 0 "xyzzy"
     update
     .e insert 2 00
@@ -2054,11 +2071,11 @@
     destroy .e
 } -result {59}
 
 test entry-8.1 {DeleteChars procedure} -setup {
     unset -nocomplain contents
-    entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
     focus .e
 } -body {
     .e configure -textvariable contents -xscrollcommand scroll
     .e insert 0 abcde
@@ -2068,11 +2085,11 @@
 } -cleanup {
     destroy .e
 } -result {abe abe {0.000000 1.000000}}
 test entry-8.2 {DeleteChars procedure} -setup {
     unset -nocomplain contents
-    entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
     focus .e
 } -body {
     .e configure -textvariable contents -xscrollcommand scroll
     .e insert 0 abcde
@@ -2082,11 +2099,11 @@
 } -cleanup {
     destroy .e
 } -result {cde cde {0.000000 1.000000}}
 test entry-8.3 {DeleteChars procedure} -setup {
     unset -nocomplain contents
-    entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
     focus .e
 } -body {
     .e configure -textvariable contents -xscrollcommand scroll
     .e insert 0 abcde
@@ -2095,11 +2112,11 @@
     list [.e get] $contents [format {%.6f %.6f} {*}$scrollInfo]
 } -cleanup {
     destroy .e
 } -result {abc abc {0.000000 1.000000}}
 test entry-8.4 {DeleteChars procedure} -setup {
-    entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
     focus .e
 } -body {
     .e insert 0 0123456789abcde
     .e select from 3
@@ -2111,11 +2128,11 @@
     lappend x [.e index sel.first] [.e index sel.last]
 } -cleanup {
     destroy .e
 } -result {1 6 1 5}
 test entry-8.5 {DeleteChars procedure} -setup {
-    entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
     focus .e
 } -body {
     .e insert 0 0123456789abcde
     .e select from 3
@@ -2127,11 +2144,11 @@
     lappend x [.e index sel.first] [.e index sel.last]
 } -cleanup {
     destroy .e
 } -result {1 5 1 4}
 test entry-8.6 {DeleteChars procedure} -setup {
-    entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
     focus .e
 } -body {
     .e insert 0 0123456789abcde
     .e select from 3
@@ -2143,11 +2160,11 @@
     lappend x [.e index sel.first] [.e index sel.last]
 } -cleanup {
     destroy .e
 } -result {1 2 1 5}
 test entry-8.7 {DeleteChars procedure} -setup {
-    entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
     focus .e
 } -body {
     .e insert 0 0123456789abcde
     .e select from 3
@@ -2157,11 +2174,11 @@
     .e index sel.first
 } -cleanup {
     destroy .e
 } -returnCodes error -result {selection isn't in widget .e}
 test entry-8.8 {DeleteChars procedure} -setup {
-    entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
     focus .e
 } -body {
     .e insert 0 0123456789abcde
     .e select from 3
@@ -2173,11 +2190,11 @@
     lappend x [.e index sel.first] [.e index sel.last]
 } -cleanup {
     destroy .e
 } -result {3 4 3 8}
 test entry-8.9 {DeleteChars procedure} -setup {
-    entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
 } -body {
     .e insert 0 0123456789abcde
     .e select from 3
     .e select to 8
@@ -2186,11 +2203,11 @@
     .e index sel.first
 } -cleanup {
     destroy .e
 } -returnCodes error -result {selection isn't in widget .e}
 test entry-8.10 {DeleteChars procedure} -setup {
-    entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
     focus .e
 } -body {
     .e insert 0 0123456789abcde
     .e select from 8
@@ -2202,11 +2219,11 @@
     lappend x [.e index sel.first] [.e index sel.last]
 } -cleanup {
     destroy .e
 } -result {3 5 5 8}
 test entry-8.11 {DeleteChars procedure} -setup {
-    entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
     focus .e
 } -body {
     .e insert 0 0123456789abcde
     .e select from 8
@@ -2218,11 +2235,11 @@
     lappend x [.e index sel.first] [.e index sel.last]
 } -cleanup {
     destroy .e
 } -result {3 8 4 8}
 test entry-8.12 {DeleteChars procedure} -setup {
-    entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
     focus .e
 } -body {
     .e insert 0 0123456789abcde
     .e icursor 4
@@ -2231,11 +2248,11 @@
     .e index insert
 } -cleanup {
     destroy .e
 } -result {1}
 test entry-8.13 {DeleteChars procedure} -setup {
-    entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
     focus .e
 } -body {
     .e insert 0 0123456789abcde
     .e icursor 4
@@ -2244,11 +2261,11 @@
     .e index insert
 } -cleanup {
     destroy .e
 } -result {1}
 test entry-8.14 {DeleteChars procedure} -setup {
-    entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
     focus .e
 } -body {
     .e insert 0 0123456789abcde
     .e icursor 4
@@ -2257,11 +2274,11 @@
     .e index insert
 } -cleanup {
     destroy .e
 } -result {4}
 test entry-8.15 {DeleteChars procedure} -setup {
-    entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
     focus .e
 } -body {
     .e insert 0 "This is a very long string"
     .e xview 4
@@ -2270,11 +2287,11 @@
     .e index @0
 } -cleanup {
     destroy .e
 } -result {1}
 test entry-8.16 {DeleteChars procedure} -setup {
-    entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
     focus .e
 } -body {
     .e insert 0 "This is a very long string"
     .e xview 4
@@ -2283,11 +2300,11 @@
     .e index @0
 } -cleanup {
     destroy .e
 } -result {1}
 test entry-8.17 {DeleteChars procedure} -setup {
-    entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    entry .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
     focus .e
 } -body {
     .e insert 0 "This is a very long string"
     .e xview 4
@@ -2296,21 +2313,31 @@
     .e index @0
 } -cleanup {
     destroy .e
 } -result {4}
 test entry-8.18 {DeleteChars procedure} -setup {
-    entry .e -width 0 -font {Courier -12} -highlightthickness 2 -bd 2 
+    entry .e -width 0 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
     focus .e
 } -body {
     .e insert 0 "xyzzy"
     update
     .e delete 2 4
-    winfo reqwidth .e
+    # To check that deletion actually happened we measure the new width
+    # of the widget, based on the measuring width of the remaining text ("xyy")
+    # in the widget. For that purpose we have to mirror the code in tkEntry.c
+    # for computation of the reqwidth
+    # note: XPAD corresponds to the hardcoded    #define XPAD 1
+    set XPAD 1
+    set expected [expr { [font measure [.e cget -font] "xyy"] \
+                          + 2 * ( [.e cget -borderwidth] + \
+                                [.e cget -highlightthickness] + $XPAD ) } ]
+    expr {[winfo reqwidth .e] == $expected}
 } -cleanup {
     destroy .e
-} -result {31}
+    unset XPAD expected
+} -result {1}
 
 test entry-9.1 {EntryValueChanged procedure} -setup {
     unset -nocomplain x
 } -body {
     trace variable x w override
@@ -2327,20 +2354,20 @@
 test entry-10.1 {EntrySetValue procedure} -constraints fonts -body {
     set x abcde
     set y ab
     entry .e  -font {Helvetica -12} -highlightthickness 2 -bd 2  -width 0
     pack .e
-    .e configure -textvariable x 
+    .e configure -textvariable x
     .e configure -textvariable y
     update
     list [.e get] [winfo reqwidth .e]
 } -cleanup {
     destroy .e
 } -result {ab 24}
 test entry-10.2 {EntrySetValue procedure, updating selection} -setup {
     unset -nocomplain x
-    entry .e -font {Helvetica -12} -highlightthickness 2 -bd 2 
+    entry .e -font {Helvetica -12} -highlightthickness 2 -bd 2
     pack .e
 } -body {
     .e configure -textvariable x
     .e insert 0 "abcdefghjklmnopqrstu"
     .e selection range 4 10
@@ -2349,11 +2376,11 @@
 } -cleanup {
     destroy .e
 } -returnCodes error -result {selection isn't in widget .e}
 test entry-10.3 {EntrySetValue procedure, updating selection} -setup {
     unset -nocomplain x
-    entry .e -font {Helvetica -12} -highlightthickness 2 -bd 2 
+    entry .e -font {Helvetica -12} -highlightthickness 2 -bd 2
     pack .e
 } -body {
     .e configure -textvariable x
     .e insert 0 "abcdefghjklmnopqrstu"
     .e selection range 4 10
@@ -2362,11 +2389,11 @@
 } -cleanup {
     destroy .e
 } -result {4 7}
 test entry-10.4 {EntrySetValue procedure, updating selection} -setup {
     unset -nocomplain x
-    entry .e -font {Helvetica -12} -highlightthickness 2 -bd 2 
+    entry .e -font {Helvetica -12} -highlightthickness 2 -bd 2
     pack .e
 } -body {
     .e configure -textvariable x
     .e insert 0 "abcdefghjklmnopqrstu"
     .e selection range 4 10
@@ -2375,11 +2402,11 @@
 } -cleanup {
     destroy .e
 } -result {4 10}
 test entry-10.5 {EntrySetValue procedure, updating display position} -setup {
     unset -nocomplain x
-    entry .e -highlightthickness 2 -bd 2 
+    entry .e -highlightthickness 2 -bd 2
     pack .e
 } -body {
     .e configure -width 10 -font {Courier -12} -textvariable x
     .e insert 0 "abcdefghjklmnopqrstuvwxyz"
     .e xview 10
@@ -2390,11 +2417,11 @@
 } -cleanup {
     destroy .e
 } -result {0}
 test entry-10.6 {EntrySetValue procedure, updating display position} -setup {
     unset -nocomplain x
-    entry .e -highlightthickness 2 -bd 2 
+    entry .e -highlightthickness 2 -bd 2
     pack .e
 } -body {
     .e configure -width 10 -font {Courier -12} -textvariable x
     pack .e
     .e insert 0 "abcdefghjklmnopqrstuvwxyz"
@@ -2406,11 +2433,11 @@
 } -cleanup {
     destroy .e
 } -result {10}
 test entry-10.7 {EntrySetValue procedure, updating insertion cursor} -setup {
     unset -nocomplain x
-    entry .e -highlightthickness 2 -bd 2 
+    entry .e -highlightthickness 2 -bd 2
     pack .e
     update
 } -body {
     .e configure -width 10 -font {Courier -12} -textvariable x
     pack .e
@@ -2421,11 +2448,11 @@
 } -cleanup {
     destroy .e
 } -result {3}
 test entry-10.8 {EntrySetValue procedure, updating insertion cursor} -setup {
     unset -nocomplain x
-    entry .e -highlightthickness 2 -bd 2 
+    entry .e -highlightthickness 2 -bd 2
     pack .e
 } -body {
     .e configure -width 10 -font {Courier -12} -textvariable x
     pack .e
     .e insert 0 "abcdefghjklmnopqrstuvwxyz"
@@ -2478,11 +2505,11 @@
     .e index end
 } -cleanup {
     destroy .e
 } -result {21}
 test entry-13.2 {GetEntryIndex procedure} -body {
-    entry .e 
+    entry .e
     .e index abogus
 } -cleanup {
     destroy .e
 } -returnCodes error -result {bad entry index "abogus"}
 test entry-13.3 {GetEntryIndex procedure} -setup {
@@ -2568,12 +2595,12 @@
 
 
 
 
 
-test entry-13.10 {GetEntryIndex procedure} -constraints unix -body {
-# On unix, when selection is cleared, entry widget's internal 
+test entry-13.10 {GetEntryIndex procedure} -constraints x11 -body {
+# On unix, when selection is cleared, entry widget's internal
 # selection range is reset.
 # Previous settings:
 	entry .e -font {Courier -12} -width 5 -bd 2 -relief sunken
 	pack .e
 	.e insert 0 012345678901234567890
@@ -2587,13 +2614,13 @@
     .e index sel.first
 } -cleanup {
     destroy .e
 } -returnCodes error -result {selection isn't in widget .e}
 
-test entry-13.11 {GetEntryIndex procedure} -constraints win -body {
+test entry-13.11 {GetEntryIndex procedure} -constraints aquaOrWin32 -body {
 # On mac and pc, when selection is cleared, entry widget remembers
-# last selected range.  When selection ownership is restored to 
+# last selected range.  When selection ownership is restored to
 # entry, the old range will be rehighlighted.
 # Previous settings:
 	entry .e -font {Courier -12} -width 5 -bd 2 -relief sunken
 	pack .e
 	.e insert 0 012345678901234567890
@@ -2606,13 +2633,13 @@
     selection clear .e
     catch {selection get}
     .e index sel.first
 } -cleanup {
     destroy .e
-} -result {1}           
+} -result {1}
 
-test entry-13.12 {GetEntryIndex procedure} -constraints unix -body {
+test entry-13.12 {GetEntryIndex procedure} -constraints x11 -body {
 # Previous settings:
 	entry .e -font {Courier -12} -width 5 -bd 2 -relief sunken
 	pack .e
 	.e insert 0 012345678901234567890
 	.e xview 4
@@ -2625,11 +2652,11 @@
     .e index sbogus
 } -cleanup {
     destroy .e
 } -returnCodes error -result {selection isn't in widget .e}
 
-# why when string in .e index changed to not beginning with s, 
+# why when string in .e index changed to not beginning with s,
 # it behaves differently?
 test entry-13.12.1 {GetEntryIndex procedure} -constraints unix -body {
 # Previous settings:
 	entry .e -font {Courier -12} -width 5 -bd 2 -relief sunken
 	pack .e
@@ -2663,11 +2690,31 @@
     destroy .e
 } -returnCodes error -result {bad entry index "sbogus"}
 
 test entry-13.14 {GetEntryIndex procedure} -constraints win -body {
 # On mac and pc, when selection is cleared, entry widget remembers
-# last selected range.  When selection ownership is restored to 
+# last selected range.  When selection ownership is restored to
+# entry, the old range will be rehighlighted.
+# Previous settings:
+	entry .e -font {Courier -12} -width 5 -bd 2 -relief sunken
+	pack .e
+	.e insert 0 012345678901234567890
+	.e xview 4
+	update
+    .e select from 1
+    .e select to 6
+    list [.e index sel.first] [.e index sel.last]
+# Testing:
+    selection clear .e
+    selection get
+} -cleanup {
+    destroy .e
+} -returnCodes error -match glob -result {*}
+
+test entry-13.14.1 {GetEntryIndex procedure} -constraints win -body {
+# On mac and pc, when selection is cleared, entry widget remembers
+# last selected range.  When selection ownership is restored to
 # entry, the old range will be rehighlighted.
 # Previous settings:
 	entry .e -font {Courier -12} -width 5 -bd 2 -relief sunken
 	pack .e
 	.e insert 0 012345678901234567890
@@ -2676,32 +2723,12 @@
     .e select from 1
     .e select to 6
     list [.e index sel.first] [.e index sel.last]
 # Testing:
     selection clear .e
-    selection get 
-} -cleanup {
-    destroy .e
-} -returnCodes error -match glob -result {*}
-
-test entry-13.14.1 {GetEntryIndex procedure} -constraints win -body {
-# On mac and pc, when selection is cleared, entry widget remembers
-# last selected range.  When selection ownership is restored to 
-# entry, the old range will be rehighlighted.
-# Previous settings:
-	entry .e -font {Courier -12} -width 5 -bd 2 -relief sunken
-	pack .e
-	.e insert 0 012345678901234567890
-	.e xview 4
-	update
-    .e select from 1
-    .e select to 6
-    list [.e index sel.first] [.e index sel.last]
-# Testing:
-    selection clear .e  
-    catch {selection get} 
-    .e index sbogus      
+    catch {selection get}
+    .e index sbogus
 } -cleanup {
     destroy .e
 } -returnCodes error -match glob -result {*}
 
 test entry-13.15 {GetEntryIndex procedure} -body {
@@ -2712,11 +2739,11 @@
     destroy .e
 } -returnCodes error -result {bad entry index "@xyz"}
 
 test entry-13.16 {GetEntryIndex procedure} -constraints fonts -body {
     entry .e -width 5 -relief sunken -highlightthickness 2 -bd 2\
-        -font {Courier -12} 
+        -font {Courier -12}
     pack .e
     .e insert 0 012345678901234567890
     .e xview 4
     update
     .e index @4
@@ -2745,11 +2772,11 @@
 } -cleanup {
     destroy .e
 } -result {5}
 test entry-13.19 {GetEntryIndex procedure} -constraints fonts -body {
     entry .e -width 5 -relief sunken -highlightthickness 2 -bd 2\
-        -font {Courier -12} 
+        -font {Courier -12}
     pack .e
     .e insert 0 012345678901234567890
     .e xview 4
     update
     .e index @[expr {[winfo width .e] - 6}]
@@ -2777,21 +2804,21 @@
     .e index @1000
 } -cleanup {
     destroy .e
 } -result {9}
 test entry-13.22 {GetEntryIndex procedure} -setup {
-    entry .e 
+    entry .e
     pack .e
     update
 } -body {
     .e index 1xyz
 } -cleanup {
     destroy .e
 } -returnCodes error -result {bad entry index "1xyz"}
 test entry-13.23 {GetEntryIndex procedure} -body {
     entry .e -width 5 -relief sunken -highlightthickness 2 -bd 2\
-        -font {Courier -12} 
+        -font {Courier -12}
     pack .e
     .e insert 0 012345678901234567890
     .e xview 4
     update
     .e index -10
@@ -2798,11 +2825,11 @@
 } -cleanup {
     destroy .e
 } -result {0}
 test entry-13.24 {GetEntryIndex procedure} -body {
     entry .e -width 5 -relief sunken -highlightthickness 2 -bd 2\
-        -font {Courier -12} 
+        -font {Courier -12}
     pack .e
     .e insert 0 012345678901234567890
     .e xview 4
     update
     .e index 12
@@ -2809,11 +2836,11 @@
 } -cleanup {
     destroy .e
 } -result {12}
 test entry-13.25 {GetEntryIndex procedure} -body {
     entry .e -width 5 -relief sunken -highlightthickness 2 -bd 2\
-        -font {Courier -12} 
+        -font {Courier -12}
     pack .e
     .e insert 0 012345678901234567890
     .e xview 4
     update
     .e index 49
@@ -2858,11 +2885,11 @@
     for {set i 1} {$i <= 500} {incr i} {
         append x "This is line $i, out of 500\n"
 }
 } -body {
     entry .e
-    .e insert end $x    
+    .e insert end $x
     .e select from 0
     .e select to end
     string compare [selection get] $x
 } -cleanup {
     destroy .e
@@ -2885,11 +2912,11 @@
 # is scrollcommand needed here??
 test entry-16.1 {EntryVisibleRange procedure} -constraints fonts  -body {
     entry .e -width 10 -font {Helvetica -12}
     pack .e
     update
-    .e insert 0 "............................." 
+    .e insert 0 "............................."
     format {%.6f %.6f} {*}[.e xview]
 } -cleanup {
     destroy .e
 } -result {0.000000 0.827586}
 test entry-16.2 {EntryVisibleRange procedure} -constraints {
@@ -2978,11 +3005,11 @@
     interp hide {} .e
     destroy .e
     set res1 [list [winfo children .] [interp hidden]]
     set res2 [list {} $l]
     expr {$res1 == $res2}
-} -result {1} 
+} -result {1}
 
 ##
 ## Entry widget VALIDATION tests
 ##
 # The validation tests build each one upon the previous, so cascading
@@ -3332,11 +3359,11 @@
         -invalidcommand bell \
         -textvariable ::e \
         -background red -foreground white
     pack .e
     set ::e nextdata                 ;# previous settings
-    
+
     .e configure -validatecommand [list doval2 %W %d %i %P %s %S %v %V]
     .e validate
     list [.e cget -validate] [.e get] $::vVals
 } -cleanup {
     destroy .e
@@ -3357,11 +3384,11 @@
         -background red -foreground white
     pack .e
     set ::e nextdata                 ;# previous settings
     .e configure -validatecommand [list doval2 %W %d %i %P %s %S %v %V] ;# prev
     .e validate                     ;# previous settings
-    
+
     .e configure -validate all
     set ::e testdata
     list [.e cget -validate] [.e get] $::e $::vVals
 } -cleanup {
     destroy .e

Index: tests/event.test
==================================================================
--- tests/event.test
+++ tests/event.test
@@ -355,11 +355,11 @@
     event generate $e <Enter>
     event generate $e <ButtonPress-1> -x $anchor_x -y $anchor_y
 
     # Save the position of the insert cursor
     lappend result [$e index insert]
-    
+
     # Now drag until selend is highlighted, then click up
 
     set current $anchor
     while {[$e compare $current <= $selend]} {
         foreach {current_x current_y} [_text_ind_to_x_y $e $current] break
@@ -422,11 +422,11 @@
     event generate $e <Enter>
     event generate $e <ButtonPress-1> -x $anchor_x -y $anchor_y
 
     # Save the position of the insert cursor
     lappend result [$e index insert]
-    
+
     # Now drag until selend is highlighted, then click up
 
     set current $anchor
     while {$current <= $selend} {
         foreach {current_x current_y} [_text_ind_to_x_y $e $current] break
@@ -608,11 +608,11 @@
     return $result
 } -cleanup {
     deleteWindows
 } -result {select 11 7 select 4 { select} {Word select} 2}
 
-test event-5.1(triple-click-drag) {Triple click and drag across lines in a 
+test event-5.1(triple-click-drag) {Triple click and drag across lines in a
         text widget, this should extend the selection to the new line} -setup {
 	deleteWindows
 } -body {
     set t [toplevel .t]
     set e [text $t.e]
@@ -793,11 +793,11 @@
     _pause 50
 
     set result [list]
     lappend result [$e index insert]
     lappend result [_get_selection $e]
-  
+
     # Clear selection by clicking at 0,0
 
     event generate $e <ButtonPress-1> -x 0 -y 0
     _pause 50
     event generate $e <ButtonRelease-1> -x 0 -y 0
@@ -819,10 +819,45 @@
 
     return $result
 } -cleanup {
     deleteWindows
 } -result {4 A 4 A}
+
+test event-8 {event generate with keysyms corresponding to
+              multi-byte virtual keycodes - bug
+              e36963bfe8df9f5e528134707a91b9c0051de723} -constraints nonPortable -setup {
+    deleteWindows
+    set res [list ]
+} -body {
+    set t [toplevel .t]
+    set e [entry $t.e]
+    pack $e
+    tkwait visibility $e
+    bind $e <KeyPress> {lappend res keycode: %k keysym: %K}
+    focus -force $e
+    update
+    event generate $e <diaeresis>
+    # The value now contained in $res depends on the actual
+    # physical keyboard layout and keycode generated, from
+    # the hardware on which the test suite happens to run.
+    # We don't need (and we can't really) check correctness
+    # of the (system-dependent) keycode received, however
+    # Tk should be able to associate this keycode to a
+    # (system-independent) known keysym, unless the system
+    # running the test does not have a keyboard with a
+    # diaeresis key.
+    if {[expr {[lindex $res 3] ne "??"}]} {
+        # keyboard has a physical diaeresis key and bug is fixed
+        return "OK"
+    } else  {
+        return "Test failed, unless the keyboard tied to the system \
+                on which this test is run does NOT have a diaeresis \
+                physical key - in this case, test is actually void."
+    }
+} -cleanup {
+    deleteWindows
+} -result {OK}
 
 # cleanup
 unset -nocomplain keypress_lookup
 rename _init_keypress_lookup {}
 rename _keypress_lookup {}

Index: tests/filebox.test
==================================================================
--- tests/filebox.test
+++ tests/filebox.test
@@ -108,12 +108,14 @@
     set modes "0 1"
 } else {
     set modes 1
 }
 
-set unknownOptionsMsg(tk_getOpenFile) {bad option "-foo": must be -defaultextension, -filetypes, -initialdir, -initialfile, -multiple, -parent, -title, or -typevariable}
-set unknownOptionsMsg(tk_getSaveFile) {bad option "-foo": must be -confirmoverwrite, -defaultextension, -filetypes, -initialdir, -initialfile, -parent, -title, or -typevariable}
+set unknownOptionsMsg(tk_getOpenFile,notAqua) {bad option "-foo": must be -defaultextension, -filetypes, -initialdir, -initialfile, -multiple, -parent, -title, or -typevariable}
+set unknownOptionsMsg(tk_getOpenFile,aqua) {bad option "-foo": must be -defaultextension, -filetypes, -initialdir, -initialfile, -message, -multiple, -parent, -title, -typevariable, or -command}
+set unknownOptionsMsg(tk_getSaveFile,notAqua) {bad option "-foo": must be -confirmoverwrite, -defaultextension, -filetypes, -initialdir, -initialfile, -parent, -title, or -typevariable}
+set unknownOptionsMsg(tk_getSaveFile,aqua) {bad option "-foo": must be -defaultextension, -filetypes, -initialdir, -initialfile, -message, -parent, -title, -typevariable, -command, or -confirmoverwrite}
 
 set tmpFile "filebox.tmp"
 makeFile {
     # this file can be empty!
 } $tmpFile
@@ -153,29 +155,35 @@
 	if {!$mode} {
 	    set addedExtensions {NONE {} .txt .txt}
 	}
     }
 
-    test filebox-1.1-$mode "tk_getOpenFile command" -body {
+    test filebox-1.1.1-$mode "tk_getOpenFile command" -constraints notAqua -body {
+	tk_getOpenFile -foo
+    } -returnCodes error -result $unknownOptionsMsg(tk_getOpenFile,notAqua)
+    test filebox-1.1.2-$mode "tk_getOpenFile command" -constraints aqua -body {
 	tk_getOpenFile -foo
-    } -returnCodes error -result $unknownOptionsMsg(tk_getOpenFile)
+    } -returnCodes error -result $unknownOptionsMsg(tk_getOpenFile,aqua)
 
     catch {tk_getOpenFile -foo 1} msg
     regsub -all ,      $msg "" options
     regsub \"-foo\" $options "" options
-    
+
     foreach option $options {
         if {[string index $option 0] eq "-"} {
 	    test filebox-1.2-$mode$option "tk_getOpenFile command" -body {
 		tk_getOpenFile $option
 	    } -returnCodes error -result "value for \"$option\" missing"
         }
     }
 
-    test filebox-1.3-$mode "tk_getOpenFile command" -body {
+    test filebox-1.3.1-$mode "tk_getOpenFile command" -constraints notAqua -body {
+        tk_getOpenFile -foo bar
+    } -returnCodes error -result $unknownOptionsMsg(tk_getOpenFile,notAqua)
+    test filebox-1.3.2-$mode "tk_getOpenFile command" -constraints aqua -body {
         tk_getOpenFile -foo bar
-    } -returnCodes error -result $unknownOptionsMsg(tk_getOpenFile)
+    } -returnCodes error -result $unknownOptionsMsg(tk_getOpenFile,aqua)
     test filebox-1.4-$mode "tk_getOpenFile command" -body {
         tk_getOpenFile -initialdir
     } -returnCodes error -result {value for "-initialdir" missing}
     test filebox-1.5-$mode "tk_getOpenFile command" -body {
         tk_getOpenFile -parent foo.bar
@@ -279,21 +287,24 @@
 	    set choice [tk_getOpenFile -title "Press Ok" \
 		    -filetypes $filters($x) -parent $parent \
 		    -initialfile $fileName -initialdir $fileDir \
 		    -typevariable tv]
 	    if {[info exists tv]} {
-		regexp {^(.*) \(.*\)$} $tv dummy typeName
+		set typeName $tv
 	    } else {
 		set typeName "-unset-"
 	    }
 	    set typeName
         } $res
     }
 
-    test filebox-4.1-$mode "tk_getSaveFile command" -body {
+    test filebox-4.1.1-$mode "tk_getSaveFile command" -constraints notAqua -body {
+	tk_getSaveFile -foo
+    } -returnCodes error -result $unknownOptionsMsg(tk_getSaveFile,notAqua)
+    test filebox-4.1.2-$mode "tk_getSaveFile command" -constraints aqua -body {
 	tk_getSaveFile -foo
-    } -returnCodes error -result $unknownOptionsMsg(tk_getSaveFile)
+    } -returnCodes error -result $unknownOptionsMsg(tk_getSaveFile,aqua)
 
     catch {tk_getSaveFile -foo 1} msg
     regsub -all ,      $msg "" options
     regsub \"-foo\" $options "" options
 
@@ -303,13 +314,16 @@
 		tk_getSaveFile $option
 	    } -returnCodes error -result "value for \"$option\" missing"
 	}
     }
 
-    test filebox-4.3-$mode "tk_getSaveFile command" -body {
+    test filebox-4.3.1-$mode "tk_getSaveFile command" -constraints notAqua -body {
+	tk_getSaveFile -foo bar
+    } -returnCodes error -result $unknownOptionsMsg(tk_getSaveFile,notAqua)
+    test filebox-4.3.2-$mode "tk_getSaveFile command" -constraints aqua -body {
 	tk_getSaveFile -foo bar
-    } -returnCodes error -result $unknownOptionsMsg(tk_getSaveFile)
+    } -returnCodes error -result $unknownOptionsMsg(tk_getSaveFile,aqua)
     test filebox-4.4-$mode "tk_getSaveFile command" -body {
 	tk_getSaveFile -initialdir
     } -returnCodes error -result {value for "-initialdir" missing}
     test filebox-4.5-$mode "tk_getSaveFile command" -body {
 	tk_getSaveFile -parent foo.bar
@@ -461,11 +475,11 @@
 	    -match glob \
 	    -result "*RUBBISH*"
     }
 
     # The rest of the tests need to be executed on Unix only.
-    # The test whether the dialog box widgets were implemented correctly.
+    # They test whether the dialog box widgets were implemented correctly.
     # These tests are not
     # needed on the other platforms because they use native file dialogs.
 }
 
 set tk_strictMotif $tk_strictMotif_old

Index: tests/focus.test
==================================================================
--- tests/focus.test
+++ tests/focus.test
@@ -102,11 +102,11 @@
 } -returnCodes error -result {bad window path name ".gorp"}
 test focus-1.7 {Tk_FocusCmd procedure} -constraints unix -body {
     focus .gorp a
 } -returnCodes error -result {bad option ".gorp": must be -displayof, -force, or -lastfor}
 test focus-1.8 {Tk_FocusCmd procedure, focussing on dead window} -constraints {
-	unix 
+	unix
 } -setup {
     destroy .t2
 } -body {
     focusClear
     toplevel .t2
@@ -128,33 +128,33 @@
     return $x
 } -cleanup {
     destroy .t2
 } -result {.t2.f2 .t2 .t2}
 test focus-1.9 {Tk_FocusCmd procedure, -displayof option} -constraints {
-	unix 
+	unix
 } -body {
     focus -displayof
 } -returnCodes error -result {wrong # args: should be "focus -displayof window"}
 test focus-1.10 {Tk_FocusCmd procedure, -displayof option} -constraints {
-	unix 
+	unix
 } -body {
     focus -displayof a b
 } -returnCodes error -result {wrong # args: should be "focus -displayof window"}
 test focus-1.11 {Tk_FocusCmd procedure, -displayof option} -constraints {
-	unix 
+	unix
 } -body {
     focus -displayof .lousy
 } -returnCodes error -result {bad window path name ".lousy"}
 test focus-1.12 {Tk_FocusCmd procedure, -displayof option} -constraints {
-	unix 
+	unix
 } -body {
     focusClear
     focus .t
     focus -displayof .t.b3
 }  -result {}
 test focus-1.13 {Tk_FocusCmd procedure, -displayof option} -constraints {
-	unix 
+	unix
 } -body {
     focusClear
     focus -force .t
     focus -displayof .t.b3
 } -result {.t}
@@ -183,35 +183,35 @@
     set x  [list [focus]]
     focus -force .t.b1
     lappend x [focus]
 } -result {{} .t.b1}
 test focus-1.20 {Tk_FocusCmd procedure, -lastfor option} -constraints {
-    unix 
+    unix
 } -body {
     focus -lastfor
 } -returnCodes error -result {wrong # args: should be "focus -lastfor window"}
 test focus-1.21 {Tk_FocusCmd procedure, -lastfor option} -constraints {
-    unix 
+    unix
 } -body {
     focus -lastfor 1 2
 } -returnCodes error -result {wrong # args: should be "focus -lastfor window"}
 test focus-1.22 {Tk_FocusCmd procedure, -lastfor option} -constraints {
-    unix 
+    unix
 } -body {
     focus -lastfor who_knows?
 } -returnCodes error -result {bad window path name "who_knows?"}
 test focus-1.23 {Tk_FocusCmd procedure, -lastfor option} -constraints {
-    unix 
+    unix
 } -body {
     focusClear
     focusSetup
     focus .b
     focus .t.b1
     list [focus -lastfor .] [focus -lastfor .t.b3]
 } -result {.b .t.b1}
 test focus-1.24 {Tk_FocusCmd procedure, -lastfor option} -constraints {
-    unix 
+    unix
 } -body {
     focusClear
     focusSetup
     update
     focus -lastfor .t.b2

Index: tests/focusTcl.test
==================================================================
--- tests/focusTcl.test
+++ tests/focusTcl.test
@@ -400,11 +400,11 @@
     cleanup1 .
 } -result {.b.x}
 test focusTcl-5.5 {tkFocusOK procedure, -takefocus "", not mapped} -body {
     setup1 .
     .b.x configure -takefocus ""
-    pack unpack .b.x
+    pack forget .b.x
     update
     tk_focusNext .b
 } -cleanup {
     cleanup1 .
 } -result {.b.y}
@@ -411,30 +411,30 @@
 test focusTcl-5.6 {tkFocusOK procedure, -takefocus "", not mapped} -body {
     setup1 .
     foreach w {.b.x .b.y .b.z} {
         $w configure -takefocus ""
     }
-    pack unpack .b
+    pack forget .b
     update
     tk_focusNext .b
 } -cleanup {
     cleanup1 .
 } -result {.c}
 test focusTcl-5.7 {tkFocusOK procedure, -takefocus "", not mapped} -body {
     setup1 .
     .b.y configure -takefocus 1
-    pack unpack .b.y
+    pack forget .b.y
     update
     tk_focusNext .b.x
 } -cleanup {
     cleanup1 .
 } -result {.b.z}
 test focusTcl-5.8 {tkFocusOK procedure, -takefocus "", not mapped} -body {
     proc always args {return 1}
     setup1 .
     .b.y configure -takefocus always
-    pack unpack .b.y
+    pack forget .b.y
     update
     tk_focusNext .b.x
 } -cleanup {
     cleanup1 .
 } -result {.b.y}

Index: tests/font.test
==================================================================
--- tests/font.test
+++ tests/font.test
@@ -36,11 +36,11 @@
 toplevel .t
 wm geom .t +0+0
 update idletasks
 
 switch [tk windowingsystem] {
-    x11	 	{set fixed "fixed"}
+    x11	 	{set fixed "TkFixedFont"}
     win32	{set fixed "courier 12"}
     aqua	{set fixed "monaco 9"}
 }
 
 
@@ -107,11 +107,11 @@
 test font-4.1 {font command: actual: arguments} -body {
     # (skip < 0)
     font actual xyz -displayof
 } -returnCodes error -result {value for "-displayof" missing}
 test font-4.2 {font command: actual: arguments} -body {
-    # (objc < 3) 
+    # (objc < 3)
     font actual
 } -returnCodes error -result {wrong # args: should be "font actual font ?-displayof window? ?option? ?--? ?char?"}
 test font-4.3 {font command: actual: arguments} -body {
     # (objc - skip > 4) when skip == 0
     font actual xyz abc def
@@ -139,18 +139,30 @@
     string tolower [font actual {-family times} -family]
 } -result {times}
 test font-4.10 {font command: actual} -constraints win -body {
     # (objc > 3) so objPtr = objv[3 + skip]
     font actual {-family times} -family
-} -result {Times New Roman}
+} -result {times}
 test font-4.11 {font command: bad option} -body {
     font actual xyz -style
 } -returnCodes error -result {bad option "-style": must be -family, -size, -weight, -slant, -underline, or -overstrike}
+test font-4.12 {font command: actual} -body {
+    font actual {-family times} -- \ud800
+} -match glob -result {*}
+test font-4.13 {font command: actual} -body {
+    font actual {-family times} -- \udc00
+} -match glob -result {*}
+test font-4.14 {font command: actual} -constraints win -body {
+    font actual {-family times} -family -- \ud800\udc00
+} -result {times}
+test font-4.15 {font command: actual} -body {
+    font actual {-family times} -- \udc00\ud800
+} -returnCodes 1 -match glob -result {expected a single character but got "*"}
 
 
 test font-5.1 {font command: configure} -body {
-    # (objc < 3) 
+    # (objc < 3)
     font configure
 } -returnCodes error -result {wrong # args: should be "font configure fontname ?-option value ...?"}
 test font-5.2 {font command: configure: non-existent font} -body {
     # (namedHashPtr == NULL)
     font configure xyz
@@ -159,11 +171,11 @@
     destroy .t.f
     catch {font delete xyz}
     pack [label .t.f]
     update
 } -body {
-    # (nfPtr->deletePending != 0) 
+    # (nfPtr->deletePending != 0)
     font create xyz
     .t.f configure -font xyz
     font delete xyz
     font configure xyz
 } -cleanup {
@@ -249,17 +261,17 @@
     font delete font1 font2 font3
 } -result {four}
 test font-6.5 {font command: create: bad option creating new font} -setup {
     catch {font delete xyz}
 } -body {
-    # name was specified so skip = 3 
+    # name was specified so skip = 3
     font create xyz -xyz times
 } -returnCodes error -result {bad option "-xyz": must be -family, -size, -weight, -slant, -underline, or -overstrike}
 test font-6.6 {font command: create: bad option creating new font} -setup {
     clearnondefaultfonts
 } -body {
-    # name was not specified so skip = 2 
+    # name was not specified so skip = 2
     font create -xyz times
 } -returnCodes error -result {bad option "-xyz": must be -family, -size, -weight, -slant, -underline, or -overstrike}
 test font-6.7 {font command: create: already exists} -setup {
     catch {font delete xyz}
 } -body {
@@ -269,18 +281,18 @@
 } -cleanup {
 	font delete xyz
 } -returnCodes error -result {named font "xyz" already exists}
 
 test font-7.1 {font command: delete: arguments} -body {
-    # (objc < 3) 
+    # (objc < 3)
     font delete
 } -returnCodes error -result {wrong # args: should be "font delete fontname ?fontname ...?"}
 test font-7.2 {font command: delete: loop test} -setup {
     clearnondefaultfonts
 	set x {}
 } -body {
-    # for (i = 2; i < objc; i++) 
+    # for (i = 2; i < objc; i++)
     font create a -underline 1
     font create b -underline 1
     font create c -underline 1
     font create d -underline 1
     font create e -underline 1
@@ -307,11 +319,11 @@
     clearnondefaultfonts
 } -result {{a b c d e} {b c e}}
 test font-7.4 {font command: delete: non-existent} -setup {
     catch {font delete xyz}
 } -body {
-    # (namedHashPtr == NULL) 
+    # (namedHashPtr == NULL)
     font delete xyz
 } -returnCodes error -result {named font "xyz" doesn't exist}
 test font-7.5 {font command: delete: mark for later deletion} -setup {
     destroy .t.f
     catch {font delete xyz}
@@ -374,15 +386,15 @@
 test font-9.1 {font command: measure: arguments} -body {
     # (skip < 0)
     expr {[font measure xyz -displayof] > 0}
 } -returnCodes ok -result 1
 test font-9.2 {font command: measure: arguments} -body {
-    # (objc - skip != 4) 
+    # (objc - skip != 4)
     font measure
 } -returnCodes error -result {wrong # args: should be "font measure font ?-displayof window? text"}
 test font-9.3 {font command: measure: arguments} -body {
-    # (objc - skip != 4) 
+    # (objc - skip != 4)
     font measure xyz abc def
 } -returnCodes error -result {wrong # args: should be "font measure font ?-displayof window? text"}
 test font-9.4 {font command: measure: arguments} -constraints noExceed -body {
     # (tkfont == NULL)
     font measure "\{xyz" abc
@@ -408,11 +420,11 @@
 test font-10.2 {font command: metrics: arguments} -body {
     # (skip < 0)
     font metrics xyz -displayof
 } -returnCodes error -result {value for "-displayof" missing}
 test font-10.3 {font command: metrics: arguments} -body {
-    # (objc < 3) 
+    # (objc < 3)
     font metrics
 } -returnCodes error -result {wrong # args: should be "font metrics font ?-displayof window? ?option?"}
 test font-10.4 {font command: metrics: arguments} -body {
     # (objc - skip) > 4) when skip == 0
     font metrics xyz abc def
@@ -571,11 +583,11 @@
 test font-14.1 {Tk_GetFont procedure} -body {
 } -result {}
 
 
 test font-15.1 {Tk_AllocFontFromObj - converting internal reps} -constraints {
-	testfont 
+	testfont
 } -setup {
     destroy .b1 .b2
 } -body {
     set x {Times 16}
     lindex $x 0
@@ -584,11 +596,11 @@
     testfont counts {Times 16}
 } -cleanup {
     destroy .b1 .b2
 } -result {{1 0}}
 test font-15.2 {Tk_AllocFontFromObj - discard stale font} -constraints {
-	testfont 
+	testfont
 } -setup {
     destroy .b1 .b2
     set result {}
 } -body {
     set x {Times 16}
@@ -599,11 +611,11 @@
     lappend result [testfont counts {Times 16}]
 } -cleanup {
     destroy .b2
 } -result {{} {{1 1}}}
 test font-15.3 {Tk_AllocFontFromObj - reuse existing font} -constraints {
-	testfont 
+	testfont
 } -setup {
     destroy .b1 .b2
     set result {}
 } -body {
     set x {Times 16}
@@ -630,13 +642,13 @@
     destroy .t.f
     catch {font delete xyz}
     pack [label .t.f]
     update
 } -body {
-    # (namedHashPtr != NULL) 
-    font create xyz 
-    .t.f config -font xyz 
+    # (namedHashPtr != NULL)
+    font create xyz
+    .t.f config -font xyz
 } -cleanup {
 	destroy .t.f
     font delete xyz
 } -result {}
 test font-15.6 {Tk_AllocFontFromObj procedure: not a named font} -setup {
@@ -648,38 +660,38 @@
     .t.f config -font {times 20}
 } -cleanup {
 	destroy .t.f
 } -result {-family} -result {}
 test font-15.7 {Tk_AllocFontFromObj procedure: get native font} -constraints {
-	unix 
+	unix
 } -setup {
     destroy .t.f
     pack [label .t.f]
     update
 } -body {
-    # not (fontPtr == NULL) 
+    # not (fontPtr == NULL)
     .t.f config -font fixed
 } -result {}
 test font-15.8 {Tk_AllocFontFromObj procedure: get native font} -constraints {
-	win 
+	win
 } -setup {
     destroy .t.f
     clearnondefaultfonts
     pack [label .t.f]
     update
 } -body {
-    # not (fontPtr == NULL) 
+    # not (fontPtr == NULL)
     .t.f config -font oemfixed
 } -cleanup {
 	destroy .t.f
 } -result {}
 test font-15.9 {Tk_AllocFontFromObj procedure: get attribute font} -setup {
     destroy .t.f
     pack [label .t.f]
     update
 } -body {
-    # (fontPtr == NULL) 
+    # (fontPtr == NULL)
     .t.f config -font {xxx yyy zzz}
 } -cleanup {
 	destroy .t.f
 } -returnCodes error -result {expected integer but got "yyy"}
 test font-15.10 {Tk_AllocFontFromObj procedure: no match} -constraints noExceed -body {
@@ -710,11 +722,11 @@
     # (fontPtr->underlineHeight == 0) because size was < 10
     .t.f config -text "underline" -font "times -8 underline"
     update
 } -cleanup {
 	destroy .t.f
-} -result {}    
+} -result {}
 
 
 test font-16.1 {Tk_NameOfFont procedure} -setup {
     destroy .t.f
     pack [label .t.f]
@@ -726,11 +738,11 @@
 	destroy .t.f
 } -result {-family fixed}
 
 
 test font-17.1 {Tk_FreeFontFromObj - reference counts} -constraints {
-	testfont 
+	testfont
 } -setup {
     destroy .b1 .b2 .b3
     set result {}
 } -body {
     set x {Courier 12}
@@ -771,11 +783,11 @@
     destroy .t.f
     clearnondefaultfonts
     pack [label .t.f]
     update
 } -body {
-    # (fontPtr->namedHashPtr != NULL) 
+    # (fontPtr->namedHashPtr != NULL)
     font create xyz
     .t.f config -font xyz
     destroy .t.f
     getnondefaultfonts
 } -result {xyz}
@@ -783,11 +795,11 @@
     destroy .t.f
     catch {font delete xyz}
     pack [label .t.f]
     update
 } -body {
-    # not (fontPtr->refCount == 0) 
+    # not (fontPtr->refCount == 0)
     font create xyz -underline 1
     .t.f config -font xyz
     font delete xyz
     set x [font actual xyz -underline]
     destroy .t.f
@@ -797,11 +809,11 @@
     destroy .t.f .t.b
     catch {font delete xyz}
     pack [label .t.f]
     update
 } -body {
-    font create xyz 
+    font create xyz
     .t.f config -font xyz
     button .t.b -font xyz
     font delete xyz
     set x [font actual xyz]
     destroy .t.b
@@ -856,11 +868,11 @@
 
 
 # Procedure used in 21.* tests
 proc psfontname {name} {
 	destroy .t.c
-	canvas .t.c -closeenough 0 
+	canvas .t.c -closeenough 0
 	.t.c create text 0 0 -tags text -anchor nw -just left -font "Courier -12"
 	pack .t.c
 	update
     set a [.t.c itemcget text -font]
     .t.c itemconfig text -text "We need text" -font $name
@@ -882,72 +894,72 @@
     } else {
 		set x {AvantGarde-Book}
     }
 } -result {AvantGarde-Book}
 test font-21.2 {Tk_PostscriptFontName procedure: native} -constraints {
-	win 
+	win
 } -body {
     psfontname "arial 10"
 } -result {Helvetica}
 test font-21.3 {Tk_PostscriptFontName procedure: native} -constraints {
-	win 
+	win
 } -body {
     psfontname "{times new roman} 10"
 } -result {Times-Roman}
 test font-21.4 {Tk_PostscriptFontName procedure: native} -constraints {
-	win 
+	win
 } -body {
     psfontname "{courier new} 10"
 } -result {Courier}
 test font-21.5 {Tk_PostscriptFontName procedure: spaces} -constraints {
-	unix 
+	unix
 } -body {
     set x [font actual {{lucida bright} 10} -family]
     if {[string match lucida*bright $x]} {
 		psfontname "{lucida bright} 10"
     } else {
 		set x {LucidaBright}
     }
 } -result {LucidaBright}
 test font-21.6 {Tk_PostscriptFontName procedure: spaces} -constraints {
-	unix 
+	x11
 } -body {
     psfontname "{new century schoolbook} 10"
 } -result {NewCenturySchlbk-Roman}
 
 test font-21.7 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {avantgarde 12 roman normal}
     if {[font actual {avantgarde 12 roman normal} -family] == "avantgarde"} {
         set x [psfontname avantgarde 12 roman normal]
     } else {
         set x AvantGarde-Book
     }
 } -result {AvantGarde-Book}
 test font-21.8 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {avantgarde 12 roman bold}
     if {[font actual {avantgarde 12 roman normal} -family] == "avantgarde"} {
         set x [psfontname avantgarde 12 roman normal]
     } else {
         set x AvantGarde-Demi
     }
 } -result {AvantGarde-Demi}
 test font-21.9 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {avantgarde 12 italic normal}
     if {[font actual {avantgarde 12 roman normal} -family] == "avantgarde"} {
         set x [psfontname avantgarde 12 roman normal]
     } else {
         set x AvantGarde-BookOblique
     }
 } -result {AvantGarde-BookOblique}
 test font-21.10 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {avantgarde 12 italic bold}
     if {[font actual {avantgarde 12 roman normal} -family] == "avantgarde"} {
         set x [psfontname avantgarde 12 roman normal]
     } else {
@@ -954,41 +966,41 @@
         set x AvantGarde-DemiOblique
     }
 } -result {AvantGarde-DemiOblique}
 
 test font-21.11 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {bookman 12 roman normal}
     if {[font actual {avantgarde 12 roman normal} -family] == "bookman"} {
         set x [psfontname avantgarde 12 roman normal]
     } else {
         set x Bookman-Light
     }
 } -result {Bookman-Light}
 test font-21.12 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {bookman 12 roman bold}
     if {[font actual {avantgarde 12 roman normal} -family] == "bookman"} {
         set x [psfontname avantgarde 12 roman normal]
     } else {
         set x Bookman-Demi
     }
 } -result {Bookman-Demi}
 test font-21.13 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {bookman 12 italic normal}
     if {[font actual {avantgarde 12 roman normal} -family] == "bookman"} {
         set x [psfontname avantgarde 12 roman normal]
     } else {
         set x Bookman-LightItalic
     }
 } -result {Bookman-LightItalic}
 test font-21.14 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {bookman 12 italic bold}
     if {[font actual {avantgarde 12 roman normal} -family] == "bookman"} {
         set x [psfontname avantgarde 12 roman normal]
     } else {
@@ -995,41 +1007,41 @@
         set x Bookman-DemiItalic
     }
 } -result {Bookman-DemiItalic}
 
 test font-21.15 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {courier 12 roman normal}
     if {[font actual {avantgarde 12 roman normal} -family] == "courier"} {
         set x [psfontname avantgarde 12 roman normal]
     } else {
         set x Courier
     }
 } -result {Courier}
 test font-21.16 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {courier 12 roman bold}
     if {[font actual {avantgarde 12 roman normal} -family] == "courier"} {
         set x [psfontname avantgarde 12 roman normal]
     } else {
         set x Courier-Bold
     }
 } -result {Courier-Bold}
 test font-21.17 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {courier 12 italic normal}
     if {[font actual {avantgarde 12 roman normal} -family] == "courier"} {
         set x [psfontname avantgarde 12 roman normal]
     } else {
         set x Courier-Oblique
     }
 } -result {Courier-Oblique}
 test font-21.18 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {courier 12 italic bold}
     if {[font actual {avantgarde 12 roman normal} -family] == "courier"} {
         set x [psfontname avantgarde 12 roman normal]
     } else {
@@ -1036,41 +1048,41 @@
         set x Courier-BoldOblique
     }
 } -result {Courier-BoldOblique}
 
 test font-21.19 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {helvetica 12 roman normal}
     if {[font actual {avantgarde 12 roman normal} -family] == "helvetica"} {
         set x [psfontname avantgarde 12 roman normal]
     } else {
         set x Helvetica
     }
 } -result {Helvetica}
 test font-21.20 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {helvetica 12 roman bold}
     if {[font actual {avantgarde 12 roman normal} -family] == "helvetica"} {
         set x [psfontname avantgarde 12 roman normal]
     } else {
         set x Helvetica-Bold
     }
 } -result {Helvetica-Bold}
 test font-21.21 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {helvetica 12 italic normal}
     if {[font actual {avantgarde 12 roman normal} -family] == "helvetica"} {
         set x [psfontname avantgarde 12 roman normal]
     } else {
         set x Helvetica-Oblique
     }
 } -result {Helvetica-Oblique}
 test font-21.22 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {helvetica 12 italic bold}
     if {[font actual {avantgarde 12 roman normal} -family] == "helvetica"} {
         set x [psfontname avantgarde 12 roman normal]
     } else {
@@ -1077,41 +1089,41 @@
         set x Helvetica-BoldOblique
     }
 } -result {Helvetica-BoldOblique}
 
 test font-21.23 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {{new century schoolbook} 12 roman normal}
     if {[font actual {avantgarde 12 roman normal} -family] == "new century schoolbook"} {
         set x [psfontname avantgarde 12 roman normal]
     } else {
         set x NewCenturySchlbk-Roman
     }
 } -result {NewCenturySchlbk-Roman}
 test font-21.24 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {{new century schoolbook} 12 roman bold}
     if {[font actual {avantgarde 12 roman normal} -family] == "new century schoolbook"} {
         set x [psfontname avantgarde 12 roman normal]
     } else {
         set x NewCenturySchlbk-Bold
     }
 } -result {NewCenturySchlbk-Bold}
 test font-21.25 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {{new century schoolbook} 12 italic normal}
     if {[font actual {avantgarde 12 roman normal} -family] == "new century schoolbook"} {
         set x [psfontname avantgarde 12 roman normal]
     } else {
         set x NewCenturySchlbk-Italic
     }
 } -result {NewCenturySchlbk-Italic}
 test font-21.26 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {{new century schoolbook} 12 italic bold}
     if {[font actual {avantgarde 12 roman normal} -family] == "new century schoolbook"} {
         set x [psfontname avantgarde 12 roman normal]
     } else {
@@ -1118,41 +1130,41 @@
         set x NewCenturySchlbk-BoldItalic
     }
 } -result {NewCenturySchlbk-BoldItalic}
 
 test font-21.27 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {palatino 12 roman normal}
     if {[font actual {avantgarde 12 roman normal} -family] == "palatino"} {
         set x [psfontname avantgarde 12 roman normal]
     } else {
         set x Palatino-Roman
     }
 } -result {Palatino-Roman}
 test font-21.28 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {palatino 12 roman bold}
     if {[font actual {avantgarde 12 roman normal} -family] == "palatino"} {
         set x [psfontname avantgarde 12 roman normal]
     } else {
         set x Palatino-Bold
     }
 } -result {Palatino-Bold}
 test font-21.29 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {palatino 12 italic normal}
     if {[font actual {avantgarde 12 roman normal} -family] == "palatino"} {
         set x [psfontname avantgarde 12 roman normal]
     } else {
         set x Palatino-Italic
     }
 } -result {Palatino-Italic}
 test font-21.30 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {palatino 12 italic bold}
     if {[font actual {avantgarde 12 roman normal} -family] == "palatino"} {
         set x [psfontname avantgarde 12 roman normal]
     } else {
@@ -1159,41 +1171,41 @@
         set x Palatino-BoldItalic
     }
 } -result {Palatino-BoldItalic}
 
 test font-21.31 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {symbol 12 roman normal}
     if {[font actual {avantgarde 12 roman normal} -family] == "symbol"} {
         set x [psfontname avantgarde 12 roman normal]
     } else {
         set x Symbol
     }
 } -result {Symbol}
 test font-21.32 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {symbol 12 roman bold}
     if {[font actual {avantgarde 12 roman normal} -family] == "symbol"} {
         set x [psfontname avantgarde 12 roman normal]
     } else {
         set x Symbol
     }
 } -result {Symbol}
 test font-21.33 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {symbol 12 italic normal}
     if {[font actual {avantgarde 12 roman normal} -family] == "symbol"} {
         set x [psfontname avantgarde 12 roman normal]
     } else {
         set x Symbol
     }
 } -result {Symbol}
 test font-21.34 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {symbol 12 italic bold}
     if {[font actual {avantgarde 12 roman normal} -family] == "symbol"} {
         set x [psfontname avantgarde 12 roman normal]
     } else {
@@ -1200,41 +1212,41 @@
         set x Symbol
     }
 } -result {Symbol}
 
 test font-21.35 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {times 12 roman normal}
     if {[font actual {avantgarde 12 roman normal} -family] == "times"} {
         set x [psfontname avantgarde 12 roman normal]
     } else {
         set x Times-Roman
     }
 } -result {Times-Roman}
 test font-21.36 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {times 12 roman bold}
     if {[font actual {avantgarde 12 roman normal} -family] == "times"} {
         set x [psfontname avantgarde 12 roman normal]
     } else {
         set x Times-Bold
     }
 } -result {Times-Bold}
 test font-21.37 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {times 12 italic normal}
     if {[font actual {avantgarde 12 roman normal} -family] == "times"} {
         set x [psfontname avantgarde 12 roman normal]
     } else {
         set x Times-Italic
     }
 } -result {Times-Italic}
 test font-21.38 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {times 12 italic bold}
     if {[font actual {avantgarde 12 roman normal} -family] == "times"} {
         set x [psfontname avantgarde 12 roman normal]
     } else {
@@ -1241,41 +1253,41 @@
         set x Times-BoldItalic
     }
 } -result {Times-BoldItalic}
 
 test font-21.39 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {zapfchancery 12 roman normal}
     if {[font actual {avantgarde 12 roman normal} -family] == "zapfchancery"} {
         set x [psfontname avantgarde 12 roman normal]
     } else {
         set x ZapfChancery-MediumItalic
     }
 } -result {ZapfChancery-MediumItalic}
 test font-21.40 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {zapfchancery 12 roman bold}
     if {[font actual {avantgarde 12 roman normal} -family] == "zapfchancery"} {
         set x [psfontname avantgarde 12 roman normal]
     } else {
         set x ZapfChancery-MediumItalic
     }
 } -result {ZapfChancery-MediumItalic}
 test font-21.41 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {zapfchancery 12 italic normal}
     if {[font actual {avantgarde 12 roman normal} -family] == "zapfchancery"} {
         set x [psfontname avantgarde 12 roman normal]
     } else {
         set x ZapfChancery-MediumItalic
     }
 } -result {ZapfChancery-MediumItalic}
 test font-21.42 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {zapfchancery 12 italic bold}
     if {[font actual {avantgarde 12 roman normal} -family] == "zapfchancery"} {
         set x [psfontname avantgarde 12 roman normal]
     } else {
@@ -1282,41 +1294,41 @@
         set x ZapfChancery-MediumItalic
     }
 } -result {ZapfChancery-MediumItalic}
 
 test font-21.43 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {zapfdingbats 12 roman normal}
     if {[font actual {avantgarde 12 roman normal} -family] == "zapfdingbats"} {
         set x [psfontname avantgarde 12 roman normal]
     } else {
         set x ZapfDingbats
     }
 } -result {ZapfDingbats}
 test font-21.44 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {zapfdingbats 12 roman bold}
     if {[font actual {avantgarde 12 roman normal} -family] == "zapfdingbats"} {
         set x [psfontname avantgarde 12 roman normal]
     } else {
         set x ZapfDingbats
     }
 } -result {ZapfDingbats}
 test font-21.45 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {zapfdingbats 12 italic normal}
     if {[font actual {avantgarde 12 roman normal} -family] == "zapfdingbats"} {
         set x [psfontname avantgarde 12 roman normal]
     } else {
         set x ZapfDingbats
     }
 } -result {ZapfDingbats}
 test font-21.46 {Tk_PostscriptFontName procedure: exhaustive} -constraints {
-    unix 
+    unix
 } -body {
     set name {zapfdingbats 12 italic bold}
     if {[font actual {avantgarde 12 roman normal} -family] == "zapfdingbats"} {
         set x [psfontname avantgarde 12 roman normal]
     } else {
@@ -1429,11 +1441,11 @@
     set x [psfontname {{times new roman} 12 italic bold}]
 } -result {Times-BoldItalic}
 
 
 test font-22.1 {Tk_TextWidth procedure} -setup {
-	destroy .t.l 
+	destroy .t.l
 } -body {
 	label .t.l -padx 0 -pady 0 -bd 0 -highlightthickness 0 -justify left \
 		-text "0" -font "Courier -12"
 	pack .t.l
 	set ax [winfo reqwidth .t.l]
@@ -1455,11 +1467,11 @@
 	destroy .t.t
 } -result {}
 
 
 # Data used in 24.* tests
-destroy .t.l 
+destroy .t.l
 label .t.l -padx 0 -pady 0 -bd 0 -highlightthickness 0 -justify left \
 	-text "0" -font "Courier -12"
 pack .t.l
 update
 set ax [winfo reqwidth .t.l]
@@ -1580,16 +1592,16 @@
 	update
 	lappend x [expr {[winfo reqwidth .t.l] eq [expr {$ax * 4}]}]
 	lappend x [expr {[winfo reqheight .t.l] eq [expr {$ay * 2}]}]
     return $x
 } -result {1 1 1 1}
-destroy .t.l 
+destroy .t.l
 
 test font-24.15 {Tk_ComputeTextLayout: justification} -setup {
     set x {}
 	destroy .t.c
-	canvas .t.c -closeenough 0 
+	canvas .t.c -closeenough 0
 	.t.c create text 0 0 -tags text -anchor nw -just left -font "Courier -12"
 	pack .t.c
 	update
 } -body {
     csetup "000\n00000"
@@ -1614,15 +1626,15 @@
     .t.f config -text foo
     .t.f config -text boo
 } -cleanup {
 	destroy .t.f
 } -result {}
-    
+
 
 # Canvas created for tests: 26.*
 destroy .t.c
-canvas .t.c -closeenough 0 
+canvas .t.c -closeenough 0
 .t.c create text 0 0 -tags text -anchor nw -just left -font "Courier -12"
 pack .t.c
 update
 test font-26.1 {Tk_DrawTextLayout procedure: auto-detect last char} -setup {
     destroy .t.f
@@ -1676,11 +1688,11 @@
 
 
 
 # Canvas created for tests: 28.*
 destroy .t.c
-canvas .t.c -closeenough 0 
+canvas .t.c -closeenough 0
 .t.c create text 0 0 -tags text -anchor nw -just left -font "Courier -12"
 pack .t.c
 update
 test font-28.1 {Tk_PointToChar procedure: above all lines} -body {
     csetup "000"
@@ -1768,11 +1780,11 @@
 
 
 
 # Canvas created for tests: 30.*
 destroy .t.c
-canvas .t.c -closeenough 0 
+canvas .t.c -closeenough 0
 .t.c create text 0 0 -tags text -anchor nw -just left -font "Courier -12"
 pack .t.c
 update
 test font-30.1 {Tk_DistanceToTextLayout procedure: loop once} -body {
     csetup "000\n000\n000"
@@ -1911,11 +1923,11 @@
 destroy .t.c
 
 
 # Canvas created for tests 31.*
 destroy .t.c
-canvas .t.c -closeenough 0 
+canvas .t.c -closeenough 0
 .t.c create text 0 0 -tags text -anchor nw -just left -font "Courier -12"
 pack .t.c
 update
 test font-31.1 {Tk_IntersectTextLayout procedure: loop once} -body {
     csetup "000\n000\n000"
@@ -1942,16 +1954,26 @@
     .t.c itemconfig text -width [expr $ax*10]
     set x [.t.c find overlapping [expr $ax*5] $ay [expr $ax*5] $ay]
     .t.c itemconfig text -width 0
     return $x
 } -result {}
+test font-31.7 {TkIntersectAngledTextLayout procedure: bug [514ff64dd0]} -body {
+    csetup "This is line one\nand line two\nand line three here"
+    .t.c itemconfigure text -angle 90
+    # Coordinates of the rectangle to check can be hardcoded:
+    # The goal of this test is to check whether the overlap detection algorithm
+    # works when the rectangle is entirely included in a chunk of the text layout.
+    # The text has been rotated 90 degrees around it's upper left corner,
+    # so it's enough to check with a small rectangle with small negative y coords.
+    .t.c find overlapping 5 -7 7 -5
+} -result {1}
 destroy .t.c
 
 
 test font-32.1 {Tk_TextLayoutToPostscript: ensure buffer doesn't overflow} -setup {
 	destroy .t.c
-	canvas .t.c -closeenough 0 
+	canvas .t.c -closeenough 0
 	.t.c create text 0 0 -tags text -anchor nw -just left -font "Courier -12"
 	pack .t.c
 	update
 } -body {
     # If there were a whole bunch of returns or tabs in a row, then the
@@ -1960,11 +1982,11 @@
     .t.c itemconfig text -width 800
     .t.c insert text end "qwertyuiopasdfghjklzxcvbnm1234qwertyuiopasdfghjklzxcvbnm\n"
     .t.c insert text end "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n"
     .t.c insert text end "end"
     set x [.t.c postscript]
-    set i [string first "(qwerty" $x] 
+    set i [string first "(qwerty" $x]
     string range $x $i [expr {$i + 278}]
 } -cleanup {
 	destroy .t.c
 } -result {(qwertyuiopasdfghjklzxcvbnm1234qwertyuiopasdfghjklzxcvbnm)]
 [(qwertyuiopasdfghjklzxcvbnm1234qwertyuiopasdfghjklzxcvbnm)]
@@ -2176,20 +2198,20 @@
 test font-37.6 {GetAttributeInfo procedure: underline} -setup {
     catch {font delete xyz}
 	set x {}
 } -body {
 	font create xyz -underline yes
-	font config xyz -underline 
+	font config xyz -underline
 } -cleanup {
 	font delete xyz
 } -result {1}
 test font-37.7 {GetAttributeInfo procedure: overstrike} -setup {
     catch {font delete xyz}
 	set x {}
 } -body {
 	font create xyz -overstrike no
-	font config xyz -overstrike 
+	font config xyz -overstrike
 } -cleanup {
 	font delete xyz
 } -result {0}
 
 
@@ -2331,15 +2353,20 @@
 test font-45.1 {TkFontGetAliasList: no match} -body {
     font actual {snarky 10} -family
 } -result [font actual {-size 10} -family]
 test font-45.2 {TkFontGetAliasList: match} -constraints win -body {
     font actual {times 10} -family
-} -result {Times New Roman}
-test font-45.3 {TkFontGetAliasList: match} -constraints {unix noExceed} -body {
-    # can fail on Unix systems that have a real "times new roman" font
-    font actual {{times new roman} 10} -family
-} -result [font actual {times 10} -family]
+} -result {times}
+test font-45.3 {TkFontGetAliasList: match} -constraints {noExceed} -body {
+    if {[font actual {{times new roman} 10} -family] eq "Times New Roman"} {
+        # avoid test failure on systems that have a real "times new roman" font
+        set res 1
+    } else {
+        set res [expr {[font actual {{times new roman} 10} -family] eq \
+                       [font actual {times 10} -family]} ]
+    }
+} -result {1}
 
 
 test font-46.1 {font actual, with character, no option, no --} -body {
 	font actual {times 10} a
 } -match glob -result [list -family [font actual {times 10} -family] -size *\

Index: tests/frame.test
==================================================================
--- tests/frame.test
+++ tests/frame.test
@@ -58,11 +58,11 @@
 } -body {
     frame .f -class NewFrame
     .f configure -class
 } -cleanup {
     deleteWindows
-} -result {-class class Class Frame NewFrame} 
+} -result {-class class Class Frame NewFrame}
 test frame-1.2 {frame configuration options} -setup {
     deleteWindows
 } -body {
     frame .f -class NewFrame
     .f configure -class Different
@@ -790,11 +790,11 @@
 test frame-3.18 {TkCreateFrame procedure} -constraints {
 	defaultPseudocolor8 haveGrayscale8 nonPortable
 } -setup {
 	deleteWindows
 } -body {
-    toplevel .t -visual {grayscale 8} -width 300 -height 200 -bg #434343 
+    toplevel .t -visual {grayscale 8} -width 300 -height 200 -bg #434343
     wm geometry .t +0+0
     update
     colorsFree .t 131 131 131
 } -cleanup {
     deleteWindows
@@ -834,11 +834,11 @@
 	defaultPseudocolor8 haveGrayscale8 nonPortable
 } -setup {
 	deleteWindows
 } -body {
     set x ok
-    toplevel .t -visual {grayscale 8} -width 300 -height 200 -bg #434343 
+    toplevel .t -visual {grayscale 8} -width 300 -height 200 -bg #434343
     wm geometry .t +0+0
     update
     colorsFree .t 131 131 131
 } -cleanup {
     deleteWindows
@@ -1130,11 +1130,11 @@
     if {$fw < 0} {set fw 0}
     if {$fh < 0} {set fh 0}
     place .f -x 0 -y 0 -width 100 -height 100
     pack [frame .f.f] -fill both -expand 1
 
-    set result {} 
+    set result {}
     foreach lp {nw n ne en e es se s sw ws w wn} {
         .f configure -labelanchor $lp
         update
         set expx 5
         set expy 6

Index: tests/geometry.test
==================================================================
--- tests/geometry.test
+++ tests/geometry.test
@@ -268,11 +268,11 @@
 } -body {
     toplevel .t
     wm geometry .t +0+0
     tkwait visibility .t
     update
-    pack [frame .t.f] 
+    pack [frame .t.f]
     button .t.quit -text Quit -command exit
     pack .t.quit -in .t.f
     wm iconify .t
     set x 0
     after 500 {set x 1}

Index: tests/grid.test
==================================================================
--- tests/grid.test
+++ tests/grid.test
@@ -1798,11 +1798,10 @@
     grid .t.f.l
     destroy .t
     set result ok
 } -result ok
 
-
 test grid-18.1 {test respect for internalborder} -body {
     toplevel .pack
     wm geometry .pack 200x200
     frame .pack.l -width 15 -height 10
     labelframe .pack.lf -labelwidget .pack.l
@@ -1996,13 +1995,147 @@
     destroy .a
     grid .c -row 0 -column 0
     grid info .c
 } {-in . -column 0 -row 0 -columnspan 2 -rowspan 2 -ipadx 0 -ipady 0 -padx {3 5} -pady {4 7} -sticky ns}
 grid_reset 22.5
+
+test grid-23 {grid configure -in leaked from previous master - bug
+              6aea69fccbb266b7f0437686379fbe5b55442958} {
+    frame .f
+    frame .g
+    pack .f .g
+    text .t
+    grid .t -in .f
+    pack forget .f
+    update
+    grid .t -in .g
+    # .t is now managed by .g; following lines must have no effect on .t
+    pack .f
+    update
+    pack forget .f
+    update
+    winfo ismapped .t ; # must return 1
+} {1}
+grid_reset 23
+
+test grid-24.1 {<<NoManagedChild>> fires on last grid forget} -setup {
+    global A
+    unset -nocomplain A
+} -body {
+    grid [frame .1]
+    update
+    bind . <<NoManagedChild>> {set A 1}
+    grid forget .1
+    update
+    info exists A
+} -cleanup {
+    bind . <<NoManagedChild>> {}
+    grid_reset 24.1
+} -result {1}
+test grid-24.2 {<<NoManagedChild>> fires on last grid remove} -setup {
+    global A
+    unset -nocomplain A
+} -body {
+    grid [frame .1]
+    update
+    bind . <<NoManagedChild>> {set A 1}
+    grid remove .1
+    update
+    info exists A
+} -cleanup {
+    bind . <<NoManagedChild>> {}
+    grid_reset 24.2
+} -result {1}
+test grid-24.3 {<<NoManagedChild>> fires on last gridded child destruction} -setup {
+    global A
+    unset -nocomplain A
+} -body {
+    grid [frame .1]
+    update
+    bind . <<NoManagedChild>> {incr A}
+    destroy .1
+    update
+    set A
+} -cleanup {
+    bind . <<NoManagedChild>> {}
+    grid_reset 24.3
+} -result {1}
+test grid-24.4 {<Configure> does not fire on last grid forget} -setup {
+    global A
+    unset -nocomplain A
+} -body {
+    grid [frame .1]
+    update
+    bind . <Configure> {set A 1}
+    grid forget .1
+    update
+    info exists A
+} -cleanup {
+    bind . <Configure> {}
+    grid_reset 24.4
+} -result {0}
+test grid-24.5 {<Configure> fires on forelast grid forget} -setup {
+    global A
+    unset -nocomplain A
+} -body {
+    grid [frame .1]
+    grid [frame .2]
+    update
+    bind . <Configure> {set A 1}
+    grid forget .1
+    update
+    info exists A
+} -cleanup {
+    bind . <Configure> {}
+    grid_reset 24.5
+} -result {1}
+test grid-24.6 {<<NoManagedChild>> does not fire on forelast grid forget} -setup {
+    global A
+    unset -nocomplain A
+} -body {
+    grid [frame .1]
+    grid [frame .2]
+    update
+    bind . <<NoManagedChild>> {set A 1}
+    grid forget .1
+    update
+    info exists A
+} -cleanup {
+    bind . <<NoManagedChild>> {}
+    grid_reset 24.6
+} -result {0}
+test grid-24.7 {<<NoManagedChild>> does not fire on grid anchor} -setup {
+    global A
+    unset -nocomplain A
+} -body {
+    bind . <<NoManagedChild>> {set A 1}
+    grid anchor . w
+    update
+    info exists A
+} -cleanup {
+    grid anchor . nw
+    bind . <<NoManagedChild>> {}
+    grid_reset 24.7
+} -result {0}
+test grid-24.8 {<<NoManagedChild>> does not fire on last grid forget if propagation is off} -setup {
+    global A
+    unset -nocomplain A
+} -body {
+    grid [frame .1]
+    grid propagate . 0
+    update
+    bind . <<NoManagedChild>> {set A 1}
+    grid forget .1
+    update
+    info exists A
+} -cleanup {
+    bind . <<NoManagedChild>> {}
+    grid_reset 24.8
+} -result {0}
 
 # cleanup
 cleanupTests
 return
 
 # Local Variables:
 # mode: tcl
 # End:

ADDED   tests/iDOT.png
Index: tests/iDOT.png
==================================================================
--- /dev/null
+++ tests/iDOT.png
cannot compute difference between binary files

Index: tests/image.test
==================================================================
--- tests/image.test
+++ tests/image.test
@@ -31,18 +31,18 @@
 } -returnCodes error -result {wrong # args: should be "image create type ?name? ?-option value ...?"}
 test image-1.4 {Tk_ImageCmd procedure, "create" option} -body {
     image c bad_type
 } -returnCodes error -result {image type "bad_type" doesn't exist}
 test image-1.5 {Tk_ImageCmd procedure, "create" option} -constraints {
-    testImageType 
+    testImageType
 } -body {
     list [image create test myimage] [imageNames]
 } -cleanup {
     imageCleanup
 } -result {myimage myimage}
 test image-1.6 {Tk_ImageCmd procedure, "create" option} -constraints {
-    testImageType 
+    testImageType
 } -setup {
     imageCleanup
 } -body {
     scan [image create test] image%d first
     image create test myimage
@@ -51,11 +51,11 @@
 } -cleanup {
     imageCleanup
 } -result {1}
 
 test image-1.7 {Tk_ImageCmd procedure, "create" option} -constraints {
-    testImageType 
+    testImageType
 } -setup {
     imageCleanup
 } -body {
     image create test myimage -variable x
     .c create image 100 50 -image myimage
@@ -65,13 +65,13 @@
     image create test myimage -variable x
     update
     return $x
 } -cleanup {
     imageCleanup
-} -result {{myimage free} {myimage free} {myimage delete} {myimage get} {myimage get} {myimage display 0 0 30 15 30 30} {myimage display 0 0 30 15 30 130}}
+} -result {{myimage free} {myimage free} {myimage delete} {myimage get} {myimage get} {myimage display 0 0 30 15} {myimage display 0 0 30 15}}
 test image-1.8 {Tk_ImageCmd procedure, "create" option} -constraints {
-	testImageType 
+	testImageType
 } -setup {
     .c delete all
     imageCleanup
 } -body {
     image create test myimage -variable x
@@ -84,18 +84,18 @@
     update
     return $x
 } -cleanup {
     .c delete all
     imageCleanup
-} -result {{myimage get} {myimage get} {myimage display 0 0 30 15 30 30} {myimage display 0 0 30 15 30 130}}
+} -result {{myimage get} {myimage get} {myimage display 0 0 30 15} {myimage display 0 0 30 15}}
 test image-1.9 {Tk_ImageCmd procedure, "create" option} -constraints {
-	testImageType 
+	testImageType
 } -body {
     image create test -badName foo
 } -returnCodes error -result {bad option name "-badName"}
 test image-1.10 {Tk_ImageCmd procedure, "create" option} -constraints {
-    testImageType 
+    testImageType
 } -body {
     catch {image create test -badName foo}
     imageNames
 } -result {}
 test image-1.11 {Tk_ImageCmd procedure, "create" option with same name as main window} -body {
@@ -140,11 +140,11 @@
 
 test image-2.1 {Tk_ImageCmd procedure, "delete" option} -body {
     image delete
 } -result {}
 test image-2.2 {Tk_ImageCmd procedure, "delete" option} -constraints {
-    testImageType 
+    testImageType
 } -setup {
     imageCleanup
     set result {}
 } -body {
     image create test myimage
@@ -154,11 +154,11 @@
     lappend result [imageNames]
 } -cleanup {
     imageCleanup
 } -result {{img2 myimage} {}}
 test image-2.3 {Tk_ImageCmd procedure, "delete" option} -constraints {
-    testImageType 
+    testImageType
 } -setup {
     imageCleanup
 } -body {
     image create test myimage
     image create test img2
@@ -165,11 +165,11 @@
     image delete myimage gorp img2
 } -cleanup {
     imageCleanup
 } -returnCodes error -result {image "gorp" doesn't exist}
 test image-2.4 {Tk_ImageCmd procedure, "delete" option} -constraints {
-    testImageType 
+    testImageType
 } -setup {
     imageCleanup
 } -body {
     image create test myimage
     image create test img2
@@ -188,11 +188,11 @@
 } -returnCodes error -result {wrong # args: should be "image height name"}
 test image-3.3 {Tk_ImageCmd procedure, "height" option} -body {
     image height foo
 } -returnCodes error -result {image "foo" doesn't exist}
 test image-3.4 {Tk_ImageCmd procedure, "height" option} -constraints {
-    testImageType 
+    testImageType
 } -setup {
     imageCleanup
 } -body {
     image create test myimage
     set x [image h myimage]
@@ -205,11 +205,11 @@
 
 test image-4.1 {Tk_ImageCmd procedure, "names" option} -body {
     image names x
 } -returnCodes error -result {wrong # args: should be "image names"}
 test image-4.2 {Tk_ImageCmd procedure, "names" option} -constraints {
-    testImageType 
+    testImageType
 } -setup {
     catch {interp delete testinterp}
 } -body {
     interp create testinterp
     load {} Tk testinterp
@@ -247,21 +247,21 @@
 test image-5.3 {Tk_ImageCmd procedure, "type" option} -body {
     image type foo
 } -returnCodes error -result {image "foo" doesn't exist}
 
 test image-5.4 {Tk_ImageCmd procedure, "type" option} -constraints {
-    testImageType 
+    testImageType
 } -setup {
     imageCleanup
 } -body {
     image create test myimage
     image type myimage
 } -cleanup {
     imageCleanup
 } -result {test}
 test image-5.5 {Tk_ImageCmd procedure, "type" option} -constraints {
-    testImageType 
+    testImageType
 } -setup {
     imageCleanup
 } -body {
     image create test myimage
     .c create image 50 50 -image myimage
@@ -269,21 +269,21 @@
     image type myimage
 } -cleanup {
     imageCleanup
 } -returnCodes error -result {image "myimage" doesn't exist}
 test image-5.6 {Tk_ImageCmd procedure, "type" option} -constraints {
-    testOldImageType 
+    testOldImageType
 } -setup {
     imageCleanup
 } -body {
     image create oldtest myimage
     image type myimage
 } -cleanup {
     imageCleanup
 } -result {oldtest}
 test image-5.7 {Tk_ImageCmd procedure, "type" option} -constraints {
-    testOldImageType 
+    testOldImageType
 } -setup {
     .c delete all
     imageCleanup
 } -body {
     image create oldtest myimage
@@ -298,11 +298,11 @@
 
 test image-6.1 {Tk_ImageCmd procedure, "types" option} -body {
     image types x
 } -returnCodes error -result {wrong # args: should be "image types"}
 test image-6.2 {Tk_ImageCmd procedure, "types" option} -constraints {
-    testImageType 
+    testImageType
 } -body {
     lsort [image types]
 } -result {bitmap oldtest photo test}
 
 
@@ -314,11 +314,11 @@
 } -returnCodes error -result {wrong # args: should be "image width name"}
 test image-7.3 {Tk_ImageCmd procedure, "width" option} -body {
     image width foo
 } -returnCodes error -result {image "foo" doesn't exist}
 test image-7.4 {Tk_ImageCmd procedure, "width" option} -constraints {
-    testImageType 
+    testImageType
 } -setup {
     imageCleanup
 } -body {
     image create test myimage
     set x [image w myimage]
@@ -328,11 +328,11 @@
     imageCleanup
 } -result {30 60}
 
 
 test image-8.1 {Tk_ImageCmd procedure, "inuse" option} -constraints {
-    testImageType 
+    testImageType
 } -setup {
     imageCleanup
     set res {}
     destroy .b
 } -body {
@@ -342,11 +342,11 @@
     lappend res [image inuse myimage2]
 } -cleanup {
     imageCleanup
     catch {destroy .b}
 } -result [list 0 1]
-    
+
 
 test image-9.1 {Tk_ImageChanged procedure} -constraints testImageType -setup {
     .c delete all
     imageCleanup
 } -body {
@@ -358,11 +358,11 @@
     update
     return $x
 } -cleanup {
     .c delete all
     imageCleanup
-} -result {{foo display 5 6 7 8 30 30}}
+} -result {{foo display 5 6 7 8}}
 test image-9.2 {Tk_ImageChanged procedure} -constraints testImageType -setup {
     .c delete all
     imageCleanup
 } -body {
     image create test foo -variable x
@@ -374,11 +374,11 @@
     update
     return $x
 } -cleanup {
     .c delete all
     imageCleanup
-} -result {{foo display 5 6 25 9 30 30} {foo display 0 0 12 14 65 74}}
+} -result {{foo display 5 6 25 9} {foo display 0 0 12 14}}
 
 
 test image-10.1 {Tk_GetImage procedure} -setup {
     imageCleanup
 } -body {
@@ -415,11 +415,11 @@
     update
     list [imageNames] $x
 } -cleanup {
     .c delete all
     imageCleanup
-} -result {foo {{foo free} {foo display 0 0 30 15 103 121}}}
+} -result {foo {{foo free} {foo display 0 0 30 15}}}
 test image-11.2 {Tk_FreeImage procedure} -constraints testImageType -setup {
     .c delete all
     imageCleanup
 } -body {
     image create test foo -variable x
@@ -611,11 +611,11 @@
     lappend x [.c bbox i1] [imageNames]
 } -cleanup {
     .c delete all
     imageCleanup
 } -result {10 10 20 20 foo {} {10 10 30 30} foo}
-    
+
 destroy .c
 imageFinish
 
 # cleanup
 cleanupTests

Index: tests/imgBmap.test
==================================================================
--- tests/imgBmap.test
+++ tests/imgBmap.test
@@ -378,11 +378,12 @@
     i1 configure -foreground #221100 -background
 } -returnCodes error -result {value for "-background" missing}
 test imageBmap-7.10 {ImgBmapCmd procedure} -body {
     i1 gorp
 } -returnCodes error -result {bad option "gorp": must be cget or configure}
-
+# Clean it up after use!!
+imageCleanup
 
 test imageBmap-8.1 {ImgBmapGet/Free procedures, shared instances} -setup {
     destroy .c
     pack [canvas .c]
     update

ADDED   tests/imgListFormat.test
Index: tests/imgListFormat.test
==================================================================
--- /dev/null
+++ tests/imgListFormat.test
@@ -0,0 +1,661 @@
+# This file is a Tcl script to test out the default image data format
+# ("list format") implementend in the file tkImgListFormat.c.
+# It is organized in the standard fashion for Tcl tests.
+#
+# Copyright (c) 2017 Simon Bachmann
+# All rights reserved.
+#
+# Author: Simon Bachmann (simonbachmann@bluewin.ch)
+
+package require tcltest 2.2
+namespace import ::tcltest::*
+tcltest::configure {*}$argv
+tcltest::loadTestedCommands
+
+imageInit
+
+# find the teapot.ppm file for use in these tests
+set teapotPhotoFile [file join [file dirname [info script]] teapot.ppm]
+testConstraint hasTeapotPhoto [file exists $teapotPhotoFile]
+# let's see if we have the semi-transparent one as well
+set transpTeapotPhotoFile [file join [file dirname [info script]] teapotTransparent.png]
+testConstraint hasTranspTeapotPhoto [file exists $transpTeapotPhotoFile]
+
+# ---------------------------------------------------------------------
+
+
+test imgListFormat-1.1 {ParseFormatOptions: default values} -setup {
+    image create photo photo1
+} -body {
+    photo1 put {{red green} {blue black}}
+    lindex [photo1 data] 1 1
+} -cleanup {
+    imageCleanup
+} -result {#000000}
+test imgListFormat-1.2 {ParseFormatOptions: format name as first arg} -setup {
+    image create photo photo1
+} -body {
+    photo1 put #1256ef -format {default} -to 0 0 10 10
+} -cleanup {
+    imageCleanup
+} -result {}
+test imgListFormat-1.3 {ParseFormatOptions: unknown option} -setup {
+    image create photo photo1
+} -body {
+    photo1 data -format {default -bogus}
+} -cleanup {
+    imageCleanup
+} -returnCodes error -result {bad format option "-bogus": must be -colorformat}
+test imgListFormat-1.4 {ParseFormatOptions: option not allowed} -setup {
+    image create photo photo1
+} -body {
+    photo1 put yellow -format {default -colorformat rgb}
+} -cleanup {
+    imageCleanup
+} -returnCodes error -result \
+    {bad format option "-colorformat": no options allowed}
+test imgListFormat-1.5 {ParseFormatOptions: no -colorformat value} -setup {
+    image create photo photo1 -data black
+} -body {
+    photo1 data -format {default -colorformat}
+} -returnCodes error -result {the "-colorformat" option requires a value}
+test imgListFormat-1.6 {ParseFormatOptions: bad -colorformat val #1} -setup {
+    image create photo photo1
+} -body {
+    photo1 put yellow
+    photo1 data -format {default -colorformat bogus}
+} -cleanup {
+    imageCleanup
+} -returnCodes error -result \
+    {bad color format "bogus": must be rgb, rgba, or list}
+test imgListFormat-1.7 {ParseFormatOptions: bad -colorformat val #2} -setup {
+    image create photo photo1
+} -body {
+    photo1 data -format {default -colorformat tkcolor}
+} -returnCodes error -result \
+    {bad color format "tkcolor": must be rgb, rgba, or list}
+test imgListFormat-1.8 {ParseFormatOptions: bad -colorformat #3} -setup {
+    image create photo photo1
+} -body {
+    photo1 data -format {default -colorformat emptystring}
+} -returnCodes error -result \
+    {bad color format "emptystring": must be rgb, rgba, or list}
+test imgListFormat-1.9 {ParseFormatOptions: bad -colorformat #4} -setup {
+    image create photo photo1
+} -body {
+    photo1 data -format {default -colorformat rgb-short}
+} -cleanup {
+    imageCleanup
+} -returnCodes error -result \
+    {bad color format "rgb-short": must be rgb, rgba, or list}
+test imgListFormat-1.10 {ParseFormatOptions: bad -colorformat #5} -setup {
+    image create photo photo1
+} -body {
+    photo1 data -format {default -colorformat rgba-short}
+} -returnCodes error -result \
+    {bad color format "rgba-short": must be rgb, rgba, or list}
+test imgListFormat-1.11 {valid colorformats} -setup {
+    image create photo photo1
+} -body {
+    photo1 put white#78
+    set result {}
+    lappend result [photo1 data -format {default -colorformat rgb}]
+    lappend result [photo1 data -format {default -colorformat rgba}]
+    lappend result [photo1 data -format {default -colorformat list}]
+    set result
+} -cleanup {
+    imageCleanup
+    unset result
+} -result {{{#ffffff}} {{#ffffff78}} {{{255 255 255 120}}}}
+
+# GetBadOptMsg: only use case already tested with imgListFormat-1.4
+
+test imgListFormat-3.1 {StringMatchDef: data is not a list} -body {
+    testphotostringmatch {not a " proper list}
+    # " (this comment is here only for editor highlighting)
+} -returnCodes error -result {unmatched open quote in list}
+# empty data case tested with imgPhoto-4.95 (imgPhoto.test)
+test imgListFormat-3.2 {StringMatchDef: \
+        list element not a proper list} -body {
+    testphotostringmatch {{red white} {not "} {blue green}}
+    # "
+} -returnCodes error -result {unmatched open quote in list}
+test imgListFormat-3.3 {StringMatchDef: \
+        sublists with differen lengths} -body {
+    testphotostringmatch {{#001122 #334455 #667788}
+		{#99AABB #CCDDEE}
+		{#FF0011 #223344 #556677}}
+} -returnCodes error -result \
+    {invalid row # 1: all rows must have the same number of elements}
+test imgListFormat-3.4 {StringMatchDef: base64 data is not parsed as valid \
+} -setup {
+    image create photo photo1
+} -body {
+    photo1 put {
+	iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCA
+	YAAAEFsT2yAAAABGdBTUEAAYagMeiWXwAA
+	ABdJREFUCJkFwQEBAAAAgiD6P9pACRoqDk
+	fUBvt1wUFKAAAAAElFTkSuQmCC
+    } -format default
+} -cleanup {
+    imageCleanup
+} -returnCodes error -result {couldn't recognize image data}
+test imgListFormat-3.5 {StringMatchDef: valid data} -setup {
+    image create photo photo1
+} -body {
+    photo1 put {{blue green}
+		{yellow magenta}
+	        {#000000 #FFFFFFFF}}
+    list [image width photo1] [image height photo1] \
+	[photo1 get 0 2 -withalpha]
+} -cleanup {
+    imageCleanup
+} -result {2 3 {0 0 0 255}}
+
+# ImgStringRead: most of the error cases cannot be tested with current code,
+# as the errors are detected by StringMatchDef
+test imgListFormat-4.1 {StringReadDef: use with -format opt} -setup {
+    image create photo photo1
+} -body {
+    photo1 put white -format "default"
+    photo1 get 0 0
+} -cleanup {
+    imageCleanup
+} -result {255 255 255}
+test imgListFormat-4.2 {StringReadDef: suboptions to format} -setup {
+    image create photo photo1
+} -body {
+    photo1 put white -format {default -bogus}
+} -cleanup {
+    imageCleanup
+} -returnCodes error -result \
+    {bad format option "-bogus": no options allowed}
+test imgListFormat-4.3 {StringReadDef: erroneous non-option argument} -setup {
+    image create photo photo1
+} -body {
+    photo1 put orange -format {default bogus}
+} -returnCodes error -result {bad format option "bogus": no options allowed}
+test imgListFormat-4.4 {StringReadDef: normal use case} -constraints {
+    hasTeapotPhoto
+} -setup {
+    image create photo photo1 -file $teapotPhotoFile
+    image create photo photo2
+} -body {
+    set imgData [photo1 data]
+    photo2 put $imgData
+    string equal [photo1 data] [photo2 data]
+} -cleanup {
+    imageCleanup
+    unset imgData
+} -result {1}
+test imgListFormat-4.5 {StringReadDef: correct compositing rule} -constraints {
+    hasTranspTeapotPhoto
+} -setup {
+    image create photo photo1 -file $transpTeapotPhotoFile
+    image create photo photo2
+} -body {
+    photo2 put #FF0000 -to 0 0 50 50
+    photo2 put [photo1 data -format {default -colorformat rgba}] -to 10 10 40 40
+    list [photo2 get 0 0 -withalpha] [photo2 get 20 25 -withalpha] \
+	[photo2 get 49 49 -withalpha]
+} -cleanup {
+    imageCleanup
+} -result {{255 0 0 255} {0 78 185 225} {255 0 0 255}}
+
+test imgListFormat-5.1 {StringWriteDef: format options not a list} -setup {
+    image create photo photo1
+} -body {
+    photo1 data -format {default " bogus}
+    # "
+} -cleanup {
+    imageCleanup
+} -returnCodes error -result {unmatched open quote in list}
+test imgListFormat-5.2 {StringWriteDef: invalid format option} -setup {
+    image create photo photo1
+} -body {
+    photo1 data -format {default -bogus}
+} -cleanup {
+    imageCleanup
+} -returnCodes error -result {bad format option "-bogus": must be -colorformat}
+test imgListFormat-5.3 {StringWriteDef: non-option arg in format} -setup {
+    image create photo photo1
+} -body {
+    photo1 data -format {default -colorformat list bogus}
+} -cleanup {
+    imageCleanup
+} -returnCodes error -result {bad format option "bogus": must be -colorformat}
+test imgListFormat-5.4 {StringWriteDef: empty image} -setup {
+    image create photo photo1
+} -body {
+    photo1 data -format {default -colorformat rgba}
+} -cleanup {
+    imageCleanup
+} -result {}
+test imgListFormat-5.5 {StirngWriteDef: size of data} -setup {
+    image create photo photo1
+} -body {
+    photo1 put blue -to 0 0 35 64
+    set imgData [photo1 data]
+    list [llength [lindex $imgData 0]] [llength $imgData]
+} -cleanup {
+    unset imgData
+    imageCleanup
+} -result {35 64}
+test imgListFormat-5.6 {StringWriteDef: test some pixels #1} -constraints {
+    hasTeapotPhoto
+} -setup {
+    set result {}
+    image create photo photo1 -file $teapotPhotoFile
+} -body {
+    set imgData [photo1 data]
+    # note: with [lindex], the coords are inverted (y x)
+    lappend result [lindex $imgData 0 0]
+    lappend result [lindex $imgData 3 2]
+    lappend result [lindex $imgData 107 53]
+    lappend result [lindex $imgData 203 157]
+    lappend result [lindex $imgData 255 255]
+    set result
+} -cleanup {
+    unset result
+    unset imgData
+    imageCleanup
+} -result {{#135cc0} #135cc0 #a06d52 #e1c8ba #135cc0}
+test imgListFormat-5.7 {StringWriteDef: test some pixels #2} -constraints {
+    hasTeapotPhoto
+} -setup {
+    set result {}
+    image create photo photo1 -file $teapotPhotoFile
+} -body {
+    set imgData [photo1 data -format {default -colorformat rgba}]
+    # note: with [lindex], the coords are inverted (y x)
+    lappend result [lindex $imgData 0 0]
+    lappend result [lindex $imgData 3 2]
+    lappend result [lindex $imgData 107 53]
+    lappend result [lindex $imgData 203 157]
+    lappend result [lindex $imgData 255 255]
+    set result
+} -cleanup {
+    unset result
+    unset imgData
+    imageCleanup
+} -result {{#135cc0ff} #135cc0ff #a06d52ff #e1c8baff #135cc0ff}
+test imgListFormat-5.8 {StringWriteDef: test some pixels #3} -constraints {
+    hasTranspTeapotPhoto
+} -setup {
+    image create photo photo1 -file $transpTeapotPhotoFile
+} -body {
+    set imgData [photo1 data -format {default -colorformat rgb}]
+    set result {}
+    lappend result [lindex $imgData 3 2]
+    lappend result [lindex $imgData 107 53]
+    lappend result [lindex $imgData 203 157]
+    set result
+} -cleanup {
+    unset result
+    unset imgData
+    imageCleanup
+} -result {{#004eb9} #a14100 #ffca9f}
+test imgListFormat-5.9 {StringWriteDef: test some pixels #4} -constraints {
+    hasTranspTeapotPhoto
+} -setup {
+    image create photo photo1 -file $transpTeapotPhotoFile
+} -body {
+    set imgData [photo1 data -format {default -colorformat rgba}]
+    set result [lindex $imgData 3 2]
+    lappend result [lindex $imgData 107 53]
+    lappend result [lindex $imgData 203 157]
+    set result
+} -cleanup {
+    unset result
+    unset imgData
+    imageCleanup
+} -result {{#004eb9e1} #a14100aa #ffca9faf}
+test imgListFormat-5.10 {StringWriteDef: test some pixels #5} -constraints {
+    hasTranspTeapotPhoto
+} -setup {
+    image create photo photo1 -file $transpTeapotPhotoFile
+} -body {
+    set imgData [photo1 data -format {default -colorformat list}]
+    set result {}
+    lappend result [lindex $imgData 3 2]
+    lappend result [lindex $imgData 107 53]
+    lappend result [lindex $imgData 203 157]
+    set result
+} -cleanup {
+    unset imgData
+    unset result
+    imageCleanup
+} -result {{0 78 185 225} {161 65 0 170} {255 202 159 175}}
+
+test imgListFormat-6.1 {ParseColor: empty string} -setup {
+    image create photo photo1
+    set result {}
+} -body {
+    photo1 put {{"" ""} {"" ""}}
+    lappend result [image width photo1]
+    lappend result [image height photo1]
+    lappend result [photo1 get 1 1 -withalpha]
+    set result
+} -cleanup {
+    unset result
+    imageCleanup
+} -result {2 2 {0 0 0 0}}
+test imgListFormat-6.2 {ParseColor: empty string, mixed} -setup {
+    image create photo photo1
+} -body {
+    photo1 put {{black white} {{} white}}
+    list [photo1 get 0 0 -withalpha] [photo1 get 0 1 -withalpha]
+} -cleanup {
+    imageCleanup
+} -result {{0 0 0 255} {0 0 0 0}}
+test imgListFormat-6.3 {ParseColor: color name too long} -setup {
+    image create photo photo1
+    set longstr {}
+    for {set i 1} {$i <= 100} {incr i} {
+        append longstr "z"
+    }
+} -body {
+    photo1 put [list [list blue] [list $longstr]]
+} -cleanup {
+    imageCleanup
+    unset longstr
+} -returnCodes error -result {invalid color}
+test imgListFormat-6.4 {ParseColor: #XXX color, different forms} -setup {
+    image create photo photo1
+} -body {
+    photo1 put {{#A123 #334455} {#012 #fffefd#00}}
+    photo1 data -format {default -colorformat rgba}
+} -cleanup {
+    imageCleanup
+} -result {{#aa112233 #334455ff} {#001122ff #fffefd00}}
+test imgListFormat-6.5 {ParseColor: list format} -setup {
+    image create photo photo1
+} -body {
+    photo1 put [list [list [list 255 255 255]]]
+    photo1 get 0 0 -withalpha
+} -cleanup {
+    imageCleanup
+} -result {255 255 255 255}
+test imgListFormat-6.6 {ParseColor: string format} -setup {
+    image create photo photo1
+} -body {
+    photo1 put [list [list [list white]]]
+    photo1 get 0 0 -withalpha
+} -cleanup {
+    imageCleanup
+} -result {255 255 255 255}
+test imgListFormat-6.7 {ParseColor: invalid color} -setup {
+    image create photo photo1
+} -body {
+    photo1 put {{blue red} {green bogus}}
+} -cleanup {
+    imageCleanup
+} -returnCodes error -result {invalid color name "bogus"}
+test imgListFormat-6.8 {ParseColor: overall test} -setup {
+    image create photo photo1
+    set result {}
+} -body {
+    photo1 put {
+		{snow@0.5 snow#80 snow#8 #fffffafafafa@0.5 #fffffabbfacc#8}
+		{#fffffafffaff#80 #ffffaafaa@.5 #ffffaafaa#8 #ffffaafaa#80 #fee#8}
+		{#fee#80 #fee@0.5 #fffafa@0.5 #fffafa#8 #fffafa#80}
+		{{0xff 250 0xfa 128} {255 250 250} #fee8 #fffafa80 snow}}
+    for {set y 0} {$y < 4} {incr y} {
+		for {set x 0} {$x < 5} {incr x} {
+			lappend result [photo1 get $x $y -withalpha]
+		}
+    }
+    set result
+} -cleanup {
+    imageCleanup
+    unset result
+} -result \
+{{255 250 250 128} {255 250 250 128} {255 250 250 136} {255 250 250 128}\
+{255 250 250 136} {255 250 250 128} {255 250 250 128} {255 250 250 136}\
+{255 250 250 128} {255 238 238 136} {255 238 238 128} {255 238 238 128}\
+{255 250 250 128} {255 250 250 136} {255 250 250 128} {255 250 250 128}\
+{255 250 250 255} {255 238 238 136} {255 250 250 128} {255 250 250 255}}
+
+# Note: these tests were written for an earlier implementation of
+# ParseColorAsList. For this reason, their order and layout do not follow the
+# current code very well. Test coverage is pretty good, nevertheless.
+test imgListFormat-7.1 {ParseColorAsList: invalid list} -setup {
+    image create photo photo1
+} -body {
+    photo1 put {{{123 45 67 89} {123 45 " 67}}}
+	#"
+} -cleanup {
+    imageCleanup
+} -returnCodes error -result {invalid color name "123 45 " 67"}
+#"
+test imgListFormat-7.2 {ParseColorAsList: too few elements in list} -setup {
+    image create photo photo1
+} -body {
+    photo1 put {{{0 255 0 255} {0 255}}}
+} -cleanup {
+    imageCleanup
+} -returnCodes error -result {invalid color name "0 255"}
+test imgListFormat-7.3 {ParseColorAsList: too many elements in list} -setup {
+    image create photo photo1
+} -body {
+    photo1 put {{{0 100 200 255} {0 100 200 255 0}}}
+} -returnCodes error -result {invalid color name "0 100 200 255 0"}
+test imgListFormat-7.4 {ParseColorAsList: not an integer value} -setup {
+    image create photo photo1
+} -body {
+    photo1 put {{{9 0xf3 87 65} {43 21 10 1.0}}}
+} -cleanup {
+    imageCleanup
+} -returnCodes error -result {invalid color name "43 21 10 1.0"}
+test imgListFormat-7.5 {ParseColorAsList: negative value in list} -setup {
+    image create photo photo1
+} -body {
+    photo1 put {{{121 121 121} {121 121 -1}}}
+} -cleanup {
+    imageCleanup
+} -returnCodes error -result {invalid color name "121 121 -1"}
+test imgListFormat-7.6 {ParseColorAsList: value in list too large} -setup {
+    image create photo photo1
+} -body {
+    photo1 put {{{0 1 2 3} {254 255 256}}}
+} -cleanup {
+    imageCleanup
+} -returnCodes error -result {invalid color name "254 255 256"}
+test imgListFormat-7.7 {ParseColorAsList: suffix not allowed} -setup {
+    image create photo photo1
+} -body {
+    photo1 put {{{100 100 100} {100 100 100#FE}}}
+} -cleanup {
+    imageCleanup
+} -returnCodes error -result {invalid color name "100 100 100#FE"}
+test imgListFormat-7.8 {ParseColorAsList: valid list form} -setup {
+    image create photo photo1
+} -body {
+    photo1 put {{{0x0 0x10 0xfe 0xff} {0 100 254}}
+		{{30 30 30 0} {1 1 254 1}}}
+    list [photo1 get 0 0 -withalpha] [photo1 get 1 0 -withalpha] \
+	[photo1 get 0 1 -withalpha] [photo1 get 1 1 -withalpha]
+} -cleanup {
+    imageCleanup
+} -result {{0 16 254 255} {0 100 254 255} {30 30 30 0} {1 1 254 1}}
+test imgListFormat-7.9 {ParseColorAsList: additional spaces in list} -setup {
+    image create photo photo1
+} -body {
+    photo1 put { { { 1 2 3} {1  2	 3} } { {1 2 3  } {  1  2  3   4  }  } }
+    photo1 data -format {default -colorformat rgba}
+} -cleanup {
+    imageCleanup
+} -result {{#010203ff #010203ff} {#010203ff #01020304}}
+test imgListFormat-7.10 {ParseColorAsList: list format, string rep} -setup {
+	image create photo photo1
+} -body {
+	photo1 put {{"111 222 33 44"}}
+	photo1 get 0 0 -withalpha
+} -cleanup {
+	imageCleanup
+} -result {111 222 33 44}
+
+test imgListFormat-8.1 {ParseColorAsHex: RGB format} -setup {
+    image create photo photo1
+} -body {
+    photo1 put {{#010 #001100}}
+    photo1 data
+} -cleanup {
+    imageCleanup
+} -result {{#001100 #001100}}
+test imgListFormat-8.2 {ParseColorAsHex: invalid hex digit} -setup {
+    image create photo photo1
+} -body {
+    photo1 put {#ABCD #ABCZ}
+} -cleanup {
+    imageCleanup
+} -returnCodes error -result {invalid color name "#ABCZ"}
+test imgListFormat-8.3 {ParseColorAsHex: RGB with suffix, 8 chars} -setup {
+    image create photo photo1
+} -body {
+    photo1 put {{#FFfFFf #AbCdef#0}}
+    photo1 data
+} -cleanup {
+    imageCleanup
+} -result {{#ffffff #abcdef}}
+test imgListFormat-8.4 {ParseColor: valid #RGBA color} -setup {
+    image create photo photo1
+} -body {
+    photo1 put {{#9bd5020d #7acF}}
+    list [photo1 get 0 0 -withalpha] [photo1 get 1 0 -withalpha]
+} -cleanup {
+    imageCleanup
+} -result {{155 213 2 13} {119 170 204 255}}
+
+test imgListFormat-9.1 {ParseColorAsStandard:
+        Tk color, valid suffixes} -setup {
+    image create photo photo1
+    set result {}
+} -body {
+    photo1 put {{blue@0.711 #114433#C} {#8D4#1A magenta}}
+    lappend result [photo1 get 0 0 -withalpha]
+    lappend result [photo1 get 1 0 -withalpha]
+    lappend result [photo1 get 0 1 -withalpha]
+    lappend result [photo1 get 1 1 -withalpha]
+    set result
+} -cleanup {
+    unset result
+    imageCleanup
+} -result {{0 0 255 181} {17 68 51 204} {136 221 68 26} {255 0 255 255}}
+test imgListFormat-9.2 {ParseColorAsStandard:
+        Tk color with and w/o suffixes} -setup {
+    image create photo photo1
+    set result {}
+} -body {
+    photo1 put {{#52D8a0 #2B5} {#E47@0.01 maroon#4}}
+    lappend result [photo1 get 0 0 -withalpha]
+    lappend result [photo1 get 1 0 -withalpha]
+    lappend result [photo1 get 0 1 -withalpha]
+    lappend result [photo1 get 1 1 -withalpha]
+    set result
+} -cleanup {
+    unset result
+    imageCleanup
+} -result {{82 216 160 255} {34 187 85 255} {238 68 119 3} {128 0 0 68}}
+test imgListFormat-9.3 {ParseColorAsStandard: wrong digit count} -setup {
+    image create photo photo1
+} -body {
+    photo1 put {{#000 #00}}
+} -returnCodes error -result {invalid color name "#00"}
+test imgListFormat-9.4 {ParseColorAsStandard: @A suffix, not a float} -setup {
+    image create photo photo1
+} -body {
+    photo1 put {{blue@0.5 blue@bogus}}
+} -cleanup {
+    imageCleanup
+} -returnCodes error -result \
+    {invalid alpha suffix "@bogus": expected floating-point value}
+test imgListFormat-9.5 {ParseColorAsStandard: @A, value too low} -setup {
+    image create photo photo1
+} -body {
+    photo1 put {green@.1 green@-0.1}
+} -cleanup {
+    imageCleanup
+} -returnCodes error -result \
+    {invalid alpha suffix "@-0.1": value must be in the range from 0 to 1}
+test imgListFormat-9.6 {ParseColorAsStandard: @A, value too high} -setup {
+    image create photo photo1
+} -body {
+    photo1 put {#000000@0 #000000@1.0001}
+} -cleanup {
+    imageCleanup
+} -returnCodes error -result \
+    {invalid alpha suffix "@1.0001": value must be in the range from 0 to 1}
+test imgListFormat-9.7 {ParseColorAsStandard: @A suffix, edge values} -setup {
+    imageCleanup
+    image create photo photo1
+} -body {
+    photo1 put {{yellow@1e-22 yellow@0.12352941 yellow@0.12352942 \
+		 yellow@0.9999999}}
+    list [photo1 get 0 0 -withalpha] [photo1 get 1 0 -withalpha] \
+	[photo1 get 2 0 -withalpha] [photo1 get 3 0 -withalpha]
+} -cleanup {
+    imageCleanup
+} -result {{255 255 0 0} {255 255 0 31} {255 255 0 32} {255 255 0 255}}
+test imgListFormat-9.8 {ParseColorAsStandard: # suffix, no hex digits} -setup {
+    image create photo photo1
+} -body {
+    photo1 put {{black#f} {black#}}
+} -cleanup {
+    imageCleanup
+} -returnCodes error -result {invalid alpha suffix "#"}
+test imgListFormat-9.9 {ParseColorAsStandard:
+        '#' suffix, too many digits} -setup {
+    image create photo photo1
+} -body {
+    photo1 put {{#ABC#12 #ABC#123}}
+} -cleanup {
+    imageCleanup
+} -returnCodes error -result {invalid alpha suffix "#123"}
+test imgListFormat-9.10 {ParseColorAsStandard:
+        invalid digit in #X suffix} -setup {
+    image create photo photo1
+} -body {
+    photo1 put {#000#a #000#g}
+} -cleanup {
+    imageCleanup
+} -returnCodes error -result {invalid alpha suffix "#g": expected hex digit}
+test imgListFormat-9.11 {ParseColorAsStandard:
+        invalid digit in #XX suffix} -setup {
+    image create photo photo1
+} -body {
+    photo1 put {green#2 green#2W}
+} -cleanup {
+    imageCleanup
+} -returnCodes error -result {invalid alpha suffix "#2W": expected hex digit}
+test imgListFormat-9.12 {ParseColorAsStandard:
+        invalid color: not a hex digit} -setup {
+    image create photo photo1
+} -body {
+    photo1 put {#ABCDEF@.99 #ABCDEG@.99}
+} -cleanup {
+    imageCleanup
+} -returnCodes error -result {invalid color name "#ABCDEG@.99"}
+test imgListFormat-9.13 {ParseColorAsStandard: suffix not allowed #1} -setup {
+    image create photo photo1
+} -body {
+    photo1 put {#ABC@.5 #ABCD@0.5}
+} -cleanup {
+    imageCleanup
+} -returnCodes error -result {invalid color name "#ABCD@0.5"}
+test imgListFormat-9.14 {ParseColorAsStandard: suffix not allowed #2} -setup {
+    image create photo photo1
+} -body {
+    photo1 put {#1111 #1111#1}
+} -cleanup {
+    imageCleanup
+} -returnCodes error -result {invalid color name "#1111#1"}
+
+
+# ---------------------------------------------------------------------
+
+imageFinish
+
+# cleanup
+cleanupTests
+return

Index: tests/imgPNG.test
==================================================================
--- tests/imgPNG.test
+++ tests/imgPNG.test
@@ -1101,10 +1101,21 @@
     $i put $encoded(MultiIDAT)
     return [image width $i]x[image height $i]
 } -cleanup {
     image delete $i
 } -result 223x212
+
+test imgPNG-3.1 {reading image with unknown ancillary chunk - bug [1c659ef0f1]} -setup {
+    set fileName [file join [file dirname [info script]] iDOT.png]
+} -body {
+    # the image contains an unknown chunk iDOT
+    # since the name of this chunk starts with a lowercase letter,
+    # it's an ancillary chunk that shall not trigger an error
+    catch {set i [image create photo -file $fileName]}
+} -cleanup {
+    image delete $i
+} -result {0}
 
 }
 namespace delete png
 imageFinish
 cleanupTests

Index: tests/imgPhoto.test
==================================================================
--- tests/imgPhoto.test
+++ tests/imgPhoto.test
@@ -7,19 +7,87 @@
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # Copyright (c) 2002-2008 Donal K. Fellows
 # All rights reserved.
 #
 # Author: Paul Mackerras (paulus@cs.anu.edu.au)
+
+#
+# This file is somewhat caothic: the order of the tests does not
+# really follow the order of the corresponding functions in
+# tkImgPhoto.c. Probably, because early versions had only a few tests
+# and over time test cases were added in bits and pieces.
+# To be noted, also, that this file is not complete: large portions of
+# code in tkImgPhoto.c have no test coverage.
+#
+# To help keeping the overview, the table below lists where to find
+# tests for each of the functions in tkImgPhoto.c. The function are
+# listed in the order as they appear in the source file.
+#
+
+#
+# Function name                         Tests for function
+#--------------------------------------------------------------------------
+# PhotoFormatThreadExitProc             no tests
+# Tk_Create*PhotoImageFormat            no tests
+# ImgPhotoCreate                        imgPhoto-2.*
+# ImgPhotoCmd                           imgPhoto-4.*, imgPhoto-17.*
+# GetExtension:                         no tests
+# ParseSubcommandOptions:               imgPhoto-1.*
+# ImgPhotoConfigureMaster:              imgPhoto-3.*, imgPhoto-15.*
+# toggleComplexAlphaIfNeeded:           no tests
+# ImgPhotoDelete:                       imgPhoto-8.*
+# ImgPhotoCmdDeleteProc:                imgPhoto-9.*
+# ImgPhotoSetSize:                      no tests
+# MatchFileFormat:                      imgPhoto-18.*
+# MatchSringFormat:                     imgPhoto-19.*
+# Tk_FindPhoto:                         imgPhoto-11.*
+# Tk_PhotoPutBlock:                     imgPhoto-10.*, imgPhoto-16.*
+# Tk_PhotoPutZoomedBlock:               imgPhoto-12.*
+# Tk_DitherPhoto:                       no tets
+# Tk_PhotoBlank:                        no tests
+# Tk_PhotoExpand:                       no tests
+# Tk_PhotoGetSize:                      no tests
+# Tk_PhotoSetSize:                      no tests
+# TkGetPhotoValidRegion:                no tests
+# ImgGetPhoto:                          no tests
+# Tk_PhotoGetImage                      no tests
+# ImgPostscriptPhoto                    no tests
+# Tk_PhotoPutBlock_NoComposite          no tests, probably none needed
+# Tk_PhotoPutZoomedBlock_NoComposite    no tests, probably none needed
+# Tk_PhotoExpand_Panic                  no tests, probably none needed
+# Tk_PhotoPutBlock_Panic                no tests, probably none needed
+# Tk_PhotoPutZoomedBlock_Panic          no tests, probably none needed
+# Tk_PhotoSetSize_Panic                 no tests, probably none needed
+#--------------------------------------------------------------------------
+#
+
+#
+# Some tests are not specific to a function in tkImgPhoto.c. They are:
+#
+
+#
+# Test name(s)          Description
+#--------------------------------------------------------------------------
+# imgPhoto-5.*          Do not really belong to this file. ImgPhotoGet and
+#                       ImgPhotoFree are defined in tkImgPhInstance.c.
+# imgPhoto-6.*          Do not really belong to this file. ImgPhotoDisplay
+#                       is defined in tkImgPhInstance.c.
+# imgPhoto-7.*          Do not really belong to this file. ImgPhotoFree is
+#                       defined in tkImgPhInstance.c.
+# imgPhoto-13.*         Tests for separation in different interpreters
+# imgPhoto-14.*         Test GIF format. Would belong to imgGIF.test
+#                       - which does not exist.
+#
 
 package require tcltest 2.2
 namespace import ::tcltest::*
 tcltest::configure {*}$argv
 tcltest::loadTestedCommands
-
-# Used for 4.65 - 4.73 tests
-# Now for some heftier testing, checking that setting and resetting of pixels'
-# transparency status doesn't "leak" with any one-off errors.
+
+#
+# Used for imgPhoto-4.65 - imgPhoto-4.73
+#
 proc foreachPixel {img xVar yVar script} {
     upvar 1 $xVar x $yVar y
     set width [image width $img]
     set height [image height $img]
     for {set x 0} {$x<$width} {incr x} {
@@ -56,12 +124,21 @@
 } README-imgPhoto]
 
 # find the teapot.ppm file for use in these tests
 set teapotPhotoFile [file join [file dirname [info script]] teapot.ppm]
 testConstraint hasTeapotPhoto [file exists $teapotPhotoFile]
+# let's see if we have the semi-transparent one as well
+set transpTeapotPhotoFile [file join [file dirname [info script]] teapotTransparent.png]
+testConstraint hasTranspTeapotPhoto [file exists $transpTeapotPhotoFile]
+
+proc base64ok {} {
+    expr {
+        ![catch {package require base64}]
+    }
+}
 
-# ----------------------------------------------------------------------
+testConstraint base64PackageNeeded [base64ok]
 
 test imgPhoto-1.1 {options for photo images} -body {
     image create photo photo1 -width 79 -height 83
     list [photo1 cget -width] [photo1 cget -height] \
 	[image width photo1] [image height photo1]
@@ -107,11 +184,27 @@
     image create photo -data
 } -returnCodes error -result {value for "-data" missing}
 test imgPhoto-1.11 {options for photo images - error case} -body {
     image create photo photo1 -format
 } -returnCodes error -result {value for "-format" missing}
-
+test imgPhoto-1.12 {option -alpha, normal use} -setup {
+    image create photo photo1
+} -body {
+    photo1 put "white" -to 0 0
+    photo1 transparency get 0 0 -alpha
+} -cleanup {
+    imageCleanup
+} -result {255}
+test imgPhoto-1.13 {option -withalpha, normal use} -setup {
+    image create photo photo1
+} -body {
+    photo1 put {{blue green}}
+    photo1 get 1 0 -withalpha
+} -cleanup {
+    imageCleanup
+} -result {0 128 0 255}
+
 test imgPhoto-2.1 {ImgPhotoCreate procedure} -setup {
     imageCleanup
 } -body {
     catch {image create photo -blah blah}
     imageNames
@@ -130,30 +223,30 @@
 #     image create photo photo2 -width 10 -height 10
 #     catch {image create photo photo2 -file bogus.img} msg
 #     photo1 copy photo2
 #     set msg
 # } {couldn't open "bogus.img": no such file or directory}
-
+
 test imgPhoto-3.1 {ImgPhotoConfigureMaster procedure} -constraints {
-    hasTeapotPhoto 
+    hasTeapotPhoto
 } -body {
     image create photo photo1 -file $teapotPhotoFile
     photo1 configure -file $teapotPhotoFile
 } -cleanup {
     image delete photo1
 } -result {}
 test imgPhoto-3.2 {ImgPhotoConfigureMaster procedure} -constraints {
-    hasTeapotPhoto 
+    hasTeapotPhoto
 } -body {
     image create photo photo1 -file $teapotPhotoFile
     list [catch {photo1 configure -file bogus} err] [string tolower $err] \
 	[image width photo1] [image height photo1]
 } -cleanup {
     image delete photo1
 } -result {1 {couldn't open "bogus": no such file or directory} 256 256}
 test imgPhoto-3.3 {ImgPhotoConfigureMaster procedure} -constraints {
-    hasTeapotPhoto 
+    hasTeapotPhoto
 } -setup {
     destroy .c
     pack [canvas .c]
     update
 } -body {
@@ -166,11 +259,44 @@
     list [image width photo1] [image height photo1] [.c bbox photo1.1] [.c bbox photo1.2]
 } -cleanup {
     destroy .c
     image delete photo1
 } -result {256 256 {10 10 266 266} {300 10 556 266}}
-
+test imgPhoto-3.4 {ImgPhotoConfigureMaster: -data <ppm>} -constraints {
+    hasTeapotPhoto
+} -setup {
+    image create photo photo1 -file $teapotPhotoFile
+    image create photo photo2
+} -body {
+    photo2 configure -data [photo1 data -format ppm -from 100 100 120 120]
+    list [image width photo2] [image height photo2]
+} -cleanup {
+    imageCleanup
+} -result {20 20}
+test imgPhoto-3.5 {ImgPhotoConfigureMaster: -data <png>} -constraints {
+    hasTeapotPhoto
+} -setup {
+    image create photo photo1 -file $teapotPhotoFile
+    image create photo photo2
+} -body {
+    photo2 configure -data [photo1 data -format png -from 120 120 140 140]
+    list [image width photo2] [image height photo2]
+} -cleanup {
+    imageCleanup
+} -result {20 20}
+test imgPhoto-3.6 {ImgPhotoConfigureMaster: -data <default>} -constraints {
+    hasTeapotPhoto
+} -setup {
+    image create photo photo1 -file $teapotPhotoFile
+    image create photo photo2
+} -body {
+    photo2 configure -data [photo1 data -from 80 90 100 110]
+    list [image width photo2] [image height photo2]
+} -cleanup {
+    imageCleanup
+} -result {20 20}
+
 test imgPhoto-4.1 {ImgPhotoCmd procedure} -setup {
     image create photo photo1
 } -body {
     photo1
 } -returnCodes error -cleanup {
@@ -233,11 +359,11 @@
     photo1 configure -palette {} -gamma
 } -cleanup {
     image delete photo1
 } -returnCodes error -result {value for "-gamma" missing}
 test imgPhoto-4.10 {ImgPhotoCmd procedure: copy option} -constraints {
-    hasTeapotPhoto 
+    hasTeapotPhoto
 } -setup {
     image create photo photo1
     image create photo photo2 -width 25 -height 30
 } -body {
     image create photo photo2 -file $teapotPhotoFile
@@ -276,11 +402,11 @@
     photo1 copy photo2 -from -to
 } -returnCodes error -cleanup {
     image delete photo1 photo2
 } -result {the "-from" option requires one to four integer values}
 test imgPhoto-4.15 {ImgPhotoCmd procedure: copy option} -constraints {
-    hasTeapotPhoto 
+    hasTeapotPhoto
 } -setup {
     image create photo photo1
     image create photo photo2 -file $teapotPhotoFile
 } -body {
     photo1 copy photo2
@@ -288,11 +414,11 @@
     list [image width photo1] [image height photo1] [photo1 get 20 10]
 } -cleanup {
     image delete photo1 photo2
 } -result {60 50 {215 154 120}}
 test imgPhoto-4.16 {ImgPhotoCmd procedure: copy option} -constraints {
-    hasTeapotPhoto 
+    hasTeapotPhoto
 } -setup {
     image create photo photo1
     image create photo photo2 -file $teapotPhotoFile
 } -body {
     photo1 copy photo2 -from 60 120 0 70 -to 20 50
@@ -299,11 +425,11 @@
     list [image width photo1] [image height photo1] [photo1 get 40 80]
 } -cleanup {
     image delete photo1 photo2
 } -result {80 100 {19 92 192}}
 test imgPhoto-4.17 {ImgPhotoCmd procedure: copy option} -constraints {
-    hasTeapotPhoto 
+    hasTeapotPhoto
 } -setup {
     image create photo photo1
     image create photo photo2 -file $teapotPhotoFile
 } -body {
     photo1 copy photo2 -from 0 120 60 70 -to 0 0 100 100
@@ -310,11 +436,11 @@
     list [image width photo1] [image height photo1] [photo1 get 80 60]
 } -cleanup {
     image delete photo1 photo2
 } -result {100 100 {215 154 120}}
 test imgPhoto-4.18 {ImgPhotoCmd procedure: copy option} -constraints {
-    hasTeapotPhoto 
+    hasTeapotPhoto
 } -setup {
     image create photo photo1
     image create photo photo2 -file $teapotPhotoFile
 } -body {
     photo1 copy photo2 -from 60 70 0 120 -zoom 2
@@ -332,11 +458,11 @@
     list [image width photo1] [image height photo1] [photo1 get 100 50]
 } -cleanup {
     image delete photo1 photo2
 } -result {120 100 {169 99 47}}
 test imgPhoto-4.20 {ImgPhotoCmd procedure: copy option} -constraints {
-    hasTeapotPhoto 
+    hasTeapotPhoto
 } -setup {
     image create photo photo1
     image create photo photo2 -file $teapotPhotoFile
 } -body {
     photo1 copy photo2 -from 20 20 200 180 -subsample 2 -shrink
@@ -343,11 +469,11 @@
     list [image width photo1] [image height photo1] [photo1 get 50 30]
 } -cleanup {
     image delete photo1 photo2
 } -result {90 80 {207 146 112}}
 test imgPhoto-4.21 {ImgPhotoCmd procedure: copy option} -constraints {
-    hasTeapotPhoto 
+    hasTeapotPhoto
 } -setup {
     image create photo photo1
     image create photo photo2 -file $teapotPhotoFile
 } -body {
     photo1 copy photo2
@@ -365,20 +491,23 @@
     photo1 copy photo2 -from 0 0 10 10 -shrink
     lappend result [image width photo1] [image height photo1]
 } -cleanup {
     image delete photo1 photo2
 } -result {256 256 49 51 49 51 49 51 10 51 10 10}
+# tests for <imageName> data: imgPhoto-4.
 test imgPhoto-4.22 {ImgPhotoCmd procedure: get option} -constraints {
-    hasTeapotPhoto 
+    hasTranspTeapotPhoto
 } -setup {
     image create photo photo1
 } -body {
-    photo1 read $teapotPhotoFile
-    list [photo1 get 100 100] [photo1 get 150 100] [photo1 get 100 150]
+    photo1 read $transpTeapotPhotoFile
+    list [photo1 get 100 100 -withalpha] \
+	[photo1 get 150 100 -withalpha] \
+	[photo1 get 100 150] [photo1 get 150 150]
 } -cleanup {
     image delete photo1
-} -result {{169 117 90} {172 115 84} {35 35 35}}
+} -result {{175 71 0 162} {179 73 0 168} {14 8 0} {0 0 0}}
 test imgPhoto-4.23 {ImgPhotoCmd procedure: get option} -setup {
     image create photo photo1
 } -body {
     photo1 get 256 0
 } -cleanup {
@@ -392,14 +521,16 @@
     image delete photo1
 } -returnCodes error -result {photo1 get: coordinates out of range}
 test imgPhoto-4.25 {ImgPhotoCmd procedure: get option} -setup {
     image create photo photo1
 } -body {
-    photo1 get
+    photo1 get 0
 } -cleanup {
     image delete photo1
-} -returnCodes error -result {wrong # args: should be "photo1 get x y"}
+} -returnCodes error -result \
+    {wrong # args: should be "photo1 get x y ?-withalpha?"}
+# more test for image get: 4.101-4.102
 test imgPhoto-4.26 {ImgPhotoCmd procedure: put option} -setup {
     image create photo photo1
 } -body {
     photo1 put
 } -returnCodes error -cleanup {
@@ -409,35 +540,41 @@
     image create photo photo1
 } -body {
     photo1 put {{white} {white white}}
 } -returnCodes error -cleanup {
     image delete photo1
-} -result {all elements of color list must have the same number of elements}
+} -result {couldn't recognize image data}
 test imgPhoto-4.28 {ImgPhotoCmd procedure: put option} -setup {
     image create photo photo1
 } -body {
     photo1 put {{blahgle}}
 } -cleanup {
     image delete photo1
-} -returnCodes error -result {can't parse color "blahgle"}
+} -returnCodes error -result {couldn't recognize image data}
 test imgPhoto-4.29 {ImgPhotoCmd procedure: put option} -setup {
     image create photo photo1
 } -body {
-    photo1 put -to 10 10 20 20 {{white}}
+    # SB: odd thing - this test passed with tk 8.6.6, even if the data
+    # is in the wrong position:
+    #photo1 put -to 10 10 20 20 {{white}}
+
+    # this is how it's supposed to be:
+    photo1 put {{white}} -to 10 10 20 20
     photo1 get 19 19
 } -cleanup {
     image delete photo1
 } -result {255 255 255}
+# more tests for image put: 4.90-4.100
 test imgPhoto-4.30 {ImgPhotoCmd procedure: read option} -setup {
     image create photo photo1
 } -body {
     photo1 read
 } -returnCodes error -cleanup {
     image delete photo1
 } -result {wrong # args: should be "photo1 read fileName ?-option value ...?"}
 test imgPhoto-4.31 {ImgPhotoCmd procedure: read option} -constraints {
-    hasTeapotPhoto 
+    hasTeapotPhoto
 } -setup {
     image create photo photo1
 } -body {
     photo1 read $teapotPhotoFile -zoom 2
 } -returnCodes error -cleanup {
@@ -449,11 +586,11 @@
     list [catch {photo1 read bogus} err] [string tolower $err]
 } -cleanup {
     image delete photo1
 } -result {1 {couldn't open "bogus": no such file or directory}}
 test imgPhoto-4.33 {ImgPhotoCmd procedure: read option} -constraints {
-    hasTeapotPhoto 
+    hasTeapotPhoto
 } -setup {
     image create photo photo1
 } -body {
     photo1 read $teapotPhotoFile -format bogus
 } -cleanup {
@@ -465,21 +602,21 @@
     photo1 read $README
 } -returnCodes error -cleanup {
     image delete photo1
 } -result [subst {couldn't recognize data in image file "$README"}]
 test imgPhoto-4.35 {ImgPhotoCmd procedure: read option} -constraints {
-    hasTeapotPhoto 
+    hasTeapotPhoto
 } -setup {
     image create photo photo1
 } -body {
     photo1 read $teapotPhotoFile
     list [image width photo1] [image height photo1] [photo1 get 120 120]
 } -cleanup {
     image delete photo1
 } -result {256 256 {161 109 82}}
 test imgPhoto-4.36 {ImgPhotoCmd procedure: read option} -constraints {
-    hasTeapotPhoto 
+    hasTeapotPhoto
 } -setup {
     image create photo photo1
 } -body {
     photo1 read $teapotPhotoFile -from 0 70 60 120 -to 10 10 -shrink
     list [image width photo1] [image height photo1] [photo1 get 29 19]
@@ -506,10 +643,11 @@
 } -body {
     photo1 write teapot.tmp -format bogus
 } -cleanup {
     image delete photo1
 } -returnCodes error -result {image file format "bogus" is unknown}
+# more tests on "imageName write": imgPhoto-17.*
 test imgPhoto-4.40 {ImgPhotoCmd procedure: transparency option} -setup {
     image create photo photo1
 } -body {
     photo1 transparency
 } -returnCodes error -cleanup {
@@ -519,25 +657,25 @@
     image create photo photo1
 } -body {
     photo1 transparency get
 } -returnCodes error -cleanup {
     image delete photo1
-} -result {wrong # args: should be "photo1 transparency get x y"}
+} -result {wrong # args: should be "photo1 transparency get x y ?-option?"}
 test imgPhoto-4.42 {ImgPhotoCmd procedure: transparency get option} -setup {
     image create photo photo1
 } -body {
     photo1 transparency get 0
 } -returnCodes error -cleanup {
     image delete photo1
-} -result {wrong # args: should be "photo1 transparency get x y"}
+} -result {wrong # args: should be "photo1 transparency get x y ?-option?"}
 test imgPhoto-4.43 {ImgPhotoCmd procedure: transparency get option} -setup {
     image create photo photo1
 } -body {
-    photo1 transparency get 0 0 0
+    photo1 transparency get 0 0 0 -alpha
 } -returnCodes error -cleanup {
     image delete photo1
-} -result {wrong # args: should be "photo1 transparency get x y"}
+} -result {wrong # args: should be "photo1 transparency get x y ?-option?"}
 test imgPhoto-4.44 {ImgPhotoCmd procedure: transparency get option} -setup {
     image create photo photo1
 } -body {
     photo1 transparency get bogus 0
 } -cleanup {
@@ -593,38 +731,43 @@
     photo1 blank
     photo1 transparency get 0 0
 } -cleanup {
     image delete photo1
 } -result 1
+# more tests for transparency get: 4.65, 4.66, 4.76-4.81
 test imgPhoto-4.52 {ImgPhotoCmd procedure: transparency set option} -setup {
     image create photo photo1
 } -body {
     photo1 transparency set
 } -returnCodes error -cleanup {
     image delete photo1
-} -result {wrong # args: should be "photo1 transparency set x y boolean"}
+} -result \
+    {wrong # args: should be "photo1 transparency set x y newVal ?-option?"}
 test imgPhoto-4.53 {ImgPhotoCmd procedure: transparency set option} -setup {
     image create photo photo1
 } -body {
     photo1 transparency set 0
 } -returnCodes error -cleanup {
     image delete photo1
-} -result {wrong # args: should be "photo1 transparency set x y boolean"}
+} -result \
+    {wrong # args: should be "photo1 transparency set x y newVal ?-option?"}
 test imgPhoto-4.54 {ImgPhotoCmd procedure: transparency set option} -setup {
     image create photo photo1
 } -body {
     photo1 transparency set 0 0
 } -returnCodes error -cleanup {
     image delete photo1
-} -result {wrong # args: should be "photo1 transparency set x y boolean"}
+} -result \
+    {wrong # args: should be "photo1 transparency set x y newVal ?-option?"}
 test imgPhoto-4.55 {ImgPhotoCmd procedure: transparency set option} -setup {
     image create photo photo1
 } -body {
-    photo1 transparency set 0 0 0 0
+    photo1 transparency set 0 0 0 0 -alpha
 } -returnCodes error -cleanup {
     image delete photo1
-} -result {wrong # args: should be "photo1 transparency set x y boolean"}
+} -result \
+    {wrong # args: should be "photo1 transparency set x y newVal ?-option?"}
 test imgPhoto-4.56 {ImgPhotoCmd procedure: transparency set option} -setup {
     image create photo photo1
 } -body {
     photo1 transparency set bogus 0 0
 } -cleanup {
@@ -637,10 +780,11 @@
 } -cleanup {
     image delete photo1
 } -returnCodes error -result {expected integer but got "bogus"}
 test imgPhoto-4.58 {ImgPhotoCmd procedure: transparency set option} -setup {
     image create photo photo1
+    photo1 put blue
 } -body {
     photo1 transparency set 0 0 bogus
 } -cleanup {
     image delete photo1
 } -returnCodes error -result {expected boolean value but got "bogus"}
@@ -688,10 +832,11 @@
     photo1 transparency set 0 0 true
     photo1 transparency get 0 0
 } -cleanup {
     image delete photo1
 } -result 1
+# more tests for transparency set: 4.67, 4.68, 4.82-4.89
 # Now for some heftier testing, checking that setting and resetting of pixels'
 # transparency status doesn't "leak" with any one-off errors.
 test imgPhoto-4.65 {ImgPhotoCmd procedure: transparency get option} -setup {
     image create photo photo1
 } -body {
@@ -795,13 +940,446 @@
     photo1 copy photo2 -to 1 1 -compositingrule set
     checkImgTrans photo1
 } -cleanup {
     image delete photo1 photo2
 } -result {0,2 1,1 2,0}
-
+test imgPhoto-4.74 {ImgPhotoCmd procedure: put option error handling} -setup {
+    image create photo photo1
+} -body {
+    photo1 put {{white}} -to 10 10 20 20 {{white}}
+} -cleanup {
+    image delete photo1
+} -returnCodes 1 -result {wrong # args: should be "photo1 put data ?-option value ...?"}
+test imgPhoto-4.75 {<photo> read command: filename starting with '-'} -constraints {
+    hasTeapotPhoto
+} -body {
+    file copy -force $teapotPhotoFile -teapotPhotoFile
+    image create photo photo1
+    photo1 read -teapotPhotoFile
+} -cleanup {
+    image delete photo1
+    file delete ./-teapotPhotoFile
+} -result {}
+test imgPhoto-4.76 {ImgPhotoCmd procedure: copy to same image} -constraints {
+    hasTeapotPhoto
+} -setup {
+    imageCleanup
+    image create photo photo1 -file $teapotPhotoFile
+} -body {
+    # non-regression test for bug [5239fd749b] - shall just not crash
+    photo1 copy photo1 -to 0 0 2000 1000
+    photo1 copy photo1 -subsample 2 2 -shrink
+} -cleanup {
+    imageCleanup
+} -result {}
+test imgPhoto-4.76 {ImgPhotoCmd, transparancy get: too many options} -setup {
+    image create photo photo1
+} -body {
+    photo1 put white -to 0 0 1 1
+    photo1 transparency get 0 0 -alpha -bogus
+} -cleanup {
+    imageCleanup
+} -returnCodes error -result \
+    {wrong # args: should be "photo1 transparency get x y ?-option?"}
+test imgPhoto-4.77 {ImgPhotoCmd, transparency get: invalid option} -setup {
+    image create photo photo1
+} -body {
+    photo1 put white -to 0 0 1 1
+    photo1 transparency get 0 0 -bogus
+} -cleanup {
+    imageCleanup
+} -returnCodes error -result \
+    {unrecognized option "-bogus": must be -alpha}
+test imgPhoto-4.78 {ImgPhotoCmd, transparency get: normal use} -setup {
+    image create photo photo1
+} -body {
+    photo1 put white -to 0 0 1 1
+    set result [photo1 transparency get 0 0]
+    lappend result [photo1 transparency get 0 0 -alpha]
+} -cleanup {
+    imageCleanup
+} -result {0 255}
+test imgPhoto-4.79 {ImgPhotoCmd, transparency get: no option} -constraints {
+    hasTranspTeapotPhoto
+} -setup {
+    image create photo photo1 -file $transpTeapotPhotoFile
+    set result {}
+} -body {
+    set pixelCoords {{156 239} {76 207} {153 213} {139 43} {75 112}}
+    foreach coord $pixelCoords {
+	lappend result [photo1 transparency get {*}$coord]
+    }
+    set result
+} -cleanup {
+    imageCleanup
+} -result {0 1 0 0 0}
+# test imgPhoto-4.80: deleted (was transparency get: -boolean)
+test imgPhoto-4.81 {ImgPhotoCmd, transparency get: -alpha} -constraints {
+    hasTranspTeapotPhoto
+} -setup {
+    image create photo photo1 -file $transpTeapotPhotoFile
+    set result {}
+} -body {
+    set pixelCoords {{156 239} {76 207} {153 213} {139 43} {75 112}}
+    foreach coord $pixelCoords {
+	lappend result [photo1 transparency get {*}$coord -alpha]
+    }
+    set result
+} -cleanup {
+    imageCleanup
+} -result {255 0 1 254 206}
+test imgPhoto-4.82 {ImgPhotoCmd, transparency set: too many opts} -setup {
+    image create photo photo1
+} -body {
+    photo1 transparency set 0 0 -alpha -bogus 1
+} -cleanup {
+    imageCleanup
+} -returnCodes error -result \
+    {wrong # args: should be "photo1 transparency set x y newVal ?-option?"}
+test imgPhoto-4.83 {ImgPhotoCmd, transparency set: invalid opt} -setup {
+    image create photo photo1 -data black
+} -body {
+    photo1 transparency set 0 0 0 -bogus
+} -cleanup {
+    imageCleanup
+} -returnCodes error -result \
+    {unrecognized option "-bogus": must be -alpha}
+test imgPhoto-4.84 {ImgPhotoCmd, transparency set: invalid newVal} -setup {
+    image create photo photo1 -data white
+} -body {
+    photo1 transparency set 0 0 bogus -alpha
+} -cleanup {
+    imageCleanup
+} -returnCodes error -result {expected integer but got "bogus"}
+test imgPhoto-4.85 {ImgPhotoCmd, transparency set: invalid newVal} -setup {
+    image create photo photo1 -data red
+} -body {
+    photo1 transparency set 0 0 -1 -alpha
+} -returnCodes error -result \
+    {invalid alpha value "-1": must be integer between 0 and 255}
+test imgPhoto-4.86 {ImgPhotoCmd, transparency set: invalid newVal} -setup {
+    image create photo photo1 -data green
+} -body {
+    photo1 transparency set 0 0 256 -alpha
+} -cleanup {
+    imageCleanup
+} -returnCodes error -result \
+    {invalid alpha value "256": must be integer between 0 and 255}
+test imgPhoto-4.87 {ImgPhotoCmd, transparency set: no opt} -setup {
+    image create photo photo1
+} -body {
+    photo1 put white -to 0 0 2 1
+    photo1 transparency set 0 0 0
+    photo1 transparency set 1 0 1
+    list [photo1 transparency get 0 0 -alpha] \
+        [photo1 transparency get 1 0 -alpha]
+} -cleanup {
+    imageCleanup
+} -result {255 0}
+# deleted: test imgPhoto-4.88 {ImgPhotoCmd, transparency set: -boolean}
+test imgPhoto-4.89 {ImgPhotoCmd, transparency set: -alpha} -setup {
+    image create photo photo1
+} -body {
+    photo1 put white -to 0 0 2 2
+    photo1 transparency set 0 0 0 -alpha
+    photo1 transparency set 1 0 1 -alpha
+    photo1 transparency set 0 1 254 -alpha
+    photo1 transparency set 1 1 255 -alpha
+    list [photo1 transparency get 0 0] [photo1 transparency get 1 0] \
+	[photo1 transparency get 0 1] [photo1 transparency get 1 1]
+} -cleanup {
+    imageCleanup
+} -result {1 0 0 0}
+test imgPhoto-4.90 {ImgPhotoCmd put: existing but not allowed opt} -setup {
+    image create photo photo1
+} -body {
+    photo1 put yellow -from 0 0 1 1
+} -cleanup {
+    imageCleanup
+} -returnCodes error -result \
+    {unrecognized option "-from": must be -format, or -to}
+test imgPhoto-4.91 {ImgPhotoCmd put: invalid option} -setup {
+    image create photo photo1
+} -body {
+    photo1 put {{0 1 2 3}} -bogus x
+} -returnCodes error -result \
+    {unrecognized option "-bogus": must be -format, or -to}
+test imgPhoto-4.92 {ImgPhotocmd put: missing data} -setup {
+    image create photo photo1
+} -body {
+    photo1 put -to 0 0
+} -returnCodes error -result \
+    {wrong # args: should be "photo1 put data ?-option value ...?"}
+test imgPhoto-4.93 {ImgPhotoCmd put: data in ppm format} -constraints {
+    hasTeapotPhoto
+} -setup {
+    image create photo photo1 -file $teapotPhotoFile
+    image create photo photo2
+} -body {
+    set imgdata [photo1 data -format ppm]
+    photo2 put $imgdata -format ppm
+    set result {}
+    if {[image width photo1] != [image width photo2] \
+            || [image height photo1] != [image height photo2]} {
+        lappend result [list [image width photo2] [image height photo2]]
+    } else {
+        lappend result 1
+    }
+    foreach point {{206 125} {67 12} {13 46} {19 184}} {
+        if {[photo1 get {*}$point] ne [photo2 get {*}$point]} {
+            lappend result [photo2 get {*}$point]
+        } else {
+            lappend result 1
+        }
+    }
+    set result
+} -cleanup {
+    imageCleanup
+} -result {1 1 1 1 1}
+test imgPhoto-4.94 {ImgPhotoCmd put: unknown format} -setup {
+    image create photo photo1
+} -body {
+    photo1 put {no real data} -format bogus
+} -cleanup {
+    imageCleanup
+} -returnCodes error -result {image format "bogus" is not supported}
+test imgPhoto-4.95 {ImgPhotoCmd put: default fmt, invalid data} -setup {
+    image create photo photo1
+} -body {
+    photo1 put {{red green blue} {red " blue}}
+    #"
+} -cleanup {
+    imageCleanup
+} -returnCodes error -result {couldn't recognize image data}
+test imgPhoto-4.96 {ImgPhotoCmd put: "default" handler is selected} -setup {
+    image create photo photo1
+    image create photo photo2
+    set imgData {{{1 2 3 4} {5 6 7 8} {9 10 11 12}}
+        {{13 14 15 15} {17 18 19 20} {21 22 23 24}}}
+} -body {
+    photo1 put $imgData
+    photo2 put $imgData -format default
+    set result {}
+    lappend result [list [image width photo1] [image height photo1]]
+    lappend result [list [image width photo2] [image height photo2]]
+    lappend result [string equal \
+        [photo1 data -format "default -colorformat rgba"] \
+        [photo2 data -format "default -colorformat rgba"]]
+    set result
+} -cleanup {
+    imageCleanup
+    unset result
+    unset imgData
+} -result {{3 2} {3 2} 1}
+test imgPhoto-4.97 {ImgPhotoCmd put: image size} -setup {
+    image create photo photo1
+} -body {
+    photo1 put {{red green blue} {blue red green}}
+    list [image width photo1] [image height photo1]
+} -cleanup {
+    imageCleanup
+} -result {3 2}
+test imgPhoto-4.98 {ImgPhotoCmd put: -to with 2 coords} -setup {
+    image create photo photo1
+} -body {
+    photo1 put {{"alice blue" "blanched almond"}
+		{"deep sky blue" "ghost white"}
+		{#AABBCC #AABBCCDD}} -to 5 6
+    list [image width photo1] [image height photo1]
+} -cleanup {
+    imageCleanup
+} -result {7 9}
+test imgPhoto-4.99 {ImgPhotoCmd put: -to with 4 coords} -setup {
+    image create photo photo1
+} -body {
+    photo1 put {{#123 #456 #678} {#9AB #CDE #F01}} -to 1 2 20 21
+    set result {}
+    lappend result [photo1 get 19 20 -withalpha]
+    lappend result [string equal \
+	[photo1 data -from 1 2 4 4] [photo1 data -from 4 2 7 4]]
+    lappend result [string equal \
+	[photo1 data -from 10 12 13 14] [photo1 data -from 16 16 19 18]]
+    set result
+} -cleanup {
+    imageCleanup
+} -result {{17 34 51 255} 1 1}
+test imgPhoto-4.100 {ImgPhotoCmd put: no changes on empty data} -setup {
+    image create photo photo1
+} -body {
+    photo1 put {{brown blue} {cyan coral}}
+    set imgData [photo1 data]
+    photo1 put {}
+    string equal $imgData [photo1 data]
+} -cleanup {
+    imageCleanup
+} -result {1}
+test imgPhoto-4.101 {ImgPhotoCmd get: too many args} -setup {
+    image create photo photo1
+} -body {
+    photo1 get 0 0 -withalpha bogus
+} -cleanup {
+    imageCleanup
+} -returnCodes error -result \
+    {wrong # args: should be "photo1 get x y ?-withalpha?"}
+test imgPhoto-4.102 {ImgPhotoCmd get: invalid option} -setup {
+    image create photo photo1
+} -body {
+    photo1 get 0 0 -bogus
+} -cleanup {
+    imageCleanup
+} -returnCodes error -result \
+    {unrecognized option "-bogus": must be -withalpha}
+test imgPhoto-4.103 {ImgPhotoCmd data: accepted opts} -setup {
+    image create photo photo1 -data black
+} -body {
+    photo1 data -format default -from 0 0 -grayscale -background blue
+} -cleanup {
+    imageCleanup
+} -result {{#000000}}
+test imgPhoto-4.104 {ImgPhotoCmd data: existing but not accepted opt} -setup {
+    image create photo photo1
+} -body {
+    photo1 data -to
+} -cleanup {
+    imageCleanup
+} -returnCodes error -result \
+{unrecognized option "-to": must be -background, -format, -from, or -grayscale}
+test imgPhoto-4.105 {ImgPhotoCmd data: invalid option} -setup {
+    image create photo photo1
+} -body {
+    photo1 data -bogus
+} -cleanup {
+    imageCleanup
+} -returnCodes error -result \
+{unrecognized option "-bogus": must be -background, -format, -from, or -grayscale}
+test imgPhoto-4.106 {ImgPhotoCmd data: extra arg before options} -setup {
+    image create photo photo1
+} -body {
+    photo1 data bogus -grayscale
+} -cleanup {
+    imageCleanup
+} -returnCodes error -result \
+    {wrong # args: should be "photo1 data ?-option value ...?"}
+test imgPhoto-4.107 {ImgPhotoCmd data: extra arg after options} -setup {
+    image create photo photo1
+} -body {
+    photo1 data -format default bogus
+} -cleanup {
+    imageCleanup
+} -returnCodes error -result \
+    {wrong # args: should be "photo1 data ?-option value ...?"}
+test imgPhoto-4.108 {ImgPhotoCmd data: invalid -from coords #1} -setup {
+    image create photo photo1 -data blue
+} -body {
+    photo1 data -from 2 0
+} -cleanup {
+    imageCleanup
+} -returnCodes error -result \
+    {coordinates for -from option extend outside image}
+test imgPhoto-4.109 {ImgPhotoCmd data: invalid -from coords #2} -setup {
+    image create photo photo1 -data blue
+} -body {
+    photo1 data -from 0 2
+} -cleanup {
+    imageCleanup
+} -returnCodes error -result \
+    {coordinates for -from option extend outside image}
+test imgPhoto-4.110 {ImgPhotoCmd data: invalid -from coords #3} -setup {
+    image create photo photo1 -data blue
+} -body {
+    photo1 data -from 0 0 2 1
+} -cleanup {
+    imageCleanup
+} -returnCodes error -result \
+    {coordinates for -from option extend outside image}
+test imgPhoto-4.111 {ImgPhotoCmd data: invalid -from coords #4} -setup {
+    image create photo photo1 -data blue
+} -body {
+    photo1 data -from 0 0 1 2
+} -cleanup {
+    imageCleanup
+} -returnCodes error -result \
+    {coordinates for -from option extend outside image}
+test imgPhoto-4.112 {ImgPhotoCmd data: -from with 2 coords} -setup {
+    image create photo photo1 -data {
+        {black black black black black}
+        {white white white white white}
+        {green green green green green}}
+} -body {
+    set imgData [photo1 data -from 2 1]
+    list [llength [lindex $imgData 0]] [llength $imgData]
+} -cleanup {
+    imageCleanup
+    unset imgData
+} -result {3 2}
+test imgPhoto-4.113 {ImgPhotoCmd data: default is rgb format} -setup {
+    image create photo photo1 -data red
+} -body {
+    photo1 data
+} -cleanup {
+    imageCleanup
+} -result {{#ff0000}}
+test imgPhoto-4.114 {ImgPhotoCmd data: unknown format} -setup {
+    image create photo photo1
+} -body {
+    photo1 data -format bogus
+} -cleanup {
+    imageCleanup
+} -returnCodes error -result {image string format "bogus" is unknown}
+test imgPhoto-4.115 {ImgPhotoCmd data: rgb colorformat} -setup {
+    image create photo photo1 -data {{red#a green#b} {blue#c white}}
+} -body {
+    photo1 data -format {default -colorformat rgb}
+} -result {{#ff0000 #008000} {#0000ff #ffffff}}
+test imgPhoto-4.116 {ImgPhotoCmd data: rgba colorformat} -setup {
+    image create photo photo1 -data {{red green} {blue white}}
+} -body {
+    photo1 data -format {default -colorformat rgba}
+} -result {{#ff0000ff #008000ff} {#0000ffff #ffffffff}}
+test imgPhoto-4.117 {ImgPhotoCmd data: list colorformat} -setup {
+    image create photo photo1 -data {{red#a green} {blue#c white#d}}
+} -body {
+    photo1 data -format {default -colorformat list}
+} -result {{{255 0 0 170} {0 128 0 255}} {{0 0 255 204} {255 255 255 221}}}
+test imgPhoto-4.118 {ImgPhotoCmd data: using data for new image
+    results in same image as orignial } -constraints {
+        hasTeapotPhoto
+        hasTranspTeapotPhoto
+} -setup {
+    image create photo teapot -file $teapotPhotoFile
+    teapot copy teapot -from 50 60 70 80 -shrink
+    image create photo teapotTransp -file $transpTeapotPhotoFile
+    teapotTransp copy teapotTransp -from 100 110 120 130 -shrink
+    image create photo photo1
+} -body {
+    set result {}
+    # We don't test gif here, as there seems to be a problem with
+    # <imgName> data and gif format ("too many colors", probably a bug)
+    foreach fmt {ppm png {default -colorformat rgba} \
+            {default -colorformat list}} {
+        set imgData [teapotTransp data -format $fmt]
+        photo1 blank
+        photo1 put $imgData
+        if { ! [string equal [photo1 data] [teapotTransp data]]} {
+            lappend result $fmt
+        }
+    }
+    set imgData [teapot data -format default]
+    photo1 blank
+    photo1 put $imgData
+    if { ! [string equal [photo1 data] [teapot data]]} {
+        lappend result default
+    }
+    set result
+} -cleanup {
+    unset imgData
+    unset result
+    imageCleanup
+} -result {}
+
 test imgPhoto-5.1 {ImgPhotoGet/Free procedures, shared instances} -constraints {
-    hasTeapotPhoto 
+    hasTeapotPhoto
 } -setup {
     destroy .c
     pack [canvas .c]
     imageCleanup
 } -body {
@@ -818,11 +1396,11 @@
     update
     image delete photo1
 } -cleanup {
     destroy .c
 } -result {}
-
+
 test imgPhoto-6.1 {ImgPhotoDisplay procedure, blank display} -setup {
     destroy .c
     pack [canvas .c]
     imageCleanup
 } -body {
@@ -832,13 +1410,13 @@
     update
 } -cleanup {
     destroy .c
     image delete photo1
 } -result {}
-
+
 test imgPhoto-7.1 {ImgPhotoFree procedure, resource freeing} -constraints {
-    hasTeapotPhoto 
+    hasTeapotPhoto
 } -setup {
     destroy .c
     pack [canvas .c]
     imageCleanup
 } -body {
@@ -849,11 +1427,11 @@
     image delete photo1
 } -cleanup {
     destroy .c
 }  -result {}
 test imgPhoto-7.2 {ImgPhotoFree procedures, unlinking} -constraints {
-    hasTeapotPhoto 
+    hasTeapotPhoto
 } -setup {
     deleteWindows
     imageCleanup
 } -body {
     image create photo photo1 -file $teapotPhotoFile
@@ -874,11 +1452,11 @@
 } -cleanup {
     destroy .c
     image delete photo1
 } -result {}
 test imgPhoto-7.3 {ImgPhotoFree procedures, multiple visuals} -constraints {
-    hasTeapotPhoto 
+    hasTeapotPhoto
 } -setup {
     deleteWindows
     imageCleanup
 } -body {
     image create photo photo1 -file $teapotPhotoFile
@@ -893,17 +1471,17 @@
     .f.b2 configure -image {}
     update
     destroy .f
     image delete photo1
 } -result {}
-
+
 test imgPhoto-8.1 {ImgPhotoDelete procedure} -constraints hasTeapotPhoto -body {
     image create photo photo2 -file $teapotPhotoFile
     image delete photo2
 } -result {}
 test imgPhoto-8.2 {ImgPhotoDelete procedure} -constraints {
-    hasTeapotPhoto 
+    hasTeapotPhoto
 } -setup {
     set x {}
 } -body {
     image create photo photo2 -file $teapotPhotoFile
     rename photo2 newphoto2
@@ -917,27 +1495,64 @@
     image delete photo2
     photo1 copy photo2
 } -returnCodes error -cleanup {
     imageCleanup
 } -result {image "photo2" doesn't exist or is not a photo image}
-
+
 test imgPhoto-9.1 {ImgPhotoCmdDeletedProc procedure} -constraints {
-    hasTeapotPhoto 
+    hasTeapotPhoto
 } -body {
     image create photo photo2 -file $teapotPhotoFile
     rename photo2 {}
     list [lsearch -exact [imageNames] photo2] [catch {photo2 foo} msg] $msg
 } -result {-1 1 {invalid command name "photo2"}}
-
+
 test imgPhoto-10.1 {Tk_ImgPhotoPutBlock procedure} -setup {
     imageCleanup
 } -body {
     image create photo photo1
     photo1 put "{#ff0000 #ff0000 #ff0000 #ff0000 #ff0000 #ff0000 #ff0000 #ff0000}" -to 0 0
     photo1 put "{#00ff00 #00ff00}" -to 2 0
     list [photo1 get 2 0] [photo1 get 3 0] [photo1 get 4 0]
 } -result {{0 255 0} {0 255 0} {255 0 0}}
+test imgPhoto-10.2 {Tk_ImgPhotoPutBlock, same source and dest img} -constraints {
+    hasTeapotPhoto
+} -setup {
+    imageCleanup
+} -body {
+    # Test for bug e4336bef5d
+    image create photo photo1 -file $teapotPhotoFile
+    image create photo photo2 -file $teapotPhotoFile
+    photo2 copy photo1 -to 1 2
+    photo1 copy photo1 -to 1 2
+    string equal [photo1 data] [photo2 data]
+} -cleanup {
+    imageCleanup
+} -result {1}
+test imgPhoto-10.3 {Tk_ImgPhotoPutBlock, same source and dest img} -constraints {
+    hasTeapotPhoto
+} -setup {
+    imageCleanup
+} -body {
+    # Test for bug e4336bef5d
+    image create photo photo1 -file $teapotPhotoFile
+    image create photo photo2 -file $teapotPhotoFile
+    photo2 copy photo1 -from 2 1 -to 4 5 300 300
+    photo1 copy photo1 -from 2 1 -to 4 5 300 300
+    string equal [photo1 data] [photo2 data]
+} -cleanup {
+    imageCleanup
+} -result {1}
+test imgPhoto-10.4 {Tk_ImgPhotoPutBlock, empty image} -setup {
+    imageCleanup
+} -body {
+    image create photo photo1
+    photo1 copy photo1 -to 0 5 10 20
+    list [image width photo1] [image height photo1]
+} -cleanup {
+    imageCleanup
+} -result {0 0}
 
 test imgPhoto-11.1 {Tk_FindPhoto} -setup {
     imageCleanup
 } -body {
     image create bitmap i1
@@ -944,19 +1559,54 @@
     image create photo photo1
     photo1 copy i1
 } -cleanup {
     imageCleanup
 } -returnCodes error -result {image "i1" doesn't exist or is not a photo image}
-
+
 test imgPhoto-12.1 {Tk_PhotoPutZoomedBlock} -constraints hasTeapotPhoto -body {
     image create photo p3 -file $teapotPhotoFile
     set result [list [p3 get 50 50] [p3 get 100 100]]
     p3 copy p3 -zoom 2
     lappend result [image width p3] [image height p3] [p3 get 100 100]
 } -cleanup {
     image delete p3
 } -result {{19 92 192} {169 117 90} 512 512 {19 92 192}}
+test imgPhoto-12.2 {Tk_ImgPhotoPutZoomedBlock, same source and dest img} -constraints {
+    hasTeapotPhoto
+} -setup {
+    imageCleanup
+} -body {
+    # Test for bug e4336bef5d
+    image create photo photo1 -file $teapotPhotoFile
+    image create photo photo2 -file $teapotPhotoFile
+    photo2 copy photo1 -to 0 1 200 200 -zoom 2 3
+    photo1 copy photo1 -to 0 1 200 200 -zoom 2 3
+    string equal [photo1 data] [photo2 data]
+} -cleanup {
+    imageCleanup
+} -result {1}
+test imgPhoto-12.3 {Tk_ImgPhotoPutZoomedBlock, same source and dest img} -setup {
+    imageCleanup
+} -body {
+    # Test for bug e4336bef5d
+    image create photo photo1 -file $teapotPhotoFile
+    image create photo photo2 -file $teapotPhotoFile
+    photo2 copy photo1 -from 1 0 -to 4 5 300 300 -zoom 1 2
+    photo1 copy photo1 -from 1 0 -to 4 5 300 300 -zoom 1 2
+    string equal [photo1 data] [photo2 data]
+} -cleanup {
+    imageCleanup
+} -result {1}
+test imgPhoto-12.4 {Tk_ImgPhotoPutZoomedBlock, empty image} -setup {
+    imageCleanup
+} -body {
+    image create photo photo1
+    photo1 copy photo1 -to 0 5 10 20
+    list [image width photo1] [image height photo1]
+} -cleanup {
+    imageCleanup
+} -result {0 0}
 
 test imgPhoto-13.1 {check separation of images in different interpreters} -setup {
     imageCleanup
     set data {
 	R0lGODlhQgBkAPUAANbWxs7Wxs7OxsbOxsbGxsbGvb3Gvca9vcDAwL21vbW1vbW1tbWtta2t
@@ -998,11 +1648,11 @@
     x2 eval [list image create photo T1_data -data $data]
 } -cleanup {
     interp delete x1
     interp delete x2
 } -result T1_data
-
+
 test imgPhoto-14.1 {GIF writes work correctly} -setup {
     set data {
 	R0lGODlhYwA5APcAAAAAAIAAAACAAICAAAAAgIAAgACAgICAgAysnGy8hKzM
 	hASs3MTcjAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 	AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
@@ -1091,19 +1741,29 @@
     set i [image create photo]
     $i configure -data $data
 } -cleanup {
     image delete $i
 } -returnCodes error -result {malformed image}
+test imgPhoto-14.5 {Bug [fbaed1f66b] - GIF decoder with deferred clear code} -setup {
+    set fileName [file join [file dirname [info script]] deferredClearCode.gif]
+} -body {
+    # This erroneously produced "malformed image" error.
+    # The animated GIF "deferredClearCode.gif" has two frames, and calling for -index 2
+    # simply is an easy way to trigger the problem of improper management of a deferred
+    # clear code. The effect was that the GIF decoder bailed out before the end of the
+    # image reading, and produced the inappropriate "malformed image error".
+    image create photo -file $fileName -format "gif -index 2"
+} -returnCodes error -result {no image data for this index}
 
 test imgPhoto-15.1 {photo images can fail to allocate memory gracefully} -constraints {
     nonPortable
 } -body {
     # This is not portable to very large machines with more than around 3GB of
     # free memory available...
     image create photo -width 32000 -height 32000
 } -returnCodes error -result {not enough free memory for image buffer}
-
+
 test imgPhoto-16.1 {copying to self doesn't access freed memory} -setup {
     set i [image create photo]
 } -body {
     # Bug 877950 makes this crash when trying to copy out of a deallocated
     # area.
@@ -1110,11 +1770,11 @@
     $i put red -to 0 0 1000 1000
     $i copy $i -from 0 0 1000 1000 -to 500 0
 } -cleanup {
     image delete $i
 } -result {}
-
+
 # Check that we can guess our supported output formats [Bug 2983824]
 test imgPhoto-17.1 {photo write: format guessing from filename} -setup {
     set i [image create photo -width 3 -height 3]
 } -body {
     set f [makeFile {} test.png]
@@ -1149,12 +1809,254 @@
 } -cleanup {
     catch {close $fd}
     image delete $i
     catch {removeFile $f}
 } -result "P6\n"
+test imgPhoto-17.4 {photo write: default format not supported} -setup {
+    image create photo photo1 -data {{blue blue} {red red} {green green}}
+    set f [makeFile {} test.txt]
+} -body {
+    photo1 write $f -format default
+} -cleanup {
+    imageCleanup
+    catch {removeFile $f}
+    unset f
+} -returnCodes error -result \
+    {image file format "default" has no file writing capability}
+test imgPhoto-17.5 {photo write: file with extension .default} -setup {
+    image create photo photo1 -data {{black}}
+    set f [makeFile {} test.default]
+} -body {
+    photo1 write $f
+} -cleanup {
+    imageCleanup
+    catch {removeFile $f}
+    unset f
+} -returnCodes error -result \
+    {image file format "default" has no file writing capability}
+
+test imgPhoto-18.1 {MatchFileFormat: "default" format not supported} -setup {
+    image create photo photo1
+    set f [makeFile {} test.txt]
+} -body {
+    photo1 read $f -format default
+} -cleanup {
+    imageCleanup
+    catch {removeFile $f}
+    unset f
+} -returnCodes error -result {-file option isn't supported for default images}
+
+test imgPhoto-19.1 {MatchStringFormat: with "-format default"} -setup {
+    image create photo photo1
+} -body {
+    photo1 put {{red blue red} {yellow green yellow}} -format default
+    list [image width photo1] [image height photo1]
+} -cleanup {
+    imageCleanup
+} -result {3 2}
+test imgPhoto-19.2 {MatchStringFormat: without -format option,
+        default fmt} -body {
+    image create photo photo1
+    photo1 put {{red} {green}}
+    list [image width photo1] [image height photo1]
+} -cleanup {
+    imageCleanup
+} -result {1 2}
+test imgPhoto-19.3 {MatchStringFormat: "-format ppm"} -setup {
+    image create photo photo1
+    image create photo photo2
+    photo2 put {cyan cyan}
+    set imgData [photo2 data -format ppm]
+} -body {
+    photo1 put $imgData -format ppm
+    list [image width photo1] [image height photo1]
+} -cleanup {
+    unset imgData
+    imageCleanup
+} -result {1 2}
+test imgPhoto-19.4 {MatchStringFormat: ppm fmt, without opt} -constraints {
+    hasTeapotPhoto
+} -setup {
+    image create photo photo1 -file $teapotPhotoFile
+    image create photo photo2
+} -body {
+    set imgData [photo1 data -format ppm]
+    photo2 put $imgData
+    list [image width photo2] [image height photo2]
+} -cleanup {
+    imageCleanup
+    unset imgData
+} -result {256 256}
+test imgPhoto-19.5 {MatchStirngFormat: unknown -format} -setup {
+    image create photo photo1
+} -body {
+    photo1 put {} -format bogus
+} -cleanup {
+    imageCleanup
+} -returnCodes error -result {image format "bogus" is not supported}
+test imgPhoto-19.6 {MatchStringFormat: invalid data for default} -setup {
+    image create photo photo1
+} -body {
+    photo1 put bogus
+} -cleanup {
+    imageCleanup
+} -returnCodes error -result {couldn't recognize image data}
+test imgPhoto-19.7 {MatchStringFormat: invalid data for default} -setup {
+    image create photo photo1
+} -body {
+    photo1 put bogus -format dEFault
+} -cleanup {
+    imageCleanup
+} -returnCodes error -result {couldn't recognize image data}
+test imgPhoto-19.8 {MatchStirngFormat: invalid data for gif} -setup {
+    image create photo photo1
+} -body {
+    photo1 put bogus -format giF
+} -cleanup {
+    imageCleanup
+} -returnCodes error -result {couldn't recognize image data}
 
-# ----------------------------------------------------------------------
+# Reject corrupted or truncated image [Bug b601ce3ab1].
+# WARNING - tests 18.1-18.9 will cause a segfault on 8.5.19 and lower,
+#           and on 8.6.6 and lower.
+test imgPhoto-18.1 {Reject corrupted GIF (binary string)} -constraints {
+    base64PackageNeeded
+} -setup {
+    package require base64
+    set data [base64::decode {
+	R0lGODlhAAQABP8zM/8z/zP/MzP/////M////yH5CiwheLrcLTBCd6Tv2qW16tdK4jhV
+	5qpraXIvM1JlNyAgOw==
+    }]
+} -body {
+    image create photo gif1 -data $data
+} -cleanup {
+    catch {image delete gif1}
+} -returnCodes error -result {error reading color map|not enough free memory for image buffer} -match regexp
+test imgPhoto-18.2 {Reject corrupted GIF (base 64 string)} -setup {
+    set data {
+	R0lGODlhAAQABP8zM/8z/zP/MzP/////M////yH5CiwheLrcLTBCd6Tv2qW16tdK4jhV
+	5qpraXIvM1JlNyAgOw==
+    }
+} -body {
+    image create photo gif1 -data $data
+} -cleanup {
+    catch {image delete gif1}
+} -returnCodes error -result {error reading color map|not enough free memory for image buffer} -match regexp
+test imgPhoto-18.3 {Reject corrupted GIF (file)} -setup {
+    set fileName [file join [file dirname [info script]] corruptMangled.gif]
+} -body {
+    image create photo gif1 -file $fileName
+} -cleanup {
+    catch {image delete gif1}
+} -returnCodes error -result {error reading color map|not enough free memory for image buffer} -match regexp
+test imgPhoto-18.4 {Reject truncated GIF (binary string)} -constraints {
+    base64PackageNeeded
+} -setup {
+    package require base64
+    set data [base64::decode {
+	R0lGODlhEAAQAMIHAAAAADMz//8zM/8z/zP/MzP///8=
+    }]
+} -body {
+    image create photo gif1 -data $data
+} -cleanup {
+    catch {image delete gif1}
+} -returnCodes error -result {error reading color map}
+test imgPhoto-18.5 {Reject truncated GIF (base 64 string)} -setup {
+    set data {
+	R0lGODlhEAAQAMIHAAAAADMz//8zM/8z/zP/MzP///8=
+    }
+} -body {
+    image create photo gif1 -data $data
+} -cleanup {
+    catch {image delete gif1}
+} -returnCodes error -result {error reading color map}
+test imgPhoto-18.6 {Reject truncated GIF (file)} -setup {
+    set fileName [file join [file dirname [info script]] corruptTruncated.gif]
+} -body {
+    image create photo gif1 -file $fileName
+} -cleanup {
+    catch {image delete gif1}
+} -returnCodes error -result {error reading color map}
+test imgPhoto-18.7 {Reject corrupted GIF (> 4Gb) (binary string)} -constraints {
+    base64PackageNeeded nonPortable
+} -setup {
+    # About the non portability constraint of this test: see ticket [cc42cc18a5]
+    # If there is insufficient memory, the error message
+    # {not enough free memory for image buffer} should be returned.
+    # Instead, some systems (e.g. FreeBSD 11.1) terminate the test interpreter.
+    package require base64
+    set data [base64::decode {
+	R0lGODlhwmYz//8zM/8z/zP/MzP/////M////yH5Ciwhe
+	LrcLTBCd6Tv2qW16tdK4jhV5qpraXIvM1JlNyAgOw==
+    }]
+} -body {
+    image create photo gif1 -data $data
+} -cleanup {
+    catch {image delete gif1}
+} -returnCodes error -result {error reading color map|not enough free memory for image buffer} -match regexp
+test imgPhoto-18.8 {Reject corrupted GIF (> 4Gb) (base 64 string)} -constraints {
+    nonPortable
+} -setup {
+    # About the non portability constraint of this test: see ticket [cc42cc18a5]
+    # If there is insufficient memory, the error message
+    # {not enough free memory for image buffer} should be returned.
+    # Instead, some systems (e.g. FreeBSD 11.1) terminate the test interpreter.
+    set data {
+	R0lGODlhwmYz//8zM/8z/zP/MzP/////M////yH5Ciwhe
+	LrcLTBCd6Tv2qW16tdK4jhV5qpraXIvM1JlNyAgOw==
+    }
+} -body {
+    image create photo gif1 -data $data
+} -cleanup {
+    catch {image delete gif1}
+} -returnCodes error -result {error reading color map|not enough free memory for image buffer} -match regexp
+test imgPhoto-18.9 {Reject corrupted GIF (> 4Gb) (file)} -constraints {
+    nonPortable
+} -setup {
+    # About the non portability constraint of this test: see ticket [cc42cc18a5]
+    # If there is insufficient memory, the error message
+    # {not enough free memory for image buffer} should be returned.
+    # Instead, some systems (e.g. FreeBSD 11.1) terminate the test interpreter.
+    set fileName [file join [file dirname [info script]] corruptMangled4G.gif]
+} -body {
+    image create photo gif1 -file $fileName
+} -cleanup {
+    catch {image delete gif1}
+} -returnCodes error -result {error reading color map|not enough free memory for image buffer} -match regexp
+test imgPhoto-18.10 {Valid GIF (binary string)} -constraints {
+    base64PackageNeeded
+} -setup {
+    # Test the binary string reader with a valid GIF.
+    # This is not tested elsewhere.
+    # Tests 18.11, 18.12, with matching data, are included for completeness.
+    package require base64
+    set data [base64::decode {
+	R0lGODlhEAAQAMIHAAAAADMz//8zM/8z/zP/MzP/////M////yH5BAEKAAcALAAA
+	AAAQABAAAAMheLrcLTBCd6QV79qlterXB0riOFXmmapraXIvM1IdZTcJADs=
+    }]
+} -body {
+    image create photo gif1 -data $data
+} -cleanup {
+    catch {image delete gif1}
+} -result gif1
+test imgPhoto-18.11 {Valid GIF (base 64 string)} -setup {
+    set data {
+	R0lGODlhEAAQAMIHAAAAADMz//8zM/8z/zP/MzP/////M////yH5BAEKAAcALAAA
+	AAAQABAAAAMheLrcLTBCd6QV79qlterXB0riOFXmmapraXIvM1IdZTcJADs=
+    }
+} -body {
+    image create photo gif1 -data $data
+} -cleanup {
+    catch {image delete gif1}
+} -result gif1
+test imgPhoto-18.12 {Valid GIF (file)} -setup {
+    set fileName [file join [file dirname [info script]] red.gif]
+} -body {
+    image create photo gif1 -file $fileName
+} -cleanup {
+    catch {image delete gif1}
+} -result gif1
 
 catch {rename foreachPixel {}}
 catch {rename checkImgTrans {}}
 catch {rename checkImgTransLoop {}}
 imageFinish

Index: tests/listbox.test
==================================================================
--- tests/listbox.test
+++ tests/listbox.test
@@ -1402,11 +1402,11 @@
 test listbox-4.12 {ConfigureListbox procedure, listvar -> different listvar} -setup {
     destroy .l2
 } -body {
     set x [list a b c d]
     set y [list 1 2 3 4]
-    listbox .l2 
+    listbox .l2
     .l2 configure -listvar x
     .l2 configure -listvar y
     .l2 insert end 5 6 7 8
     list $x $y
 } -cleanup {
@@ -1550,11 +1550,11 @@
     pack [listbox .l -font {{open look glyph}}]
     update
 } -cleanup {
     destroy .l
 } -result {}
-    
+
 
 # Listbox used in 6.*, 7.* tests
 destroy .l
 listbox .l -height 2 -xscrollcommand "record x" -yscrollcommand "record y"
 pack .l
@@ -1911,11 +1911,11 @@
     list [info command .l*] [winfo children .]
 } -cleanup {
     deleteWindows
 } -result {{} {}}
 test listbox-9.2 {ListboxCmdDeletedProc procedure, disabling -setgrid} -constraints {
-	fonts 
+	fonts
 } -setup {
     destroy .top
 } -body {
     toplevel .top
     wm geom .top +0+0
@@ -2992,11 +2992,11 @@
     .l insert 0 1 2 3 4
     list [.l itemcget 0 -fg] [.l itemcget 4 -fg]
 } -cleanup {
     destroy .l
 } -result {{} red}
-    
+
 
 # state issues
 test listbox-26.1 {listbox disabled state disallows inserts} -setup {
     destroy .l
 } -body {

Index: tests/main.test
==================================================================
--- tests/main.test
+++ tests/main.test
@@ -53,11 +53,11 @@
 } -cleanup {
 	close $f
 	removeFile script
 } -result "script {} 0\n0\n"
 
-    # Procedure to simulate interactive typing of commands, line by line, 
+    # Procedure to simulate interactive typing of commands, line by line,
 	# for test 2.3
     proc type {chan script} {
         foreach line [split $script \n] {
             if {[catch {
                 puts $chan $line

Index: tests/menu.test
==================================================================
--- tests/menu.test
+++ tests/menu.test
@@ -173,10 +173,18 @@
 } -result {#ff0000}
 test menu-2.6 {configuration options -activeforeground non-existent} -body {
     .m1 configure -activeforeground non-existent
 } -returnCodes error -result {unknown color name "non-existent"}
 
+test menu-2.6a {configuration options -activerelief sunken} -body {
+    .m1 configure -activerelief sunken
+    .m1 cget -activerelief
+} -result {sunken}
+test menu-2.6b {configuration options -activerelief badValue} -body {
+    .m1 configure -activerelief badValue
+} -returnCodes error -result {bad relief "badValue": must be flat, groove, raised, ridge, solid, or sunken}
+
 test menu-2.7 {configuration options -background #ff0000} -body {
     .m1 configure -background #ff0000
     .m1 cget -background
 } -result {#ff0000}
 test menu-2.8 {configuration options -background non-existent} -body {
@@ -274,16 +282,16 @@
 destroy .m1
 
 # We need to test all of the options with all of the different types of
 # menu entries. The following code sets up .m1 with 6 items. It then
 # runs through the 2.31 - 2.228 tests below
-# index 0 is tearoff, 1 command, 2 cascade, 3 separator, 4 checkbutton, 
+# index 0 is tearoff, 1 command, 2 cascade, 3 separator, 4 checkbutton,
 # 5 radiobutton
 deleteWindows
-menu .m1
+menu .m1 -tearoff 1
 .m1 add command -label "command"
-menu .m2
+menu .m2 -tearoff 1
 .m2 add command -label "test"
 .m1 add cascade -label "cascade" -menu .m2
 .m1 add separator
 .m1 add checkbutton -label "checkbutton" -variable check -onvalue on -offvalue off
 .m1 add radiobutton -label "radiobutton" -variable radio
@@ -769,38 +777,38 @@
 test menu-2.132 {entry configuration options 5 -image bogus radiobutton} -body {
     .m1 entryconfigure 5 -image bogus
 } -returnCodes error -result {image "bogus" doesn't exist}
 
 test menu-2.133 {entry configuration options 0 -image {} tearoff} -body {
-    .m1 entryconfigure 0 -image 
+    .m1 entryconfigure 0 -image
 } -returnCodes error -result {unknown option "-image"}
 
 test menu-2.134 {entry configuration options 1 -image {} command} -setup {
     .m1 entryconfigure 1 -image {}
 } -body {
-    .m1 entryconfigure 1 -image 
+    .m1 entryconfigure 1 -image
     lindex [.m1 entryconfigure 1 -image] 4
 } -result {}
 
 test menu-2.135 {entry configuration options 2 -image {} cascade} -setup {
     .m1 entryconfigure 2 -image {}
 } -body {
-    .m1 entryconfigure 2 -image 
+    .m1 entryconfigure 2 -image
     lindex [.m1 entryconfigure 2 -image] 4
 } -result {}
 
 test menu-2.136 {entry configuration options 3 -image {} separator} -body {
-    .m1 entryconfigure 3 -image 
+    .m1 entryconfigure 3 -image
 } -returnCodes error -result {unknown option "-image"}
 
 test menu-2.137 {entry configuration options 4 -image {} checkbutton} -body {
-    .m1 entryconfigure 4 -image 
+    .m1 entryconfigure 4 -image
     lindex [.m1 entryconfigure 4 -image] 4
 } -result {}
 
 test menu-2.138 {entry configuration options 5 -image {} radiobutton} -body {
-    .m1 entryconfigure 5 -image 
+    .m1 entryconfigure 5 -image
     lindex [.m1 entryconfigure 5 -image] 4
 } -result {}
 
 test menu-2.139 {entry configuration options 0 -indicatoron 1 tearoff} -body {
     .m1 entryconfigure 0 -indicatoron 1
@@ -1050,32 +1058,32 @@
 test menu-2.192 {entry configuration options 5 -selectimage bogus radiobutton} -body {
     .m1 entryconfigure 5 -selectimage bogus
 } -returnCodes error -result {image "bogus" doesn't exist}
 
 test menu-2.193 {entry configuration options 0 -selectimage {} tearoff} -body {
-    .m1 entryconfigure 0 -selectimage 
+    .m1 entryconfigure 0 -selectimage
 } -returnCodes error -result {unknown option "-selectimage"}
 
 test menu-2.194 {entry configuration options 1 -selectimage {} command} -body {
-    .m1 entryconfigure 1 -selectimage 
+    .m1 entryconfigure 1 -selectimage
 } -returnCodes error -result {unknown option "-selectimage"}
 
 test menu-2.195 {entry configuration options 2 -selectimage {} cascade} -body {
-    .m1 entryconfigure 2 -selectimage 
+    .m1 entryconfigure 2 -selectimage
 } -returnCodes error -result {unknown option "-selectimage"}
 
 test menu-2.196 {entry configuration options 3 -selectimage {} separator} -body {
-    .m1 entryconfigure 3 -selectimage 
+    .m1 entryconfigure 3 -selectimage
 } -returnCodes error -result {unknown option "-selectimage"}
 
 test menu-2.197 {entry configuration options 4 -selectimage {} checkbutton} -body {
-    .m1 entryconfigure 4 -selectimage 
+    .m1 entryconfigure 4 -selectimage
     lindex [.m1 entryconfigure 4 -selectimage] 4
 } -result {}
 
 test menu-2.198 {entry configuration options 5 -selectimage {} radiobutton} -body {
-    .m1 entryconfigure 5 -selectimage 
+    .m1 entryconfigure 5 -selectimage
     lindex [.m1 entryconfigure 5 -selectimage] 4
 } -result {}
 
 test menu-2.199 {entry configuration options 0 -state normal tearoff} -body {
     .m1 entryconfigure 0 -state normal
@@ -1223,11 +1231,11 @@
     .m1
 } -cleanup {
 	destroy .m1
 } -returnCodes error -result {wrong # args: should be ".m1 option ?arg ...?"}
 test menu-3.2 {MenuWidgetCmd, Tcl_Preserve and Tcl_Release} -constraints {
-	nonUnixUserInteraction 
+	nonUnixUserInteraction
 } -setup {
     destroy .m1
 } -body  {
     menu .m1 -postcommand "destroy .m1"
     .m1 add command -label "menu-3.2: Hit Escape"
@@ -1235,11 +1243,11 @@
 } -cleanup {
     destroy .m1
 } -returnCodes ok -result {}
 test menu-3.3 {MenuWidgetCmd procedure, "activate" option} -setup {
 	destroy .m1
-} -body {    
+} -body {
     menu .m1
     .m1 add command -label "test"
     .m1 activate
 } -cleanup {
 	destroy .m1
@@ -1357,11 +1365,11 @@
 } -body {
     menu .m1
     llength [.m1 configure]
 } -cleanup {
 	destroy .m1
-} -result {20}
+} -result {21}
 test menu-3.19 {MenuWidgetCmd procedure, "configure" option} -setup {
 	destroy .m1
 } -body {
     menu .m1
     .m1 configure -gorp
@@ -1396,11 +1404,11 @@
     .m1 delete foo
 } -returnCodes error -result {bad menu entry index "foo"}
 test menu-3.24 {MenuWidgetCmd procedure, "delete" option} -setup {
 	destroy .m1
 } -body {
-    menu .m1
+    menu .m1 -tearoff 1
     .m1 delete 0 "foo"
 } -returnCodes error -result {bad menu entry index "foo"}
 test menu-3.25 {MenuWidgetCmd procedure, "delete" option} -setup {
 	destroy .m1
 } -body {
@@ -1412,11 +1420,11 @@
 test menu-3.26 {MenuWidgetCmd procedure, "delete" option} -setup {
 	destroy .m1
 } -body {
     menu .m1
     .m1 add command -label "foo"
-    .m1 delete 1 0 
+    .m1 delete 1 0
 } -cleanup {
 	destroy .m1
 } -result {}
 test menu-3.27 {MenuWidgetCmd procedure, "delete" option} -setup {
 	destroy .m1
@@ -1544,11 +1552,11 @@
     .m1 index foo
 } -returnCodes error -result {bad menu entry index "foo"}
 test menu-3.41 {MenuWidgetCmd procedure, "index" option} -setup {
 	destroy .m1
 } -body {
-    menu .m1
+    menu .m1 -tearoff 1
     .m1 add command -label "test"
     .m1 add command -label "3"
     .m1 add command -label "another label"
     .m1 add command -label "end"
     .m1 add command -label "3a"
@@ -1625,13 +1633,13 @@
 } -returnCodes error -result {expected integer but got "bar"}
 test menu-3.50 {MenuWidgetCmd procedure, "post" option} -constraints {
 	nonUnixUserInteraction
 } -setup {
 	destroy .m1
-} -body { 
+} -body {
     menu .m1
-    .m1 add command -label "menu-3.53: hit Escape" -command "puts hello"
+    .m1 add command -label "menu-3.50: hit Escape" -command "puts hello"
     .m1 post 40 40
 } -cleanup {
 	destroy .m1
 } -result {}
 test menu-3.51 {MenuWidgetCmd procedure, "postcascade" option} -setup {
@@ -1652,13 +1660,13 @@
 } -returnCodes error -result {bad menu entry index "foo"}
 test menu-3.53 {MenuWidgetCmd procedure, "postcascade" option} -constraints {
 	nonUnixUserInteraction
 } -setup {
 	destroy .m1 .m2
-} -body { 
+} -body {
     menu .m1
-    .m1 add command -label "menu-3.56 - hit Escape"
+    .m1 add command -label "menu-3.53 - hit Escape"
     menu .m2
     .m1 post 40 40
     .m1 add cascade -menu .m2
     .m1 postcascade 1
 } -cleanup {
@@ -1737,11 +1745,11 @@
 	destroy .m1
 } -result {cascade}
 test menu-3.62 {MenuWidgetCmd procedure, "type" option} -setup {
 	destroy .m1
 } -body {
-    menu .m1
+    menu .m1 -tearoff 1
     .m1 type 0
 } -cleanup {
 	destroy .m1
 } -result {tearoff}
 test menu-3.63 {MenuWidgetCmd procedure, "unpost" option} -setup {
@@ -1754,14 +1762,14 @@
 } -returnCodes error -result {wrong # args: should be ".m1 unpost"}
 test menu-3.64 {MenuWidgetCmd procedure, "unpost" option} -constraints {
 	nonUnixUserInteraction
 } -setup {
 	destroy .m1
-} -body { 
+} -body {
     menu .m1
-    .m1 add command -label "menu-3.68 - hit Escape"
-    .m1 post 40 40 
+    .m1 add command -label "menu-3.64 - hit Escape"
+    .m1 post 40 40
     .m1 unpost
 } -cleanup {
 	destroy .m1
 } -result {}
 test menu-3.65 {MenuWidgetCmd procedure, "yposition" option} -setup {
@@ -1770,18 +1778,42 @@
     menu .m1
     .m1 yposition
 } -cleanup {
 	destroy .m1
 } -returnCodes error -result {wrong # args: should be ".m1 yposition index"}
-test menu-3.66 {MenuWidgetCmd procedure, "yposition" option} -setup {
+test menu-3.66a {MenuWidgetCmd procedure, "yposition" option, no tearoff} -setup {
+	destroy .m1
+} -body {
+    menu .m1 -tearoff 0
+    .m1 yposition 1
+} -cleanup {
+	destroy .m1
+} -result {0}
+test menu-3.66b {MenuWidgetCmd procedure, "yposition" option, with tearoff} -constraints {
+    notAqua
+} -setup {
 	destroy .m1
 } -body {
-    menu .m1
+    # on Win or Linux, tearoff menus are supported
+    # see menu-3.66c for aqua
+    menu .m1 -tearoff 1
     .m1 yposition 1
 } -cleanup {
 	destroy .m1
 } -result {1}
+test menu-3.66c {MenuWidgetCmd procedure, "yposition" option, with tearoff} -constraints {
+    aqua
+} -setup {
+	destroy .m1
+} -body {
+    # on OS X, tearoff menus are not supported
+    # see menu-3.66b for win or linux
+    menu .m1 -tearoff 1
+    .m1 yposition 1
+} -cleanup {
+	destroy .m1
+} -result {0}
 test menu-3.67 {MenuWidgetCmd procedure, bad option} -setup {
 	destroy .m1
 } -body {
     menu .m1
     .m1 foo
@@ -1872,20 +1904,20 @@
 test menu-4.5 {TkInvokeMenu: checkbutton array element} -setup {
     destroy .m1
 } -body {
     catch {unset foo}
     menu .m1
-    .m1 add checkbutton -label "test" -variable foo(1) -onvalue on 
+    .m1 add checkbutton -label "test" -variable foo(1) -onvalue on
     list [catch {.m1 invoke 1} msg] $msg [catch {set foo(1)} msg2] $msg2 [catch {unset foo} msg3] $msg3
 } -cleanup {
 	destroy .m1
 } -result {0 {} 0 on 0 {}}
 test menu-4.6 {TkInvokeMenu: radiobutton} -setup {
     destroy .m1
 } -body {
     catch {unset foo}
-    menu .m1
+    menu .m1 -tearoff 1
     .m1 add radiobutton -label "1" -variable foo -value one
     .m1 add radiobutton -label "2" -variable foo -value two
     .m1 add radiobutton -label "3" -variable foo -value three
     list [catch {.m1 invoke 1} msg] $msg [catch {set foo} msg2] $msg2 [catch {unset foo} msg3] $msg3
 } -cleanup {
@@ -1893,11 +1925,11 @@
 } -result {0 {} 0 one 0 {}}
 test menu-4.7 {TkInvokeMenu: radiobutton} -setup {
     destroy .m1
 } -body {
     catch {unset foo}
-    menu .m1
+    menu .m1 -tearoff 1
     .m1 add radiobutton -label "1" -variable foo -value one
     .m1 add radiobutton -label "2" -variable foo -value two
     .m1 add radiobutton -label "3" -variable foo -value three
     list [catch {.m1 invoke 2} msg] $msg [catch {set foo} msg2] $msg2 [catch {unset foo} msg3] $msg3
 } -cleanup {
@@ -1940,18 +1972,18 @@
 test menu-4.11 {TkInvokeMenu} -setup {
     destroy .m1
 } -body {
     menu .m1
     .m1 add cascade -label "test" -menu .m1.m2
-    list [catch {.m1 invoke 1} msg] $msg 
+    list [catch {.m1 invoke 1} msg] $msg
 } -cleanup {
 	destroy .m1
 } -result {0 {}}
 test menu-4.12 {TkInvokeMenu} -setup {
     destroy .m1
 } -body {
-    menu .m1
+    menu .m1 -tearoff 1
     .m1 add command -label "test" -command ".m1 delete 1"
     list [catch {.m1 invoke 1} msg] $msg [catch {.m1 type "test"} msg2] $msg2
 } -cleanup {
 	destroy .m1
 } -result {0 {} 1 {bad menu entry index "test"}}
@@ -2097,11 +2129,11 @@
     .m1 clone .m2
     .m1 clone .m1.m3
     destroy .m1
 } -cleanup {
 	deleteWindows
-} -returnCodes ok 
+} -returnCodes ok
 test menu-6.5 {TkDestroyMenu} -setup {
     destroy .m1 .m2
 } -body {
     menu .m1
     .m1 clone .m2
@@ -2324,11 +2356,11 @@
     destroy .m1
 } -body {
     menu .m1
     .m1 add checkbutton -variable foo
     list [.m1 delete 1] [destroy .m1]
-} -result {{} {}} 
+} -result {{} {}}
 test menu-8.5 {DestroyMenuEntry} -setup {
     destroy .m1
 } -body {
     menu .m1
     .m1 add command -label "test"
@@ -2335,11 +2367,11 @@
     list [.m1 delete 1] [destroy .m1]
 } -result {{} {}}
 test menu-8.6 {DestroyMenuEntry} -setup {
     destroy .m1
 } -body {
-    menu .m1
+    menu .m1 -tearoff 1
     .m1 add command -label "one"
     .m1 add command -label "two"
     list [.m1 delete 1] [.m1 entrycget 1 -label] [destroy .m1]
 } -result {{} two {}}
 test menu-8.7 {DestroyMenuEntry} -setup {
@@ -2356,11 +2388,11 @@
 # be done from tcl.
 test menu-9.1 {ConfigureMenu} -setup {
     destroy .m1
 } -body {
     menu .m1
-    list [.m1 configure -postcommand "beep"] [.m1 cget -postcommand] 
+    list [.m1 configure -postcommand "beep"] [.m1 cget -postcommand]
 } -cleanup {
 	deleteWindows
 } -result {{} beep}
 test menu-9.2 {ConfigureMenu}  -setup {
     destroy .m1
@@ -2489,11 +2521,11 @@
 	deleteWindows
 } -result {{} test}
 test menu-11.4 {ConfigureMenuEntry} -setup {
 	deleteWindows
 } -body {
-    menu .m1 
+    menu .m1
     .m1 add command
     list [.m1 entryconfigure 1 -accel "S"] [.m1 entrycget 1 -accel]
 } -cleanup {
 	deleteWindows
 } -result {{} S}
@@ -2563,31 +2595,31 @@
 } -result {}
 test menu-11.12 {ConfigureMenuEntry} -setup {
 	deleteWindows
 } -body {
     menu .m1
-    menu .m2 
+    menu .m2
     .m2 add cascade -menu .m1
-    menu .m3 
+    menu .m3
     .m3 add cascade -menu .m1
-    menu .m4 
+    menu .m4
     .m4 add cascade -menu .m1
-    menu .m5 
+    menu .m5
     .m5 add cascade
     .m5 entryconfigure 1 -label "test" -menu .m1
 } -cleanup {
 	deleteWindows
 } -result {}
 test menu-11.13 {ConfigureMenuEntry} -setup {
 	deleteWindows
 } -body {
     menu .m1
-    menu .m2 
+    menu .m2
     .m2 add cascade -menu .m1
-    menu .m3 
+    menu .m3
     .m3 add cascade -menu .m1
-    menu .m4 
+    menu .m4
     .m4 add cascade -menu .m1
     .m3 entryconfigure 1 -label "test" -menu .m1
 } -cleanup {
 	deleteWindows
 } -result {}
@@ -2735,11 +2767,11 @@
 
 
 test menu-13.1 {TkGetMenuIndex} -setup {
     deleteWindows
 } -body {
-    menu .m1
+    menu .m1 -tearoff 1
     .m1 add command -label "active"
     .m1 add command -label "test2"
     .m1 add command -label "test3"
     .m1 activate 2
     .m1 entrycget active -label
@@ -2802,11 +2834,11 @@
 } -result {}
 #test menu-13.7 - Need to add @test here.
 test menu-13.7 {TkGetMenuIndex} -setup {
     deleteWindows
 } -body {
-    menu .m1
+    menu .m1 -tearoff 1
     .m1 add command -label "active"
     .m1 add command -label "test2"
     .m1 add command -label "test3"
     .m1 entrycget 1 -label
 } -cleanup {
@@ -2935,11 +2967,11 @@
     .m1 insert -1 command -label "test"
 } -returnCodes error -result {bad menu entry index "-1"}
 test menu-16.4 {MenuAddOrInsert} -setup {
 	deleteWindows
 } -body {
-    menu .m1
+    menu .m1 -tearoff 1
     .m1 add command -label "test"
     .m1 insert 0 command -label "test2"
     .m1 entrycget 1 -label
 } -cleanup {
 	deleteWindows
@@ -3182,20 +3214,20 @@
 } -result {}
 
 
 test menu-19.1 {TkPostCommand} -constraints nonUnixUserInteraction -setup {
 	deleteWindows
-} -body { 
+} -body {
     menu .m1 -postcommand "set menu_test menu-19.1"
     .m1 add command -label "menu-19.1 - hit Escape"
     list [.m1 post 40 40] [.m1 unpost] [set menu_test]
 } -cleanup {
 	deleteWindows
 } -result {menu-19.1 {} menu-19.1}
 test menu-19.2 {TkPostCommand} -constraints nonUnixUserInteraction -setup {
 	deleteWindows
-} -body { 
+} -body {
     menu .m1
     .m1 add command -label "menu-19.2 - hit Escape"
     list [.m1 post 40 40] [.m1 unpost]
 } -cleanup {
 	deleteWindows
@@ -3275,11 +3307,11 @@
 	deleteWindows
 } -result {}
 test menu-20.10 {CloneMenu - tearoff fields} -setup {
 	deleteWindows
 } -body {
-    menu .m1
+    menu .m1 -tearoff 1
     list [.m1 clone .m2 normal] [.m2 cget -tearoff]
 } -cleanup {
 	deleteWindows
 } -result {{} 1}
 test menu-20.11 {CloneMenu} -setup {
@@ -3326,11 +3358,11 @@
 } -cleanup {
 	deleteWindows
 } -result {0}
 test menu-22.3 {GetIndexFromCoords: mapped window, y only} -setup {
 	deleteWindows
-} -constraints {unix} -body {
+} -constraints {x11} -body {
     menu .m1
     .m1 add command -label "test"
     .m1 configure -tearoff 0
     tk_popup .m1 0 0
     tkwait visibility .m1
@@ -3338,11 +3370,11 @@
 } -cleanup {
 	deleteWindows
 } -result {0}
 test menu-22.4 {GetIndexFromCoords: mapped window x,y} -setup {
 	deleteWindows
-} -constraints {unix} -body {
+} -constraints {x11} -body {
     menu .m1
     .m1 add command -label "test"
     .m1 configure -tearoff 0
     tk_popup .m1 0 0
     tkwait visibility .m1
@@ -3352,11 +3384,11 @@
 } -cleanup {
 	deleteWindows
 } -result {0}
 test menu-22.5 {GetIndexFromCoords: mapped wide window} -setup {
 	deleteWindows
-} -constraints {unix} -body {
+} -constraints {x11} -body {
     menu .m1
     .m1 add command -label "test"
     .m1 configure -tearoff 0
     tk_popup .m1 0 0
     tkwait visibility .m1
@@ -3712,11 +3744,11 @@
 	deleteWindows
 } -result {}
 test menu-32.2 {DeleteMenuCloneEntries} -setup {
 	deleteWindows
 } -body {
-    
+
     menu .m1
     .m1 add command -label one
     .m1 add command -label two
     .m1 add command -label three
     .m1 add command -label four
@@ -3877,11 +3909,11 @@
 } -cleanup {
     destroy .m
 } -result {1 {a menubar menu cannot be posted}}
 
 test menu-38.1 {Can't dismiss ttk::menubutton menu until mouse has hovered over it - bug fa32290898} -setup {
-} -constraints {macOrUnix} -body {
+} -constraints {userInteraction} -body {
     toplevel .top
     ttk::menubutton .top.mb -text "Some menu";
     menu .top.mb.m;
     .top.mb.m add command -label "Item 1";
     .top.mb.m add command -label "Item 2";

Index: tests/menuDraw.test
==================================================================
--- tests/menuDraw.test
+++ tests/menuDraw.test
@@ -74,11 +74,11 @@
     deleteWindows
 } -body {
     menu .m1 -disabledforeground ""
 } -cleanup {
     deleteWindows
-} -result {.m1}  
+} -result {.m1}
 
 
 test menuDraw-6.1 {TkMenuConfigureEntryDrawOptions - no tkfont specified} -setup {
     deleteWindows
 } -body {
@@ -319,11 +319,11 @@
     deleteWindows
 } -result {}
 
 
 test menuDraw-11.1 {TkMenuSelectImageProc - entry selected; redraw not pending} -constraints {
-    testImageType 
+    testImageType
 } -setup {
     deleteWindows
     imageCleanup
 } -body {
     image create test image1
@@ -336,11 +336,11 @@
     list [image delete image2] [destroy .m1]
 } -cleanup {
     imageCleanup
 } -result {{} {}}
 test menuDraw-11.2 {TkMenuSelectImageProc - entry selected; redraw pending} -constraints {
-    testImageType 
+    testImageType
 } -setup {
     deleteWindows
     imageCleanup
 } -body {
     image create test image1
@@ -352,11 +352,11 @@
     list [image delete image2] [destroy .m1]
 } -cleanup {
     imageCleanup
 } -result {{} {}}
 test menuDraw-11.3 {TkMenuSelectImageProc - entry not selected} -constraints {
-    testImageType 
+    testImageType
 } -setup {
     deleteWindows
     imageCleanup
 } -body {
     image create test image1
@@ -449,11 +449,11 @@
     update
 } -cleanup {
     deleteWindows
 } -result {}
 test menuDraw-12.6 {Display menu - testing for extra space and menubars} -constraints {
-    unix 
+    unix
 } -setup {
     deleteWindows
 } -body {
     menu .m1
     .m1 add cascade -label foo
@@ -645,11 +645,11 @@
     set tearoff [tk::TearOffMenu .m1 40 40]
     $tearoff postcascade 0
 } -cleanup {
     deleteWindows
 } -result {}
-test menuDraw-16.5 {TkPostSubMenu} -constraints unix -setup {
+test menuDraw-16.5 {TkPostSubMenu} -setup {
     deleteWindows
 } -body {
     menu .m1
     .m1 add cascade -label test -menu .m2
     menu .m2 -postcommand "glorp"
@@ -666,11 +666,11 @@
     menu .m1
     .m1 add cascade -label test -menu .m2
     menu .m2
     .m2 add command -label "Hit ESCAPE to get rid of this menu"
     set tearoff [tk::TearOffMenu .m1 40 40]
-    $tearoff postcascade 0 
+    $tearoff postcascade 0
 } -cleanup {
     deleteWindows
 } -result {}
 
 

Index: tests/menubut.test
==================================================================
--- tests/menubut.test
+++ tests/menubut.test
@@ -392,11 +392,11 @@
 } -body {
     button .mb1 -text "Menubutton 1"
     .mb1 configure -width 1i
 } -cleanup {
     deleteWindows
-} -returnCodes error -result {expected integer but got "1i"} 
+} -returnCodes error -result {expected integer but got "1i"}
 test menubutton-4.2 {ConfigureMenuButton procedure} -setup {
     deleteWindows
 } -body {
     button .mb1 -text "Menubutton 1"
     catch {.mb1 configure -width 1i}
@@ -449,11 +449,11 @@
     (processing -width option)
     invoked from within
 ".mb1 configure -width abc"}
 
 test menubutton-4.7 {ConfigureMenuButton procedure} -constraints {
-    testImageType 
+    testImageType
 } -setup {
     deleteWindows
     imageCleanup
 } -body {
     image create test image1
@@ -462,11 +462,11 @@
 } -cleanup {
     deleteWindows
     imageCleanup
 } -returnCodes error -result {bad screen distance "0.5x"}
 test menubutton-4.8 {ConfigureMenuButton procedure} -constraints {
-    testImageType 
+    testImageType
 } -setup {
     deleteWindows
     imageCleanup
 } -body {
     image create test image1
@@ -497,11 +497,11 @@
 
 test menubutton-4.10 {ConfigureMenuButton procedure - bad direction} -setup {
     deleteWindows
 } -body {
     menubutton .mb -text "Test"
-    .mb configure -direction badValue 
+    .mb configure -direction badValue
 } -cleanup {
     deleteWindows
 } -returnCodes error -result {bad direction "badValue": must be above, below, flush, left, or right}
 test menubutton-4.11 {ConfigureMenuButton procedure - bad direction} -setup {
     deleteWindows
@@ -542,11 +542,11 @@
     deleteWindows
 } -result {{} {}}
 
 
 test menubutton-7.1 {ComputeMenuButtonGeometry procedure} -constraints {
-    testImageType 
+    testImageType
 } -setup {
     deleteWindows
     image create test image1
 } -body {
     menubutton .mb -image image1 -bd 4 -highlightthickness 0
@@ -555,11 +555,11 @@
 } -cleanup {
     deleteWindows
     imageCleanup
 } -result {38 23}
 test menubutton-7.2 {ComputeMenuButtonGeometry procedure} -constraints {
-    testImageType 
+    testImageType
 } -setup {
     deleteWindows
     image create test image1
 } -body {
     menubutton .mb -image image1 -bd 1 -highlightthickness 2
@@ -568,11 +568,11 @@
 } -cleanup {
     deleteWindows
     imageCleanup
 } -result {36 21}
 test menubutton-7.3 {ComputeMenuButtonGeometry procedure} -constraints {
-    testImageType 
+    testImageType
 } -setup {
     deleteWindows
     image create test image1
 } -body {
     menubutton .mb -image image1 -bd 0 -highlightthickness 2 -padx 5 -pady 5
@@ -581,11 +581,11 @@
 } -cleanup {
     deleteWindows
     imageCleanup
 } -result {34 19}
 test menubutton-7.4 {ComputeMenuButtonGeometry procedure} -constraints {
-    testImageType 
+    testImageType
 } -setup {
     deleteWindows
     image create test image1
 } -body {
     menubutton .mb -image image1 -bd 2 -relief raised -width 40 \
@@ -595,11 +595,11 @@
 } -cleanup {
     deleteWindows
     imageCleanup
 } -result {48 23}
 test menubutton-7.5 {ComputeMenuButtonGeometry procedure} -constraints {
-    testImageType 
+    testImageType
 } -setup {
     deleteWindows
     image create test image1
 } -body {
     menubutton .mb -image image1 -bd 2 -relief raised -height 30 \

Index: tests/message.test
==================================================================
--- tests/message.test
+++ tests/message.test
@@ -10,12 +10,12 @@
 namespace import ::tcltest::*
 tcltest::loadTestedCommands
 eval tcltest::configure $argv
 
 
-test message-1.1 {configuration option: "anchor"} -setup { 
-    message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold} 
+test message-1.1 {configuration option: "anchor"} -setup {
+    message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .m
     update
 } -body {
     .m configure -anchor w
     .m cget -anchor
@@ -30,14 +30,14 @@
     .m configure -anchor bogus
 } -cleanup {
     destroy .m
 } -returnCodes {error} -result {bad anchor "bogus": must be n, ne, e, se, s, sw, w, nw, or center}
 
-test message-1.3 {configuration option: "aspect"} -setup { 
+test message-1.3 {configuration option: "aspect"} -setup {
     message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .m
-    update 
+    update
 } -body {
     .m configure -aspect 3
     .m cget -aspect
 } -cleanup {
     destroy .m
@@ -50,14 +50,14 @@
     .m configure -aspect bogus
 } -cleanup {
     destroy .m
 } -returnCodes {error} -result {expected integer but got "bogus"}
 
-test message-1.5 {configuration option: "background"} -setup { 
+test message-1.5 {configuration option: "background"} -setup {
     message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .m
-    update 
+    update
 } -body {
     .m configure -background #ff0000
     .m cget -background
 } -cleanup {
     destroy .m
@@ -70,14 +70,14 @@
     .m configure -background non-existent
 } -cleanup {
     destroy .m
 } -returnCodes {error} -result {unknown color name "non-existent"}
 
-test message-1.7 {configuration option: "bd"} -setup { 
+test message-1.7 {configuration option: "bd"} -setup {
     message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .m
-    update 
+    update
 } -body {
     .m configure -bd 4
     .m cget -bd
 } -cleanup {
     destroy .m
@@ -90,16 +90,16 @@
     .m configure -bd badValue
 } -cleanup {
     destroy .m
 } -returnCodes {error} -result {bad screen distance "badValue"}
 
-test message-1.9 {configuration option: "bg"} -setup { 
+test message-1.9 {configuration option: "bg"} -setup {
     message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .m
-    update 
+    update
 } -body {
-    .m configure -bg #ff0000 
+    .m configure -bg #ff0000
     .m cget -bg
 } -cleanup {
     destroy .m
 } -result {#ff0000}
 test message-1.10 {configuration option: "bg"} -setup {
@@ -110,14 +110,14 @@
     .m configure -bg non-existent
 } -cleanup {
     destroy .m
 } -returnCodes {error} -result {unknown color name "non-existent"}
 
-test message-1.11 {configuration option: "borderwidth"} -setup { 
+test message-1.11 {configuration option: "borderwidth"} -setup {
     message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .m
-    update 
+    update
 } -body {
     .m configure -borderwidth 1.3
     .m cget -borderwidth
 } -cleanup {
     destroy .m
@@ -130,14 +130,14 @@
     .m configure -borderwidth badValue
 } -cleanup {
     destroy .m
 } -returnCodes {error} -result {bad screen distance "badValue"}
 
-test message-1.13 {configuration option: "cursor"} -setup { 
+test message-1.13 {configuration option: "cursor"} -setup {
     message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .m
-    update 
+    update
 } -body {
     .m configure -cursor arrow
     .m cget -cursor
 } -cleanup {
     destroy .m
@@ -150,14 +150,14 @@
     .m configure -cursor badValue
 } -cleanup {
     destroy .m
 } -returnCodes {error} -result {bad cursor spec "badValue"}
 
-test message-1.15 {configuration option: "fg"} -setup { 
+test message-1.15 {configuration option: "fg"} -setup {
     message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .m
-    update 
+    update
 } -body {
     .m configure -fg #00ff00
     .m cget -fg
 } -cleanup {
     destroy .m
@@ -170,14 +170,14 @@
     .m configure -fg badValue
 } -cleanup {
     destroy .m
 } -returnCodes {error} -result {unknown color name "badValue"}
 
-test message-1.17 {configuration option: "font"} -setup { 
+test message-1.17 {configuration option: "font"} -setup {
     message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .m
-    update 
+    update
 } -body {
     .m configure -font fixed
     .m cget -font
 } -cleanup {
     destroy .m
@@ -190,17 +190,17 @@
     .m configure -font {}
 } -cleanup {
     destroy .m
 } -returnCodes {error} -result {font "" doesn't exist}
 
-test message-1.19 {configuration option: "-foreground"} -setup { 
+test message-1.19 {configuration option: "-foreground"} -setup {
     message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .m
-    update 
+    update
 } -body {
     .m configure -foreground  green
-    .m cget -foreground 
+    .m cget -foreground
 } -cleanup {
     destroy .m
 } -result {green}
 test message-1.20 {configuration option: "-foreground"} -setup {
     message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
@@ -210,14 +210,14 @@
     .m configure -foreground  badValue
 } -cleanup {
     destroy .m
 } -returnCodes {error} -result {unknown color name "badValue"}
 
-test message-1.21 {configuration option: "highlightbackground"} -setup { 
+test message-1.21 {configuration option: "highlightbackground"} -setup {
     message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .m
-    update 
+    update
 } -body {
     .m configure -highlightbackground  #112233
     .m cget -highlightbackground
 } -cleanup {
     destroy .m
@@ -230,17 +230,17 @@
     .m configure -highlightbackground  ugly
 } -cleanup {
     destroy .m
 } -returnCodes {error} -result {unknown color name "ugly"}
 
-test message-1.23 {configuration option: "highlightcolor"} -setup { 
+test message-1.23 {configuration option: "highlightcolor"} -setup {
     message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .m
-    update 
+    update
 } -body {
     .m configure -highlightcolor #123456
-    .m cget -highlightcolor 
+    .m cget -highlightcolor
 } -cleanup {
     destroy .m
 } -result {#123456}
 test message-1.24 {configuration option: "highlightcolor"} -setup {
     message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
@@ -250,17 +250,17 @@
     .m configure -highlightcolor non-existent
 } -cleanup {
     destroy .m
 } -returnCodes {error} -result {unknown color name "non-existent"}
 
-test message-1.25 {configuration option: "highlightthickness"} -setup { 
+test message-1.25 {configuration option: "highlightthickness"} -setup {
     message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .m
-    update 
+    update
 } -body {
     .m configure -highlightthickness  2
-    .m cget -highlightthickness 
+    .m cget -highlightthickness
 } -cleanup {
     destroy .m
 } -result {2}
 test message-1.26 {configuration option: "highlightthickness"} -setup {
     message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
@@ -270,14 +270,14 @@
     .m configure -highlightthickness  badValue
 } -cleanup {
     destroy .m
 } -returnCodes {error} -result {bad screen distance "badValue"}
 
-test message-1.27 {configuration option: "justify"} -setup { 
+test message-1.27 {configuration option: "justify"} -setup {
     message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .m
-    update 
+    update
 } -body {
     .m configure -justify  right
     .m cget -justify
 } -cleanup {
     destroy .m
@@ -290,17 +290,17 @@
     .m configure -justify bogus
 } -cleanup {
     destroy .m
 } -returnCodes {error} -result {bad justification "bogus": must be left, right, or center}
 
-test message-1.29 {configuration option: "padx"} -setup { 
+test message-1.29 {configuration option: "padx"} -setup {
     message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .m
-    update 
+    update
 } -body {
     .m configure -padx  12m
-    .m cget -padx 
+    .m cget -padx
 } -cleanup {
     destroy .m
 } -result {12m}
 test message-1.30 {configuration option: "padx"} -setup {
     message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
@@ -310,14 +310,14 @@
     .m configure -padx 420x
 } -cleanup {
     destroy .m
 } -returnCodes {error} -result {bad screen distance "420x"}
 
-test message-1.31 {configuration option: "pady"} -setup { 
+test message-1.31 {configuration option: "pady"} -setup {
     message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .m
-    update 
+    update
 } -body {
     .m configure -pady  12m
     .m cget -pady
 } -cleanup {
     destroy .m
@@ -330,17 +330,17 @@
     .m configure -pady 420x
 } -cleanup {
     destroy .m
 } -returnCodes {error} -result {bad screen distance "420x"}
 
-test message-1.33 {configuration option: "relief"} -setup { 
+test message-1.33 {configuration option: "relief"} -setup {
     message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .m
-    update 
+    update
 } -body {
     .m configure -relief ridge
-    .m cget -relief 
+    .m cget -relief
 } -cleanup {
     destroy .m
 } -result {ridge}
 test message-1.34 {configuration option: "relief"} -setup {
     message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
@@ -350,39 +350,39 @@
     .m configure -relief  badValue
 } -cleanup {
     destroy .m
 } -returnCodes {error} -result {bad relief "badValue": must be flat, groove, raised, ridge, solid, or sunken}
 
-test message-1.35 {configuration options: "text"} -setup { 
+test message-1.35 {configuration options: "text"} -setup {
     message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .m
-    update 
+    update
 } -body {
     .m configure -text "Sample text"
     .m cget -text
 } -cleanup {
     destroy .m
 } -result {Sample text}
 
-test message-1.36 {configuration option: "textvariable"} -setup { 
+test message-1.36 {configuration option: "textvariable"} -setup {
     message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .m
-    update 
+    update
 } -body {
     .m configure -textvariable  i
-    .m cget -textvariable 
+    .m cget -textvariable
 } -cleanup {
     destroy .m
 } -result {i}
 
-test message-1.37 {configuration option: "width"} -setup { 
+test message-1.37 {configuration option: "width"} -setup {
     message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
     pack .m
-    update 
+    update
 } -body {
     .m configure -width  2
-    .m cget -width 
+    .m cget -width
 } -cleanup {
     destroy .m
 } -result {2}
 test message-1.38 {configuration option: "width"} -setup {
     message .m -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold}
@@ -401,27 +401,27 @@
 
 test message-2.2 {Tk_MessageObjCmd procedure} -body {
     message foo
 } -returnCodes {error} -result {bad window path name "foo"}
 test message-2.3 {Tk_MessageObjCmd procedure} -body {
-    catch {message foo}  
+    catch {message foo}
     winfo child .
 } -result {}
 
 test message-2.4 {Tk_MessageObjCmd procedure} -body {
     message .s -gorp dump
 } -returnCodes {error} -result {unknown option "-gorp"}
 test message-2.5 {Tk_MessageObjCmd procedure} -body {
-    catch {message .s -gorp dump}  
+    catch {message .s -gorp dump}
     winfo child .
-} -result {} 
+} -result {}
 
 
 test message-3.1 {MessageWidgetObjCmd procedure} -setup {
     message .m
 } -body {
-    .m 
+    .m
 } -cleanup {
     destroy .m
 } -returnCodes error -result {wrong # args: should be ".m option ?arg ...?"}
 test message-3.2 {MessageWidgetObjCmd procedure, "cget"} -setup {
     message .m
@@ -440,11 +440,11 @@
 
 test message-3.4 {MessageWidgetObjCmd procedure, "configure"} -setup {
     message .m
 } -body {
     .m configure -text foobar
-    lindex [.m configure -text] 4 
+    lindex [.m configure -text] 4
 } -cleanup {
     destroy .m
 } -result {foobar}
 test message-3.5 {MessageWidgetObjCmd procedure, "configure"} -setup {
     message .m

Index: tests/msgbox.test
==================================================================
--- tests/msgbox.test
+++ tests/msgbox.test
@@ -9,16 +9,22 @@
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 namespace import -force tcltest::test
 
 
-test msgbox-1.1 {tk_messageBox command} -body {
+test msgbox-1.1.1 {tk_messageBox command} -constraints notAqua -body {
     tk_messageBox -foo
 } -returnCodes error -result {bad option "-foo": must be -default, -detail, -icon, -message, -parent, -title, or -type}
-test msgbox-1.2 {tk_messageBox command} -body {
+test msgbox-1.1.2 {tk_messageBox command} -constraints aqua -body {
+    tk_messageBox -foo
+} -returnCodes error -result {bad option "-foo": must be -default, -detail, -icon, -message, -parent, -title, -type, or -command}
+test msgbox-1.2.1 {tk_messageBox command} -constraints notAqua -body {
     tk_messageBox -foo bar
 } -returnCodes error -result {bad option "-foo": must be -default, -detail, -icon, -message, -parent, -title, or -type}
+test msgbox-1.2.2 {tk_messageBox command} -constraints aqua -body {
+    tk_messageBox -foo bar
+} -returnCodes error -result {bad option "-foo": must be -default, -detail, -icon, -message, -parent, -title, -type, or -command}
 
 test msgbox-1.3 {tk_messageBox command} -body {
     tk_messageBox -default
 } -returnCodes error -result {value for "-default" missing}
 test msgbox-1.4 {tk_messageBox command} -body {
@@ -46,34 +52,26 @@
 
 test msgbox-1.11 {tk_messageBox command} -body {
     tk_messageBox -type foo
 } -returnCodes error -result {bad -type value "foo": must be abortretryignore, ok, okcancel, retrycancel, yesno, or yesnocancel}
 
-test msgbox-1.12 {tk_messageBox command} -constraints unix -body {
-    tk_messageBox -default 1.1
-} -returnCodes error -result {invalid default button "1.1"}
-test msgbox-1.13 {tk_messageBox command} -constraints macOrWin -body {
+test msgbox-1.13 {tk_messageBox command} -body {
     tk_messageBox -default 1.1
 } -returnCodes error -result {bad -default value "1.1": must be abort, retry, ignore, ok, cancel, no, or yes}
 
-test msgbox-1.14 {tk_messageBox command} -constraints unix -body {
-    tk_messageBox -default foo
-} -returnCodes error -result {invalid default button "foo"}
-test msgbox-1.15 {tk_messageBox command} -constraints macOrWin -body {
+test msgbox-1.14 {tk_messageBox command} -body {
     tk_messageBox -default foo
 } -returnCodes error -result {bad -default value "foo": must be abort, retry, ignore, ok, cancel, no, or yes}
 
-test msgbox-1.16 {tk_messageBox command} -constraints unix -body {
-    tk_messageBox -type yesno -default 3
-} -returnCodes error -result {invalid default button "3"}
-test msgbox-1.17 {tk_messageBox command} -constraints macOrWin -body {
+test msgbox-1.16 {tk_messageBox command} -body {
     tk_messageBox -type yesno -default 3
 } -returnCodes error -result {bad -default value "3": must be abort, retry, ignore, ok, cancel, no, or yes}
 
 test msgbox-1.18 {tk_messageBox command} -body {
     tk_messageBox -icon foo
 } -returnCodes error -result {bad -icon value "foo": must be error, info, question, or warning}
+
 test msgbox-1.19 {tk_messageBox command} -body {
     tk_messageBox -parent foo.bar
 } -returnCodes error -result {bad window path name "foo.bar"}
 
 
@@ -121,309 +119,309 @@
 #
 # Try out all combinations of (type) x (default button) and
 # (type) x (icon).
 #
 test msgbox-2.1 {tk_messageBox command} -constraints {
-    nonUnixUserInteraction 
+    nonUnixUserInteraction
 } -body {
     ChooseMsg . abort
     tk_messageBox -title Hi -message "Please press abort" -type abortretryignore
 } -result {abort}
 test msgbox-2.2 {tk_messageBox command -icon option} -constraints {
-    nonUnixUserInteraction 
+    nonUnixUserInteraction
 } -body {
     ChooseMsg . abort
     tk_messageBox -title Hi -message "Please press abort" \
         -type abortretryignore -icon warning
 } -result {abort}
 test msgbox-2.3 {tk_messageBox command -icon option} -constraints {
-    nonUnixUserInteraction 
+    nonUnixUserInteraction
 } -body {
     ChooseMsg . abort
     tk_messageBox -title Hi -message "Please press abort" \
         -type abortretryignore -icon error
 } -result {abort}
 test msgbox-2.4 {tk_messageBox command -icon option} -constraints {
-    nonUnixUserInteraction 
+    nonUnixUserInteraction
 } -body {
     ChooseMsg . abort
     tk_messageBox -title Hi -message "Please press abort" \
         -type abortretryignore -icon info
 } -result {abort}
 test msgbox-2.5 {tk_messageBox command -icon option} -constraints {
-    nonUnixUserInteraction 
+    nonUnixUserInteraction
 } -body {
     ChooseMsg . abort
     tk_messageBox -title Hi -message "Please press abort" \
         -type abortretryignore -icon question
 } -result {abort}
 test msgbox-2.6 {tk_messageBox command} -constraints {
-    nonUnixUserInteraction 
+    nonUnixUserInteraction
 } -body {
     ChooseMsg . abort
     tk_messageBox -title Hi -message "Please press abort" \
         -type abortretryignore -default abort
 } -result {abort}
 test msgbox-2.7 {tk_messageBox command} -constraints {
-    nonUnixUserInteraction 
+    nonUnixUserInteraction
 } -body {
     ChooseMsg . retry
     tk_messageBox -title Hi -message "Please press retry" \
         -type abortretryignore -default retry
 } -result {retry}
 test msgbox-2.8 {tk_messageBox command} -constraints {
-    nonUnixUserInteraction 
+    nonUnixUserInteraction
 } -body {
     ChooseMsg . ignore
     tk_messageBox -title Hi -message "Please press ignore" \
         -type abortretryignore -default ignore
 } -result {ignore}
 test msgbox-2.9 {tk_messageBox command} -constraints {
-    nonUnixUserInteraction 
+    nonUnixUserInteraction
 } -body {
     ChooseMsg . ok
     tk_messageBox -title Hi -message "Please press ok" -type ok
 } -result {ok}
 test msgbox-2.10 {tk_messageBox command -icon option} -constraints {
-    nonUnixUserInteraction 
+    nonUnixUserInteraction
 } -body {
     ChooseMsg . ok
     tk_messageBox -title Hi -message "Please press ok" \
         -type ok -icon warning
 } -result {ok}
 test msgbox-2.11 {tk_messageBox command -icon option} -constraints {
-    nonUnixUserInteraction 
+    nonUnixUserInteraction
 } -body {
     ChooseMsg . ok
     tk_messageBox -title Hi -message "Please press ok" \
         -type ok -icon error
 } -result {ok}
 test msgbox-2.12 {tk_messageBox command -icon option} -constraints {
-    nonUnixUserInteraction 
+    nonUnixUserInteraction
 } -body {
     ChooseMsg . ok
     tk_messageBox -title Hi -message "Please press ok" \
         -type ok -icon info
 } -result {ok}
 test msgbox-2.13 {tk_messageBox command -icon option} -constraints {
-    nonUnixUserInteraction 
+    nonUnixUserInteraction
 } -body {
     ChooseMsg . ok
     tk_messageBox -title Hi -message "Please press ok" \
         -type ok -icon question
 } -result {ok}
 test msgbox-2.14 {tk_messageBox command} -constraints {
-    nonUnixUserInteraction 
+    nonUnixUserInteraction
 } -body {
     ChooseMsg . ok
     tk_messageBox -title Hi -message "Please press ok" \
         -type ok -default ok
 } -result {ok}
 test msgbox-2.15 {tk_messageBox command} -constraints {
-    nonUnixUserInteraction 
+    nonUnixUserInteraction
 } -body {
     ChooseMsg . ok
     tk_messageBox -title Hi -message "Please press ok" -type okcancel
 } -result {ok}
 test msgbox-2.16 {tk_messageBox command -icon option} -constraints {
-    nonUnixUserInteraction 
+    nonUnixUserInteraction
 } -body {
     ChooseMsg . ok
     tk_messageBox -title Hi -message "Please press ok" \
         -type okcancel -icon warning
 } -result {ok}
 test msgbox-2.17 {tk_messageBox command -icon option} -constraints {
-    nonUnixUserInteraction 
+    nonUnixUserInteraction
 } -body {
     ChooseMsg . ok
     tk_messageBox -title Hi -message "Please press ok" \
         -type okcancel -icon error
 } -result {ok}
 test msgbox-2.18 {tk_messageBox command -icon option} -constraints {
-    nonUnixUserInteraction 
+    nonUnixUserInteraction
 } -body {
     ChooseMsg . ok
     tk_messageBox -title Hi -message "Please press ok" \
         -type okcancel -icon info
 } -result {ok}
 test msgbox-2.19 {tk_messageBox command -icon option} -constraints {
-    nonUnixUserInteraction 
+    nonUnixUserInteraction
 } -body {
     ChooseMsg . ok
     tk_messageBox -title Hi -message "Please press ok" \
         -type okcancel -icon question
 } -result {ok}
 test msgbox-2.20 {tk_messageBox command} -constraints {
-    nonUnixUserInteraction 
+    nonUnixUserInteraction
 } -body {
     ChooseMsg . ok
     tk_messageBox -title Hi -message "Please press ok" \
         -type okcancel -default ok
 } -result {ok}
 test msgbox-2.21 {tk_messageBox command} -constraints {
-    nonUnixUserInteraction 
+    nonUnixUserInteraction
 } -body {
     ChooseMsg . cancel
     tk_messageBox -title Hi -message "Please press cancel" \
         -type okcancel -default cancel
 } -result {cancel}
 test msgbox-2.22 {tk_messageBox command} -constraints {
-    nonUnixUserInteraction 
+    nonUnixUserInteraction
 } -body {
     ChooseMsg . retry
     tk_messageBox -title Hi -message "Please press retry" -type retrycancel
 } -result {retry}
 test msgbox-2.23 {tk_messageBox command -icon option} -constraints {
-    nonUnixUserInteraction 
+    nonUnixUserInteraction
 } -body {
     ChooseMsg . retry
     tk_messageBox -title Hi -message "Please press retry" \
         -type retrycancel -icon warning
 } -result {retry}
 test msgbox-2.24 {tk_messageBox command -icon option} -constraints {
-    nonUnixUserInteraction 
+    nonUnixUserInteraction
 } -body {
     ChooseMsg . retry
     tk_messageBox -title Hi -message "Please press retry" \
         -type retrycancel -icon error
 } -result {retry}
 test msgbox-2.25 {tk_messageBox command -icon option} -constraints {
-    nonUnixUserInteraction 
+    nonUnixUserInteraction
 } -body {
     ChooseMsg . retry
     tk_messageBox -title Hi -message "Please press retry" \
         -type retrycancel -icon info
 } -result {retry}
 test msgbox-2.26 {tk_messageBox command -icon option} -constraints {
-    nonUnixUserInteraction 
+    nonUnixUserInteraction
 } -body {
     ChooseMsg . retry
     tk_messageBox -title Hi -message "Please press retry" \
         -type retrycancel -icon question
 } -result {retry}
 test msgbox-2.27 {tk_messageBox command} -constraints {
-    nonUnixUserInteraction 
+    nonUnixUserInteraction
 } -body {
     ChooseMsg . retry
     tk_messageBox -title Hi -message "Please press retry" \
         -type retrycancel -default retry
 } -result {retry}
 test msgbox-2.28 {tk_messageBox command} -constraints {
-    nonUnixUserInteraction 
+    nonUnixUserInteraction
 } -body {
     ChooseMsg . cancel
     tk_messageBox -title Hi -message "Please press cancel" \
         -type retrycancel -default cancel
 } -result {cancel}
 test msgbox-2.29 {tk_messageBox command} -constraints {
-    nonUnixUserInteraction 
+    nonUnixUserInteraction
 } -body {
     ChooseMsg . yes
     tk_messageBox -title Hi -message "Please press yes" -type yesno
 } -result {yes}
 test msgbox-2.30 {tk_messageBox command -icon option} -constraints {
-    nonUnixUserInteraction 
+    nonUnixUserInteraction
 } -body {
     ChooseMsg . yes
     tk_messageBox -title Hi -message "Please press yes" \
         -type yesno -icon warning
 } -result {yes}
 test msgbox-2.31 {tk_messageBox command -icon option} -constraints {
-    nonUnixUserInteraction 
+    nonUnixUserInteraction
 } -body {
     ChooseMsg . yes
     tk_messageBox -title Hi -message "Please press yes" \
         -type yesno -icon error
 } -result {yes}
 test msgbox-2.32 {tk_messageBox command -icon option} -constraints {
-    nonUnixUserInteraction 
+    nonUnixUserInteraction
 } -body {
     ChooseMsg . yes
     tk_messageBox -title Hi -message "Please press yes" \
         -type yesno -icon info
 } -result {yes}
 test msgbox-2.33 {tk_messageBox command -icon option} -constraints {
-    nonUnixUserInteraction 
+    nonUnixUserInteraction
 } -body {
     ChooseMsg . yes
     tk_messageBox -title Hi -message "Please press yes" \
         -type yesno -icon question
 } -result {yes}
 test msgbox-2.34 {tk_messageBox command} -constraints {
-    nonUnixUserInteraction 
+    nonUnixUserInteraction
 } -body {
     ChooseMsg . yes
     tk_messageBox -title Hi -message "Please press yes" \
         -type yesno -default yes
 } -result {yes}
 test msgbox-2.35 {tk_messageBox command} -constraints {
-    nonUnixUserInteraction 
+    nonUnixUserInteraction
 } -body {
     ChooseMsg . no
     tk_messageBox -title Hi -message "Please press no" \
         -type yesno -default no
 } -result {no}
 test msgbox-2.36 {tk_messageBox command} -constraints {
-    nonUnixUserInteraction 
+    nonUnixUserInteraction
 } -body {
     ChooseMsg . yes
     tk_messageBox -title Hi -message "Please press yes" -type yesnocancel
 } -result {yes}
 test msgbox-2.37 {tk_messageBox command -icon option} -constraints {
-    nonUnixUserInteraction 
+    nonUnixUserInteraction
 } -body {
     ChooseMsg . yes
     tk_messageBox -title Hi -message "Please press yes" \
         -type yesnocancel -icon warning
 } -result {yes}
 test msgbox-2.38 {tk_messageBox command -icon option} -constraints {
-    nonUnixUserInteraction 
+    nonUnixUserInteraction
 } -body {
     ChooseMsg . yes
     tk_messageBox -title Hi -message "Please press yes" \
         -type yesnocancel -icon error
 } -result {yes}
 test msgbox-2.39 {tk_messageBox command -icon option} -constraints {
-    nonUnixUserInteraction 
+    nonUnixUserInteraction
 } -body {
     ChooseMsg . yes
     tk_messageBox -title Hi -message "Please press yes" \
         -type yesnocancel -icon info
 } -result {yes}
 test msgbox-2.40 {tk_messageBox command -icon option} -constraints {
-    nonUnixUserInteraction 
+    nonUnixUserInteraction
 } -body {
     ChooseMsg . yes
     tk_messageBox -title Hi -message "Please press yes" \
         -type yesnocancel -icon question
 } -result {yes}
 test msgbox-2.41 {tk_messageBox command} -constraints {
-    nonUnixUserInteraction 
+    nonUnixUserInteraction
 } -body {
     ChooseMsg . yes
     tk_messageBox -title Hi -message "Please press yes" \
         -type yesnocancel -default yes
 } -result {yes}
 test msgbox-2.42 {tk_messageBox command} -constraints {
-    nonUnixUserInteraction 
+    nonUnixUserInteraction
 } -body {
     ChooseMsg . no
     tk_messageBox -title Hi -message "Please press no" \
         -type yesnocancel -default no
 } -result {no}
 test msgbox-2.43 {tk_messageBox command} -constraints {
-    nonUnixUserInteraction 
+    nonUnixUserInteraction
 } -body {
     ChooseMsg . cancel
     tk_messageBox -title Hi -message "Please press cancel" \
         -type yesnocancel -default cancel
 } -result {cancel}
 
 
 # These tests will hang your test suite if they fail.
 test msgbox-3.1 {tk_messageBox handles withdrawn parent} -constraints {
-	nonUnixUserInteraction 
+	nonUnixUserInteraction
 } -body {
     wm withdraw .
     ChooseMsg . "ok"
     tk_messageBox -title Hi -message "Please press ok" \
 	    -type ok -default ok
@@ -430,11 +428,11 @@
 } -cleanup {
     wm deiconify .
 } -result {ok}
 
 test msgbox-3.2 {tk_messageBox handles iconified parent} -constraints {
-	nonUnixUserInteraction 
+	nonUnixUserInteraction
 } -body {
     wm iconify .
     ChooseMsg . "ok"
     tk_messageBox -title Hi -message "Please press ok" \
 	    -type ok -default ok

Index: tests/option.file1
==================================================================
--- tests/option.file1
+++ tests/option.file1
@@ -11,8 +11,8 @@
   : pur\
 ple
 *x 4:	brown
 # More comments, this time delimited by hash-marks.
 	# Comment-line with space.
-*x6:	  
+*x6:
 *x9: \ \	\\\101\n
 # comment line as last line of file.

Index: tests/option.file3
==================================================================
--- tests/option.file3
+++ tests/option.file3
@@ -11,8 +11,8 @@
   : pur\
 ple
 *x 4:	brówn
 # More comments, this time delimited by hash-marks.
 	# Comment-line with space.
-*x6:	  
+*x6:
 *x9: \ \	\\\101\n
 # comment line as last line of file.

Index: tests/option.test
==================================================================
--- tests/option.test
+++ tests/option.test
@@ -283,11 +283,11 @@
     option get .op1 z Color2
 } -result {}
 
 # Test the major priority levels (widgetDefault, etc.)
 
-# Configurations for tests 13.* 
+# Configurations for tests 13.*
 option clear
 option add $appName.op1.a 100 100
 option add $appName.op1.A interactive interactive
 option add $appName.op1.b userDefault userDefault
 option add $appName.op1.B startupFile startupFile

Index: tests/pack.test
==================================================================
--- tests/pack.test
+++ tests/pack.test
@@ -1,7 +1,7 @@
-# This file is a Tcl script to test out the "pack" command
-# of Tk.  It is organized in the standard fashion for Tcl tests.
+# This file is a Tcl script to test out the "pack" command of Tk.  It is
+# organized in the standard fashion for Tcl tests.
 #
 # Copyright (c) 1993 The Regents of the University of California.
 # Copyright (c) 1994 Sun Microsystems, Inc.
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
@@ -26,11 +26,11 @@
 }
 .pack.a config -width 20 -height 40
 .pack.b config -width 50 -height 30
 .pack.c config -width 80 -height 80
 .pack.d config -width 40 -height 30
-
+
 test pack-1.1 {-side option} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
     pack .pack.a -side top
     pack .pack.b -expand yes -fill both
@@ -229,11 +229,10 @@
     pack .pack.a -side top -ipadx 5 -padx {5 15} -fill x
     pack .pack.b -expand yes -fill both
     update
     list [winfo geometry .pack.a] [winfo geometry .pack.b]
 } -result {280x40+5+0 300x160+0+40}
-
 test pack-2.22 {x padding and filling} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
     pack .pack.a -padx 1c
     set x [pack info .pack.a]
@@ -248,11 +247,10 @@
     set x [pack info .pack.a]
     set res1 [lindex $x [expr [lsearch -exact $x -ipadx]+1]]
     set res2 [winfo pixels .pack 1c]
     expr {$res1 eq $res2}
 } -result 1
-
 
 test pack-3.1 {y padding and filling} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
     pack .pack.a -side right -pady 20
@@ -418,11 +416,10 @@
     pack .pack.a -side top -ipady 5 -pady {1 19} -fill y
     pack .pack.b -expand yes -fill both
     update
     list [winfo geometry .pack.a] [winfo geometry .pack.b]
 } -result {20x50+140+1 300x130+0+70}
-
 test pack-3.22 {y padding and filling} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
     pack .pack.a -pady 1c
     set x [pack info .pack.a]
@@ -437,11 +434,10 @@
     set x [pack info .pack.a]
     set res1 [lindex $x [expr [lsearch -exact $x -ipady]+1]]
     set res2 [winfo pixels .pack 1c]
     expr {$res1 eq $res2}
 } -result 1
-
 
 test pack-4.1 {anchors} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
     pack .pack.a -side top -ipadx 5 -padx 10 -ipady 15 -pady 20 -expand y -anchor n
@@ -502,11 +498,10 @@
 } -body {
     pack .pack.a -side top -ipadx 5 -padx 10 -ipady 15 -pady 20 -expand y -anchor center
     update
     winfo geometry .pack.a
 } -result {30x70+135+65}
-
 
 # Repeat above tests, but with a frame that isn't at (0,0), so that
 # we can be sure that the frame offset is being added in correctly.
 
 test pack-5.1 {more anchors} -setup {
@@ -588,11 +583,10 @@
     pack .pack.c -side left
     pack .pack.b -side top -ipadx 5 -padx 10 -ipady 15 -pady 20 -expand y -anchor center
     update
     winfo geometry .pack.b
 } -result {60x60+160+90}
-
 
 test pack-6.1 {-expand option} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
     pack .pack.a .pack.b .pack.c .pack.d -side left
@@ -695,11 +689,10 @@
     pack .pack.d -side bottom -expand yes -fill both
     update
     list [winfo geometry .pack.a] [winfo geometry .pack.b] \
         [winfo geometry .pack.c] [winfo geometry .pack.d]
 } -result {100x200+0+0 200x100+100+0 160x100+140+100 40x100+100+100}
-
 test pack-6.12 {-expand option} -setup {
     toplevel .pack2 -height 400 -width 400
     wm geometry .pack2 +0+0
     pack propagate .pack2 0
     foreach i {w1 w2 w3} {
@@ -729,11 +722,10 @@
     update
     list [winfo geometry .pack2.w1] [winfo geometry .pack2.w2] [winfo geometry .pack2.w3]
 } -cleanup {
     destroy .pack2
 } -result {38x42+181+45 38x42+181+178 38x42+181+312}
-
 
 wm geometry .pack {}
 test pack-7.1 {requesting size for parent} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
@@ -788,11 +780,10 @@
     pack .pack.c -side bottom
     pack .pack.d -side top
     update
     list [winfo reqwidth .pack] [winfo reqheight .pack]
 } -result {100 110}
-
 
 # For the tests below, create a couple of "pad" windows to shrink
 # the available space for the remaining windows.  The tests have to
 # be done this way rather than shrinking the whole window, because
 # some window managers like mwm won't let a top-level window get
@@ -870,11 +861,10 @@
         [winfo geometry .pack.b] [winfo ismapped .pack.b] \
         [winfo geometry .pack.c] [winfo ismapped .pack.c]
 } -result {20x40+0+20 1 50x30+100+25 1 80x80+20+0 1}
 pack forget .pack.right .pack.bottom
 
-
 test pack-9.1 {window ordering} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
     pack .pack.a .pack.b .pack.c .pack.d -side top
     pack .pack.a -after .pack.b
@@ -943,11 +933,10 @@
     pack .pack.a .pack.b .pack.c .pack.d
     pack .pack.a .pack.c .pack.d .pack.b -after .pack.a
     pack slaves .pack
 } -result {.pack.a .pack.c .pack.d .pack.b}
 
-
 test pack-10.1 {retaining/clearing configuration state} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
     pack .pack.a -side bottom -anchor n -padx 1 -pady 2 -ipadx 3 -ipady 4 \
     -fill both -expand 1
@@ -974,11 +963,10 @@
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
     winfo manager .pack.a
     pack .pack.a -in .pack.a
 } -returnCodes error -result {can't pack .pack.a inside itself}
-
 
 test pack-11.1 {info option} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
     pack .pack.a -in .pack
@@ -1109,11 +1097,10 @@
 } -body {
     pack .pack.a -side right
     set i [pack info .pack.a]
     lindex $i [expr [lsearch -exact $i -side]+1]
 } -result right
-
 
 test pack-12.1 {command options and errors} -body {
     pack
 } -returnCodes error -result {wrong # args: should be "pack option arg ?arg ...?"}
 test pack-12.2 {command options and errors} -body {
@@ -1352,11 +1339,10 @@
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
     pack lousy .pack
 } -returnCodes error -result {bad option "lousy": must be configure, forget, info, propagate, or slaves}
 
-
 test pack-13.1 {window deletion} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d .pack.right .pack.bottom
 } -body {
     pack .pack.right -side right
     pack .pack.bottom -side bottom
@@ -1365,11 +1351,10 @@
     destroy .pack.d
     update
     set result [list [pack slaves .pack] [winfo geometry .pack.a] \
         [winfo geometry .pack.b] [winfo geometry .pack.c]]
 } -result {{.pack.right .pack.bottom .pack.a .pack.b .pack.c} 20x40+30+0 50x30+15+40 80x80+0+70}
-
 
 test pack-14.1 {respond to changes in expansion} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d .pack.right .pack.bottom
 } -body {
     pack .pack.right -side right
@@ -1401,11 +1386,11 @@
     lower .pack.f.f2
     pack .pack.f.f2 -side top
     pack .pack.b -in .pack.f.f2
     update
     set result [winfo geom .pack.b]
-    pack unpack .pack.a
+    pack forget .pack.a
     update
     lappend result [winfo geom .pack.b]
 } -cleanup {
     destroy .pack.f
 } -result {50x30+0+40 50x30+0+0}
@@ -1439,11 +1424,11 @@
     lower .pack.f.f2
     pack .pack.f.f2 -side top
     pack .pack.b -in .pack.f.f2
     update
     set result [winfo ismapped .pack.b]
-    pack unpack .pack.f
+    pack forget .pack.f
     update
     lappend result [winfo ismapped .pack.b]
 } -cleanup {
     destroy .pack.f
 } -result {1 0}
@@ -1492,11 +1477,10 @@
     lappend result [winfo geometry .pack.b] [winfo ismapped .pack.b]
 } -cleanup {
     destroy .pack.f1 .pack.f2
 } -result {50x16+25+22 1 50x16+25+22 0}
 
-
 test pack-16.1 {geometry manager name} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
     set result {}
 } -body {
     lappend result [winfo manager .pack.a]
@@ -1503,11 +1487,10 @@
     pack .pack.a
     lappend result [winfo manager .pack.a]
     pack forget .pack.a
     lappend result [winfo manager .pack.a]
 } -result {{} pack {}}
-
 
 test pack-17.1 {PackLostSlaveProc procedure} -setup {
     pack forget .pack.a .pack.b .pack.c .pack.d
 } -body {
     pack .pack.a
@@ -1526,24 +1509,22 @@
     winfo manager .pack.a
     winfo geometry .pack.a
     pack info .pack.a
 } -returnCodes error -result {window ".pack.a" isn't packed}
 
-
 test pack-18.1 {unmap slaves when master unmapped} -constraints {
     tempNotPc
 } -setup {
     eval destroy [winfo child .pack]
 } -body {
-
     # adjust the position of .pack before test to avoid a screen switch
     # that occurs with window managers that have desktops four times as big
     # as the screen (screen switch causes scale and other tests to fail).
 
     wm geometry .pack +100+100
 
-    # On the PC, when the width/height is configured while the window is 
+    # On the PC, when the width/height is configured while the window is
     # unmapped, the changes don't take effect until the window is remapped.
     # Who knows why?
 
     eval destroy [winfo child .pack]
     frame .pack.a -width 100 -height 50 -relief raised -bd 2
@@ -1562,11 +1543,10 @@
     lappend result [winfo ismapped .pack.a]
 } -result {1 0 200 75 0 1}
 test pack-18.2 {unmap slaves when master unmapped} -setup {
     eval destroy [winfo child .pack]
 } -body {
-
     # adjust the position of .pack before test to avoid a screen switch
     # that occurs with window managers that have desktops four times as big
     # as the screen (screen switch causes scale and other tests to fail).
 
     wm geometry .pack +100+100
@@ -1585,11 +1565,10 @@
     [winfo ismapped .pack.b]
     wm deiconify .pack
     update
     lappend result [winfo ismapped .pack.b]
 } -result {1 0 100 30 0 1}
-
 
 test pack-19.1 {test respect for internalborder} -setup {
     catch {eval pack forget [pack slaves .pack]}
     destroy .pack.l .pack.lf
 } -body {
@@ -1624,12 +1603,100 @@
     lappend res [winfo geometry .pack.lf]
 } -cleanup {
     destroy .pack.l .pack.lf
 } -result {162x127+0+0 172x112+0+0}
 
-
+test pack-20.1 {<<NoManagedChild>> fires on last pack forget} -setup {
+    global A
+    unset -nocomplain A
+} -body {
+    pack [frame .1]
+    update
+    bind . <<NoManagedChild>> {set A 1}
+    pack forget .1
+    update
+    info exists A
+} -cleanup {
+    bind . <<NoManagedChild>> {}
+    destroy .1
+} -result {1}
+test pack-20.2 {<<NoManagedChild>> fires on last packed child destruction} -setup {
+    global A
+    unset -nocomplain A
+} -body {
+    pack [frame .1]
+    update
+    bind . <<NoManagedChild>> {incr A}
+    destroy .1
+    update
+    set A
+} -cleanup {
+    bind . <<NoManagedChild>> {}
+    destroy .1
+} -result {1}
+test pack-20.3 {<Configure> does not fire on last pack forget} -setup {
+    global A
+    unset -nocomplain A
+} -body {
+    pack [frame .1]
+    update
+    bind . <Configure> {set A 1}
+    pack forget .1
+    update
+    info exists A
+} -cleanup {
+    bind . <Configure> {}
+    destroy .1
+} -result {0}
+test pack-20.4 {<<NoManagedChild>> does not fire on forelast pack forget} -setup {
+    global A
+    unset -nocomplain A
+} -body {
+    pack [frame .1]
+    pack [frame .2]
+    update
+    bind . <<NoManagedChild>> {set A 1}
+    pack forget .1
+    update
+    info exists A
+} -cleanup {
+    bind . <<NoManagedChild>> {}
+    destroy .1 .2
+} -result {0}
+test pack-20.5 {<Configure> does not fire on last pack forget} -setup {
+    global A
+    unset -nocomplain A
+} -body {
+    pack [frame .1]
+    pack [frame .2]
+    update
+    bind . <Configure> {set A 1}
+    pack forget .1
+    update
+    info exists A
+} -cleanup {
+    bind . <Configure> {}
+    destroy .1 .2
+} -result {1}
+test pack-20.6 {<<NoManagedChild>> does not fire on last pack forget if propagation is off} -setup {
+    global A
+    unset -nocomplain A
+} -body {
+    pack [frame .1]
+    pack propagate . 0
+    update
+    bind . <<NoManagedChild>> {set A 1}
+    pack forget .1
+    update
+    info exists A
+} -cleanup {
+    bind . <<NoManagedChild>> {}
+    destroy .1
+} -result {0}
+
 # cleanup
 cleanupTests
 return
 
-
-
+# Local Variables:
+# mode: tcl
+# End:

Index: tests/packgrid.test
==================================================================
--- tests/packgrid.test
+++ tests/packgrid.test
@@ -243,8 +243,38 @@
     grid .g
 }  -returnCodes error -cleanup {
     destroy .p
     destroy .g
 } -result {cannot use geometry manager grid inside . which already has slaves managed by pack}
+
+test packgrid-4.1 {slave stolen after master destruction - bug [aa7679685e]} -setup {
+    frame .f
+    button .b -text hello
+} -body {
+    pack .f
+    grid .b -in .f
+    destroy .f
+    set res [winfo manager .b]
+    # shall not crash
+    pack .b
+    set res
+} -cleanup {
+    destroy .b
+} -result {}
+
+test packgrid-4.2 {slave stolen after master destruction - bug [aa7679685e]} -setup {
+    frame .f
+    button .b -text hello
+} -body {
+    pack .f
+    pack .b -in .f
+    destroy .f
+    set res [winfo manager .b]
+    # shall not crash
+    grid .b
+    set res
+} -cleanup {
+    destroy .b
+} -result {}
 
 cleanupTests
 return

Index: tests/panedwindow.test
==================================================================
--- tests/panedwindow.test
+++ tests/panedwindow.test
@@ -496,11 +496,11 @@
     # There are no sashes until you have 2 panes
     panedwindow .p
     .p add [frame .p.f]
     list [catch {.p sash coord -1} msg] $msg \
 	    [catch {.p sash coord  0} msg] $msg \
-	    [catch {.p sash coord  1} msg] $msg 
+	    [catch {.p sash coord  1} msg] $msg
 } -cleanup {
 	deleteWindows
 } -result [list 1 "invalid sash index" 1 "invalid sash index" 1 "invalid sash index"]
 test panedwindow-6.10 {sash coord subcommand, errors} -setup {
 	deleteWindows
@@ -509,11 +509,11 @@
     panedwindow .p
     .p add [frame .p.f] [frame .p.f2]
     list [catch {.p sash coord -1} msg] $msg \
 	    [catch {.p sash coord  0} msg] \
 	    [catch {.p sash coord  1} msg] $msg \
-	    [catch {.p sash coord  2} msg] $msg 
+	    [catch {.p sash coord  2} msg] $msg
 } -cleanup {
 	deleteWindows
 } -result [list 1 "invalid sash index" 0 1 "invalid sash index" 1 "invalid sash index"]
 
 
@@ -620,11 +620,11 @@
     .p add [button .b] [button .c]
     .p sash dragto 0 0 bar
 } -cleanup {
 	deleteWindows
 } -returnCodes error -result {expected integer but got "bar"}
-    
+
 
 test panedwindow-9.1 {sash mark/sash dragto interaction} -setup {
 	deleteWindows
 } -body {
     panedwindow .p -borderwidth 0 -sashpad 0 -sashwidth 4 -showhandle false
@@ -923,11 +923,11 @@
     update
     lappend result [winfo reqwidth .p]
 } -cleanup {
 	deleteWindows
 } -result {68 100}
-    
+
 
 test panedwindow-12.1 {horizontal panedwindow lays out widgets properly} -setup {
 	deleteWindows
     set result {}
 } -body {
@@ -1147,11 +1147,11 @@
 test panedwindow-13.2 {PanedWindowLostSlaveProc, widget yields management} -setup {
 	deleteWindows
 } -body {
     # Check that the paned window correctly yields geometry management of
     # a slave when some other geometry manager steals the slave from us.
-    
+
     # This test should not cause a core dump, and it should not cause a
     # memory leak.
     panedwindow .p
     .p add [button .b]
     pack .p
@@ -1516,13 +1516,13 @@
 	    .p add [frame $w -height 20 -width 20 -bg $c] -sticky nsew
     }
 
     # Get the requested width of the paned window
     lappend result [winfo reqwidth .p]
-    
+
     .p sash place 0 30 0
-    
+
     # Get the reqwidth again, to make sure it hasn't changed
     lappend result [winfo reqwidth .p]
 
     # Check that the sash moved
     lappend result [.p sash coord 0]
@@ -1536,11 +1536,11 @@
     foreach w {.f1 .f2} c {red blue} {
 	    .p add [frame $w -height 20 -width 20 -bg $c] -sticky nsew
     }
 
     .p sash place 0 100 0
-    
+
     # Get the new sash coord; it should be clipped by the reqwidth of
     # the panedwindow.
     .p sash coord 0
 } -cleanup {
 	deleteWindows
@@ -1550,17 +1550,17 @@
 } -body {
     panedwindow .p -showhandle false -borderwidth 0 -sashpad 0 -sashwidth 2
     foreach w {.f1 .f2} c {red blue} {
 	    .p add [frame $w -height 20 -width 20 -bg $c] -sticky nsew
     }
-    
+
     # Put the panedwindow up on the display and give it a width < reqwidth
     place .p -x 0 -y 0 -width 32
     update
 
     .p sash place 0 100 0
-    
+
     # Get the new sash coord; it should be clipped by the visible width of
     # the panedwindow.
     .p sash coord 0
 } -cleanup {
 	deleteWindows
@@ -1570,17 +1570,17 @@
 } -body {
     panedwindow .p -showhandle false -borderwidth 0 -sashpad 0 -sashwidth 2
     foreach w {.f1 .f2} c {red blue} {
 	    .p add [frame $w -height 20 -width 20 -bg $c] -sticky nsew
     }
-    
+
     # Put the panedwindow up on the display and give it a width > reqwidth
     place .p -x 0 -y 0 -width 102
     update
 
     .p sash place 0 200 0
-    
+
     # Get the new sash coord; it should be clipped by the visible width of
     # the panedwindow.
     .p sash coord 0
 } -cleanup {
 	deleteWindows
@@ -1592,11 +1592,11 @@
     foreach w {.f1 .f2} c {red blue} {
 	    .p add [frame $w -height 20 -width 20 -bg $c] -sticky nsew -minsize 10
     }
 
     .p sash place 0 100 0
-    
+
     # Get the new sash coord; it should have moved as far as possible while
     # respecting minsizes.
     .p sash coord 0
 } -cleanup {
 	deleteWindows
@@ -1608,11 +1608,11 @@
     foreach w {.f1 .f2 .f3} c {red blue} {
 	    .p add [frame $w -height 20 -width 20 -bg $c] -sticky nsew -minsize 10
     }
 
     .p sash place 0 100 0
-    
+
     # Get the new sash coord; it should have moved as far as possible.
     .p sash coord 0
 } -cleanup {
 	deleteWindows
 } -result [list 40 0]
@@ -1623,11 +1623,11 @@
     foreach w {.f1 .f2 .f3} c {red blue} {
 	    .p add [frame $w -height 20 -width 20 -bg $c] -sticky nsew
     }
 
     .p sash place 0 100 0
-    
+
     # Get the new sash coord; it should have moved as far as possible while
     # respecting minsizes.
     .p sash coord 1
 } -cleanup {
 	deleteWindows
@@ -1639,11 +1639,11 @@
     foreach w {.f1 .f2 .f3} c {red blue} {
 	    .p add [frame $w -height 20 -width 20 -bg $c] -sticky nsew -minsize 10
     }
 
     .p sash place 0 100 0
-    
+
     # Get the new sash coord; it should have moved as far as possible while
     # respecting minsizes.
     .p sash coord 1
 } -cleanup {
 	deleteWindows
@@ -1656,12 +1656,12 @@
 	    .p add [frame $w -height 20 -width 20 -bg $c] \
 		    -sticky nsew -minsize 10 -padx 5
     }
 
     .p sash place 0 100 0
-    
-    # Get the new sash coord; it should have moved as far as possible, 
+
+    # Get the new sash coord; it should have moved as far as possible,
     # respecting minsizes.
     .p sash coord 0
 } -cleanup {
 	deleteWindows
 } -result [list 50 0]
@@ -1673,12 +1673,12 @@
 	    .p add [frame $w -height 20 -width 20 -bg $c] \
 		    -sticky nsew -minsize -50
     }
 
     .p sash place 0 50 0
-    
-    # Get the new sash coord; it should have moved as far as possible, 
+
+    # Get the new sash coord; it should have moved as far as possible,
     # respecting minsizes.
     list [.p sash coord 0] [.p sash coord 1]
 } -cleanup {
 	deleteWindows
 } -result [list [list 50 0] [list 52 0]]
@@ -1691,13 +1691,13 @@
 	    .p add [frame $w -height 20 -width 20 -bg $c] -sticky nsew
     }
 
     # Get the requested width of the paned window
     lappend result [winfo reqwidth .p]
-    
+
     .p sash place 0 10 0
-    
+
     # Get the reqwidth again, to make sure it hasn't changed
     lappend result [winfo reqwidth .p]
 
     # Check that the sash moved
     lappend result [.p sash coord 0]
@@ -1711,11 +1711,11 @@
     foreach w {.f1 .f2} c {red blue} {
 	    .p add [frame $w -height 20 -width 20 -bg $c] -sticky nsew
     }
 
     .p sash place 0 -100 0
-    
+
     # Get the new sash coord; it should be clipped by the reqwidth of
     # the panedwindow.
     .p sash coord 0
 } -cleanup {
 	deleteWindows
@@ -1727,11 +1727,11 @@
     foreach w {.f1 .f2} c {red blue} {
 	    .p add [frame $w -height 20 -width 20 -bg $c] -sticky nsew -minsize 10
     }
 
     .p sash place 0 0 0
-    
+
     # Get the new sash coord; it should have moved as far as possible while
     # respecting minsizes.
     .p sash coord 0
 } -cleanup {
 	deleteWindows
@@ -1743,11 +1743,11 @@
     foreach w {.f1 .f2 .f3} c {red blue} {
 	    .p add [frame $w -height 20 -width 20 -bg $c] -sticky nsew -minsize 10
     }
 
     .p sash place 1 0 0
-    
+
     # Get the new sash coord; it should have moved as far as possible.
     .p sash coord 1
 } -cleanup {
 	deleteWindows
 } -result [list 22 0]
@@ -1758,11 +1758,11 @@
     foreach w {.f1 .f2 .f3} c {red blue} {
 	    .p add [frame $w -height 20 -width 20 -bg $c] -sticky nsew
     }
 
     .p sash place 1 0 0
-    
+
     # Get the new sash coord; it should have moved as far as possible while
     # respecting minsizes.
     .p sash coord 0
 } -cleanup {
 	deleteWindows
@@ -1774,11 +1774,11 @@
     foreach w {.f1 .f2 .f3} c {red blue} {
 	    .p add [frame $w -height 20 -width 20 -bg $c] -sticky nsew -minsize 10
     }
 
     .p sash place 1 0 0
-    
+
     # Get the new sash coord; it should have moved as far as possible while
     # respecting minsizes.
     .p sash coord 0
 } -cleanup {
 	deleteWindows
@@ -1791,12 +1791,12 @@
 	    .p add [frame $w -height 20 -width 20 -bg $c] \
 		    -sticky nsew -minsize 10 -padx 5
     }
 
     .p sash place 1 0 0
-    
-    # Get the new sash coord; it should have moved as far as possible, 
+
+    # Get the new sash coord; it should have moved as far as possible,
     # respecting minsizes.
     .p sash coord 1
 } -cleanup {
 	deleteWindows
 } -result [list 42 0]
@@ -1808,12 +1808,12 @@
 	    .p add [frame $w -height 20 -width 20 -bg $c] \
 		    -sticky nsew -minsize -50
     }
 
     .p sash place 1 10 0
-    
-    # Get the new sash coord; it should have moved as far as possible, 
+
+    # Get the new sash coord; it should have moved as far as possible,
     # respecting minsizes.
     list [.p sash coord 0] [.p sash coord 1]
 } -cleanup {
 	deleteWindows
 } -result [list [list 8 0] [list 10 0]]
@@ -1829,13 +1829,13 @@
 	    .p add [frame $w -height 20 -width 20 -bg $c] -sticky nsew
     }
 
     # Get the requested width of the paned window
     lappend result [winfo reqheight .p]
-    
+
     .p sash place 0 0 30
-    
+
     # Get the reqwidth again, to make sure it hasn't changed
     lappend result [winfo reqheight .p]
 
     # Check that the sash moved
     lappend result [.p sash coord 0]
@@ -1850,11 +1850,11 @@
     foreach w {.f1 .f2} c {red blue} {
 	    .p add [frame $w -height 20 -width 20 -bg $c] -sticky nsew
     }
 
     .p sash place 0 0 100
-    
+
     # Get the new sash coord; it should be clipped by the reqheight of
     # the panedwindow.
     .p sash coord 0
 } -cleanup {
 	deleteWindows
@@ -1865,17 +1865,17 @@
     panedwindow .p -showhandle false -borderwidth 0 -sashpad 0 -sashwidth 2 \
             -orient vertical
     foreach w {.f1 .f2} c {red blue} {
 	    .p add [frame $w -height 20 -width 20 -bg $c] -sticky nsew
     }
-    
+
     # Put the panedwindow up on the display and give it a height < reqheight
     place .p -x 0 -y 0 -height 32
     update
 
     .p sash place 0 0 100
-    
+
     # Get the new sash coord; it should be clipped by the visible height of
     # the panedwindow.
     .p sash coord 0
 } -cleanup {
 	deleteWindows
@@ -1886,17 +1886,17 @@
     panedwindow .p -showhandle false -borderwidth 0 -sashpad 0 -sashwidth 2 \
             -orient vertical
     foreach w {.f1 .f2} c {red blue} {
 	    .p add [frame $w -height 20 -width 20 -bg $c] -sticky nsew
     }
-    
+
     # Put the panedwindow up on the display and give it a width > reqwidth
     place .p -x 0 -y 0 -height 102
     update
 
     .p sash place 0 0 200
-    
+
     # Get the new sash coord; it should be clipped by the visible width of
     # the panedwindow.
     .p sash coord 0
 } -cleanup {
 	deleteWindows
@@ -1909,11 +1909,11 @@
     foreach w {.f1 .f2} c {red blue} {
 	    .p add [frame $w -height 20 -width 20 -bg $c] -sticky nsew -minsize 10
     }
 
     .p sash place 0 0 100
-    
+
     # Get the new sash coord; it should have moved as far as possible while
     # respecting minsizes.
     .p sash coord 0
 } -cleanup {
 	deleteWindows
@@ -1926,11 +1926,11 @@
     foreach w {.f1 .f2 .f3} c {red blue} {
 	    .p add [frame $w -height 20 -width 20 -bg $c] -sticky nsew -minsize 10
     }
 
     .p sash place 0 0 100
-    
+
     # Get the new sash coord; it should have moved as far as possible while
     # respecting minsizes.
     .p sash coord 0
 } -cleanup {
 	deleteWindows
@@ -1943,11 +1943,11 @@
     foreach w {.f1 .f2 .f3} c {red blue} {
 	    .p add [frame $w -height 20 -width 20 -bg $c] -sticky nsew
     }
 
     .p sash place 0 0 100
-    
+
     # Get the new sash coord; it should have moved as far as possible while
     # respecting minsizes.
     .p sash coord 1
 } -cleanup {
 	deleteWindows
@@ -1960,11 +1960,11 @@
     foreach w {.f1 .f2 .f3} c {red blue} {
 	    .p add [frame $w -height 20 -width 20 -bg $c] -sticky nsew -minsize 10
     }
 
     .p sash place 0 0 100
-    
+
     # Get the new sash coord; it should have moved as far as possible while
     # respecting minsizes.
     .p sash coord 1
 } -cleanup {
 	deleteWindows
@@ -1978,12 +1978,12 @@
 	    .p add [frame $w -height 20 -width 20 -bg $c] \
 		    -sticky nsew -minsize 10 -pady 5
     }
 
     .p sash place 0 0 100
-    
-    # Get the new sash coord; it should have moved as far as possible, 
+
+    # Get the new sash coord; it should have moved as far as possible,
     # respecting minsizes.
     .p sash coord 0
 } -cleanup {
 	deleteWindows
 } -result [list 0 50]
@@ -1996,12 +1996,12 @@
 	    .p add [frame $w -height 20 -width 20 -bg $c] \
 		    -sticky nsew -minsize -50
     }
 
     .p sash place 0 0 50
-    
-    # Get the new sash coord; it should have moved as far as possible, 
+
+    # Get the new sash coord; it should have moved as far as possible,
     # respecting minsizes.
     list [.p sash coord 0] [.p sash coord 1]
 } -cleanup {
 	deleteWindows
 } -result [list [list 0 50] [list 0 52]]
@@ -2015,13 +2015,13 @@
 	    .p add [frame $w -height 20 -width 20 -bg $c] -sticky nsew
     }
 
     # Get the requested width of the paned window
     lappend result [winfo reqheight .p]
-    
+
     .p sash place 0 0 10
-    
+
     # Get the reqwidth again, to make sure it hasn't changed
     lappend result [winfo reqheight .p]
 
     # Check that the sash moved
     lappend result [.p sash coord 0]
@@ -2036,11 +2036,11 @@
     foreach w {.f1 .f2} c {red blue} {
 	    .p add [frame $w -height 20 -width 20 -bg $c] -sticky nsew
     }
 
     .p sash place 0 0 -100
-    
+
     # Get the new sash coord; it should be clipped by the reqwidth of
     # the panedwindow.
     .p sash coord 0
 } -cleanup {
 	deleteWindows
@@ -2053,11 +2053,11 @@
     foreach w {.f1 .f2} c {red blue} {
 	    .p add [frame $w -height 20 -width 20 -bg $c] -sticky nsew -minsize 10
     }
 
     .p sash place 0 0 0
-    
+
     # Get the new sash coord; it should have moved as far as possible while
     # respecting minsizes.
     .p sash coord 0
 } -cleanup {
 	deleteWindows
@@ -2070,11 +2070,11 @@
     foreach w {.f1 .f2 .f3} c {red blue} {
 	    .p add [frame $w -height 20 -width 20 -bg $c] -sticky nsew -minsize 10
     }
 
     .p sash place 1 0 0
-    
+
     # Get the new sash coord; it should have moved as far as possible.
     .p sash coord 1
 } -cleanup {
 	deleteWindows
 } -result [list 0 22]
@@ -2086,11 +2086,11 @@
     foreach w {.f1 .f2 .f3} c {red blue} {
 	    .p add [frame $w -height 20 -width 20 -bg $c] -sticky nsew
     }
 
     .p sash place 1 0 0
-    
+
     # Get the new sash coord; it should have moved as far as possible while
     # respecting minsizes.
     .p sash coord 0
 } -cleanup {
 	deleteWindows
@@ -2103,11 +2103,11 @@
     foreach w {.f1 .f2 .f3} c {red blue} {
 	    .p add [frame $w -height 20 -width 20 -bg $c] -sticky nsew -minsize 10
     }
 
     .p sash place 1 0 0
-    
+
     # Get the new sash coord; it should have moved as far as possible while
     # respecting minsizes.
     .p sash coord 0
 } -cleanup {
 	deleteWindows
@@ -2121,12 +2121,12 @@
 	    .p add [frame $w -height 20 -width 20 -bg $c] \
 		    -sticky nsew -minsize 10 -pady 5
     }
 
     .p sash place 1 0 0
-    
-    # Get the new sash coord; it should have moved as far as possible, 
+
+    # Get the new sash coord; it should have moved as far as possible,
     # respecting minsizes.
     .p sash coord 1
 } -cleanup {
 	deleteWindows
 } -result [list 0 42]
@@ -2139,12 +2139,12 @@
 	    .p add [frame $w -height 20 -width 20 -bg $c] \
 		    -sticky nsew -minsize -50
     }
 
     .p sash place 1 0 10
-    
-    # Get the new sash coord; it should have moved as far as possible, 
+
+    # Get the new sash coord; it should have moved as far as possible,
     # respecting minsizes.
     list [.p sash coord 0] [.p sash coord 1]
 } -cleanup {
 	deleteWindows
 } -result [list [list 0 8] [list 0 10]]
@@ -4326,11 +4326,11 @@
     destroy .f
     winfo reqwidth .p
 } -cleanup {
     deleteWindows
 } -result 20
-    
+
 
 test panedwindow-21.1 {ArrangePanes, extra space is given to the last pane} -setup {
 	deleteWindows
 } -body {
     panedwindow .p -showhandle false -borderwidth 0 -sashpad 0 -sashwidth 2

Index: tests/place.test
==================================================================
--- tests/place.test
+++ tests/place.test
@@ -394,11 +394,11 @@
     frame .foo
     place configure .foo -x 0 -y
 } -cleanup {
     destroy .foo
 } -returnCodes error -result {value for "-y" missing}
-    
+
 
 test place-11.1 {PlaceObjCmd, slaves command} -setup {
     destroy .foo
 } -body {
     frame .foo

Index: tests/raise.test
==================================================================
--- tests/raise.test
+++ tests/raise.test
@@ -129,29 +129,29 @@
     update
     raise .raise.a .raise.d
     raise_getOrder
 } -result {a d d a c e e e}
 test raise-3.2 {raise internal windows after creation} -constraints {
-	testmakeexist 
+	testmakeexist
 } -body {
     raise_setup
     testmakeexist .raise.a .raise.b
     raise .raise.a .raise.b
     update
     raise_getOrder
 } -result {d d d a c e e e}
 test raise-3.3 {raise internal windows after creation} -constraints {
-	testmakeexist 
+	testmakeexist
 } -body {
     raise_setup
     testmakeexist .raise.a .raise.d
     raise .raise.a .raise.b
     update
     raise_getOrder
 } -result {d d d a c e e e}
 test raise-3.4 {raise internal windows after creation} -constraints {
-	testmakeexist 
+	testmakeexist
 } -body {
     raise_setup
     testmakeexist .raise.a .raise.c .raise.d
     raise .raise.a .raise.b
     update

ADDED   tests/red.gif
Index: tests/red.gif
==================================================================
--- /dev/null
+++ tests/red.gif
cannot compute difference between binary files

Index: tests/safe.test
==================================================================
--- tests/safe.test
+++ tests/safe.test
@@ -13,36 +13,56 @@
 
 ## NOTE: Any time tests fail here with an error like:
 
 # Can't find a usable tk.tcl in the following directories:
 #     {$p(:26:)}
-# 
+#
 # $p(:26:)/tk.tcl: script error
 # script error
 #     invoked from within
 # "source {$p(:26:)/tk.tcl}"
 #     ("uplevel" body line 1)
 #     invoked from within
 # "uplevel #0 [list source $file]"
-# 
-# 
+#
+#
 # This probably means that tk wasn't installed properly.
 
 ## it indicates that something went wrong sourcing tk.tcl.
-## Ensure that any changes that occured to tk.tcl will work or are properly
+## Ensure that any changes that occurred to tk.tcl will work or are properly
 ## prevented in a safe interpreter.  -- hobbs
 
 # The set of hidden commands is platform dependent:
 
-set hidden_cmds {bell cd clipboard encoding exec exit fconfigure glob grab load menu open pwd selection socket source toplevel unload wm}
+set hidden_cmds {bell cd clipboard encoding exec exit fconfigure}
 lappend hidden_cmds {*}[apply {{} {
+    if {[package vsatisfies [package provide Tcl] 8.7-]} {
+	lappend result file
+    }
+    lappend result glob grab load menu open pwd selection socket source tcl:encoding:dirs
+    if {[package vsatisfies [package provide Tcl] 8.7-]} {
+	lappend result tcl:encoding:system
+    }
+    lappend result toplevel unload wm
     foreach cmd {
 	atime attributes copy delete dirname executable exists extension
 	isdirectory isfile link lstat mkdir mtime nativename normalize owned
 	readable readlink rename rootname size stat tail tempfile type
 	volumes writable
-    } {lappend result tcl:file:$cmd}; return $result
+    } {lappend result tcl:file:$cmd}
+    if {[package vsatisfies [package provide Tcl] 8.7-]} {
+	foreach cmd {
+	    cmdtype nameofexecutable
+	} {lappend result tcl:info:$cmd}
+	foreach cmd {
+	    autopurge list purge status
+	} {lappend result tcl:process:$cmd}
+	foreach cmd {
+	    lmkimg lmkzip mkimg mkkey mkzip mount  mount_data unmount
+	} {lappend result tcl:zipfs:$cmd}
+    }
+    return $result
 }}]
 if {[tk windowingsystem] ne "x11"} {
     lappend hidden_cmds tk_chooseColor tk_chooseDirectory tk_getOpenFile \
 	tk_getSaveFile tk_messageBox
 }

ADDED   tests/safePrimarySelection.test
Index: tests/safePrimarySelection.test
==================================================================
--- /dev/null
+++ tests/safePrimarySelection.test
@@ -0,0 +1,1220 @@
+# This file is a Tcl script to test entry widgets in Tk.  It is
+# organized in the standard fashion for Tcl tests.
+#
+# Copyright (c) 1994 The Regents of the University of California.
+# Copyright (c) 1994-1997 Sun Microsystems, Inc.
+# Copyright (c) 1998-1999 by Scriptics Corporation.
+# All rights reserved.
+
+package require tcltest 2.2
+namespace import ::tcltest::*
+eval tcltest::configure $argv
+tcltest::loadTestedCommands
+
+# ------------------------------------------------------------------------------
+# Tests that a Safe Base interpreter cannot write to the PRIMARY selection.
+# ------------------------------------------------------------------------------
+# - Tests 3.*, 6.* test that the fix for ticket de156e9efe implemented in branch
+#   bug-de156e9efe has been applied and still works.  They test that a Safe Base
+#   slave interpreter cannot write to the PRIMARY selection.
+# - The other tests verify that the master interpreter and an unsafe slave CAN
+#   write to the PRIMARY selection, and therefore that the test scripts
+#   themselves are valid.
+# - A text, entry, ttk::entry, listbox, spinbox or ttk::spinbox widget can have
+#   option -exportselection 1, meaning (in an unsafe interpreter) that a
+#   selection made in one of these widgets is automatically written to the
+#   PRIMARY selection.
+# - A safe interpreter must not write to the PRIMARY selection.
+# - The spinbox, ttk::spinbox are variants of entry, ttk::entry respectively.
+# ------------------------------------------------------------------------------
+
+namespace eval ::_test_tmp {}
+
+# ------------------------------------------------------------------------------
+#  Proc ::_test_tmp::unsafeInterp
+# ------------------------------------------------------------------------------
+# Command that creates an unsafe child interpreter and tries to load Tk.
+# - This is necessary for loading Tk if the tests are done in the build
+#   directory without installing Tk.  In that case the usual auto_path loading
+#   mechanism cannot work because the tk binary is not where pkgIndex.tcl says
+#   it is.
+# - This command is not needed for Safe Base slaves because safe::loadTk does
+#   something similar and works correctly.
+# - Based on scripts in winSend.test.
+# ------------------------------------------------------------------------------
+
+namespace eval ::_test_tmp {
+    variable TkLoadCmd
+}
+
+foreach pkg [info loaded] {
+    if {[lindex $pkg 1] eq "Tk"} {
+	set ::_test_tmp::TkLoadCmd [list load {*}$pkg]
+	break
+    }
+}
+
+proc ::_test_tmp::unsafeInterp {name} {
+    variable TkLoadCmd
+    interp create $name
+    $name eval [list set argv [list -name $name]]
+    catch {{*}$TkLoadCmd $name}
+}
+
+
+set ::_test_tmp::script {
+    package require Tk
+    namespace eval ::_test_tmp {}
+
+    proc ::_test_tmp::getPrimarySelection {} {
+        if {[catch {::tk::GetSelection . PRIMARY} sel]} {
+            set sel {}
+        }
+        return $sel
+    }
+
+    proc ::_test_tmp::setPrimarySelection {} {
+        destroy .preset
+        text .preset -exportselection 1
+        .preset insert end OLD_VALUE
+        # pack .preset
+        .preset tag add sel 1.0 end-1c
+        update
+        return
+    }
+
+    # Clearing the PRIMARY selection is troublesome.
+    # The window need not be mapped.
+    # However, the window must continue to exist, or some X11 servers
+    # will set the PRIMARY selection to something else.
+    proc ::_test_tmp::clearPrimarySelection {} {
+        destroy .clear
+        text .clear -exportselection 1
+        .clear insert end TMP_VALUE
+        # pack .clear
+        .clear tag add sel 1.0 end-1c
+        update
+        .clear tag remove sel 1.0 end-1c
+        update
+        return
+    }
+
+    # If this interpreter can write to the PRIMARY
+    # selection, the commands below will do so.
+
+    proc ::_test_tmp::tryText {} {
+        text .t -exportselection 1
+        .t insert end PAYLOAD
+        pack .t
+        .t tag add sel 1.0 end-1c
+        update
+        return
+    }
+
+    proc ::_test_tmp::tryEntry {} {
+        entry .t -exportselection 1
+        .t insert end PAYLOAD
+        pack .t
+        .t selection range 0 end
+        update
+        return
+    }
+
+    proc ::_test_tmp::tryTtkEntry {} {
+        ::ttk::entry .t -exportselection 1
+        .t insert end PAYLOAD
+        pack .t
+        .t selection range 0 end
+        update
+        return
+    }
+
+    proc ::_test_tmp::tryListbox {} {
+        listbox .t -exportselection 1
+        .t insert end list1 PAYLOAD list3
+        pack .t
+        .t selection set 1
+        update
+        return
+    }
+
+    proc ::_test_tmp::trySpinbox {ver} {
+        if {$ver == 1} {
+            # spinbox as entry
+            spinbox .t -exportselection 1 -values {1 2 3 4 5}
+            .t delete 0 end
+            .t insert end PAYLOAD
+            pack .t
+            .t selection range 0 end
+            update
+            return
+            # selects PAYLOAD
+        } elseif {$ver == 2} {
+            # spinbox spun
+            spinbox .t -exportselection 1 -values {1 2 3 4 5}
+            .t invoke buttonup
+            pack .t
+            .t selection range 0 end
+            update
+            return
+            # selects 2
+        } else {
+            # spinbox spun/selected/spun
+            spinbox .t -exportselection 1 -values {1 2 3 4 5}
+            .t invoke buttonup
+            pack .t
+            .t selection range 0 end
+            update
+            .t invoke buttonup
+            update
+            return
+            # selects 3
+        }
+    }
+
+    proc ::_test_tmp::tryTtkSpinbox {ver} {
+        if {$ver == 1} {
+            # ttk::spinbox as entry
+            ::ttk::spinbox .t -exportselection 1 -values {1 2 3 4 5}
+            .t delete 0 end
+            .t insert end PAYLOAD
+            pack .t
+            .t selection range 0 end
+            update
+            return
+        } elseif {$ver == 2} {
+            # ttk::spinbox spun
+            ::ttk::spinbox .t -exportselection 1 -values {1 2 3 4 5}
+            ::ttk::spinbox::Spin .t +1
+            ::ttk::spinbox::Spin .t +1
+            pack .t
+            # ttk::spinbox::Spin sets selection
+            update
+            return
+            # selects 2
+        } else {
+            # ttk::spinbox spun/selected/spun
+            ::ttk::spinbox .t -exportselection 1 -values {1 2 3 4 5}
+            ::ttk::spinbox::Spin .t +1
+            ::ttk::spinbox::Spin .t +1
+            pack .t
+            # ttk::spinbox::Spin sets selection
+            update
+            ::ttk::spinbox::Spin .t +1
+            update
+            return
+            # selects 3
+        }
+    }
+}
+
+# Do this once for the master interpreter.
+eval $::_test_tmp::script
+
+test safePrimarySelection-1.1 {master interpreter, text, no existing selection} -setup {
+    catch {interp delete slave2}
+    destroy {*}[winfo children .]
+    ::_test_tmp::clearPrimarySelection
+} -body {
+    ::_test_tmp::tryText
+    ::_test_tmp::getPrimarySelection
+} -cleanup {
+    destroy {*}[winfo children .]
+    ::_test_tmp::clearPrimarySelection
+} -result {PAYLOAD}
+
+test safePrimarySelection-1.2 {master interpreter, entry, no existing selection} -setup {
+    catch {interp delete slave2}
+    destroy {*}[winfo children .]
+    ::_test_tmp::clearPrimarySelection
+} -body {
+    ::_test_tmp::tryEntry
+    ::_test_tmp::getPrimarySelection
+} -cleanup {
+    destroy {*}[winfo children .]
+    ::_test_tmp::clearPrimarySelection
+} -result {PAYLOAD}
+
+test safePrimarySelection-1.3 {master interpreter, ttk::entry, no existing selection} -setup {
+    catch {interp delete slave2}
+    destroy {*}[winfo children .]
+    ::_test_tmp::clearPrimarySelection
+} -body {
+    ::_test_tmp::tryTtkEntry
+    ::_test_tmp::getPrimarySelection
+} -cleanup {
+    destroy {*}[winfo children .]
+    ::_test_tmp::clearPrimarySelection
+} -result {PAYLOAD}
+
+test safePrimarySelection-1.4 {master interpreter, listbox, no existing selection} -setup {
+    catch {interp delete slave2}
+    destroy {*}[winfo children .]
+    ::_test_tmp::clearPrimarySelection
+} -body {
+    ::_test_tmp::tryListbox
+    ::_test_tmp::getPrimarySelection
+} -cleanup {
+    destroy {*}[winfo children .]
+    ::_test_tmp::clearPrimarySelection
+} -result {PAYLOAD}
+
+test safePrimarySelection-1.5 {master interpreter, spinbox as entry, no existing selection} -setup {
+    catch {interp delete slave2}
+    destroy {*}[winfo children .]
+    ::_test_tmp::clearPrimarySelection
+} -body {
+    ::_test_tmp::trySpinbox 1
+    ::_test_tmp::getPrimarySelection
+} -cleanup {
+    destroy {*}[winfo children .]
+    ::_test_tmp::clearPrimarySelection
+} -result {PAYLOAD}
+
+test safePrimarySelection-1.6 {master interpreter, spinbox spun, no existing selection} -setup {
+    catch {interp delete slave2}
+    destroy {*}[winfo children .]
+    ::_test_tmp::clearPrimarySelection
+} -body {
+    ::_test_tmp::trySpinbox 2
+    ::_test_tmp::getPrimarySelection
+} -cleanup {
+    destroy {*}[winfo children .]
+    ::_test_tmp::clearPrimarySelection
+} -result {2}
+
+test safePrimarySelection-1.7 {master interpreter, spinbox spun/selected/spun, no existing selection} -setup {
+    catch {interp delete slave2}
+    destroy {*}[winfo children .]
+    ::_test_tmp::clearPrimarySelection
+} -body {
+    ::_test_tmp::trySpinbox 3
+    ::_test_tmp::getPrimarySelection
+} -cleanup {
+    destroy {*}[winfo children .]
+    ::_test_tmp::clearPrimarySelection
+} -result {3}
+
+test safePrimarySelection-1.8 {master interpreter, ttk::spinbox as entry, no existing selection} -setup {
+    catch {interp delete slave2}
+    destroy {*}[winfo children .]
+    ::_test_tmp::clearPrimarySelection
+} -body {
+    ::_test_tmp::tryTtkSpinbox 1
+    ::_test_tmp::getPrimarySelection
+} -cleanup {
+    destroy {*}[winfo children .]
+    ::_test_tmp::clearPrimarySelection
+} -result {PAYLOAD}
+
+test safePrimarySelection-1.9 {master interpreter, ttk::spinbox spun, no existing selection} -setup {
+    catch {interp delete slave2}
+    destroy {*}[winfo children .]
+    ::_test_tmp::clearPrimarySelection
+} -body {
+    ::_test_tmp::tryTtkSpinbox 2
+    ::_test_tmp::getPrimarySelection
+} -cleanup {
+    destroy {*}[winfo children .]
+    ::_test_tmp::clearPrimarySelection
+} -result {2}
+
+test safePrimarySelection-1.10 {master interpreter, ttk::spinbox spun/selected/spun, no existing selection} -setup {
+    catch {interp delete slave2}
+    destroy {*}[winfo children .]
+    ::_test_tmp::clearPrimarySelection
+} -body {
+    ::_test_tmp::tryTtkSpinbox 3
+    ::_test_tmp::getPrimarySelection
+} -cleanup {
+    destroy {*}[winfo children .]
+    ::_test_tmp::clearPrimarySelection
+} -result {3}
+
+test safePrimarySelection-2.1 {unsafe slave interpreter, text, no existing selection} -setup {
+    catch {interp delete slave2}
+    destroy {*}[winfo children .]
+    ::_test_tmp::clearPrimarySelection
+} -body {
+    set int2 slave2
+    ::_test_tmp::unsafeInterp $int2
+    $int2 eval $::_test_tmp::script
+    $int2 eval ::_test_tmp::tryText
+    $int2 eval ::_test_tmp::getPrimarySelection
+} -cleanup {
+    interp delete $int2
+    destroy {*}[winfo children .]
+    unset int2
+    ::_test_tmp::clearPrimarySelection
+} -result {PAYLOAD}
+
+test safePrimarySelection-2.2 {unsafe slave interpreter, entry, no existing selection} -setup {
+    catch {interp delete slave2}
+    destroy {*}[winfo children .]
+    ::_test_tmp::clearPrimarySelection
+} -body {
+    set int2 slave2
+    ::_test_tmp::unsafeInterp $int2
+    $int2 eval $::_test_tmp::script
+    $int2 eval ::_test_tmp::tryEntry
+    $int2 eval ::_test_tmp::getPrimarySelection
+} -cleanup {
+    interp delete $int2
+    destroy {*}[winfo children .]
+    unset int2
+    ::_test_tmp::clearPrimarySelection
+} -result {PAYLOAD}
+
+test safePrimarySelection-2.3 {unsafe slave interpreter, ttk::entry, no existing selection} -setup {
+    catch {interp delete slave2}
+    destroy {*}[winfo children .]
+    ::_test_tmp::clearPrimarySelection
+} -body {
+    set int2 slave2
+    ::_test_tmp::unsafeInterp $int2
+    $int2 eval $::_test_tmp::script
+    $int2 eval ::_test_tmp::tryTtkEntry
+    $int2 eval ::_test_tmp::getPrimarySelection
+} -cleanup {
+    interp delete $int2
+    destroy {*}[winfo children .]
+    unset int2
+    ::_test_tmp::clearPrimarySelection
+} -result {PAYLOAD}
+
+test safePrimarySelection-2.4 {unsafe slave interpreter, listbox, no existing selection} -setup {
+    catch {interp delete slave2}
+    destroy {*}[winfo children .]
+    ::_test_tmp::clearPrimarySelection
+} -body {
+    set int2 slave2
+    ::_test_tmp::unsafeInterp $int2
+    $int2 eval $::_test_tmp::script
+    $int2 eval ::_test_tmp::tryListbox
+    $int2 eval ::_test_tmp::getPrimarySelection
+} -cleanup {
+    interp delete $int2
+    destroy {*}[winfo children .]
+    unset int2
+    ::_test_tmp::clearPrimarySelection
+} -result {PAYLOAD}
+
+test safePrimarySelection-2.5 {unsafe slave interpreter, spinbox as entry, no existing selection} -setup {
+    catch {interp delete slave2}
+    destroy {*}[winfo children .]
+    ::_test_tmp::clearPrimarySelection
+} -body {
+    set int2 slave2
+    ::_test_tmp::unsafeInterp $int2
+    $int2 eval $::_test_tmp::script
+    $int2 eval ::_test_tmp::trySpinbox 1
+    $int2 eval ::_test_tmp::getPrimarySelection
+} -cleanup {
+    interp delete $int2
+    destroy {*}[winfo children .]
+    unset int2
+    ::_test_tmp::clearPrimarySelection
+} -result {PAYLOAD}
+
+test safePrimarySelection-2.6 {unsafe slave interpreter, spinbox spun, no existing selection} -setup {
+    catch {interp delete slave2}
+    destroy {*}[winfo children .]
+    ::_test_tmp::clearPrimarySelection
+} -body {
+    set int2 slave2
+    ::_test_tmp::unsafeInterp $int2
+    $int2 eval $::_test_tmp::script
+    $int2 eval ::_test_tmp::trySpinbox 2
+    $int2 eval ::_test_tmp::getPrimarySelection
+} -cleanup {
+    interp delete $int2
+    destroy {*}[winfo children .]
+    unset int2
+    ::_test_tmp::clearPrimarySelection
+} -result {2}
+
+test safePrimarySelection-2.7 {unsafe slave interpreter, spinbox spun/selected/spun, no existing selection} -setup {
+    catch {interp delete slave2}
+    destroy {*}[winfo children .]
+    ::_test_tmp::clearPrimarySelection
+} -body {
+    set int2 slave2
+    ::_test_tmp::unsafeInterp $int2
+    $int2 eval $::_test_tmp::script
+    $int2 eval ::_test_tmp::trySpinbox 3
+    $int2 eval ::_test_tmp::getPrimarySelection
+} -cleanup {
+    interp delete $int2
+    destroy {*}[winfo children .]
+    unset int2
+    ::_test_tmp::clearPrimarySelection
+} -result {3}
+
+test safePrimarySelection-2.8 {unsafe slave interpreter, ttk::spinbox as entry, no existing selection} -setup {
+    catch {interp delete slave2}
+    destroy {*}[winfo children .]
+    ::_test_tmp::clearPrimarySelection
+} -body {
+    set int2 slave2
+    ::_test_tmp::unsafeInterp $int2
+    $int2 eval $::_test_tmp::script
+    $int2 eval ::_test_tmp::tryTtkSpinbox 1
+    $int2 eval ::_test_tmp::getPrimarySelection
+} -cleanup {
+    interp delete $int2
+    destroy {*}[winfo children .]
+    unset int2
+    ::_test_tmp::clearPrimarySelection
+} -result {PAYLOAD}
+
+test safePrimarySelection-2.9 {unsafe slave interpreter, ttk::spinbox spun, no existing selection} -setup {
+    catch {interp delete slave2}
+    destroy {*}[winfo children .]
+    ::_test_tmp::clearPrimarySelection
+} -body {
+    set int2 slave2
+    ::_test_tmp::unsafeInterp $int2
+    $int2 eval $::_test_tmp::script
+    $int2 eval ::_test_tmp::tryTtkSpinbox 2
+    $int2 eval ::_test_tmp::getPrimarySelection
+} -cleanup {
+    interp delete $int2
+    destroy {*}[winfo children .]
+    unset int2
+    ::_test_tmp::clearPrimarySelection
+} -result {2}
+
+test safePrimarySelection-2.10 {unsafe slave interpreter, ttk::spinbox spun/selected/spun, no existing selection} -setup {
+    catch {interp delete slave2}
+    destroy {*}[winfo children .]
+    ::_test_tmp::clearPrimarySelection
+} -body {
+    set int2 slave2
+    ::_test_tmp::unsafeInterp $int2
+    $int2 eval $::_test_tmp::script
+    $int2 eval ::_test_tmp::tryTtkSpinbox 3
+    $int2 eval ::_test_tmp::getPrimarySelection
+} -cleanup {
+    interp delete $int2
+    destroy {*}[winfo children .]
+    unset int2
+    ::_test_tmp::clearPrimarySelection
+} -result {3}
+
+test safePrimarySelection-3.1 {IMPORTANT, safe slave interpreter, text, no existing selection} -setup {
+    catch {interp delete slave2}
+    destroy {*}[winfo children .]
+    ::_test_tmp::clearPrimarySelection
+} -body {
+    set res0 [::_test_tmp::getPrimarySelection]
+    set int2 slave2
+    ::safe::interpCreate $int2
+    ::safe::loadTk $int2
+    $int2 eval $::_test_tmp::script
+    $int2 eval ::_test_tmp::tryText
+    set res1 [$int2 eval ::_test_tmp::getPrimarySelection]
+    set res2 [::_test_tmp::getPrimarySelection]
+    set res3 $res0--$res1--$res2
+} -cleanup {
+    interp delete $int2
+    destroy {*}[winfo children .]
+    unset int2 res0 res1 res2 res3
+    ::_test_tmp::clearPrimarySelection
+} -result {----}
+
+test safePrimarySelection-3.2 {IMPORTANT, safe slave interpreter, entry, no existing selection} -setup {
+    catch {interp delete slave2}
+    destroy {*}[winfo children .]
+    ::_test_tmp::clearPrimarySelection
+} -body {
+    set res0 [::_test_tmp::getPrimarySelection]
+    set int2 slave2
+    ::safe::interpCreate $int2
+    ::safe::loadTk $int2
+    $int2 eval $::_test_tmp::script
+    $int2 eval ::_test_tmp::tryEntry
+    set res1 [$int2 eval ::_test_tmp::getPrimarySelection]
+    set res2 [::_test_tmp::getPrimarySelection]
+    set res3 $res0--$res1--$res2
+} -cleanup {
+    interp delete $int2
+    destroy {*}[winfo children .]
+    unset int2 res0 res1 res2 res3
+    ::_test_tmp::clearPrimarySelection
+} -result {----}
+
+test safePrimarySelection-3.3 {IMPORTANT, safe slave interpreter, ttk::entry, no existing selection} -setup {
+    catch {interp delete slave2}
+    destroy {*}[winfo children .]
+    ::_test_tmp::clearPrimarySelection
+} -body {
+    set res0 [::_test_tmp::getPrimarySelection]
+    set int2 slave2
+    ::safe::interpCreate $int2
+    ::safe::loadTk $int2
+    $int2 eval $::_test_tmp::script
+    $int2 eval ::_test_tmp::tryTtkEntry
+    set res1 [$int2 eval ::_test_tmp::getPrimarySelection]
+    set res2 [::_test_tmp::getPrimarySelection]
+    set res3 $res0--$res1--$res2
+} -cleanup {
+    interp delete $int2
+    destroy {*}[winfo children .]
+    unset int2 res0 res1 res2 res3
+    ::_test_tmp::clearPrimarySelection
+} -result {----}
+
+test safePrimarySelection-3.4 {IMPORTANT, safe slave interpreter, listbox, no existing selection} -setup {
+    catch {interp delete slave2}
+    destroy {*}[winfo children .]
+    ::_test_tmp::clearPrimarySelection
+} -body {
+    set res0 [::_test_tmp::getPrimarySelection]
+    set int2 slave2
+    ::safe::interpCreate $int2
+    ::safe::loadTk $int2
+    $int2 eval $::_test_tmp::script
+    $int2 eval ::_test_tmp::tryListbox
+    set res1 [$int2 eval ::_test_tmp::getPrimarySelection]
+    set res2 [::_test_tmp::getPrimarySelection]
+    set res3 $res0--$res1--$res2
+} -cleanup {
+    interp delete $int2
+    destroy {*}[winfo children .]
+    unset int2 res0 res1 res2 res3
+    ::_test_tmp::clearPrimarySelection
+} -result {----}
+
+test safePrimarySelection-3.5 {IMPORTANT, safe slave interpreter, spinbox as entry, no existing selection} -setup {
+    catch {interp delete slave2}
+    destroy {*}[winfo children .]
+    ::_test_tmp::clearPrimarySelection
+} -body {
+    set res0 [::_test_tmp::getPrimarySelection]
+    set int2 slave2
+    ::safe::interpCreate $int2
+    ::safe::loadTk $int2
+    $int2 eval $::_test_tmp::script
+    $int2 eval ::_test_tmp::trySpinbox 1
+    set res1 [$int2 eval ::_test_tmp::getPrimarySelection]
+    set res2 [::_test_tmp::getPrimarySelection]
+    set res3 $res0--$res1--$res2
+} -cleanup {
+    interp delete $int2
+    destroy {*}[winfo children .]
+    unset int2 res0 res1 res2 res3
+    ::_test_tmp::clearPrimarySelection
+} -result {----}
+
+test safePrimarySelection-3.6 {IMPORTANT, safe slave interpreter, spinbox spun, no existing selection} -setup {
+    catch {interp delete slave2}
+    destroy {*}[winfo children .]
+    ::_test_tmp::clearPrimarySelection
+} -body {
+    set res0 [::_test_tmp::getPrimarySelection]
+    set int2 slave2
+    ::safe::interpCreate $int2
+    ::safe::loadTk $int2
+    $int2 eval $::_test_tmp::script
+    $int2 eval ::_test_tmp::trySpinbox 2
+    set res1 [$int2 eval ::_test_tmp::getPrimarySelection]
+    set res2 [::_test_tmp::getPrimarySelection]
+    set res3 $res0--$res1--$res2
+} -cleanup {
+    interp delete $int2
+    destroy {*}[winfo children .]
+    unset int2 res0 res1 res2 res3
+    ::_test_tmp::clearPrimarySelection
+} -result {----}
+
+test safePrimarySelection-3.7 {IMPORTANT, safe slave interpreter, spinbox spun/selected/spun, no existing selection} -setup {
+    catch {interp delete slave2}
+    destroy {*}[winfo children .]
+    ::_test_tmp::clearPrimarySelection
+} -body {
+    set res0 [::_test_tmp::getPrimarySelection]
+    set int2 slave2
+    ::safe::interpCreate $int2
+    ::safe::loadTk $int2
+    $int2 eval $::_test_tmp::script
+    $int2 eval ::_test_tmp::trySpinbox 3
+    set res1 [$int2 eval ::_test_tmp::getPrimarySelection]
+    set res2 [::_test_tmp::getPrimarySelection]
+    set res3 $res0--$res1--$res2
+} -cleanup {
+    interp delete $int2
+    destroy {*}[winfo children .]
+    unset int2 res0 res1 res2 res3
+    ::_test_tmp::clearPrimarySelection
+} -result {----}
+
+test safePrimarySelection-3.8 {IMPORTANT, safe slave interpreter, ttk::spinbox as entry, no existing selection} -setup {
+    catch {interp delete slave2}
+    destroy {*}[winfo children .]
+    ::_test_tmp::clearPrimarySelection
+} -body {
+    set res0 [::_test_tmp::getPrimarySelection]
+    set int2 slave2
+    ::safe::interpCreate $int2
+    ::safe::loadTk $int2
+    $int2 eval $::_test_tmp::script
+    $int2 eval ::_test_tmp::tryTtkSpinbox 1
+    set res1 [$int2 eval ::_test_tmp::getPrimarySelection]
+    set res2 [::_test_tmp::getPrimarySelection]
+    set res3 $res0--$res1--$res2
+} -cleanup {
+    interp delete $int2
+    destroy {*}[winfo children .]
+    unset int2 res0 res1 res2 res3
+    ::_test_tmp::clearPrimarySelection
+} -result {----}
+
+test safePrimarySelection-3.9 {IMPORTANT, safe slave interpreter, ttk::spinbox spun, no existing selection} -setup {
+    catch {interp delete slave2}
+    destroy {*}[winfo children .]
+    ::_test_tmp::clearPrimarySelection
+} -body {
+    set res0 [::_test_tmp::getPrimarySelection]
+    set int2 slave2
+    ::safe::interpCreate $int2
+    ::safe::loadTk $int2
+    $int2 eval $::_test_tmp::script
+    $int2 eval ::_test_tmp::tryTtkSpinbox 2
+    set res1 [$int2 eval ::_test_tmp::getPrimarySelection]
+    set res2 [::_test_tmp::getPrimarySelection]
+    set res3 $res0--$res1--$res2
+} -cleanup {
+    interp delete $int2
+    destroy {*}[winfo children .]
+    unset int2 res0 res1 res2 res3
+    ::_test_tmp::clearPrimarySelection
+} -result {----}
+
+test safePrimarySelection-3.10 {IMPORTANT, safe slave interpreter, ttk::spinbox spun/selected/spun, no existing selection} -setup {
+    catch {interp delete slave2}
+    destroy {*}[winfo children .]
+    ::_test_tmp::clearPrimarySelection
+} -body {
+    set res0 [::_test_tmp::getPrimarySelection]
+    set int2 slave2
+    ::safe::interpCreate $int2
+    ::safe::loadTk $int2
+    $int2 eval $::_test_tmp::script
+    $int2 eval ::_test_tmp::tryTtkSpinbox 3
+    set res1 [$int2 eval ::_test_tmp::getPrimarySelection]
+    set res2 [::_test_tmp::getPrimarySelection]
+    set res3 $res0--$res1--$res2
+} -cleanup {
+    interp delete $int2
+    destroy {*}[winfo children .]
+    unset int2 res0 res1 res2 res3
+    ::_test_tmp::clearPrimarySelection
+} -result {----}
+
+test safePrimarySelection-4.1 {master interpreter, text, existing selection} -setup {
+    catch {interp delete slave2}
+    destroy {*}[winfo children .]
+    ::_test_tmp::setPrimarySelection
+} -body {
+    ::_test_tmp::tryText
+    ::_test_tmp::getPrimarySelection
+} -cleanup {
+    destroy {*}[winfo children .]
+    ::_test_tmp::clearPrimarySelection
+} -result {PAYLOAD}
+
+test safePrimarySelection-4.2 {master interpreter, entry, existing selection} -setup {
+    catch {interp delete slave2}
+    destroy {*}[winfo children .]
+    ::_test_tmp::setPrimarySelection
+} -body {
+    ::_test_tmp::tryEntry
+    ::_test_tmp::getPrimarySelection
+} -cleanup {
+    destroy {*}[winfo children .]
+    ::_test_tmp::clearPrimarySelection
+} -result {PAYLOAD}
+
+test safePrimarySelection-4.3 {master interpreter, ttk::entry, existing selection} -setup {
+    catch {interp delete slave2}
+    destroy {*}[winfo children .]
+    ::_test_tmp::setPrimarySelection
+} -body {
+    ::_test_tmp::tryTtkEntry
+    ::_test_tmp::getPrimarySelection
+} -cleanup {
+    destroy {*}[winfo children .]
+    ::_test_tmp::clearPrimarySelection
+} -result {PAYLOAD}
+
+test safePrimarySelection-4.4 {master interpreter, listbox, existing selection} -setup {
+    catch {interp delete slave2}
+    destroy {*}[winfo children .]
+    ::_test_tmp::setPrimarySelection
+} -body {
+    ::_test_tmp::tryListbox
+    ::_test_tmp::getPrimarySelection
+} -cleanup {
+    destroy {*}[winfo children .]
+    ::_test_tmp::clearPrimarySelection
+} -result {PAYLOAD}
+
+test safePrimarySelection-4.5 {master interpreter, spinbox as entry, existing selection} -setup {
+    catch {interp delete slave2}
+    destroy {*}[winfo children .]
+    ::_test_tmp::setPrimarySelection
+} -body {
+    ::_test_tmp::trySpinbox 1
+    ::_test_tmp::getPrimarySelection
+} -cleanup {
+    destroy {*}[winfo children .]
+    ::_test_tmp::clearPrimarySelection
+} -result {PAYLOAD}
+
+test safePrimarySelection-4.6 {master interpreter, spinbox spun, existing selection} -setup {
+    catch {interp delete slave2}
+    destroy {*}[winfo children .]
+    ::_test_tmp::setPrimarySelection
+} -body {
+    ::_test_tmp::trySpinbox 2
+    ::_test_tmp::getPrimarySelection
+} -cleanup {
+    destroy {*}[winfo children .]
+    ::_test_tmp::clearPrimarySelection
+} -result {2}
+
+test safePrimarySelection-4.7 {master interpreter, spinbox spun/selected/spun, existing selection} -setup {
+    catch {interp delete slave2}
+    destroy {*}[winfo children .]
+    ::_test_tmp::setPrimarySelection
+} -body {
+    ::_test_tmp::trySpinbox 3
+    ::_test_tmp::getPrimarySelection
+} -cleanup {
+    destroy {*}[winfo children .]
+    ::_test_tmp::clearPrimarySelection
+} -result {3}
+
+test safePrimarySelection-4.8 {master interpreter, ttk::spinbox as entry, existing selection} -setup {
+    catch {interp delete slave2}
+    destroy {*}[winfo children .]
+    ::_test_tmp::setPrimarySelection
+} -body {
+    ::_test_tmp::tryTtkSpinbox 1
+    ::_test_tmp::getPrimarySelection
+} -cleanup {
+    destroy {*}[winfo children .]
+    ::_test_tmp::clearPrimarySelection
+} -result {PAYLOAD}
+
+test safePrimarySelection-4.9 {master interpreter, ttk::spinbox spun, existing selection} -setup {
+    catch {interp delete slave2}
+    destroy {*}[winfo children .]
+    ::_test_tmp::setPrimarySelection
+} -body {
+    ::_test_tmp::tryTtkSpinbox 2
+    ::_test_tmp::getPrimarySelection
+} -cleanup {
+    destroy {*}[winfo children .]
+    ::_test_tmp::clearPrimarySelection
+} -result {2}
+
+test safePrimarySelection-4.10 {master interpreter, ttk::spinbox spun/selected/spun, existing selection} -setup {
+    catch {interp delete slave2}
+    destroy {*}[winfo children .]
+    ::_test_tmp::setPrimarySelection
+} -body {
+    ::_test_tmp::tryTtkSpinbox 3
+    ::_test_tmp::getPrimarySelection
+} -cleanup {
+    destroy {*}[winfo children .]
+    ::_test_tmp::clearPrimarySelection
+} -result {3}
+
+test safePrimarySelection-5.1 {unsafe slave interpreter, text, existing selection} -setup {
+    catch {interp delete slave2}
+    destroy {*}[winfo children .]
+    ::_test_tmp::setPrimarySelection
+} -body {
+    set int2 slave2
+    ::_test_tmp::unsafeInterp $int2
+    $int2 eval $::_test_tmp::script
+    $int2 eval ::_test_tmp::tryText
+    $int2 eval ::_test_tmp::getPrimarySelection
+} -cleanup {
+    interp delete $int2
+    destroy {*}[winfo children .]
+    unset int2
+    ::_test_tmp::clearPrimarySelection
+} -result {PAYLOAD}
+
+test safePrimarySelection-5.2 {unsafe slave interpreter, entry, existing selection} -setup {
+    catch {interp delete slave2}
+    destroy {*}[winfo children .]
+    ::_test_tmp::setPrimarySelection
+} -body {
+    set int2 slave2
+    ::_test_tmp::unsafeInterp $int2
+    $int2 eval $::_test_tmp::script
+    $int2 eval ::_test_tmp::tryEntry
+    $int2 eval ::_test_tmp::getPrimarySelection
+} -cleanup {
+    interp delete $int2
+    destroy {*}[winfo children .]
+    unset int2
+    ::_test_tmp::clearPrimarySelection
+} -result {PAYLOAD}
+
+test safePrimarySelection-5.3 {unsafe slave interpreter, ttk::entry, existing selection} -setup {
+    catch {interp delete slave2}
+    destroy {*}[winfo children .]
+    ::_test_tmp::setPrimarySelection
+} -body {
+    set int2 slave2
+    ::_test_tmp::unsafeInterp $int2
+    $int2 eval $::_test_tmp::script
+    $int2 eval ::_test_tmp::tryTtkEntry
+    $int2 eval ::_test_tmp::getPrimarySelection
+} -cleanup {
+    interp delete $int2
+    destroy {*}[winfo children .]
+    unset int2
+    ::_test_tmp::clearPrimarySelection
+} -result {PAYLOAD}
+
+test safePrimarySelection-5.4 {unsafe slave interpreter, listbox, existing selection} -setup {
+    catch {interp delete slave2}
+    destroy {*}[winfo children .]
+    ::_test_tmp::setPrimarySelection
+} -body {
+    set int2 slave2
+    ::_test_tmp::unsafeInterp $int2
+    $int2 eval $::_test_tmp::script
+    $int2 eval ::_test_tmp::tryListbox
+    $int2 eval ::_test_tmp::getPrimarySelection
+} -cleanup {
+    interp delete $int2
+    destroy {*}[winfo children .]
+    unset int2
+    ::_test_tmp::clearPrimarySelection
+} -result {PAYLOAD}
+
+test safePrimarySelection-5.5 {unsafe slave interpreter, spinbox as entry, existing selection} -setup {
+    catch {interp delete slave2}
+    destroy {*}[winfo children .]
+    ::_test_tmp::setPrimarySelection
+} -body {
+    set int2 slave2
+    ::_test_tmp::unsafeInterp $int2
+    $int2 eval $::_test_tmp::script
+    $int2 eval ::_test_tmp::trySpinbox 1
+    $int2 eval ::_test_tmp::getPrimarySelection
+} -cleanup {
+    interp delete $int2
+    destroy {*}[winfo children .]
+    unset int2
+    ::_test_tmp::clearPrimarySelection
+} -result {PAYLOAD}
+
+test safePrimarySelection-5.6 {unsafe slave interpreter, spinbox spun, existing selection} -setup {
+    catch {interp delete slave2}
+    destroy {*}[winfo children .]
+    ::_test_tmp::setPrimarySelection
+} -body {
+    set int2 slave2
+    ::_test_tmp::unsafeInterp $int2
+    $int2 eval $::_test_tmp::script
+    $int2 eval ::_test_tmp::trySpinbox 2
+    $int2 eval ::_test_tmp::getPrimarySelection
+} -cleanup {
+    interp delete $int2
+    destroy {*}[winfo children .]
+    unset int2
+    ::_test_tmp::clearPrimarySelection
+} -result {2}
+
+test safePrimarySelection-5.7 {unsafe slave interpreter, spinbox spun/selected/spun, existing selection} -setup {
+    catch {interp delete slave2}
+    destroy {*}[winfo children .]
+    ::_test_tmp::setPrimarySelection
+} -body {
+    set int2 slave2
+    ::_test_tmp::unsafeInterp $int2
+    $int2 eval $::_test_tmp::script
+    $int2 eval ::_test_tmp::trySpinbox 3
+    $int2 eval ::_test_tmp::getPrimarySelection
+} -cleanup {
+    interp delete $int2
+    destroy {*}[winfo children .]
+    unset int2
+    ::_test_tmp::clearPrimarySelection
+} -result {3}
+
+test safePrimarySelection-5.8 {unsafe slave interpreter, ttk::spinbox as entry, existing selection} -setup {
+    catch {interp delete slave2}
+    destroy {*}[winfo children .]
+    ::_test_tmp::setPrimarySelection
+} -body {
+    set int2 slave2
+    ::_test_tmp::unsafeInterp $int2
+    $int2 eval $::_test_tmp::script
+    $int2 eval ::_test_tmp::tryTtkSpinbox 1
+    $int2 eval ::_test_tmp::getPrimarySelection
+} -cleanup {
+    interp delete $int2
+    destroy {*}[winfo children .]
+    unset int2
+    ::_test_tmp::clearPrimarySelection
+} -result {PAYLOAD}
+
+test safePrimarySelection-5.9 {unsafe slave interpreter, ttk::spinbox spun, existing selection} -setup {
+    catch {interp delete slave2}
+    destroy {*}[winfo children .]
+    ::_test_tmp::setPrimarySelection
+} -body {
+    set int2 slave2
+    ::_test_tmp::unsafeInterp $int2
+    $int2 eval $::_test_tmp::script
+    $int2 eval ::_test_tmp::tryTtkSpinbox 2
+    $int2 eval ::_test_tmp::getPrimarySelection
+} -cleanup {
+    interp delete $int2
+    destroy {*}[winfo children .]
+    unset int2
+    ::_test_tmp::clearPrimarySelection
+} -result {2}
+
+test safePrimarySelection-5.10 {unsafe slave interpreter, ttk::spinbox spun/selected/spun, existing selection} -setup {
+    catch {interp delete slave2}
+    destroy {*}[winfo children .]
+    ::_test_tmp::setPrimarySelection
+} -body {
+    set int2 slave2
+    ::_test_tmp::unsafeInterp $int2
+    $int2 eval $::_test_tmp::script
+    $int2 eval ::_test_tmp::tryTtkSpinbox 3
+    $int2 eval ::_test_tmp::getPrimarySelection
+} -cleanup {
+    interp delete $int2
+    destroy {*}[winfo children .]
+    unset int2
+    ::_test_tmp::clearPrimarySelection
+} -result {3}
+
+test safePrimarySelection-6.1 {IMPORTANT, safe slave interpreter, text, existing selection} -setup {
+    catch {interp delete slave2}
+    destroy {*}[winfo children .]
+    ::_test_tmp::setPrimarySelection
+} -body {
+    set res0 [::_test_tmp::getPrimarySelection]
+    set int2 slave2
+    ::safe::interpCreate $int2
+    ::safe::loadTk $int2
+    $int2 eval $::_test_tmp::script
+    $int2 eval ::_test_tmp::tryText
+    set res1 [$int2 eval ::_test_tmp::getPrimarySelection]
+    set res2 [::_test_tmp::getPrimarySelection]
+    set res3 $res0--$res1--$res2
+} -cleanup {
+    interp delete $int2
+    destroy {*}[winfo children .]
+    unset int2 res0 res1 res2 res3
+    ::_test_tmp::clearPrimarySelection
+} -result {OLD_VALUE----OLD_VALUE}
+
+test safePrimarySelection-6.2 {IMPORTANT, safe slave interpreter, entry, existing selection} -setup {
+    catch {interp delete slave2}
+    destroy {*}[winfo children .]
+    ::_test_tmp::setPrimarySelection
+} -body {
+    set res0 [::_test_tmp::getPrimarySelection]
+    set int2 slave2
+    ::safe::interpCreate $int2
+    ::safe::loadTk $int2
+    $int2 eval $::_test_tmp::script
+    $int2 eval ::_test_tmp::tryEntry
+    set res1 [$int2 eval ::_test_tmp::getPrimarySelection]
+    set res2 [::_test_tmp::getPrimarySelection]
+    set res3 $res0--$res1--$res2
+} -cleanup {
+    interp delete $int2
+    destroy {*}[winfo children .]
+    unset int2 res0 res1 res2 res3
+    ::_test_tmp::clearPrimarySelection
+} -result {OLD_VALUE----OLD_VALUE}
+
+test safePrimarySelection-6.3 {IMPORTANT, safe slave interpreter, ttk::entry, existing selection} -setup {
+    catch {interp delete slave2}
+    destroy {*}[winfo children .]
+    ::_test_tmp::setPrimarySelection
+} -body {
+    set res0 [::_test_tmp::getPrimarySelection]
+    set int2 slave2
+    ::safe::interpCreate $int2
+    ::safe::loadTk $int2
+    $int2 eval $::_test_tmp::script
+    $int2 eval ::_test_tmp::tryTtkEntry
+    set res1 [$int2 eval ::_test_tmp::getPrimarySelection]
+    set res2 [::_test_tmp::getPrimarySelection]
+    set res3 $res0--$res1--$res2
+} -cleanup {
+    interp delete $int2
+    destroy {*}[winfo children .]
+    unset int2 res0 res1 res2 res3
+    ::_test_tmp::clearPrimarySelection
+} -result {OLD_VALUE----OLD_VALUE}
+
+test safePrimarySelection-6.4 {IMPORTANT, safe slave interpreter, listbox, existing selection} -setup {
+    catch {interp delete slave2}
+    destroy {*}[winfo children .]
+    ::_test_tmp::setPrimarySelection
+} -body {
+    set res0 [::_test_tmp::getPrimarySelection]
+    set int2 slave2
+    ::safe::interpCreate $int2
+    ::safe::loadTk $int2
+    $int2 eval $::_test_tmp::script
+    $int2 eval ::_test_tmp::tryListbox
+    set res1 [$int2 eval ::_test_tmp::getPrimarySelection]
+    set res2 [::_test_tmp::getPrimarySelection]
+    set res3 $res0--$res1--$res2
+} -cleanup {
+    interp delete $int2
+    destroy {*}[winfo children .]
+    unset int2 res0 res1 res2 res3
+    ::_test_tmp::clearPrimarySelection
+} -result {OLD_VALUE----OLD_VALUE}
+
+test safePrimarySelection-6.5 {IMPORTANT, safe slave interpreter, spinbox as entry, existing selection} -setup {
+    catch {interp delete slave2}
+    destroy {*}[winfo children .]
+    ::_test_tmp::setPrimarySelection
+} -body {
+    set res0 [::_test_tmp::getPrimarySelection]
+    set int2 slave2
+    ::safe::interpCreate $int2
+    ::safe::loadTk $int2
+    $int2 eval $::_test_tmp::script
+    $int2 eval ::_test_tmp::trySpinbox 1
+    set res1 [$int2 eval ::_test_tmp::getPrimarySelection]
+    set res2 [::_test_tmp::getPrimarySelection]
+    set res3 $res0--$res1--$res2
+} -cleanup {
+    interp delete $int2
+    destroy {*}[winfo children .]
+    unset int2 res0 res1 res2 res3
+    ::_test_tmp::clearPrimarySelection
+} -result {OLD_VALUE----OLD_VALUE}
+
+test safePrimarySelection-6.6 {IMPORTANT, safe slave interpreter, spinbox spun, existing selection} -setup {
+    catch {interp delete slave2}
+    destroy {*}[winfo children .]
+    ::_test_tmp::setPrimarySelection
+} -body {
+    set res0 [::_test_tmp::getPrimarySelection]
+    set int2 slave2
+    ::safe::interpCreate $int2
+    ::safe::loadTk $int2
+    $int2 eval $::_test_tmp::script
+    $int2 eval ::_test_tmp::trySpinbox 2
+    set res1 [$int2 eval ::_test_tmp::getPrimarySelection]
+    set res2 [::_test_tmp::getPrimarySelection]
+    set res3 $res0--$res1--$res2
+} -cleanup {
+    interp delete $int2
+    destroy {*}[winfo children .]
+    unset int2 res0 res1 res2 res3
+    ::_test_tmp::clearPrimarySelection
+} -result {OLD_VALUE----OLD_VALUE}
+
+test safePrimarySelection-6.7 {IMPORTANT, safe slave interpreter, spinbox spun/selected/spun, existing selection} -setup {
+    catch {interp delete slave2}
+    destroy {*}[winfo children .]
+    ::_test_tmp::setPrimarySelection
+} -body {
+    set res0 [::_test_tmp::getPrimarySelection]
+    set int2 slave2
+    ::safe::interpCreate $int2
+    ::safe::loadTk $int2
+    $int2 eval $::_test_tmp::script
+    $int2 eval ::_test_tmp::trySpinbox 3
+    set res1 [$int2 eval ::_test_tmp::getPrimarySelection]
+    set res2 [::_test_tmp::getPrimarySelection]
+    set res3 $res0--$res1--$res2
+} -cleanup {
+    interp delete $int2
+    destroy {*}[winfo children .]
+    unset int2 res0 res1 res2 res3
+    ::_test_tmp::clearPrimarySelection
+} -result {OLD_VALUE----OLD_VALUE}
+
+test safePrimarySelection-6.8 {IMPORTANT, safe slave interpreter, ttk::spinbox as entry, existing selection} -setup {
+    catch {interp delete slave2}
+    destroy {*}[winfo children .]
+    ::_test_tmp::setPrimarySelection
+} -body {
+    set res0 [::_test_tmp::getPrimarySelection]
+    set int2 slave2
+    ::safe::interpCreate $int2
+    ::safe::loadTk $int2
+    $int2 eval $::_test_tmp::script
+    $int2 eval ::_test_tmp::tryTtkSpinbox 1
+    set res1 [$int2 eval ::_test_tmp::getPrimarySelection]
+    set res2 [::_test_tmp::getPrimarySelection]
+    set res3 $res0--$res1--$res2
+} -cleanup {
+    interp delete $int2
+    destroy {*}[winfo children .]
+    unset int2 res0 res1 res2 res3
+    ::_test_tmp::clearPrimarySelection
+} -result {OLD_VALUE----OLD_VALUE}
+
+test safePrimarySelection-6.9 {IMPORTANT, safe slave interpreter, ttk::spinbox spun, existing selection} -setup {
+    catch {interp delete slave2}
+    destroy {*}[winfo children .]
+    ::_test_tmp::setPrimarySelection
+} -body {
+    set res0 [::_test_tmp::getPrimarySelection]
+    set int2 slave2
+    ::safe::interpCreate $int2
+    ::safe::loadTk $int2
+    $int2 eval $::_test_tmp::script
+    $int2 eval ::_test_tmp::tryTtkSpinbox 2
+    set res1 [$int2 eval ::_test_tmp::getPrimarySelection]
+    set res2 [::_test_tmp::getPrimarySelection]
+    set res3 $res0--$res1--$res2
+} -cleanup {
+    interp delete $int2
+    destroy {*}[winfo children .]
+    unset int2 res0 res1 res2 res3
+    ::_test_tmp::clearPrimarySelection
+} -result {OLD_VALUE----OLD_VALUE}
+
+test safePrimarySelection-6.10 {IMPORTANT, safe slave interpreter, ttk::spinbox spun/selected/spun, existing selection} -setup {
+    catch {interp delete slave2}
+    destroy {*}[winfo children .]
+    ::_test_tmp::setPrimarySelection
+} -body {
+    set res0 [::_test_tmp::getPrimarySelection]
+    set int2 slave2
+    ::safe::interpCreate $int2
+    ::safe::loadTk $int2
+    $int2 eval $::_test_tmp::script
+    $int2 eval ::_test_tmp::tryTtkSpinbox 3
+    set res1 [$int2 eval ::_test_tmp::getPrimarySelection]
+    set res2 [::_test_tmp::getPrimarySelection]
+    set res3 $res0--$res1--$res2
+} -cleanup {
+    interp delete $int2
+    destroy {*}[winfo children .]
+    unset int2 res0 res1 res2 res3
+    ::_test_tmp::clearPrimarySelection
+} -result {OLD_VALUE----OLD_VALUE}
+
+
+namespace delete ::_test_tmp
+
+# option clear
+# cleanup
+cleanupTests
+return

Index: tests/scale.test
==================================================================
--- tests/scale.test
+++ tests/scale.test
@@ -322,11 +322,11 @@
 
 test scale-2.1 {Tk_ScaleCmd procedure} -body {
     scale
 } -returnCodes error -result {wrong # args: should be "scale pathName ?-option value ...?"}
 test scale-2.2 {Tk_ScaleCmd procedure} -body {
-    scale foo 
+    scale foo
 } -returnCodes error -result {bad window path name "foo"}
 test scale-2.3 {Tk_ScaleCmd procedure} -body {
     catch {scale foo}
     winfo child .
 } -result {}
@@ -1501,11 +1501,31 @@
     update  ; # -command callback shall fire
     set res [list [.s get] $commandedVar]
 } -cleanup {
     destroy .s
 } -result {10 10}
+
+test scale-21.1 {Bug [55b95f578a] - Associating variable with bignum value with scale crashes it} -setup {
+    catch {destroy .s}
+} -body {
+    pack [scale .s]
+    set foo 5.79e99
+    # non-regression test for bug [55b95f578a] - shall just not crash
+    .s configure -variable foo
+} -cleanup {
+    destroy .s
+} -result {}
+test scale-21.2 {Bug [55b95f578a] again - Bignum value for -from/-to with scale crashes it} -setup {
+    catch {destroy .s}
+} -body {
+    pack [scale .s]
+    # non-regression test for bug [55b95f578a] - shall just not crash
+    .s configure -from -6.8e99 -to 8.8e99
+} -cleanup {
+    destroy .s
+} -result {}
 
 option clear
 
 # cleanup
 cleanupTests
 return

Index: tests/scrollbar.test
==================================================================
--- tests/scrollbar.test
+++ tests/scrollbar.test
@@ -16,27 +16,42 @@
     set scrollInfo $args
 }
 
 proc getTroughSize {w} {
     if {[testConstraint testmetrics]} {
+        # Only Windows has [testmetrics]
 	if [string match v* [$w cget -orient]] {
 	    return [expr [winfo height $w] - 2*[testmetrics cyvscroll $w]]
 	} else {
 	    return [expr [winfo width $w] - 2*[testmetrics cxhscroll $w]]
-	}	    
-    } else {
-	if [string match v* [$w cget -orient]] {
-	    return [expr [winfo height $w] \
-		    - ([winfo width $w] \
-			- [$w cget -highlightthickness] \
-			- [$w cget -bd] + 1)*2]
-	} else {
-	    return [expr [winfo width $w] \
-		    - ([winfo height $w] \
-			- [$w cget -highlightthickness] \
-			- [$w cget -bd] + 1)*2]
-	}
+	}
+    } else {
+        if {[tk windowingsystem] eq "x11"} {
+            # Calculations here assume that the arrow area is a square.
+	    if [string match v* [$w cget -orient]] {
+	        return [expr [winfo height $w] \
+		        - ([winfo width $w] \
+			    - [$w cget -highlightthickness] \
+			    - [$w cget -bd] + 1)*2]
+	    } else {
+	        return [expr [winfo width $w] \
+		        - ([winfo height $w] \
+			    - [$w cget -highlightthickness] \
+			    - [$w cget -bd] + 1)*2]
+	    }
+        } else {
+            # macOS aqua
+	    if [string match v* [$w cget -orient]] {
+	        return [expr [winfo height $w] \
+			- ([$w cget -highlightthickness] \
+			  +[$w cget -bd])*2]
+	    } else {
+	        return [expr [winfo width $w] \
+			- ([$w cget -highlightthickness] \
+			  +[$w cget -bd])*2]
+	    }
+        }
     }
 }
 
 # XXX Note: this test file is woefully incomplete.  Right now there are
 # only bits and pieces of tests.  Please make this file more complete
@@ -43,11 +58,11 @@
 # as you fix bugs and add features.
 
 foreach {width height} [wm minsize .] {
     set height [expr ($height < 200) ? 200 : $height]
     set width [expr ($width < 1) ? 1 : $width]
-} 
+}
 
 frame .f -height $height -width $width
 pack .f -side left
 scrollbar .s
 pack .s -side right -fill y
@@ -253,17 +268,17 @@
 } {1}
 test scrollbar-3.35 {ScrollbarWidgetCmd procedure, "fraction" option} {
     format {%.6g} [.s fraction 4 21]
 } [format %.6g [expr (21.0 - ([winfo height .s] - [getTroughSize .s])/2.0) \
        /([getTroughSize .s] - 1)]]
-test scrollbar-3.36 {ScrollbarWidgetCmd procedure, "fraction" option} unix {
+test scrollbar-3.36 {ScrollbarWidgetCmd procedure, "fraction" option} x11 {
     format {%.6g} [.s fraction 4 179]
 } {1}
 test scrollbar-3.37 {ScrollbarWidgetCmd procedure, "fraction" option} {testmetrics} {
     format {%.6g} [.s fraction 4 [expr 200 - [testmetrics cyvscroll .s]]]
 } {1}
-test scrollbar-3.38 {ScrollbarWidgetCmd procedure, "fraction" option} unix {
+test scrollbar-3.38 {ScrollbarWidgetCmd procedure, "fraction" option} x11 {
     format {%.6g} [.s fraction 4 178]
 } {0.993711}
 test scrollbar-3.39 {ScrollbarWidgetCmd procedure, "fraction" option} {testmetrics win} {
     expr \
     [format {%.6g} [.s fraction 4 [expr 200 - [testmetrics cyvscroll .s] - 2]]] \
@@ -279,13 +294,19 @@
 
 test scrollbar-3.41 {ScrollbarWidgetCmd procedure, "fraction" option} {
     format {%.6g} [.t.s fraction 100 0]
 } {0.5}
 if {[testConstraint testmetrics]} {
+    # Only Windows has [testmetrics]
     place configure .t.s -width [expr 2*[testmetrics cxhscroll .t.s]+1]
 } else {
-    place configure .t.s -width [expr [winfo reqwidth .t.s] - 4]
+    if {[tk windowingsystem] eq "x11"} {
+        place configure .t.s -width [expr [winfo height .t.s] - 2*([.t.s cget -highlightthickness] + [.t.s cget -bd] + 1)]
+    } else {
+        # macOS aqua
+        place configure .t.s -width [expr 2*([.t.s cget -highlightthickness] + [.t.s cget -bd])]
+    }
 }
 update
 test scrollbar-3.42 {ScrollbarWidgetCmd procedure, "fraction" option} {
     format {%.6g} [.t.s fraction 100 0]
 } {0}
@@ -315,13 +336,17 @@
     list [catch {.s identify bogus 2} msg] $msg
 } {1 {expected integer but got "bogus"}}
 test scrollbar-3.49 {ScrollbarWidgetCmd procedure, "identify" option} {
     list [catch {.s identify -1 bogus} msg] $msg
 } {1 {expected integer but got "bogus"}}
-test scrollbar-3.50 {ScrollbarWidgetCmd procedure, "identify" option} {
+test scrollbar-3.50.1 {ScrollbarWidgetCmd procedure, "identify" option} notAqua {
+    .s identify 5 5
+} {arrow1}
+test scrollbar-3.50.1 {ScrollbarWidgetCmd procedure, "identify" option} aqua {
+    # macOS scrollbars have no arrows nowadays
     .s identify 5 5
-} {arrow1}
+} {trough1}
 test scrollbar-3.51 {ScrollbarWidgetCmd procedure, "identify" option} {
     .s identify 5 35
 } {trough1}
 test scrollbar-3.52 {ScrollbarWidgetCmd procedure, "identify" option} {
     .s set .3 .6
@@ -328,13 +353,17 @@
     .s identify 5 80
 } {slider}
 test scrollbar-3.53 {ScrollbarWidgetCmd procedure, "identify" option} {
     .s identify 5 145
 } {trough2}
-test scrollbar-3.54 {ScrollbarWidgetCmd procedure, "identify" option} {unixOrPc} {
+test scrollbar-3.54.1 {ScrollbarWidgetCmd procedure, "identify" option} notAqua {
     .s identify 5 195
 } {arrow2}
+test scrollbar-3.54.2 {ScrollbarWidgetCmd procedure, "identify" option} aqua {
+    # macOS scrollbars have no arrows nowadays
+    .s identify 5 195
+} {trough2}
 test scrollbar-3.56 {ScrollbarWidgetCmd procedure, "identify" option} unix {
     .s identify 0 0
 } {}
 test scrollbar-3.57 {ScrollbarWidgetCmd procedure, "set" option} {
     list [catch {.s set abc def} msg] $msg
@@ -349,19 +378,19 @@
 	lappend result [format %.1f $element]
     }
     set result
 } {0.0 0.3}
 test scrollbar-3.60 {ScrollbarWidgetCmd procedure, "set" option} {
-    .s set 1.1 .4 
+    .s set 1.1 .4
     .s get
 } {1.0 1.0}
 test scrollbar-3.61 {ScrollbarWidgetCmd procedure, "set" option} {
-    .s set .5 -.3 
+    .s set .5 -.3
     .s get
 } {0.5 0.5}
 test scrollbar-3.62 {ScrollbarWidgetCmd procedure, "set" option} {
-    .s set .5 87 
+    .s set .5 87
     .s get
 } {0.5 1.0}
 test scrollbar-3.63 {ScrollbarWidgetCmd procedure, "set" option} {
     .s set .4 .3
     set result {}
@@ -381,27 +410,27 @@
 } {1 {expected integer but got "ghi"}}
 test scrollbar-3.67 {ScrollbarWidgetCmd procedure, "set" option} {
     list [catch {.s set 1 2 3 jkl} msg] $msg
 } {1 {expected integer but got "jkl"}}
 test scrollbar-3.68 {ScrollbarWidgetCmd procedure, "set" option} {
-    .s set -10 50 20 30 
+    .s set -10 50 20 30
     .s get
 } {0 50 0 0}
 test scrollbar-3.69 {ScrollbarWidgetCmd procedure, "set" option} {
-    .s set 100 -10 20 30 
+    .s set 100 -10 20 30
     .s get
 } {100 0 20 30}
 test scrollbar-3.70 {ScrollbarWidgetCmd procedure, "set" option} {
-    .s set 100 50 30 20 
+    .s set 100 50 30 20
     .s get
 } {100 50 30 30}
 test scrollbar-3.71 {ScrollbarWidgetCmd procedure, "set" option} {
     list [catch {.s set 1 2 3} msg] $msg
-} {1 {wrong # args: should be ".s set firstFraction lastFraction" or ".s set totalUnits windowUnits firstUnit lastUnit"}}
+} {1 {wrong # args: should be ".s set firstFraction lastFraction"}}
 test scrollbar-3.72 {ScrollbarWidgetCmd procedure, "set" option} {
     list [catch {.s set 1 2 3 4 5} msg] $msg
-} {1 {wrong # args: should be ".s set firstFraction lastFraction" or ".s set totalUnits windowUnits firstUnit lastUnit"}}
+} {1 {wrong # args: should be ".s set firstFraction lastFraction"}}
 test scrollbar-3.73 {ScrollbarWidgetCmd procedure} {
     list [catch {.s bogus} msg] $msg
 } {1 {bad option "bogus": must be activate, cget, configure, delta, fraction, get, identify, or set}}
 test scrollbar-3.74 {ScrollbarWidgetCmd procedure} {
     list [catch {.s c} msg] $msg
@@ -453,18 +482,26 @@
     .s identify -1 [expr [winfo height .s] / 2]
 } {}
 test scrollbar-6.10 {ScrollbarPosition procedure} {
     .s identify [winfo width .s] [expr [winfo height .s] / 2]
 } {}
-test scrollbar-6.11 {ScrollbarPosition procedure} unix {
+test scrollbar-6.11.1 {ScrollbarPosition procedure} x11 {
     .s identify 8 4
 } {arrow1}
-test scrollbar-6.12 {ScrollbarPosition procedure} unix {
+test scrollbar-6.11.2 {ScrollbarPosition procedure} aqua {
+    # macOS scrollbars have no arrows nowadays
+    .s identify 8 4
+} {trough1}
+test scrollbar-6.12.1 {ScrollbarPosition procedure} x11 {
     .s identify 8 19
 } {arrow1}
+test scrollbar-6.12.2 {ScrollbarPosition procedure} aqua {
+    # macOS scrollbars have no arrows nowadays
+    .s identify 8 19
+} {trough1}
 test scrollbar-6.14 {ScrollbarPosition procedure} win {
-    .s identify [expr [winfo width .s] / 2] 0 
+    .s identify [expr [winfo width .s] / 2] 0
 } {arrow1}
 test scrollbar-6.15 {ScrollbarPosition procedure} {testmetrics win} {
     .s identify [expr [winfo width .s] / 2] [expr [testmetrics cyvscroll .s] - 1]
 } {arrow1}
 test scrollbar-6.16 {ScrollbarPosition procedure} unix {
@@ -502,28 +539,32 @@
     .s identify 8 84
 } {trough2}
 test scrollbar-6.25 {ScrollbarPosition procedure} unix {
     .s identify 8 179
 } {trough2}
-test scrollbar-6.27 {ScrollbarPosition procedure} {testmetrics win knownBug} {
-    # This asks for 8,21, which is actually the slider, but there is a
-    # bug in that GetSystemMetrics(SM_CYVTHUMB) actually returns a value
-    # that is larger than the thumb displayed, skewing the ability to
-    # calculate the trough2 area correctly (Win2k).  -- hobbs
+test scrollbar-6.27 {ScrollbarPosition procedure} {testmetrics win} {
     .s identify [expr [winfo width .s] / 2] [expr int(.4 / [.s delta 0 1]) \
 						 + [testmetrics cyvscroll .s]]
 } {trough2}
 test scrollbar-6.28 {ScrollbarPosition procedure} {testmetrics win} {
     .s identify [expr [winfo width .s] / 2] [expr [winfo height .s] \
 						 - [testmetrics cyvscroll .s] - 1]
 } {trough2}
-test scrollbar-6.29 {ScrollbarPosition procedure} unix {
+test scrollbar-6.29.1 {ScrollbarPosition procedure} x11 {
     .s identify 8 180
 } {arrow2}
-test scrollbar-6.30 {ScrollbarPosition procedure} unix {
+test scrollbar-6.29.2 {ScrollbarPosition procedure} aqua {
+    # macOS scrollbars have no arrows nowadays
+    .s identify 8 180
+} {trough2}
+test scrollbar-6.30.1 {ScrollbarPosition procedure} x11 {
     .s identify 8 195
 } {arrow2}
+test scrollbar-6.30.2 {ScrollbarPosition procedure} aqua {
+    # macOS scrollbars have no arrows nowadays
+    .s identify 8 195
+} {trough2}
 test scrollbar-6.32 {ScrollbarPosition procedure} {testmetrics win} {
     .s identify [expr [winfo width .s] / 2]  [expr [winfo height .s] \
 						  - [testmetrics cyvscroll .s]]
 } {arrow2}
 test scrollbar-6.33 {ScrollbarPosition procedure} win {
@@ -548,22 +589,30 @@
 scrollbar .t.s -orient horizontal -relief sunken -bd 2 -highlightthickness 2
 place .t.s -width 200
 .t.s set .2 .4
 update
 
-test scrollbar-6.39 {ScrollbarPosition procedure} unix {
+test scrollbar-6.39.1 {ScrollbarPosition procedure} x11 {
     .t.s identify 4 8
 } {arrow1}
+test scrollbar-6.39.2 {ScrollbarPosition procedure} aqua {
+    # macOS scrollbars have no arrows nowadays
+    .t.s identify 4 8
+} {trough1}
 test scrollbar-6.40 {ScrollbarPosition procedure} win {
     .t.s identify 0 [expr [winfo height .t.s] / 2]
 } {arrow1}
-test scrollbar-6.41 {ScrollbarPosition procedure} unix {
+test scrollbar-6.41.1 {ScrollbarPosition procedure} x11 {
     .t.s identify 82 8
 } {slider}
+test scrollbar-6.41.2 {ScrollbarPosition procedure} aqua {
+    # macOS scrollbars have no arrows nowadays
+    .t.s identify 82 8
+} {trough2}
 test scrollbar-6.43 {ScrollbarPosition procedure} {testmetrics win} {
     .t.s identify [expr int(.4 / [.t.s delta 1 0]) + [testmetrics cxhscroll .t.s] \
-		       - 1] [expr [winfo height .t.s] / 2] 
+		       - 1] [expr [winfo height .t.s] / 2]
 } {slider}
 test scrollbar-6.44 {ScrollbarPosition procedure} unix {
     .t.s identify 100 18
 } {trough2}
 test scrollbar-6.46 {ScrollbarPosition procedure} win {
@@ -580,11 +629,13 @@
 } {horizontal vertical}
 
 catch {destroy .t}
 toplevel .t
 wm geometry .t +0+0
-test scrollbar-8.1 {TkScrollbarEventProc: recursive deletion} {
+test scrollbar-8.1 {TkScrollbarEventProc: recursive deletion} notAqua {
+    # constrained by notAqua because this test clicks on an arrow of the
+    # scrollbar - but macOS has no such arrows in modern scrollbars
     proc doit {args} { destroy .t.f }
     proc bgerror {args} {}
     destroy .t.f
     frame .t.f
     scrollbar .t.f.s -command doit
@@ -599,11 +650,13 @@
     update
     lappend result [winfo exists .t.f.s] [winfo exists .t.f]
     rename bgerror {}
     set result
 } {1 0 0}
-test scrollbar-8.2 {TkScrollbarEventProc: recursive deletion} {
+test scrollbar-8.2 {TkScrollbarEventProc: recursive deletion} notAqua {
+    # constrained by notAqua because this test clicks on an arrow of the
+    # scrollbar - but macOS has no such arrows in modern scrollbars
     proc doit {args} { destroy .t.f.s }
     proc bgerror {args} {}
     destroy .t.f
     frame .t.f
     scrollbar .t.f.s -command doit
@@ -630,11 +683,11 @@
     interp hide {} .s
     destroy .s
     list [winfo children .] [interp hidden]
 } [list {} $l]
 
-test scrollbar-10.1 {<MouseWheel> event on scrollbar} -constraints {win|unix} -setup {
+test scrollbar-10.1.1 {<MouseWheel> event on scrollbar} -constraints {notAqua} -setup {
     destroy .t .s
 } -body {
     pack [text .t -yscrollcommand {.s set}] -side left
     for {set i 1} {$i < 100} {incr i} {.t insert end "Line $i\n"}
     pack [scrollbar .s -command {.t yview}] -fill y -expand 1 -side left
@@ -644,12 +697,26 @@
     after 200 {set eventprocessed 1} ; vwait eventprocessed
     .t index @0,0
 } -cleanup {
     destroy .t .s
 } -result {5.0}
+test scrollbar-10.1.2 {<MouseWheel> event on scrollbar} -constraints {aqua} -setup {
+    destroy .t .s
+} -body {
+    pack [text .t -yscrollcommand {.s set}] -side left
+    for {set i 1} {$i < 100} {incr i} {.t insert end "Line $i\n"}
+    pack [scrollbar .s -command {.t yview}] -fill y -expand 1 -side left
+    update
+    focus -force .s
+    event generate .s <MouseWheel> -delta -4
+    after 200 {set eventprocessed 1} ; vwait eventprocessed
+    .t index @0,0
+} -cleanup {
+    destroy .t .s
+} -result {5.0}
 
-test scrollbar-10.2 {<MouseWheel> event on scrollbar} -constraints {win|unix} -setup {
+test scrollbar-10.2.1 {<MouseWheel> event on scrollbar} -constraints {notAqua} -setup {
     destroy .t .s
 } -body {
     pack [text .t -xscrollcommand {.s set} -wrap none] -side top
     for {set i 1} {$i < 100} {incr i} {.t insert end "Char $i "}
     pack [scrollbar .s -command {.t xview} -orient horizontal] -fill x -expand 1 -side top
@@ -656,10 +723,24 @@
     update
     focus -force .s
     event generate .s <Shift-MouseWheel> -delta -120
     after 200 {set eventprocessed 1} ; vwait eventprocessed
     .t index @0,0
+} -cleanup {
+    destroy .t .s
+} -result {1.4}
+test scrollbar-10.2.2 {<MouseWheel> event on scrollbar} -constraints {aqua} -setup {
+    destroy .t .s
+} -body {
+    pack [text .t -xscrollcommand {.s set} -wrap none] -side top
+    for {set i 1} {$i < 100} {incr i} {.t insert end "Char $i "}
+    pack [scrollbar .s -command {.t xview} -orient horizontal] -fill x -expand 1 -side top
+    update
+    focus -force .s
+    event generate .s <Shift-MouseWheel> -delta -4
+    after 200 {set eventprocessed 1} ; vwait eventprocessed
+    .t index @0,0
 } -cleanup {
     destroy .t .s
 } -result {1.4}
 
 test scrollbar-11.1 {bug fix: [011706ec42] Scrollbar unsafe wrt widget destruction} -body {
@@ -676,11 +757,11 @@
     update
     event generate .top.s <2>
     update  ; # shall not trigger error  invalid command name ".top.s"
 } -cleanup {
     destroy .top.s .top
-} -result {} 
+} -result {}
 test scrollbar-11.2 {bug fix: [011706ec42] Scrollbar unsafe wrt widget destruction} -body {
     proc destroy_scrollbar {{y 0}} {
         if {[winfo exists .top.s]} {
             destroy .top.s
         }
@@ -695,13 +776,13 @@
     update
     event generate .top.s <2> -x 2 -y [expr {[winfo height .top.s] / 2}]
     update  ; # shall not trigger error  invalid command name ".top.s"
 } -cleanup {
     destroy .top.s .top
-} -result {} 
+} -result {}
 
 catch {destroy .s}
 catch {destroy .t}
 
 # cleanup
 cleanupTests
 return

Index: tests/select.test
==================================================================
--- tests/select.test
+++ tests/select.test
@@ -14,10 +14,17 @@
 package require tcltest 2.2
 namespace import ::tcltest::*
 namespace import ::tk::test:loadTkCommand
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
+
+testConstraint cliboardManagerPresent 0
+if {![catch {selection get -selection CLIPBOARD_MANAGER -type TARGETS}]} {
+    if {"SAVE_TARGETS" in [selection get -selection CLIPBOARD_MANAGER -type TARGETS]} {
+        testConstraint cliboardManagerPresent 1
+    }
+}
 
 global longValue selValue selInfo
 
 set selValue {}
 set selInfo {}
@@ -324,11 +331,11 @@
     selection own -command { set lostSel {lost2} } .f1
     set result $lostSel
     selection clear .f1
     lappend result $lostSel
 } -result {owned lost2}
-test select-3.7 {Tk_OwnSelection procedure} -constraints unix -setup {
+test select-3.7 {Tk_OwnSelection procedure} -constraints x11 -setup {
     global lostSel
     setup
     setupbg
 } -body {
     set lostSel {owned}
@@ -398,11 +405,11 @@
 test select-4.3 {Tk_ClearSelection procedure} -setup {
     setup
 } -body {
     list [selection clear .f1] [selection clear .f1]
 } -result {{} {}}
-test select-4.4 {Tk_ClearSelection procedure} -constraints unix -setup {
+test select-4.4 {Tk_ClearSelection procedure} -constraints x11 -setup {
     global lostSel
     setup
     setupbg
 } -body {
     set lostSel {owned}
@@ -430,11 +437,11 @@
     selection clear -displayof .f2
     update
     list $lostSel $lostSel2
 } -result {owned lost2}
 test select-4.6 {Tk_ClearSelection procedure} -constraints {
-    unix altDisplay
+    x11 altDisplay
 } -setup {
     setup .f1
     setup .f2 $env(TK_ALT_DISPLAY)
     setupbg
 } -body {
@@ -516,11 +523,11 @@
 	selection clear
 	handler $type $offset $count
     }} STRING}
     list [selection get] $selInfo [catch {selection get} msg] $msg
 } -result "$longValue {STRING 0 4000 STRING 4000 4000 STRING 8000 4000 STRING 12000 4000 STRING 16000 4000} 1 {PRIMARY selection doesn't exist or form \"STRING\" not defined}"
-test select-5.9 {Tk_GetSelection procedure} -constraints unix -setup {
+test select-5.9 {Tk_GetSelection procedure} -constraints x11 -setup {
     setup
     setupbg
 } -body {
     selection handle -selection PRIMARY .f1 {handler TEST} TEST
     update
@@ -529,11 +536,11 @@
     set result ""
     lappend result [dobg {selection get TEST}]
     cleanupbg
     lappend result $selInfo
 } -result {{Test value} {TEST 0 4000}}
-test select-5.10 {Tk_GetSelection procedure} -constraints unix -setup {
+test select-5.10 {Tk_GetSelection procedure} -constraints x11 -setup {
     setup
     setupbg
 } -body {
     selection handle -selection PRIMARY .f1 {handler TEST} TEST
     update
@@ -577,11 +584,11 @@
     set selInfo ""
     lappend result [catch {selection get -displayof .f2 TEST} msg] $msg \
 	    $selInfo
 } -result {0 {Test value} {TEST 0 4000} 1 {PRIMARY selection doesn't exist or form "TEST" not defined} {}}
 test select-5.13 {Tk_GetSelection procedure} -constraints {
-    unix altDisplay
+    x11 altDisplay
 } -setup {
     setup .f1
     setup .f2 $env(TK_ALT_DISPLAY)
     setupbg
 } -body {
@@ -598,11 +605,11 @@
     lappend result [dobg "selection get TEST"]
     cleanupbg
     lappend result $selInfo
 } -result {{Test value} {Test value2} {TEST2 0 4000 TEST 0 4000}}
 test select-5.14 {Tk_GetSelection procedure} -constraints {
-    unix altDisplay
+    x11 altDisplay
 } -setup {
     setup .f1
     setup .f2 $env(TK_ALT_DISPLAY)
     setupbg
 } -body {
@@ -855,27 +862,28 @@
 } -result {.f1 {} 1 {PRIMARY selection doesn't exist or form "STRING" not defined}}
 
 ##############################################################################
 
 # Check reentrancy on losing selection
-test select-8.1 {TkSelEventProc procedure} -constraints unix -setup {
+test select-8.1 {TkSelEventProc procedure} -constraints x11 -setup {
     setup
     setupbg
 } -body {
     selection own -selection CLIPBOARD -command {destroy .f1} .f1
     update
     dobg {selection own -selection CLIPBOARD .}
+    winfo children .
 } -cleanup {
     cleanupbg
 } -result {}
 
 ##############################################################################
 
 test select-9.1 {SelCvtToX and SelCvtFromX procedures} -setup {
     setup
     setupbg
-} -constraints unix -body {
+} -constraints x11 -body {
     set selValue "1024"
     set selInfo ""
     selection handle -selection PRIMARY -format INTEGER -type TEST \
         .f1 {handler TEST}
     update
@@ -885,11 +893,11 @@
     lappend result $selInfo
 } -result {{0x400 } {TEST 0 4000}}
 test select-9.2 {SelCvtToX and SelCvtFromX procedures} -setup {
     setup
     setupbg
-} -constraints unix -body {
+} -constraints x11 -body {
     set selValue "1024 0xffff  2048 -2  "
     set selInfo ""
     selection handle -selection PRIMARY -format INTEGER -type TEST \
 	.f1 {handler TEST}
     set result ""
@@ -898,11 +906,11 @@
     lappend result $selInfo
 } -result {{0x400 0xffff 0x800 0xfffffffe } {TEST 0 4000}}
 test select-9.3 {SelCvtToX and SelCvtFromX procedures} -setup {
     setup
     setupbg
-} -constraints unix -body {
+} -constraints x11 -body {
     set selValue "   "
     set selInfo ""
     selection handle -selection PRIMARY -format INTEGER -type TEST \
 	.f1 {handler TEST}
     set result ""
@@ -911,11 +919,11 @@
     lappend result $selInfo
 } -result {{ } {TEST 0 4000}}
 test select-9.4 {SelCvtToX and SelCvtFromX procedures} -setup {
     setup
     setupbg
-} -constraints unix -body {
+} -constraints x11 -body {
     set selValue "16 foobar 32"
     set selInfo ""
     selection handle -selection PRIMARY -format INTEGER -type TEST \
 	.f1 {handler TEST}
     set result ""
@@ -924,11 +932,11 @@
     lappend result $selInfo
 } -result {{0x10 0x0 0x20 } {TEST 0 4000}}
 test select-9.5 {SelCvtToX and SelCvtFromX procedures} -setup {
     setup
     setupbg
-} -constraints unix -body {
+} -constraints x11 -body {
     # Ensure that lists of atoms are constructed correctly, even when the
     # atom names have spaces in. [Bug 1353414]
     set selValue "foo bar"
     set selInfo ""
     set selType {text/x-tk-test;detail="foo bar"}
@@ -942,11 +950,11 @@
 ##############################################################################
 # note, we are not testing MULTIPLE style selections
 
 # most control paths have been exercised above
 test select-10.1 {ConvertSelection procedure, race with selection clear} -constraints {
-    unix 
+    x11
 } -setup {
     setup
 } -body {
     proc Ready {fd} {
 	variable x
@@ -972,11 +980,11 @@
     # Don't understand why, but the [loadTkCommand] above causes
     # a "broken pipe" error when Tk was actually [load]ed in the child.
     catch {close $fd}
     lappend x $selInfo
 } -result {{1:PRIMARY selection doesn't exist or form "STRING" not defined} {}}
-test select-10.2 {ConvertSelection procedure} -constraints unix -setup {
+test select-10.2 {ConvertSelection procedure} -constraints x11 -setup {
     setup
     setupbg
 } -body {
     set selValue [string range $longValue 0 3999]
     set selInfo ""
@@ -984,11 +992,11 @@
     set result ""
     lappend result [dobg {selection get}]
     cleanupbg
     lappend result $selInfo
 } -result [list [string range $longValue 0 3999] {STRING 0 4000 STRING 4000 4000 STRING 0 4000 STRING 4000 4000}]
-test select-10.3 {ConvertSelection procedure} -constraints unix -setup {
+test select-10.3 {ConvertSelection procedure} -constraints x11 -setup {
     setup
     setupbg
 } -body {
     selection handle .f1 ERROR errHandler
     dobg {selection get ERROR}
@@ -996,11 +1004,11 @@
     cleanupbg
 } -result {PRIMARY selection doesn't exist or form "ERROR" not defined}
 # testing timers
 # This one hangs in Exceed
 test select-10.4 {ConvertSelection procedure} -constraints {
-    unix noExceed
+    x11 noExceed
 } -setup {
     setup
     setupbg
 } -body {
     set selValue $longValue
@@ -1011,11 +1019,11 @@
     lappend result [dobg {selection get}]
     cleanupbg
     lappend result $selInfo
 } -result {{selection owner didn't respond} {STRING 0 4000 STRING 4000 4000 STRING 8000 4000 STRING 12000 4000 STRING 16000 4000 STRING 0 4000 STRING 4000 4000}}
 test select-10.5 {ConvertSelection procedure, reentrancy issues} -constraints {
-    unix 
+    x11
 } -setup {
     setup
     setupbg
 } -body {
     set selValue "Test value"
@@ -1026,11 +1034,11 @@
     lappend result [dobg {selection get}]
     cleanupbg
     lappend result $selInfo
 } -result {{PRIMARY selection doesn't exist or form "STRING" not defined} {.f1 STRING 0 4000}}
 test select-10.6 {ConvertSelection procedure, reentrancy issues} -constraints {
-    unix 
+    x11
 } -setup {
     setup
     setupbg
 } -body {
     proc weirdHandler {type offset count} {
@@ -1042,16 +1050,18 @@
     selection handle .f1 {weirdHandler STRING}
     set result ""
     lappend result [dobg {selection get}]
     cleanupbg
     lappend result $selInfo
+} -cleanup {
+    rename weirdHandler {}
 } -result {{PRIMARY selection doesn't exist or form "STRING" not defined} {STRING 0 4000}}
 
 ##############################################################################
 
 # testing reentrancy
-test select-11.1 {TkSelPropProc procedure} -constraints unix -setup {
+test select-11.1 {TkSelPropProc procedure} -constraints x11 -setup {
     setup
     setupbg
 } -body {
     set selValue $longValue
     set selInfo ""
@@ -1065,46 +1075,46 @@
 } -result {{selection owner didn't respond} {.f1 STRING 0 4000 .f1 STRING 4000 4000 .f1 STRING 8000 4000 .f1 STRING 12000 4000 .f1 STRING 16000 4000 .f1 STRING 0 4000 .f1 STRING 4000 4000}}
 
 ##############################################################################
 
 # Note, this assumes we are using CurrentTtime
-test select-12.1 {DefaultSelection procedure} -constraints unix -body {
+test select-12.1 {DefaultSelection procedure} -constraints x11 -body {
     setup
     set result [selection get -type TIMESTAMP]
     setupbg
     lappend result [dobg {selection get -type TIMESTAMP}]
     cleanupbg
     set result
 } -result {0x0 {0x0 }}
-test select-12.2 {DefaultSelection procedure} -constraints unix -body {
+test select-12.2 {DefaultSelection procedure} -constraints x11 -body {
     setup
     set result [lsort [list [selection get -type TARGETS]]]
     setupbg
     lappend result [dobg {lsort [selection get -type TARGETS]}]
     cleanupbg
     set result
 } -result {{MULTIPLE TARGETS TIMESTAMP TK_APPLICATION TK_WINDOW} {MULTIPLE TARGETS TIMESTAMP TK_APPLICATION TK_WINDOW}}
-test select-12.3 {DefaultSelection procedure} -constraints unix -body {
+test select-12.3 {DefaultSelection procedure} -constraints x11 -body {
     setup
     selection handle .f1 {handler TEST} TEST
     set result [list [lsort [selection get -type TARGETS]]]
     setupbg
     lappend result [dobg {lsort [selection get -type TARGETS]}]
     cleanupbg
     set result
 } -result {{MULTIPLE TARGETS TEST TIMESTAMP TK_APPLICATION TK_WINDOW} {MULTIPLE TARGETS TEST TIMESTAMP TK_APPLICATION TK_WINDOW}}
-test select-12.4 {DefaultSelection procedure} -constraints unix -setup {
+test select-12.4 {DefaultSelection procedure} -constraints x11 -setup {
     setup
     set result ""
 } -body {
     lappend result [selection get -type TK_APPLICATION]
     setupbg
     lappend result [dobg {selection get -type TK_APPLICATION}]
     cleanupbg
     set result
 } -result [list [winfo name .] [winfo name .]]
-test select-12.5 {DefaultSelection procedure} -constraints unix -body {
+test select-12.5 {DefaultSelection procedure} -constraints x11 -body {
     setup
     set result [selection get -type TK_WINDOW]
     setupbg
     lappend result [dobg {selection get -type TK_WINDOW}]
     cleanupbg
@@ -1119,11 +1129,11 @@
     selection handle .f1 {} TARGETS
     lappend result [selection get TARGETS]
 } -result {{Targets value} {TARGETS.f1 0 4000} {MULTIPLE TARGETS TIMESTAMP TK_APPLICATION TK_WINDOW}}
 
 test select-13.1 {SelectionSize procedure, handler deleted} -constraints {
-    unix 
+    x11
 } -setup {
     setup
     setupbg
 } -body {
     proc badHandler {path type offset count} {
@@ -1146,15 +1156,27 @@
     set abortCount 2
     lappend result [dobg {selection get}]
     cleanupbg
     lappend result $selInfo
 } -result {{PRIMARY selection doesn't exist or form "STRING" not defined} {.f1 STRING 0 4000 .f1 STRING 4000 4000}}
+
+test select-14.1 {Bug [73ba07efcd]: Use correct property type when handling MULTIPLE conversion requests} -constraints {
+    cliboardManagerPresent
+} -setup {
+    proc get_clip {offset maxChars} {return abcd}
+} -body {
+    selection handle -selection CLIPBOARD . get_clip
+    selection own -selection CLIPBOARD .
+    selection get -selection CLIPBOARD_MANAGER -type SAVE_TARGETS
+    clipboard get
+} -cleanup {
+    rename get_clip {}
+} -result {abcd}
 
-catch {rename weirdHandler {}}
 
 # cleanup
 cleanupTests
 return
 
 # Local Variables:
 # mode: tcl
 # End:

Index: tests/spinbox.test
==================================================================
--- tests/spinbox.test
+++ tests/spinbox.test
@@ -14,11 +14,11 @@
 # For xscrollcommand
 proc scroll args {
         global scrollInfo
         set scrollInfo $args
 }
-# For trace variable 
+# For trace variable
 proc override args {
         global x
         set x 12345
 }
 
@@ -524,11 +524,11 @@
 } -cleanup {
     destroy .e
 } -returnCodes {error} -result {unknown color name "bogus"}
 
 test spinbox-1.45 {configuration option: "insertborderwidth"} -setup {
-        spinbox .e -borderwidth 2 -highlightthickness 2 -font {Helvetica -12} \
+        spinbox .e -borderwidth 2 -insertwidth 2 -highlightthickness 2 -font {Helvetica -12} \
         -relief sunken
     pack .e
     update
 } -body {
     .e configure -insertborderwidth 1.3
@@ -1015,56 +1015,56 @@
     destroy .e
 } -result {.e}
 
 
 test spinbox-3.1 {SpinboxWidgetCmd procedure} -setup {
-    spinbox .e 
+    spinbox .e
     pack .e
     update
 } -body {
     .e
 } -cleanup {
     destroy .e
 } -returnCodes error -result {wrong # args: should be ".e option ?arg ...?"}
 test spinbox-3.2 {SpinboxWidgetCmd procedure, "bbox" widget command} -setup {
-    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
     update
 } -body {
     .e bbox
 } -cleanup {
     destroy .e
 } -returnCodes error -result {wrong # args: should be ".e bbox index"}
 test spinbox-3.3 {SpinboxWidgetCmd procedure, "bbox" widget command} -setup {
-    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
     update
 } -body {
     .e bbox a b
 } -cleanup {
     destroy .e
 } -returnCodes error -result {wrong # args: should be ".e bbox index"}
 test spinbox-3.4 {SpinboxWidgetCmd procedure, "bbox" widget command} -setup {
-    spinbox .e 
+    spinbox .e
     pack .e
     update
 } -body {
     .e bbox bogus
 } -cleanup {
     destroy .e
 } -returnCodes error -result {bad spinbox index "bogus"}
 test spinbox-3.5 {SpinboxWidgetCmd procedure, "bbox" widget command} -setup {
-    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
     update
 } -body {
    .e bbox 0
 } -cleanup {
     destroy .e
 } -result [list 5 5 0 $cy]
 
-# Oryginaly the result was count using measurements 
+# Oryginaly the result was count using measurements
 # and metrics. It was changed to less verbose solution - the result is the one
 # that passes fonts constraint (this concerns tests 3.6, 3.7, 3.8, 3.10)
 test spinbox-3.6 {SpinboxWidgetCmd procedure, "bbox" widget command} -constraints {
 	fonts
 } -setup {
@@ -1079,11 +1079,11 @@
     destroy .e
 } -result {{19 5 7 13} {19 5 7 13}}
 test spinbox-3.7 {SpinboxWidgetCmd procedure, "bbox" widget command} -constraints {
 	fonts
 } -setup {
-    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
     update
 } -body {
 # Tcl_UtfAtIndex(): utf at end
     .e insert 0 "ab\u4e4e"
@@ -1092,11 +1092,11 @@
     destroy .e
 } -result {19 5 12 13}
 test spinbox-3.8 {SpinboxWidgetCmd procedure, "bbox" widget command} -constraints {
 	fonts
 } -setup {
-    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
     update
 } -body {
 # Tcl_UtfAtIndex(): utf before index
     .e insert 0 "ab\u4e4ec"
@@ -1103,11 +1103,11 @@
     .e bbox 3
 } -cleanup {
     destroy .e
 } -result {31 5 7 13}
 test spinbox-3.9 {SpinboxWidgetCmd procedure, "bbox" widget command} -setup {
-    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
     update
 } -body {
 # Tcl_UtfAtIndex(): no chars
     .e bbox end
@@ -1115,114 +1115,114 @@
     destroy .e
 } -result "5 5 0 $cy"
 test spinbox-3.10 {SpinboxWidgetCmd procedure, "bbox" widget command} -constraints {
 	fonts
 } -setup {
-    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
     update
 } -body {
     .e insert 0 "abcdefghij\u4e4eklmnop"
     list [.e bbox 0] [.e bbox 1] [.e bbox 10] [.e bbox end]
 } -cleanup {
     destroy .e
 } -result {{5 5 7 13} {12 5 7 13} {75 5 12 13} {122 5 7 13}}
 test spinbox-3.11 {SpinboxWidgetCmd procedure, "cget" widget command} -setup {
-    spinbox .e 
+    spinbox .e
 } -body {
     .e cget
 } -cleanup {
     destroy .e
 } -returnCodes error -result {wrong # args: should be ".e cget option"}
 test spinbox-3.12 {SpinboxWidgetCmd procedure, "cget" widget command} -setup {
-    spinbox .e 
+    spinbox .e
 } -body {
     .e cget a b
 } -cleanup {
     destroy .e
 } -returnCodes error -result {wrong # args: should be ".e cget option"}
 test spinbox-3.13 {SpinboxWidgetCmd procedure, "cget" widget command} -setup {
-    spinbox .e 
+    spinbox .e
 } -body {
     .e cget -gorp
 } -cleanup {
     destroy .e
 } -returnCodes error -result {unknown option "-gorp"}
 test spinbox-3.14 {SpinboxWidgetCmd procedure, "cget" widget command} -setup {
-    spinbox .e 
+    spinbox .e
 } -body {
     .e configure -bd 4
     .e cget -bd
 } -cleanup {
     destroy .e
 } -result {4}
 test spinbox-3.15 {SpinboxWidgetCmd procedure, "configure" widget command} -setup {
-    spinbox .e 
+    spinbox .e
     pack .e
     update
 } -body {
     llength [.e configure]
 } -cleanup {
     destroy .e
-} -result {49}
+} -result {51}
 test spinbox-3.16 {SpinboxWidgetCmd procedure, "configure" widget command} -setup {
-    spinbox .e 
+    spinbox .e
 } -body {
     .e configure -foo
 } -cleanup {
     destroy .e
 } -returnCodes error -result {unknown option "-foo"}
 test spinbox-3.17 {SpinboxWidgetCmd procedure, "configure" widget command} -setup {
-    spinbox .e 
+    spinbox .e
 } -body {
     .e configure -bd 4
     .e configure -bg #ffffff
     lindex [.e configure -bd] 4
 } -cleanup {
     destroy .e
 } -result {4}
 test spinbox-3.18 {SpinboxWidgetCmd procedure, "delete" widget command} -setup {
-    spinbox .e 
+    spinbox .e
 } -body {
     .e delete
 } -cleanup {
     destroy .e
 } -returnCodes error -result {wrong # args: should be ".e delete firstIndex ?lastIndex?"}
 test spinbox-3.19 {SpinboxWidgetCmd procedure, "delete" widget command} -setup {
-    spinbox .e 
+    spinbox .e
 } -body {
     .e delete a b c
 } -cleanup {
     destroy .e
 } -returnCodes error -result {wrong # args: should be ".e delete firstIndex ?lastIndex?"}
 test spinbox-3.20 {SpinboxWidgetCmd procedure, "delete" widget command} -setup {
-    spinbox .e 
+    spinbox .e
 } -body {
     .e delete foo
 } -cleanup {
     destroy .e
 } -returnCodes error -result {bad spinbox index "foo"}
 test spinbox-3.21 {SpinboxWidgetCmd procedure, "delete" widget command} -setup {
-    spinbox .e 
+    spinbox .e
 } -body {
     .e delete 0 bar
 } -cleanup {
     destroy .e
 } -returnCodes error -result {bad spinbox index "bar"}
 test spinbox-3.22 {SpinboxWidgetCmd procedure, "delete" widget command} -setup {
     spinbox .e
     pack .e
-    update 
+    update
 } -body {
     .e insert end "01234567890"
     .e delete 2 4
     .e get
 } -cleanup {
     destroy .e
 } -result {014567890}
 test spinbox-3.23 {SpinboxWidgetCmd procedure, "delete" widget command} -setup {
-    spinbox .e 
+    spinbox .e
 } -body {
     .e insert end "01234567890"
     .e delete 6
     .e get
 } -cleanup {
@@ -1229,11 +1229,11 @@
     destroy .e
 } -result {0123457890}
 test spinbox-3.24 {SpinboxWidgetCmd procedure, "delete" widget command} -setup {
     spinbox .e
     pack .e
-    update 
+    update
     set x {}
 } -body {
 # UTF
     .e insert end "01234\u4e4e67890"
     .e delete 6
@@ -1250,11 +1250,11 @@
     destroy .e
 } -result [list "01234\u4e4e7890" "0123457890" "012345\u4e4e890"]
 test spinbox-3.25 {SpinboxWidgetCmd procedure, "delete" widget command} -setup {
     spinbox .e
     pack .e
-    update  
+    update
 } -body {
     .e insert end "01234567890"
     .e delete 6 5
     .e get
 } -cleanup {
@@ -1261,11 +1261,11 @@
     destroy .e
 } -result {01234567890}
 test spinbox-3.26 {SpinboxWidgetCmd procedure, "delete" widget command} -setup {
     spinbox .e
     pack .e
-    update  
+    update
 } -body {
     .e insert end "01234567890"
     .e configure -state disabled
     .e delete 2 8
     .e configure -state normal
@@ -1274,11 +1274,11 @@
     destroy .e
 } -result {01234567890}
 test spinbox-3.26.1 {SpinboxWidgetCmd procedure, "delete" widget command} -setup {
     spinbox .e
     pack .e
-    update  
+    update
 } -body {
     .e insert end "01234567890"
     .e configure -state readonly
     .e delete 2 8
     .e configure -state normal
@@ -1285,105 +1285,105 @@
     .e get
 } -cleanup {
     destroy .e
 } -result {01234567890}
 test spinbox-3.27 {SpinboxWidgetCmd procedure, "get" widget command} -setup {
-    spinbox .e 
+    spinbox .e
 } -body {
     .e get foo
 } -cleanup {
     destroy .e
 } -returnCodes error -result {wrong # args: should be ".e get"}
 test spinbox-3.28 {SpinboxWidgetCmd procedure, "icursor" widget command} -setup {
-    spinbox .e 
+    spinbox .e
 } -body {
     .e icursor
 } -cleanup {
     destroy .e
 } -returnCodes error -result {wrong # args: should be ".e icursor pos"}
 test spinbox-3.29 {SpinboxWidgetCmd procedure, "icursor" widget command} -setup {
-    spinbox .e 
+    spinbox .e
 } -body {
     .e icursor foo
 } -cleanup {
     destroy .e
 } -returnCodes error -result {bad spinbox index "foo"}
 test spinbox-3.30 {SpinboxWidgetCmd procedure, "icursor" widget command} -setup {
-    spinbox .e 
+    spinbox .e
 } -body {
     .e insert end "01234567890"
     .e icursor 4
     .e index insert
 } -cleanup {
     destroy .e
 } -result {4}
 test spinbox-3.31 {SpinboxWidgetCmd procedure, "index" widget command} -setup {
-    spinbox .e 
+    spinbox .e
 } -body {
     .e in
 } -cleanup {
     destroy .e
 } -returnCodes error -result {ambiguous option "in": must be bbox, cget, configure, delete, get, icursor, identify, index, insert, invoke, scan, selection, set, validate, or xview}
 test spinbox-3.32 {SpinboxWidgetCmd procedure, "index" widget command} -setup {
-    spinbox .e 
+    spinbox .e
 } -body {
     .e index
 } -cleanup {
     destroy .e
 } -returnCodes error -result {wrong # args: should be ".e index string"}
 test spinbox-3.33 {SpinboxWidgetCmd procedure, "index" widget command} -setup {
-    spinbox .e 
+    spinbox .e
 } -body {
     .e index foo
 } -cleanup {
     destroy .e
 } -returnCodes error -result {bad spinbox index "foo"}
 test spinbox-3.34 {SpinboxWidgetCmd procedure, "index" widget command} -setup {
     spinbox .e
     pack .e
-    update  
+    update
 } -body {
     .e index 0
 } -cleanup {
     destroy .e
 } -returnCodes {ok} -match glob -result {*}
 test spinbox-3.35 {SpinboxWidgetCmd procedure, "index" widget command} -setup {
     spinbox .e
     pack .e
-    update  
+    update
 } -body {
 # UTF
     .e insert 0 abc\u4e4e\u0153def
     list [.e index 3] [.e index 4] [.e index end]
 } -cleanup {
     destroy .e
 } -result {3 4 8}
 test spinbox-3.36 {SpinboxWidgetCmd procedure, "insert" widget command} -setup {
-    spinbox .e 
+    spinbox .e
 } -body {
     .e insert a
 } -cleanup {
     destroy .e
 } -returnCodes error -result {wrong # args: should be ".e insert index text"}
 test spinbox-3.37 {SpinboxWidgetCmd procedure, "insert" widget command} -setup {
-    spinbox .e 
+    spinbox .e
 } -body {
     .e insert a b c
 } -cleanup {
     destroy .e
 } -returnCodes error -result {wrong # args: should be ".e insert index text"}
 test spinbox-3.38 {SpinboxWidgetCmd procedure, "insert" widget command} -setup {
-    spinbox .e 
+    spinbox .e
 } -body {
     .e insert foo Text
 } -cleanup {
     destroy .e
 } -returnCodes error -result {bad spinbox index "foo"}
 test spinbox-3.39 {SpinboxWidgetCmd procedure, "insert" widget command} -setup {
     spinbox .e
     pack .e
-    update  
+    update
 } -body {
     .e insert end "01234567890"
     .e insert 3 xxx
     .e get
 } -cleanup {
@@ -1390,11 +1390,11 @@
     destroy .e
 } -result {012xxx34567890}
 test spinbox-3.40 {SpinboxWidgetCmd procedure, "insert" widget command} -setup {
     spinbox .e
     pack .e
-    update  
+    update
 } -body {
     .e insert end "01234567890"
     .e configure -state disabled
     .e insert 3 xxx
     .e configure -state normal
@@ -1403,11 +1403,11 @@
     destroy .e
 } -result {01234567890}
 test spinbox-3.40.1 {SpinboxWidgetCmd procedure, "insert" widget command} -setup {
     spinbox .e
     pack .e
-    update  
+    update
 } -body {
     .e insert end "01234567890"
     .e configure -state readonly
     .e insert 3 xxx
     .e configure -state normal
@@ -1414,18 +1414,18 @@
     .e get
 } -cleanup {
     destroy .e
 } -result {01234567890}
 test spinbox-3.41 {SpinboxWidgetCmd procedure, "insert" widget command} -setup {
-    spinbox .e 
+    spinbox .e
 } -body {
     .e insert a b c
 } -cleanup {
     destroy .e
 } -returnCodes error -result {wrong # args: should be ".e insert index text"}
 test spinbox-3.42 {SpinboxWidgetCmd procedure, "scan" widget command} -setup {
-    spinbox .e 
+    spinbox .e
     pack .e
     update
 } -body {
     .e scan a
 } -cleanup {
@@ -1432,29 +1432,29 @@
     destroy .e
 } -returnCodes error -result {wrong # args: should be ".e scan mark|dragto x"}
 test spinbox-3.43 {SpinboxWidgetCmd procedure, "scan" widget command} -setup {
     spinbox .e
     pack .e
-    update 
+    update
 } -body {
     .e scan a b c
 } -cleanup {
     destroy .e
 } -returnCodes error -result {wrong # args: should be ".e scan mark|dragto x"}
 test spinbox-3.44 {SpinboxWidgetCmd procedure, "scan" widget command} -setup {
     spinbox .e
     pack .e
-    update 
+    update
 } -body {
     .e scan foobar 20
 } -cleanup {
     destroy .e
 } -returnCodes error -result {bad scan option "foobar": must be mark or dragto}
 test spinbox-3.45 {SpinboxWidgetCmd procedure, "scan" widget command} -setup {
     spinbox .e
     pack .e
-    update 
+    update
 } -body {
     .e scan mark 20.1
 } -cleanup {
     destroy .e
 } -returnCodes error -result {expected integer but got "20.1"}
@@ -1461,11 +1461,11 @@
 
 # This test is non-portable because character sizes vary.
 test spinbox-3.46 {SpinboxWidgetCmd procedure, "scan" widget command} -constraints {
     fonts
 } -setup {
-    spinbox .e -font {Helvetica -12} -borderwidth 2 -highlightthickness 2 
+    spinbox .e -font {Helvetica -12} -borderwidth 2 -highlightthickness 2
     pack .e
     update
 } -body {
     .e insert end "This is quite a long string, in fact a "
     .e insert end "very very long string"
@@ -1474,47 +1474,47 @@
     .e index @0
 } -cleanup {
     destroy .e
 } -result {2}
 test spinbox-3.47 {SpinboxWidgetCmd procedure, "select" widget command} -setup {
-    spinbox .e 
+    spinbox .e
 } -body {
     .e select
 } -cleanup {
     destroy .e
 } -returnCodes error -result {wrong # args: should be ".e selection option ?index?"}
 test spinbox-3.48 {SpinboxWidgetCmd procedure, "select" widget command} -setup {
-    spinbox .e 
+    spinbox .e
 } -body {
     .e select foo
 } -cleanup {
     destroy .e
 } -returnCodes error -result {bad selection option "foo": must be adjust, clear, element, from, present, range, or to}
 
 test spinbox-3.49 {SpinboxWidgetCmd procedure, "select clear" widget command} -setup {
-    spinbox .e 
+    spinbox .e
 } -body {
     .e select clear gorp
 } -cleanup {
     destroy .e
 } -returnCodes error -result {wrong # args: should be ".e selection clear"}
 test spinbox-3.50 {SpinboxWidgetCmd procedure, "select clear" widget command} -setup {
-    spinbox .e 
+    spinbox .e
 } -body {
     .e insert end "0123456789"
     .e select from 1
     .e select to 4
     update
     .e select clear
-    selection get 
+    selection get
 } -cleanup {
     destroy .e
 } -returnCodes error -result {PRIMARY selection doesn't exist or form "STRING" not defined}
 test spinbox-3.50.1 {SpinboxWidgetCmd procedure, "select clear" widget command} -setup {
     spinbox .e
     pack .e
-    update  
+    update
 } -body {
     .e insert end "0123456789"
     .e select from 1
     .e select to 4
     update
@@ -1524,20 +1524,20 @@
 } -cleanup {
     destroy .e
 } -result {.e}
 
 test spinbox-3.51 {SpinboxWidgetCmd procedure, "selection present" widget command} -setup {
-    spinbox .e 
+    spinbox .e
 } -body {
     .e selection present foo
 } -cleanup {
     destroy .e
 } -returnCodes error -result {wrong # args: should be ".e selection present"}
 test spinbox-3.52 {SpinboxWidgetCmd procedure, "selection present" widget command} -setup {
     spinbox .e
     pack .e
-    update  
+    update
 } -body {
     .e insert end 0123456789
     .e select from 3
     .e select to 6
     .e selection present
@@ -1545,11 +1545,11 @@
     destroy .e
 } -result {1}
 test spinbox-3.53 {SpinboxWidgetCmd procedure, "selection present" widget command} -setup {
     spinbox .e
     pack .e
-    update  
+    update
 } -body {
     .e insert end 0123456789
     .e select from 3
     .e select to 6
     .e configure -exportselection false
@@ -1558,11 +1558,11 @@
     destroy .e
 } -result {1}
 test spinbox-3.54 {SpinboxWidgetCmd procedure, "selection present" widget command} -setup {
     spinbox .e
     pack .e
-    update 
+    update
 } -body {
     .e insert end 0123456789
     .e select from 3
     .e select to 6
     .e delete 0 end
@@ -1697,11 +1697,11 @@
 } -cleanup {
     destroy .e
 } -result {2 4}
 
 test spinbox-3.65 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
-    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
     update
 } -body {
     .e insert end "This is quite a long text string, so long that it "
     .e insert end "runs off the end of the window quite a bit."
@@ -1709,20 +1709,20 @@
     format {%.6f %.6f} {*}[.e xview]
 } -cleanup {
     destroy .e
 } -result {0.053763 0.268817}
 test spinbox-3.66 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
-    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
     update
 } -body {
     .e xview gorp
 } -cleanup {
     destroy .e
 } -returnCodes error -result {bad spinbox index "gorp"}
 test spinbox-3.67 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
-    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
     update
 } -body {
     .e insert end "This is quite a long text string, so long that it "
     .e insert end "runs off the end of the window quite a bit."
@@ -1732,29 +1732,29 @@
     format {%.6f %.6f} {*}[.e xview]
 } -cleanup {
     destroy .e
 } -result {0.107527 0.322581}
 test spinbox-3.68 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
-    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
     update
 } -body {
     .e xview moveto foo bar
 } -cleanup {
     destroy .e
 } -returnCodes error -result {wrong # args: should be ".e xview moveto fraction"}
 test spinbox-3.69 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
-    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
     update
 } -body {
     .e xview moveto foo
 } -cleanup {
     destroy .e
 } -returnCodes error -result {expected floating-point number but got "foo"}
 test spinbox-3.70 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
-    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
     update
 } -body {
     .e insert end "This is quite a long text string, so long that it "
     .e insert end "runs off the end of the window quite a bit."
@@ -1762,11 +1762,11 @@
     format {%.6f %.6f} {*}[.e xview]
 } -cleanup {
     destroy .e
 } -result {0.505376 0.720430}
 test spinbox-3.71 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
-    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
     update
 } -body {
     .e insert end "This is quite a long text string, so long that it "
     .e insert end "runs off the end of the window quite a bit."
@@ -1773,11 +1773,11 @@
     .e xview scroll 24
 } -cleanup {
     destroy .e
 } -returnCodes error -result {wrong # args: should be ".e xview scroll number units|pages"}
 test spinbox-3.72 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
-    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
 } -body {
     .e insert end "This is quite a long text string, so long that it "
     .e insert end "runs off the end of the window quite a bit."
     update
@@ -1784,11 +1784,11 @@
     .e xview scroll gorp units
 } -cleanup {
     destroy .e
 } -returnCodes error -result {expected integer but got "gorp"}
 test spinbox-3.73 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
-    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
 } -body {
     .e insert end "This is quite a long text string, so long that it "
     .e insert end "runs off the end of the window quite a bit."
     update
@@ -1797,11 +1797,11 @@
     format {%.6f %.6f} {*}[.e xview]
 } -cleanup {
     destroy .e
 } -result {0.193548 0.408602}
 test spinbox-3.74 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
-    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
     update
 } -body {
     .e insert end "This is quite a long text string, so long that it "
     .e insert end "runs off the end of the window quite a bit."
@@ -1811,39 +1811,39 @@
     format {%.6f %.6f} {*}[.e xview]
 } -cleanup {
     destroy .e
 } -result {0.397849 0.612903}
 test spinbox-3.75 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
-    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
 } -body {
     .e insert end "This is quite a long text string, so long that it "
     .e insert end "runs off the end of the window quite a bit."
     update
     .e xview 30
     update
-    .e xview scroll 2 units 
+    .e xview scroll 2 units
     .e index @0
 } -cleanup {
     destroy .e
 } -result {32}
 test spinbox-3.76 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
-    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
 } -body {
     .e insert end "This is quite a long text string, so long that it "
     .e insert end "runs off the end of the window quite a bit."
     update
     .e xview 30
     update
-    .e xview scroll -1 units 
+    .e xview scroll -1 units
     .e index @0
 } -cleanup {
     destroy .e
 } -result {29}
 test spinbox-3.77 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
-    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
 } -body {
     .e insert end "This is quite a long text string, so long that it "
     .e insert end "runs off the end of the window quite a bit."
     update
@@ -1850,11 +1850,11 @@
     .e xview scroll 23 foobars
 } -cleanup {
     destroy .e
 } -returnCodes error -result {bad argument "foobars": must be units or pages}
 test spinbox-3.78 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
-    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
 } -body {
     .e insert end "This is quite a long text string, so long that it "
     .e insert end "runs off the end of the window quite a bit."
     update
@@ -1861,11 +1861,11 @@
     .e xview eat 23 hamburgers
 } -cleanup {
     destroy .e
 } -returnCodes error -result {unknown option "eat": must be moveto or scroll}
 test spinbox-3.79 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
-    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
     update
 } -body {
     .e insert end "This is quite a long text string, so long that it "
     .e insert end "runs off the end of the window quite a bit."
@@ -1875,11 +1875,11 @@
     .e index @0
 } -cleanup {
     destroy .e
 } -result {0}
 test spinbox-3.80 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
-    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
 } -body {
     .e insert end "This is quite a long text string, so long that it "
     .e insert end "runs off the end of the window quite a bit."
     update
@@ -1887,11 +1887,11 @@
     .e index @0
 } -cleanup {
     destroy .e
 } -result {73}
 test spinbox-3.81 {SpinboxWidgetCmd procedure, "xview" widget command} -setup {
-    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
 } -body {
     .e insert end "This is quite a long text string, so long that it "
     .e insert end "runs off the end of the window quite a bit."
     .e insert 10 \u4e4e
@@ -1909,11 +1909,11 @@
 } -cleanup {
     destroy .e
 } -result {0.095745 0.106383 0.117021}
 
 test spinbox-3.82 {SpinboxWidgetCmd procedure} -setup {
-    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2 
+    spinbox .e -font {Courier -12} -borderwidth 2 -highlightthickness 2
     pack .e
     update
 } -body {
     .e gorp
 } -cleanup {
@@ -1980,18 +1980,18 @@
     set x
 } -cleanup {
     destroy .e1 .e2
 } -result {{This is so} {This is so} 1234}
 test spinbox-5.6 {ConfigureSpinbox procedure} -setup {
-    spinbox .e 
+    spinbox .e
     pack .e
 } -body {
     .e insert end "0123456789"
     .e select from 1
     .e select to 5
     .e configure -exportselection 0
-    selection get 
+    selection get
 } -cleanup {
     destroy .e
 } -returnCodes error -result {PRIMARY selection doesn't exist or form "STRING" not defined}
 test spinbox-5.6.1 {ConfigureSpinbox procedure} -setup {
     spinbox .e
@@ -1999,18 +1999,18 @@
 } -body {
     .e insert end "0123456789"
     .e select from 1
     .e select to 5
     .e configure -exportselection 0
-    catch {selection get} 
+    catch {selection get}
     list [.e index sel.first] [.e index sel.last]
 } -cleanup {
     destroy .e
 } -result {1 5}
 
 test spinbox-5.7 {ConfigureSpinbox procedure} -setup {
-    spinbox .e -font {Helvetica -12} -borderwidth 2 -highlightthickness 2 
+    spinbox .e -font {Helvetica -12} -borderwidth 2 -highlightthickness 2
     pack .e
 } -body {
     .e configure -font {Courier -12} -width 4 -xscrollcommand scroll
     .e insert end "01234567890"
     update
@@ -2021,11 +2021,11 @@
 } -result {0.000000 0.363636}
 
 test spinbox-5.8 {ConfigureSpinbox procedure} -constraints {
     fonts
 } -setup {
-    spinbox .e -borderwidth 2 -highlightthickness 2 
+    spinbox .e -borderwidth 2 -highlightthickness 2
     pack .e
 } -body {
     .e configure -width 0 -font {Helvetica -12}
     .e insert end "0123"
     update
@@ -2070,17 +2070,32 @@
     .e scan dragto 30
     update
 } -cleanup {
     destroy .e
 } -result {}
+test spinbox-5.12 {ConfigureSpinbox procedure, -from and -to swapping} -setup {
+    spinbox .e
+} -body {
+    # this statement used to trigger error "-to value must be greater than -from value"
+    # because default value for -to is zero (bug [841280ffff])
+    set res [catch {.e configure -from 10}]
+    .e configure -from 1971 -to 2016  ; # standard case
+    lappend res [.e cget -from] [.e cget -to]
+    .e configure -from 2016 -to 1971  ; # auto-swapping happens
+    lappend res [.e cget -from] [.e cget -to]
+    .e configure -to 1971 -from 2016 ; # auto-swapping, order of options does not matter
+    lappend res [.e cget -from] [.e cget -to]
+} -cleanup {
+    destroy .e
+} -result {0 1971.0 2016.0 1971.0 2016.0 1971.0 2016.0}
 
 # No tests for DisplaySpinbox.
 
 test spinbox-6.1 {SpinboxComputeGeometry procedure} -constraints {
     fonts
 } -setup {
-    spinbox .e 
+    spinbox .e
     pack .e
 } -body {
     .e configure -font {Courier -12} -bd 2 -relief raised -width 20 -highlightthickness 3
     .e insert end 012\t45
     update
@@ -2089,11 +2104,11 @@
     destroy .e
 } -result {3 4}
 test spinbox-6.2 {SpinboxComputeGeometry procedure} -constraints {
     fonts
 } -setup {
-    spinbox .e 
+    spinbox .e
     pack .e
 } -body {
     .e configure -font {Courier -12} -bd 2 -relief raised -width 20 -justify center \
 	    -highlightthickness 3
     .e insert end 012\t45
@@ -2103,11 +2118,11 @@
     destroy .e
 } -result {3 4}
 test spinbox-6.3 {SpinboxComputeGeometry procedure} -constraints {
     fonts
 } -setup {
-    spinbox .e 
+    spinbox .e
     pack .e
 } -body {
     .e configure -font {Courier -12} -bd 2 -relief raised -width 20 -justify right \
 	    -highlightthickness 3
     .e insert end 012\t45
@@ -2115,11 +2130,11 @@
     list [.e index @131] [.e index @132]
 } -cleanup {
     destroy .e
 } -result {3 4}
 test spinbox-6.4 {SpinboxComputeGeometry procedure} -setup {
-    spinbox .e 
+    spinbox .e
     pack .e
 } -body {
     .e configure -font {Courier -12} -bd 2 -relief raised -width 5
     .e insert end "01234567890"
     update
@@ -2130,11 +2145,11 @@
 } -result {6}
 test spinbox-6.5 {SpinboxComputeGeometry procedure} -setup {
     spinbox .e -highlightthickness 2
     pack .e
 } -body {
-    .e configure -font {Courier -12} -bd 2 -relief raised -width 5 	    
+    .e configure -font {Courier -12} -bd 2 -relief raised -width 5
     .e insert end "01234567890"
     update
     .e xview 7
     .e index @0
 } -cleanup {
@@ -2144,11 +2159,11 @@
     fonts
 } -setup {
     spinbox .e -highlightthickness 2
     pack .e
 } -body {
-    .e configure -font {Courier -12} -bd 2 -relief raised -width 10 
+    .e configure -font {Courier -12} -bd 2 -relief raised -width 10
     .e insert end "01234\t67890"
     update
     .e xview 3
     list [.e index @39] [.e index @40]
 } -cleanup {
@@ -2184,20 +2199,20 @@
     fonts
 } -setup {
     spinbox .e -highlightthickness 2
     pack .e
 } -body {
-    .e configure -font {Helvetica -24} -bd 3 -relief raised -width 0 
+    .e configure -font {Helvetica -24} -bd 3 -relief raised -width 0
     update
     list [winfo reqwidth .e] [winfo reqheight .e]
 } -cleanup {
     destroy .e
 } -result {42 39}
 
 
 test spinbox-7.1 {InsertChars procedure} -setup {
-    unset -nocomplain contents 
+    unset -nocomplain contents
     spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
     focus .e
 } -body {
     .e configure -textvariable contents -xscrollcommand scroll
@@ -2208,12 +2223,12 @@
 } -cleanup {
     destroy .e
 } -result {abXXXcde abXXXcde {0.000000 1.000000}}
 
 test spinbox-7.2 {InsertChars procedure} -setup {
-    unset -nocomplain contents 
-    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    unset -nocomplain contents
+    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
     focus .e
 } -body {
     .e configure -textvariable contents -xscrollcommand scroll
     .e insert 0 abcde
@@ -2278,11 +2293,11 @@
     lappend x [.e index sel.first] [.e index sel.last]
 } -cleanup {
     destroy .e
 } -result {2 6 2 5}
 test spinbox-7.7 {InsertChars procedure} -setup {
-    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
 } -body {
     .e configure -xscrollcommand scroll
     .e insert 0 0123456789
     .e icursor 4
@@ -2290,11 +2305,11 @@
     .e index insert
 } -cleanup {
     destroy .e
 } -result {7}
 test spinbox-7.8 {InsertChars procedure} -setup {
-    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
 } -body {
     .e insert 0 0123456789
     .e icursor 4
     .e insert 5 XXX
@@ -2301,11 +2316,11 @@
     .e index insert
 } -cleanup {
     destroy .e
 } -result {4}
 test spinbox-7.9 {InsertChars procedure} -setup {
-    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
 } -body {
     .e insert 0 "This is a very long string"
     update
     .e xview 4
@@ -2313,11 +2328,11 @@
     .e index @0
 } -cleanup {
     destroy .e
 } -result {7}
 test spinbox-7.10 {InsertChars procedure} -setup {
-    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
 } -body {
     .e insert 0 "This is a very long string"
     update
     .e xview 4
@@ -2328,11 +2343,11 @@
 } -result {4}
 
 test spinbox-7.11 {InsertChars procedure} -constraints {
     fonts
 } -setup {
-    spinbox .e -width 0 -font {Courier -12} -highlightthickness 2 -bd 2 
+    spinbox .e -width 0 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
 } -body {
     .e insert 0 "xyzzy"
     update
     .e insert 2 00
@@ -2340,12 +2355,12 @@
 } -cleanup {
     destroy .e
 } -result {70}
 
 test spinbox-8.1 {DeleteChars procedure} -setup {
-    unset -nocomplain contents 
-    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    unset -nocomplain contents
+    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
     focus .e
 } -body {
     .e configure -textvariable contents -xscrollcommand scroll
     .e insert 0 abcde
@@ -2354,12 +2369,12 @@
     list [.e get] $contents [format {%.6f %.6f} {*}$scrollInfo]
 } -cleanup {
     destroy .e
 } -result {abe abe {0.000000 1.000000}}
 test spinbox-8.2 {DeleteChars procedure} -setup {
-    unset -nocomplain contents 
-    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    unset -nocomplain contents
+    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
     focus .e
 } -body {
     .e configure -textvariable contents -xscrollcommand scroll
     .e insert 0 abcde
@@ -2368,12 +2383,12 @@
     list [.e get] $contents [format {%.6f %.6f} {*}$scrollInfo]
 } -cleanup {
     destroy .e
 } -result {cde cde {0.000000 1.000000}}
 test spinbox-8.3 {DeleteChars procedure} -setup {
-    unset -nocomplain contents 
-    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    unset -nocomplain contents
+    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
     focus .e
 } -body {
     .e configure -textvariable contents -xscrollcommand scroll
     .e insert 0 abcde
@@ -2382,11 +2397,11 @@
     list [.e get] $contents [format {%.6f %.6f} {*}$scrollInfo]
 } -cleanup {
     destroy .e
 } -result {abc abc {0.000000 1.000000}}
 test spinbox-8.4 {DeleteChars procedure} -setup {
-    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
     focus .e
 } -body {
     .e insert 0 0123456789abcde
     .e select from 3
@@ -2398,11 +2413,11 @@
     lappend x [.e index sel.first] [.e index sel.last]
 } -cleanup {
     destroy .e
 } -result {1 6 1 5}
 test spinbox-8.5 {DeleteChars procedure} -setup {
-    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
     focus .e
 } -body {
     .e insert 0 0123456789abcde
     .e select from 3
@@ -2414,11 +2429,11 @@
     lappend x [.e index sel.first] [.e index sel.last]
 } -cleanup {
     destroy .e
 } -result {1 5 1 4}
 test spinbox-8.6 {DeleteChars procedure} -setup {
-    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
     focus .e
 } -body {
     .e insert 0 0123456789abcde
     .e select from 3
@@ -2430,11 +2445,11 @@
     lappend x [.e index sel.first] [.e index sel.last]
 } -cleanup {
     destroy .e
 } -result {1 2 1 5}
 test spinbox-8.7 {DeleteChars procedure} -setup {
-    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
     focus .e
 } -body {
     .e insert 0 0123456789abcde
     .e select from 3
@@ -2444,11 +2459,11 @@
     .e index sel.first
 } -cleanup {
     destroy .e
 } -returnCodes error -result {selection isn't in widget .e}
 test spinbox-8.8 {DeleteChars procedure} -setup {
-    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
     focus .e
 } -body {
     .e insert 0 0123456789abcde
     .e select from 3
@@ -2460,11 +2475,11 @@
     lappend x [.e index sel.first] [.e index sel.last]
 } -cleanup {
     destroy .e
 } -result {3 4 3 8}
 test spinbox-8.9 {DeleteChars procedure} -setup {
-    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
 } -body {
     .e insert 0 0123456789abcde
     .e select from 3
     .e select to 8
@@ -2473,11 +2488,11 @@
     .e index sel.first
 } -cleanup {
     destroy .e
 } -returnCodes error -result {selection isn't in widget .e}
 test spinbox-8.10 {DeleteChars procedure} -setup {
-    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
     focus .e
 } -body {
     .e insert 0 0123456789abcde
     .e select from 8
@@ -2489,11 +2504,11 @@
     lappend x [.e index sel.first] [.e index sel.last]
 } -cleanup {
     destroy .e
 } -result {3 5 5 8}
 test spinbox-8.11 {DeleteChars procedure} -setup {
-    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
     focus .e
 } -body {
     .e insert 0 0123456789abcde
     .e select from 8
@@ -2505,11 +2520,11 @@
     lappend x [.e index sel.first] [.e index sel.last]
 } -cleanup {
     destroy .e
 } -result {3 8 4 8}
 test spinbox-8.12 {DeleteChars procedure} -setup {
-    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
     focus .e
 } -body {
     .e insert 0 0123456789abcde
     .e icursor 4
@@ -2518,11 +2533,11 @@
     .e index insert
 } -cleanup {
     destroy .e
 } -result {1}
 test spinbox-8.13 {DeleteChars procedure} -setup {
-    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
     focus .e
 } -body {
     .e insert 0 0123456789abcde
     .e icursor 4
@@ -2531,11 +2546,11 @@
     .e index insert
 } -cleanup {
     destroy .e
 } -result {1}
 test spinbox-8.14 {DeleteChars procedure} -setup {
-    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
     focus .e
 } -body {
     .e insert 0 0123456789abcde
     .e icursor 4
@@ -2544,11 +2559,11 @@
     .e index insert
 } -cleanup {
     destroy .e
 } -result {4}
 test spinbox-8.15 {DeleteChars procedure} -setup {
-    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
     focus .e
 } -body {
     .e insert 0 "This is a very long string"
     .e xview 4
@@ -2557,11 +2572,11 @@
     .e index @0
 } -cleanup {
     destroy .e
 } -result {1}
 test spinbox-8.16 {DeleteChars procedure} -setup {
-    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
     focus .e
 } -body {
     .e insert 0 "This is a very long string"
     .e xview 4
@@ -2570,11 +2585,11 @@
     .e index @0
 } -cleanup {
     destroy .e
 } -result {1}
 test spinbox-8.17 {DeleteChars procedure} -setup {
-    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2 
+    spinbox .e -width 10 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
     focus .e
 } -body {
     .e insert 0 "This is a very long string"
     .e xview 4
@@ -2583,21 +2598,36 @@
     .e index @0
 } -cleanup {
     destroy .e
 } -result {4}
 test spinbox-8.18 {DeleteChars procedure} -setup {
-    spinbox .e -width 0 -font {Courier -12} -highlightthickness 2 -bd 2 
+    spinbox .e -width 0 -font {Courier -12} -highlightthickness 2 -bd 2
     pack .e
     focus .e
 } -body {
     .e insert 0 "xyzzy"
     update
     .e delete 2 4
-    winfo reqwidth .e
+    # To check that deletion actually happened we measure the new width
+    # of the widget, based on the measuring width of the remaining text ("xyy")
+    # in the widget. For that purpose we have to mirror the code in tkEntry.c
+    # for computation of the reqwidth
+    # note: XPAD corresponds to the hardcoded    #define XPAD 1
+    set XPAD 1
+    set buttonWidth [expr { [font measure [.e cget -font] "0"] + 2 * (1 + $XPAD) }]
+    if {$buttonWidth < 11} {
+        set buttonWidth 11
+    }
+    set expected [expr { [font measure [.e cget -font] "xyy"] \
+                          + 2 * ( [.e cget -borderwidth] + \
+                                [.e cget -highlightthickness] + $XPAD ) \
+                          + $buttonWidth } ]
+    expr {[winfo reqwidth .e] == $expected}
 } -cleanup {
     destroy .e
-} -result {42}
+    unset XPAD buttonWidth expected
+} -result {1}
 
 test spinbox-9.1 {SpinboxValueChanged procedure} -setup {
     unset -nocomplain x
 } -body {
     trace variable x w override
@@ -2613,20 +2643,20 @@
 test spinbox-10.1 {SpinboxSetValue procedure} -constraints fonts -body {
     set x abcde
     set y ab
     spinbox .e  -font {Helvetica -12} -highlightthickness 2 -bd 2  -width 0
     pack .e
-    .e configure -textvariable x 
+    .e configure -textvariable x
     .e configure -textvariable y
     update
     list [.e get] [winfo reqwidth .e]
 } -cleanup {
     destroy .e
 } -result {ab 35}
 test spinbox-10.2 {SpinboxSetValue procedure, updating selection} -setup {
     unset -nocomplain x
-    spinbox .e -font {Helvetica -12} -highlightthickness 2 -bd 2 
+    spinbox .e -font {Helvetica -12} -highlightthickness 2 -bd 2
     pack .e
 } -body {
     .e configure -textvariable x
     .e insert 0 "abcdefghjklmnopqrstu"
     .e selection range 4 10
@@ -2635,11 +2665,11 @@
 } -cleanup {
     destroy .e
 } -returnCodes error -result {selection isn't in widget .e}
 test spinbox-10.3 {SpinboxSetValue procedure, updating selection} -setup {
     unset -nocomplain x
-    spinbox .e -font {Helvetica -12} -highlightthickness 2 -bd 2 
+    spinbox .e -font {Helvetica -12} -highlightthickness 2 -bd 2
     pack .e
 } -body {
     .e configure -textvariable x
     .e insert 0 "abcdefghjklmnopqrstu"
     .e selection range 4 10
@@ -2648,11 +2678,11 @@
 } -cleanup {
     destroy .e
 } -result {4 7}
 test spinbox-10.4 {SpinboxSetValue procedure, updating selection} -setup {
     unset -nocomplain x
-    spinbox .e -font {Helvetica -12} -highlightthickness 2 -bd 2 
+    spinbox .e -font {Helvetica -12} -highlightthickness 2 -bd 2
     pack .e
 } -body {
     .e configure -textvariable x
     .e insert 0 "abcdefghjklmnopqrstu"
     .e selection range 4 10
@@ -2661,11 +2691,11 @@
 } -cleanup {
     destroy .e
 } -result {4 10}
 test spinbox-10.5 {SpinboxSetValue procedure, updating display position} -setup {
     unset -nocomplain x
-    spinbox .e -highlightthickness 2 -bd 2 
+    spinbox .e -highlightthickness 2 -bd 2
     pack .e
 } -body {
     .e configure -width 10 -font {Courier -12} -textvariable x
     .e insert 0 "abcdefghjklmnopqrstuvwxyz"
     .e xview 10
@@ -2676,11 +2706,11 @@
 } -cleanup {
     destroy .e
 } -result {0}
 test spinbox-10.6 {SpinboxSetValue procedure, updating display position} -setup {
     unset -nocomplain x
-    spinbox .e -highlightthickness 2 -bd 2 
+    spinbox .e -highlightthickness 2 -bd 2
     pack .e
 } -body {
     .e configure -width 10 -font {Courier -12} -textvariable x
     pack .e
     .e insert 0 "abcdefghjklmnopqrstuvwxyz"
@@ -2692,11 +2722,11 @@
 } -cleanup {
     destroy .e
 } -result {10}
 test spinbox-10.7 {SpinboxSetValue procedure, updating insertion cursor} -setup {
     unset -nocomplain x
-    spinbox .e -highlightthickness 2 -bd 2 
+    spinbox .e -highlightthickness 2 -bd 2
     pack .e
     update
 } -body {
     .e configure -width 10 -font {Courier -12} -textvariable x
     pack .e
@@ -2707,11 +2737,11 @@
 } -cleanup {
     destroy .e
 } -result {3}
 test spinbox-10.8 {SpinboxSetValue procedure, updating insertion cursor} -setup {
     unset -nocomplain x
-    spinbox .e -highlightthickness 2 -bd 2 
+    spinbox .e -highlightthickness 2 -bd 2
     pack .e
 } -body {
     .e configure -width 10 -font {Courier -12} -textvariable x
     pack .e
     .e insert 0 "abcdefghjklmnopqrstuvwxyz"
@@ -2764,11 +2794,11 @@
     .e index end
 } -cleanup {
     destroy .e
 } -result {21}
 test spinbox-13.2 {GetSpinboxIndex procedure} -body {
-    spinbox .e 
+    spinbox .e
     .e index abogus
 } -cleanup {
     destroy .e
 } -returnCodes error -result {bad spinbox index "abogus"}
 test spinbox-13.3 {GetSpinboxIndex procedure} -setup {
@@ -2849,12 +2879,12 @@
     list [.e index sel.first] [.e index sel.last]
 } -cleanup {
     destroy .e
 } -result {1 6}
 
-test spinbox-13.10 {GetSpinboxIndex procedure} -constraints unix -body {
-# On unix, when selection is cleared, spinbox widget's internal 
+test spinbox-13.10 {GetSpinboxIndex procedure} -constraints x11 -body {
+# On unix, when selection is cleared, spinbox widget's internal
 # selection range is reset.
 # Previous settings:
 	spinbox .e -font {Courier -12} -width 5 -bd 2 -relief sunken
 	pack .e
 	.e insert 0 012345678901234567890
@@ -2868,13 +2898,13 @@
     .e index sel.first
 } -cleanup {
     destroy .e
 } -returnCodes error -result {selection isn't in widget .e}
 
-test spinbox-13.11 {GetSpinboxIndex procedure} -constraints win -body {
+test spinbox-13.11 {GetSpinboxIndex procedure} -constraints aquaOrWin32 -body {
 # On mac and pc, when selection is cleared, spinbox widget remembers
-# last selected range.  When selection ownership is restored to 
+# last selected range.  When selection ownership is restored to
 # spinbox, the old range will be rehighlighted.
 # Previous settings:
 	spinbox .e -font {Courier -12} -width 5 -bd 2 -relief sunken
 	pack .e
 	.e insert 0 012345678901234567890
@@ -2887,13 +2917,13 @@
     selection clear .e
     catch {selection get}
     .e index sel.first
 } -cleanup {
     destroy .e
-} -result {1}           
+} -result {1}
 
-test spinbox-13.12 {GetSpinboxIndex procedure} -constraints unix -body {
+test spinbox-13.12 {GetSpinboxIndex procedure} -constraints x11 -body {
 # Previous settings:
 	spinbox .e -font {Courier -12} -width 5 -bd 2 -relief sunken
 	pack .e
 	.e insert 0 012345678901234567890
 	.e xview 4
@@ -2942,11 +2972,31 @@
     destroy .e
 } -returnCodes error -result {bad spinbox index "sbogus"}
 
 test spinbox-13.14 {GetSpinboxIndex procedure} -constraints win -body {
 # On mac and pc, when selection is cleared, spinbox widget remembers
-# last selected range.  When selection ownership is restored to 
+# last selected range.  When selection ownership is restored to
+# spinbox, the old range will be rehighlighted.
+# Previous settings:
+	spinbox .e -font {Courier -12} -width 5 -bd 2 -relief sunken
+	pack .e
+	.e insert 0 012345678901234567890
+	.e xview 4
+	update
+    .e select from 1
+    .e select to 6
+    list [.e index sel.first] [.e index sel.last]
+# Testing:
+    selection clear .e
+    selection get
+} -cleanup {
+    destroy .e
+} -returnCodes error -match glob -result {*}
+
+test spinbox-13.14.1 {GetSpinboxIndex procedure} -constraints win -body {
+# On mac and pc, when selection is cleared, spinbox widget remembers
+# last selected range.  When selection ownership is restored to
 # spinbox, the old range will be rehighlighted.
 # Previous settings:
 	spinbox .e -font {Courier -12} -width 5 -bd 2 -relief sunken
 	pack .e
 	.e insert 0 012345678901234567890
@@ -2955,32 +3005,12 @@
     .e select from 1
     .e select to 6
     list [.e index sel.first] [.e index sel.last]
 # Testing:
     selection clear .e
-    selection get 
-} -cleanup {
-    destroy .e
-} -returnCodes error -match glob -result {*}
-
-test spinbox-13.14.1 {GetSpinboxIndex procedure} -constraints win -body {
-# On mac and pc, when selection is cleared, spinbox widget remembers
-# last selected range.  When selection ownership is restored to 
-# spinbox, the old range will be rehighlighted.
-# Previous settings:
-	spinbox .e -font {Courier -12} -width 5 -bd 2 -relief sunken
-	pack .e
-	.e insert 0 012345678901234567890
-	.e xview 4
-	update
-    .e select from 1
-    .e select to 6
-    list [.e index sel.first] [.e index sel.last]
-# Testing:
-    selection clear .e  
-    catch {selection get} 
-    .e index sbogus      
+    catch {selection get}
+    .e index sbogus
 } -cleanup {
     destroy .e
 } -returnCodes error -match glob -result {*}
 
 test spinbox-13.15 {GetSpinboxIndex procedure} -body {
@@ -2991,11 +3021,11 @@
     destroy .e
 } -returnCodes error -result {bad spinbox index "@xyz"}
 
 test spinbox-13.16 {GetSpinboxIndex procedure} -constraints fonts -body {
     spinbox .e -width 5 -relief sunken -highlightthickness 2 -bd 2 \
-        -font {Courier -12} 
+        -font {Courier -12}
     pack .e
     .e insert 0 012345678901234567890
     .e xview 4
     update
     .e index @4
@@ -3002,11 +3032,11 @@
 } -cleanup {
     destroy .e
 } -result {4}
 test spinbox-13.17 {GetSpinboxIndex procedure} -constraints fonts -body {
     spinbox .e -width 5 -relief sunken -highlightthickness 2 -bd 2 \
-        -font {Courier -12} 
+        -font {Courier -12}
     pack .e
     .e insert 0 012345678901234567890
     .e xview 4
     update
     .e index @11
@@ -3013,11 +3043,11 @@
 } -cleanup {
     destroy .e
 } -result {4}
 test spinbox-13.18 {GetSpinboxIndex procedure} -constraints fonts -body {
     spinbox .e -width 5 -relief sunken -highlightthickness 2 -bd 2 \
-        -font {Courier -12} 
+        -font {Courier -12}
     pack .e
     .e insert 0 012345678901234567890
     .e xview 4
     update
     .e index @12
@@ -3024,11 +3054,11 @@
 } -cleanup {
     destroy .e
 } -result {5}
 test spinbox-13.19 {GetSpinboxIndex procedure} -constraints fonts -body {
     spinbox .e -width 5 -relief sunken -highlightthickness 2 -bd 2 \
-        -font {Courier -12} 
+        -font {Courier -12}
     pack .e
     .e insert 0 012345678901234567890
     .e xview 4
     update
     .e index @[expr {[winfo width .e] - 6-11}]
@@ -3035,11 +3065,11 @@
 } -cleanup {
     destroy .e
 } -result {8}
 test spinbox-13.20 {GetSpinboxIndex procedure} -constraints fonts -body {
     spinbox .e -width 5 -relief sunken -highlightthickness 2 -bd 2 \
-        -font {Courier -12} 
+        -font {Courier -12}
     pack .e
     .e insert 0 012345678901234567890
     .e xview 4
     update
     .e index @[expr {[winfo width .e] - 5}]
@@ -3046,31 +3076,31 @@
 } -cleanup {
     destroy .e
 } -result {9}
 test spinbox-13.21 {GetSpinboxIndex procedure} -body {
     spinbox .e -width 5 -relief sunken -highlightthickness 2 -bd 2 \
-        -font {Courier -12} 
+        -font {Courier -12}
     pack .e
     .e insert 0 012345678901234567890
     .e xview 4
     update
     .e index @1000
 } -cleanup {
     destroy .e
 } -result {9}
 test spinbox-13.22 {GetSpinboxIndex procedure} -setup {
-    spinbox .e 
+    spinbox .e
     pack .e
     update
 } -body {
     .e index 1xyz
 } -cleanup {
     destroy .e
 } -returnCodes error -result {bad spinbox index "1xyz"}
 test spinbox-13.23 {GetSpinboxIndex procedure} -body {
     spinbox .e -width 5 -relief sunken -highlightthickness 2 -bd 2 \
-        -font {Courier -12} 
+        -font {Courier -12}
     pack .e
     .e insert 0 012345678901234567890
     .e xview 4
     update
     .e index -10
@@ -3077,11 +3107,11 @@
 } -cleanup {
     destroy .e
 } -result {0}
 test spinbox-13.24 {GetSpinboxIndex procedure} -body {
     spinbox .e -width 5 -relief sunken -highlightthickness 2 -bd 2 \
-        -font {Courier -12} 
+        -font {Courier -12}
     pack .e
     .e insert 0 012345678901234567890
     .e xview 4
     update
     .e index 12
@@ -3088,11 +3118,11 @@
 } -cleanup {
     destroy .e
 } -result {12}
 test spinbox-13.25 {GetSpinboxIndex procedure} -body {
     spinbox .e -width 5 -relief sunken -highlightthickness 2 -bd 2 \
-        -font {Courier -12} 
+        -font {Courier -12}
     pack .e
     .e insert 0 012345678901234567890
     .e xview 4
     update
     .e index 49
@@ -3116,11 +3146,11 @@
     for {set i 1} {$i <= 500} {incr i} {
         append x "This is line $i, out of 500\n"
 }
 } -body {
     spinbox .e
-    .e insert end $x    
+    .e insert end $x
     .e select from 0
     .e select to end
     string compare [selection get] $x
 } -cleanup {
     destroy .e
@@ -3143,11 +3173,11 @@
 
 test spinbox-16.1 {SpinboxVisibleRange procedure} -constraints fonts  -body {
     spinbox .e -width 10 -font {Helvetica -12}
     pack .e
     update
-    .e insert 0 "............................." 
+    .e insert 0 "............................."
     format {%.6f %.6f} {*}[.e xview]
 } -cleanup {
     destroy .e
 } -result {0.000000 0.827586}
 test spinbox-16.2 {SpinboxVisibleRange procedure} -body {
@@ -3214,11 +3244,11 @@
     interp hide {} .e
     destroy .e
     set res1 [list [winfo children .] [interp hidden]]
     set res2 [list {} $l]
     expr {$res1 == $res2}
-} -result {1} 
+} -result {1}
 
 ##
 ## Spinbox widget VALIDATION tests
 ##
 # The validation tests build each one upon the previous, so cascading
@@ -3568,11 +3598,11 @@
         -invalidcommand bell \
         -textvariable ::e \
         -background red -foreground white
     pack .e
     set ::e nextdata                 ;# previous settings
-    
+
     .e configure -validatecommand [list doval2 %W %d %i %P %s %S %v %V]
     .e validate
     list [.e cget -validate] [.e get] $::vVals
 } -cleanup {
     destroy .e
@@ -3593,11 +3623,11 @@
         -background red -foreground white
     pack .e
     set ::e nextdata                 ;# previous settings
     .e configure -validatecommand [list doval2 %W %d %i %P %s %S %v %V] ;# prev
     .e validate                     ;# previous settings
-    
+
     .e configure -validate all
     set ::e testdata
     list [.e cget -validate] [.e get] $::e $::vVals
 } -cleanup {
     destroy .e

ADDED   tests/teapotTransparent.png
Index: tests/teapotTransparent.png
==================================================================
--- /dev/null
+++ tests/teapotTransparent.png
cannot compute difference between binary files

Index: tests/text.test
==================================================================
--- tests/text.test
+++ tests/text.test
@@ -908,29 +908,29 @@
 test text-2.7 {Tk_TextCmd procedure} -constraints {
     win
 } -body {
     catch {destroy .t}
     text .t
-    .t tag cget sel -relief 
+    .t tag cget sel -relief
 } -cleanup {
     destroy .t
 } -result {flat}
 test text-2.8 {Tk_TextCmd procedure} -constraints {
     aqua
 } -body {
     catch {destroy .t}
     text .t
-    .t tag cget sel -relief 
+    .t tag cget sel -relief
 } -cleanup {
     destroy .t
-} -result {solid}
+} -result {flat}
 test text-2.9 {Tk_TextCmd procedure} -constraints {
-    unix
+    unix notAqua
 } -body {
     catch {destroy .t}
     text .t
-    .t tag cget sel -relief 
+    .t tag cget sel -relief
 } -cleanup {
     destroy .t
 } -result {raised}
 test text-2.10 {Tk_TextCmd procedure} -body {
     list [text .t] [winfo class .t]
@@ -1483,11 +1483,23 @@
     return $res
 } -cleanup {
     rename .t {}
     rename test.t .t
     destroy .t
-} -result {{edit undo} {delete 2.1 2.4} {mark set insert 2.1} {see insert} {insert 2.1 ef} {mark set insert 2.3} {see insert}}
+} -result [list {edit undo} {delete 2.1 2.4} {mark set insert 2.1} {see insert} \
+                {mark set tk::undoMarkL2 2.1} {mark set tk::undoMarkR2 2.4} \
+                {mark gravity tk::undoMarkL2 left} {mark gravity tk::undoMarkR2 right} \
+                {insert 2.1 ef} {mark set insert 2.3} {see insert} \
+                {mark set tk::undoMarkL1 2.1} {mark set tk::undoMarkR1 2.3} \
+                {mark gravity tk::undoMarkL1 left} {mark gravity tk::undoMarkR1 right} \
+                {mark names} \
+                {index tk::undoMarkL1} {index tk::undoMarkR1} \
+                {mark unset tk::undoMarkL1 tk::undoMarkR1} \
+                {index tk::undoMarkL2} {index tk::undoMarkR2} \
+                {mark unset tk::undoMarkL2 tk::undoMarkR2} \
+                {compare 2.1 > 2.3} {compare 2.6 > 2.3} ]
+
 test text-8.23 {TextWidgetCmd procedure, "replace" option with undo} -setup {
     text .t
 } -body {
     .t insert 1.0 "Line 1
 aefghijklm
@@ -1573,10 +1585,29 @@
     text .tt
 } -body {
     .tt insert 0.0 foo\n
     .tt replace end-1l end bar
 } -cleanup {
+    destroy .tt
+} -result {}
+test text-8.27 {TextWidgetCmd procedure, "replace" option crash} -setup {
+    text .tt
+} -body {
+    .tt insert 0.0 \na
+    for {set i 0} {$i < 2} {incr i} {
+        .tt replace 2.0 3.0 b
+    }
+} -cleanup {
+    destroy .tt
+} -result {}
+test text-8.28 {TextWidgetCmd procedure, "replace" option crash} -setup {
+    text .tt
+} -body {
+    .tt insert end "foo\n"
+    .tt tag add sel 1.0 end
+    .tt replace sel.first sel.last "bar"
+} -cleanup {
     destroy .tt
 } -result {}
 
 
 test text-9.1 {TextWidgetCmd procedure, "get" option} -setup {
@@ -2014,11 +2045,11 @@
 !@#$%
 Line 7"
     .t tag configure elide -elide 1
     .t tag add elide 5.2 5.4
     .t window create 5.4
-    .t delete 5.4 
+    .t delete 5.4
     .t tag add elide 5.5 5.6
     .t get -displaychars 5.2 5.8
 } -cleanup {
     destroy .t
 } -result {Grl}
@@ -2629,11 +2660,11 @@
 } -cleanup {
     destroy .t
 } -result {3}
 test text-10.38 {TextWidgetCmd procedure, "count" option} -setup {
     text .t -font {Courier -12} -borderwidth 2 -highlightthickness 2
-    pack append . .t {top expand fill}
+    pack .t -expand 1 -fill both
 } -body {
     .t configure -width 20 -height 10
     update
     .t insert end [string repeat "abcde " 50]\n
     .t insert end [string repeat "fghij " 50]\n
@@ -2725,11 +2756,11 @@
 } -result {1 1}
 
 
 test text-11.1 {counting with tag priority eliding} -setup {
     text .t -font {Courier -12} -borderwidth 2 -highlightthickness 2
-    pack append . .t {top expand fill}
+    pack .t -expand 1 -fill both
 } -body {
     .t insert end "hello"
     .t configure -wrap none
     list [.t count -displaychars 1.0 1.0] \
       [.t count -displaychars 1.0 1.1] \
@@ -2742,11 +2773,11 @@
 } -cleanup {
     destroy .t
 } -result {0 1 2 3 4 5 5 6}
 test text-11.2 {counting with tag priority eliding} -setup {
     text .t -font {Courier -12} -borderwidth 2 -highlightthickness 2
-    pack append . .t {top expand fill}
+    pack .t -expand 1 -fill both
 } -body {
     .t insert end "hello"
     .t tag configure elide1 -elide 0
     .t tag add elide1 1.2 1.4
     .t count -displaychars 1.0 1.5
@@ -2854,11 +2885,11 @@
 } -cleanup {
     destroy .t
 } -result {5 5}
 test text-11.8 {counting with tag priority eliding} -setup {
     text .t -font {Courier -12} -borderwidth 2 -highlightthickness 2
-    pack append . .t {top expand fill}
+    pack .t -expand 1 -fill both
     set res {}
 } -body {
     .t insert end "hello"
 # Newer tags are higher priority
     .t tag configure elide1 -elide 0
@@ -2880,11 +2911,11 @@
 } -cleanup {
     destroy .t
 } -result {0 0 0 0 3 2 1 1}
 test text-11.9 {counting with tag priority eliding} -setup {
     text .t -font {Courier -12} -borderwidth 2 -highlightthickness 2
-    pack append . .t {top expand fill}
+    pack .t -expand 1 -fill both
     set res {}
 } -body {
     .t tag configure WELCOME -elide 1
     .t tag configure SYSTEM -elide 0
     .t tag configure TRAFFIC -elide 1
@@ -2896,11 +2927,11 @@
     lappend res [.t count -displaychars 2.0 end]
     lappend res [.t count -displaychars 2.0 end-1c]
     lappend res [.t index "1.0 +1 indices"]
     lappend res [.t index "1.0 +1 display indices"]
     lappend res [.t index "1.0 +1 display chars"]
-    lappend res [.t index end] 
+    lappend res [.t index end]
     lappend res [.t index "end -1 indices"]
     lappend res [.t index "end -1 display indices"]
     lappend res [.t index "end -1 display chars"]
     lappend res [.t index "end -2 indices"]
     lappend res [.t index "end -2 display indices"]
@@ -3068,11 +3099,11 @@
     bind .top.yt <<WidgetViewSync>> {lappend res Sync:%d}
     .top.yt insert 1.0 $content
     vwait res  ; # event dealt with by the event loop, with %d==0 i.e. we're out of sync
     # ensure the test is relevant
     lappend res "Pending:[.top.yt pendingsync]"
-    # - <<WidgetViewSync>> fires when sync returns if there was pending syncs 
+    # - <<WidgetViewSync>> fires when sync returns if there was pending syncs
     # - there is no more any pending sync after running 'sync'
     .top.yt sync
     vwait res  ; # event dealt with by the event loop, with %d==1 i.e. we're in sync again
     lappend res "Pending:[.top.yt pendingsync]"
     set res
@@ -3087,11 +3118,11 @@
 } -body {
     set res {}
     toplevel .top
     pack [text .top.t]
     for {set i 1} {$i < 10000} {incr i} {
-        .top.t insert end "Hello world!\n" 
+        .top.t insert end "Hello world!\n"
     }
     bind .top.t <<WidgetViewSync>> {destroy .top.t}
     .top.t tag add mytag 1.5 8000.8    ; # shall not crash
     update
     set res "Still doing fine!"
@@ -3290,15 +3321,15 @@
     text .t
 } -body {
     .t configure -tabs {30 foo}
 } -cleanup {
     destroy .t
-} -returnCodes {error} -result {bad tab alignment "foo": must be left, right, center, or numeric} 
+} -returnCodes {error} -result {bad tab alignment "foo": must be left, right, center, or numeric}
 test text-14.6 {ConfigureText procedure} -setup {
     text .t
 } -body {
-    catch {.t configure -tabs {30 foo}} 
+    catch {.t configure -tabs {30 foo}}
     .t configure -tabs {10 20 30}
     return $errorInfo
 } -cleanup {
     destroy .t
 } -result {bad tab alignment "foo": must be left, right, center, or numeric
@@ -3313,11 +3344,11 @@
     .t cget -tabs
 } -cleanup {
     destroy .t
 } -result {}
 test text-14.8 {ConfigureText procedure} -setup {
-   text .t 
+   text .t
 } -body {
     .t configure -wrap bogus
 } -cleanup {
     destroy .t
 } -returnCodes {error} -result {bad wrap "bogus": must be char, none, or word}
@@ -3339,11 +3370,11 @@
     .t tag cget sel -borderwidth
 } -cleanup {
     destroy .t
 } -result {}
 test text-14.11 {ConfigureText procedure} -setup {
-    text .t 
+    text .t
 } -body {
     .t configure -selectborderwidth foo
 } -cleanup {
     destroy .t
 } -returnCodes {error} -result {bad screen distance "foo"}
@@ -3429,12 +3460,12 @@
 } -result {1234}
 test text-14.18 {ConfigureText procedure} -constraints fonts -setup {
     toplevel .top
     text .top.t -font {Courier -12} -borderwidth 2 -highlightthickness 2
 } -body {
-    .top.t configure -width 20 -height 10 
-    pack append .top .top.t top
+    .top.t configure -width 20 -height 10
+    pack .top.t
     update
     set geom [wm geometry .top]
     set x [string range $geom 0 [string first + $geom]]
 } -cleanup {
     destroy .top
@@ -3447,11 +3478,11 @@
     toplevel .top
     text .top.t -font {Courier -12} -borderwidth 2 -highlightthickness 2
 } -body {
     .top.t configure -width 20 -height 10 -setgrid 1
     wm overrideredirect .top 1
-    pack append .top .top.t top
+    pack .top.t
     wm geometry .top +0+0
     update
     wm geometry .top
 } -cleanup {
     destroy .top
@@ -3464,11 +3495,11 @@
     toplevel .top
     text .top.t -font {Courier -12} -borderwidth 2 -highlightthickness 2
 } -body {
     .top.t configure -width 20 -height 10 -setgrid 1
     wm overrideredirect .top 1
-    pack append .top .top.t top
+    pack .top.t
     wm geometry .top +0+0
     update
     set result [wm geometry .top]
     wm geometry .top 15x8
     update
@@ -3518,11 +3549,11 @@
     destroy .txt1
 } -result {{} 0}
 test text-17.2 {TextCmdDeletedProc procedure, disabling -setgrid} -constraints {
     fonts
 } -body {
-   toplevel .top 
+   toplevel .top
    text .top.t -borderwidth 2 -highlightthickness 2 -font {Courier -12 bold} \
     -setgrid 1 -width 20 -height 10
    pack .top.t
    update
    set geom [wm geometry .top]
@@ -3754,11 +3785,11 @@
 Line 4
 }
 test text-19.11 {DeleteChars procedure} -body {
     toplevel .top
     text .top.t -width 20 -height 5
-    pack append .top .top.t top
+    pack .top.t
     wm geometry .top +0+0
     .top.t insert 1.0 "abc\n123\nx\ny\nz\nq\nr\ns"
     update
     .top.t delete 1.0 3.0
     list [.top.t index @0,0] [.top.t get @0,0]
@@ -3766,11 +3797,11 @@
     destroy .top
 } -result {1.0 x}
 test text-19.12 {DeleteChars procedure} -body {
     toplevel .top
     text .top.t -width 20 -height 5
-    pack append .top .top.t top
+    pack .top.t
     wm geometry .top +0+0
     .top.t insert 1.0 "abc\n123\nx\ny\nz\nq\nr\ns"
     .top.t yview 3.0
     update
     .top.t delete 2.0 4.0
@@ -3826,11 +3857,11 @@
     frame .top.f -width 200 -height 20 -relief raised -bd 2
     pack .top.f .top.t -side left
     wm geometry .top +0+0
     update
 } -body {
-    .top.t insert end "abc def\n01 2345 678 9101112\nLine 3\nLine 4\nLine 5\n6\n7\n8\n"
+    .top.t insert end "abc def\n01 2a345 678 9101112\nLine 3\nLine 4\nLine 5\n6\n7\n8\n"
     .top.t yview 2.4
     .top.t delete 2.5
     set x [.top.t index @0,0]
     .top.t delete 2.5
     list $x [.top.t index @0,0]
@@ -3839,11 +3870,11 @@
 } -result {2.3 2.0}
 
 
 test text-20.1 {TextFetchSelection procedure} -setup {
     text .t -width 20 -height 10
-    pack append . .t {top expand fill}
+    pack .t -expand 1 -fill both
     update
 } -body {
     foreach i {a b c d e f g h i j k l m n o p q r s t u v w x y z} {
         .t insert end $i.0$i.1$i.2$i.3$i.4\n
     }
@@ -3854,11 +3885,11 @@
 } -result {a.1a.2a.3a.4
 b.0b.1b.2b.3b.4
 c.0c}
 test text-20.2 {TextFetchSelection procedure} -setup {
     text .t -width 20 -height 10
-    pack append . .t {top expand fill}
+    pack .t -expand 1 -fill both
     update
 } -body {
     foreach i {a b c d e f g h i j k l m n o p q r s t u v w x y z} {
         .t insert end $i.0$i.1$i.2$i.3$i.4\n
     }
@@ -3874,11 +3905,11 @@
 } -result {a.0a.1a.2a.3a.4
 b.0b.1b.2b.3b.4
 c.0c}
 test text-20.3 {TextFetchSelection procedure}  -setup {
     text .t -width 20 -height 10
-    pack append . .t {top expand fill}
+    pack .t -expand 1 -fill both
     update
 } -body {
     foreach i {a b c d e f g h i j k l m n o p q r s t u v w x y z} {
         .t insert end $i.0$i.1$i.2$i.3$i.4\n
     }
@@ -3888,11 +3919,11 @@
 } -cleanup {
     destroy .t
 } -result {m}
 test text-20.4 {TextFetchSelection procedure}  -setup {
     text .t -width 20 -height 10
-    pack append . .t {top expand fill}
+    pack .t -expand 1 -fill both
     update
 } -body {
     foreach i {a b c d e f g h i j k l m n o p q r s t u v w x y z} {
         .t insert end $i.0$i.1$i.2$i.3$i.4\n
     }
@@ -3908,11 +3939,11 @@
     destroy .t
 } -result {0a..1b.2b.3b.4
 cj.0j.1j.2j.3j.4m}
 test text-20.5 {TextFetchSelection procedure, long selections} -setup {
     text .t -width 20 -height 10
-    pack append . .t {top expand fill}
+    pack .t -expand 1 -fill both
     update
     set x ""
 } -body {
     for {set i 1} {$i < 200} {incr i} {
         append x "This is line $i, padded to just about 53 characters.\n"
@@ -3923,11 +3954,11 @@
 } -cleanup {
     destroy .t
 } -result {1}
 
 
-test text-21.1 {TkTextLostSelection procedure} -constraints unix -setup {
+test text-21.1 {TkTextLostSelection procedure} -constraints {x11} -setup {
     text .t
     .t insert 1.0 "Line 1"
     entry .t.e
     .t.e insert end "abcdefg"
     text .t2
@@ -3938,11 +3969,11 @@
     .t.e select to 1
     .t2 tag ranges sel
 } -cleanup {
     destroy .t .t2
 } -result {}
-test text-21.2 {TkTextLostSelection procedure} -constraints win -setup {
+test text-21.2 {TkTextLostSelection procedure} -constraints aquaOrWin32 -setup {
     text .t
     .t insert 1.0 "Line 1"
     entry .t.e
     .t.e insert end "abcdefg"
     text .t2
@@ -4910,11 +4941,11 @@
     destroy .t
 } -result {}
 test text-22.119 {TextSearchCmd, multiline regexp matching} -body {
     pack [text .t]
     .t insert 1.0 {    Tcl_Obj *objPtr));
-static Tcl_Obj*         FSNormalizeAbsolutePath 
+static Tcl_Obj*         FSNormalizeAbsolutePath
 			    _ANSI_ARGS_((Tcl_Interp* interp, Tcl_Obj *pathPtr));}
     set markExpr "^(\[A-Za-z0-9~_\]+\[ \t\n\r\]*\\(|(\[^ \t\(#\n\r/@:\*\]\[^=\(\r\n\]*\[ \t\]+\\*?)?"
     append markExpr "(\[A-Za-z0-9~_\]+(<\[^>\]*>)?(::)?(\[A-Za-z0-9~_\]+::)*\[-A-Za-z0-9~_+ <>\|\\*/\]+|\[A-Za-z0-9~_\]+)"
     append markExpr "\[ \n\t\r\]*\\()"
     .t search -forwards -regexp $markExpr 1.41 end
@@ -4927,11 +4958,11 @@
 # a bug in Tcl's handling of string objects.
 # (Tcl bug 635200)
     pack [text .t]
     .t insert 1.0 {static int		SetFsPathFromAny _ANSI_ARGS_((Tcl_Interp *interp,
 			    Tcl_Obj *objPtr));
-static Tcl_Obj*         FSNormalizeAbsolutePath 
+static Tcl_Obj*         FSNormalizeAbsolutePath
 			    _ANSI_ARGS_((Tcl_Interp* interp, Tcl_Obj *pathPtr));}
     set markExpr "^(\[A-Za-z0-9~_\]+\[ \t\n\r\]*\\(|(\[^ \t\(#\n\r/@:\*\]\[^=\(\r\n\]*\[ \t\]+\\*?)?"
     append markExpr "(\[A-Za-z0-9~_\]+(<\[^>\]*>)?(::)?(\[A-Za-z0-9~_\]+::)*\[-A-Za-z0-9~_+ <>\|\\*/\]+|\[A-Za-z0-9~_\]+)"
     append markExpr "\[ \n\t\r\]*\\()"
     .t search -forwards -regexp $markExpr 1.41 end
@@ -4941,11 +4972,11 @@
 test text-22.121 {TextSearchCmd, multiline regexp matching} -body {
     pack [text .t]
     .t insert 1.0 {
 static int		SetFsPathFromAny _ANSI_ARGS_((Tcl_Interp *interp,
 			    Tcl_Obj *objPtr));
-static Tcl_Obj*         FSNormalizeAbsolutePath 
+static Tcl_Obj*         FSNormalizeAbsolutePath
 			    _ANSI_ARGS_((Tcl_Interp* interp, Tcl_Obj *pathPtr));}
     set markExpr "^(\[A-Za-z0-9~_\]+\[ \t\n\r\]*\\(|(\[^ \t\(#\n\r/@:\*\]\[^=\(\r\n\]*\[ \t\]+\\*?)?"
     append markExpr "(\[A-Za-z0-9~_\]+(<\[^>\]*>)?(::)?(\[A-Za-z0-9~_\]+::)*\[-A-Za-z0-9~_+ <>\|\\*/\]+|\[A-Za-z0-9~_\]+)"
     append markExpr "\[ \n\t\r\]*\\()"
     .t search -backwards -all -regexp $markExpr end
@@ -5536,24 +5567,20 @@
     list [.t search -regexp -forward -all -count foo \
       -- {(b+\nc+\nb+)\na+} 1.0] $foo
 } -cleanup {
     destroy .t
 } -result {2.0 19}
-test text-22.199 {TextSearchCmd, regexp search multi-line} -constraints {
-    knownBug
-} -body {
+test text-22.199 {TextSearchCmd, regexp search multi-line} -body {
     pack [text .t]
     .t insert 1.0 "aaaa\nbbbb\ncccc\nbbbb\naaaa\n"
     set foo {}
     list [.t search -regexp -forward -all -count foo \
       -- {(a+|b+\nc+\nb+)\na+} 1.0] $foo
 } -cleanup {
     destroy .t
 } -result {2.0 19}
-test text-22.200 {TextSearchCmd, regexp search multi-line} -constraints {
-    knownBug
-} -body {
+test text-22.200 {TextSearchCmd, regexp search multi-line} -body {
     pack [text .t]
     .t insert 1.0 "aaaa\nbbbb\ncccc\nbbbb\naaaa\n"
     set foo {}
     list [.t search -regexp -forward -all -count foo \
       -- {(a+|b+\nc+\nb+)+\na+} 1.0] $foo
@@ -5567,27 +5594,22 @@
     list [.t search -regexp -forward -all -count foo \
       -- {((a+|b+\nc+\nb+)+\n)+a+} 1.0] $foo
 } -cleanup {
     destroy .t
 } -result {1.0 24}
-test text-22.202 {TextSearchCmd, regexp search multi-line} -constraints {
-    knownBug
-} -body {
+test text-22.202 {TextSearchCmd, regexp search multi-line} -body {
     pack [text .t]
     .t insert 1.0 "aaaa\nbbbb\nbbbb\nbbbb\nbbbb\n"
     list [.t search -regexp -backward -all -count foo \
-      -- {b+\n|a+\n(b+\n)+} end] $foo
+      -- {(b+\n|a+\n)(b+\n)+} end] $foo
 } -cleanup {
     destroy .t
 } -result {1.0 25}
-test text-22.203 {TextSearchCmd, regexp search multi-line} -constraints {
-    knownBug
-} -body {
+test text-22.203 {TextSearchCmd, regexp search multi-line} -body {
     pack [text .t]
     .t insert 1.0 "aaaa\nbbbb\nbbbb\nbbbb\nbbbb\n"
-    .t search -regexp -backward -- {b+\n|a+\n(b+\n)+} end
-# Should match at 1.0 for a true greedy match
+    .t search -regexp -backward -- {(b+\n|a+\n)(b+\n)+} end
 } -cleanup {
     destroy .t
 } -result {1.0}
 test text-22.204 {TextSearchCmd, regexp search multi-line} -body {
     pack [text .t]
@@ -5852,11 +5874,223 @@
     .t insert 1.0 "Hello world!\nThis is a test\n"
     .t search -regexp -strictlimits -backward -- "world" 2.3 1.8
 } -cleanup {
     destroy .t
 } -result {}
-
+test text-22.226 {TextSearchCmd, exact search for the empty string} -body {
+    text .t
+    set res [.t search -count C "" 1.0]
+    lappend res $C
+} -cleanup {
+    destroy .t
+    unset -nocomplain res C
+} -result {1.0 0}
+test text-22.227 {TextSearchCmd, exact search for the empty string} -body {
+    text .t
+    .t insert end "Searching for the\nempty string!"
+    set res [.t search -count C "" 2.5]
+    lappend res $C
+} -cleanup {
+    destroy .t
+    unset -nocomplain res C
+} -result {2.5 0}
+test text-22.228 {TextSearchCmd, exact search all empty strings} -body {
+    text .t
+    set res [.t search -count C -all "" 1.0]
+    lappend res $C
+} -cleanup {
+    destroy .t
+    unset -nocomplain res C
+} -result {1.0 0}
+test text-22.229 {TextSearchCmd, exact search all empty strings} -body {
+    text .t
+    .t insert end "Searching for the\nempty string!"
+    set res [.t search -count C -all "" 2.5 2.8]
+    lappend res $C
+} -cleanup {
+    destroy .t
+    unset -nocomplain res C
+} -result {2.5 2.6 2.7 {0 0 0}}
+test text-22.230 {TextSearchCmd, exact search all empty strings, with overlap} -body {
+    text .t
+    set res [.t search -count C -all -overlap "" 1.0]
+    lappend res $C
+} -cleanup {
+    destroy .t
+    unset -nocomplain res C
+} -result {1.0 0}
+test text-22.231 {TextSearchCmd, exact search all empty strings, with overlap} -body {
+    text .t
+    .t insert end "Searching for the\nempty string!"
+    set res [.t search -count C -all -overlap "" 2.5 2.8]
+    lappend res $C
+} -cleanup {
+    destroy .t
+    unset -nocomplain res C
+} -result {2.5 2.6 2.7 {0 0 0}}
+test text-22.232 {TextSearchCmd, regexp search for the empty string} -body {
+    text .t
+    set res [.t search -count C -regexp "" 1.0]
+    lappend res $C
+} -cleanup {
+    destroy .t
+    unset -nocomplain res C
+} -result {1.0 0}
+test text-22.233 {TextSearchCmd, regexp search for the empty string} -body {
+    text .t
+    .t insert end "Searching for the\nempty string!"
+    set res [.t search -count C -regexp "" 2.5]
+    lappend res $C
+} -cleanup {
+    destroy .t
+    unset -nocomplain res C
+} -result {2.5 0}
+test text-22.234 {TextSearchCmd, regexp search all empty strings} -body {
+    text .t
+    set res [.t search -count C -all -regexp "" 1.0]
+    lappend res $C
+} -cleanup {
+    destroy .t
+    unset -nocomplain res C
+} -result {1.0 0}
+test text-22.235 {TextSearchCmd, regexp search all empty strings} -body {
+    text .t
+    .t insert end "Searching for the\nempty string!"
+    set res [.t search -count C -all -regexp "" 2.5 2.8]
+    lappend res $C
+} -cleanup {
+    destroy .t
+    unset -nocomplain res C
+} -result {2.5 2.6 2.7 {0 0 0}}
+test text-22.236 {TextSearchCmd, regexp search all empty strings, with overlap} -body {
+    text .t
+    set res [.t search -count C -all -regexp -overlap "" 1.0]
+    lappend res $C
+} -cleanup {
+    destroy .t
+    unset -nocomplain res C
+} -result {1.0 0}
+test text-22.237 {TextSearchCmd, regexp search all empty strings, with overlap} -body {
+    text .t
+    .t insert end "Searching for the\nempty string!"
+    set res [.t search -count C -all -regexp -overlap "" 2.5 2.8]
+    lappend res $C
+} -cleanup {
+    destroy .t
+    unset -nocomplain res C
+} -result {2.5 2.6 2.7 {0 0 0}}
+test text-22.238 {TextSearchCmd, exact backwards search for the empty string} -body {
+    text .t
+    set res [.t search -count C -backwards "" 1.0]
+    lappend res $C
+} -cleanup {
+    destroy .t
+    unset -nocomplain res C
+} -result {1.0 0}
+test text-22.239 {TextSearchCmd, exact backwards search for the empty string} -body {
+    text .t
+    .t insert end "Searching for the\nempty string!"
+    set res [.t search -count C -backwards "" 2.5]
+    lappend res $C
+} -cleanup {
+    destroy .t
+    unset -nocomplain res C
+} -result {2.4 0}
+test text-22.240 {TextSearchCmd, exact backwards search all empty strings} -body {
+    text .t
+    set res [.t search -count C -backwards -all "" 1.0]
+    lappend res $C
+} -cleanup {
+    destroy .t
+    unset -nocomplain res C
+} -result {1.0 0}
+test text-22.241 {TextSearchCmd, exact backwards search all empty strings} -body {
+    text .t
+    .t insert end "Searching for the\nempty string!"
+    set res [.t search -count C -backwards -all "" 2.5 2.0]
+    lappend res $C
+} -cleanup {
+    destroy .t
+    unset -nocomplain res C
+} -result {2.4 2.3 2.2 2.1 2.0 {0 0 0 0 0}}
+test text-22.242 {TextSearchCmd, exact backwards search all empty strings, with overlap} -body {
+    text .t
+    set res [.t search -count C -backwards -all -overlap "" 1.0]
+    lappend res $C
+} -cleanup {
+    destroy .t
+    unset -nocomplain res C
+} -result {1.0 0}
+test text-22.243 {TextSearchCmd, exact backwards search all empty strings, with overlap} -body {
+    text .t
+    .t insert end "Searching for the\nempty string!"
+    set res [.t search -count C -backwards -all -overlap "" 2.5 2.0]
+    lappend res $C
+} -cleanup {
+    destroy .t
+    unset -nocomplain res C
+} -result {2.4 2.3 2.2 2.1 2.0 {0 0 0 0 0}}
+test text-22.244 {TextSearchCmd, regexp backwards search for the empty string} -body {
+    text .t
+    set res [.t search -count C -backwards -regexp "" 1.0]
+    lappend res $C
+} -cleanup {
+    destroy .t
+    unset -nocomplain res C
+} -result {1.0 0}
+test text-22.245 {TextSearchCmd, regexpbackwards search for the empty string} -body {
+    text .t
+    .t insert end "Searching for the\nempty string!"
+    set res [.t search -count C -backwards -regexp "" 2.5]
+    lappend res $C
+} -cleanup {
+    destroy .t
+    unset -nocomplain res C
+} -result {2.4 0}
+test text-22.246 {TextSearchCmd, regexp backwards search all empty strings} -body {
+    text .t
+    set res [.t search -count C -backwards -all -regexp "" 1.0]
+    lappend res $C
+} -cleanup {
+    destroy .t
+    unset -nocomplain res C
+} -result {1.0 0}
+test text-22.247 {TextSearchCmd, regexp backwards search all empty strings} -body {
+    text .t
+    .t insert end "Searching for the\nempty string!"
+    set res [.t search -count C -backwards -all -regexp "" 2.5 2.0]
+    lappend res $C
+} -cleanup {
+    destroy .t
+    unset -nocomplain res C
+} -result {2.4 2.3 2.2 2.1 2.0 {0 0 0 0 0}}
+test text-22.248 {TextSearchCmd, regexp backwards search all empty strings, with overlap} -body {
+    text .t
+    set res [.t search -count C -backwards -all -regexp -overlap "" 1.0]
+    lappend res $C
+} -cleanup {
+    destroy .t
+    unset -nocomplain res C
+} -result {1.0 0}
+test text-22.249 {TextSearchCmd, regexp backwards search all empty strings, with overlap} -body {
+    text .t
+    .t insert end "Searching for the\nempty string!"
+    set res [.t search -count C -backwards -all -regexp -overlap "" 2.5 2.0]
+    lappend res $C
+} -cleanup {
+    destroy .t
+    unset -nocomplain res C
+} -result {2.4 2.3 2.2 2.1 2.0 {0 0 0 0 0}}
+test text-22.250 {TextSearchCmd, backwards search all matching at start of line} -body {
+    text .t
+    .t insert end "abc"
+    set res [.t search -backwards -all b end]      ; # works
+    lappend res [.t search -backwards a end]       ; # works
+    lappend res [.t search -backwards -all a end]  ; # used to hang
+} -cleanup {
+    destroy .t
+} -result {1.1 1.0 1.0}
 
 test text-23.1 {TkTextGetTabs procedure} -setup {
     text .t -highlightthickness 0 -bd 0 -relief flat -padx 0 -width 100
     pack .t
 } -body {
@@ -5934,43 +6168,43 @@
 
 
 test text-24.1 {TextDumpCmd procedure, bad args} -body {
     pack [text .t]
     .t insert 1.0 "One Line"
-    .t mark set insert 1.0 
+    .t mark set insert 1.0
     .t dump
 } -cleanup {
     destroy .t
 } -returnCodes {error} -result {Usage: .t dump ?-all -image -text -mark -tag -window? ?-command script? index ?index2?}
 test text-24.2 {TextDumpCmd procedure, bad args} -body {
     pack [text .t]
     .t insert 1.0 "One Line"
-    .t mark set insert 1.0 
+    .t mark set insert 1.0
     .t dump -all
 } -cleanup {
     destroy .t
 } -returnCodes {error} -result {Usage: .t dump ?-all -image -text -mark -tag -window? ?-command script? index ?index2?}
 test text-24.3 {TextDumpCmd procedure, bad args} -body {
     pack [text .t]
     .t insert 1.0 "One Line"
-    .t mark set insert 1.0 
+    .t mark set insert 1.0
     .t dump -command
 } -cleanup {
     destroy .t
 } -returnCodes {error} -result {Usage: .t dump ?-all -image -text -mark -tag -window? ?-command script? index ?index2?}
 test text-24.4 {TextDumpCmd procedure, bad args} -body {
     pack [text .t]
     .t insert 1.0 "One Line"
-    .t mark set insert 1.0 
+    .t mark set insert 1.0
     .t dump -bogus
 } -cleanup {
     destroy .t
 } -returnCodes {error} -result {bad option "-bogus": must be -all, -command, -image, -mark, -tag, -text, or -window}
 test text-24.5 {TextDumpCmd procedure, bad args} -body {
     pack [text .t]
     .t insert 1.0 "One Line"
-    .t mark set insert 1.0 
+    .t mark set insert 1.0
     .t dump bogus
 } -cleanup {
     destroy .t
 } -returnCodes {error} -result {bad text index "bogus"}
 test text-24.6 {TextDumpCmd procedure, one index} -body {
@@ -6003,11 +6237,11 @@
     destroy .t
 } -result {}
 test text-24.10 {TextDumpCmd procedure, negative range} -body {
     pack [text .t]
     .t insert 1.0 "One Line"
-    .t mark set insert 1.0 
+    .t mark set insert 1.0
     .t dump 1.5 1.0
 } -cleanup {
     destroy .t
 } -result {}
 test text-24.11 {TextDumpCmd procedure, stop at begin-line} -body {
@@ -6319,10 +6553,11 @@
 } -result {1}
 test text-27.11 {TextEditCmd procedure, set modified flag repeat} -setup {
     text .t
     pack .t
     set ::retval {}
+    update
 } -body {
     bind .t <<Modified>> "lappend ::retval modified"
 # Shouldn't require [update idle] to trigger event [Bug 1809538]
     lappend ::retval [.t edit modified]
     .t edit modified 1
@@ -6383,22 +6618,126 @@
     update
     set ::retval
 } -cleanup {
     destroy .t .tt
 } -result {4}
-test text-27.15 {<<Selection>> virtual event} -body {
+test text-27.15 {<<Selection>> virtual event on sel tagging} -body {
     set ::retval no_selection
-    pack [text .t -undo 1]
+    pack [text .t]
     bind .t <<Selection>> "set ::retval selection_changed"
     update idletasks
+    .t insert end "nothing special\n"
+    .t tag add sel 1.0 1.1
+    update
+    set ::retval
+} -cleanup {
+    destroy .t
+} -result {selection_changed}
+test text-27.15a {<<Selection>> virtual event on sel removal} -body {
+    set ::retval no_selection
+    pack [text .t]
     .t insert end "nothing special\n"
     .t tag add sel 1.0 1.1
+    bind .t <<Selection>> "set ::retval selection_changed"
+    update idletasks
+    .t tag remove 1.0 end
     update
     set ::retval
 } -cleanup {
     destroy .t
 } -result {selection_changed}
+test text-27.15b {<<Selection>> virtual event on <<PasteSelection>> inside widget selection} -body {
+    pack [text .t]
+    .t insert end "There is a selection in this text widget,\n"
+    .t insert end "and it will be impacted by the <<PasteSelection>> event received.\n"
+    .t insert end "Therefore a <<Selection>> event must fire back."
+    .t tag add sel 1.0 1.28
+    bind .t <<Selection>> "set ::retval <<Selection>>_fired"
+    update
+    set ::retval no_<<Selection>>_event_fired
+    event generate .t <<PasteSelection>> -x 15 -y 3
+    update
+    set ::retval
+} -cleanup {
+    destroy .t
+} -result {<<Selection>>_fired}
+test text-27.15c {No <<Selection>> virtual event on <<PasteSelection>> outside widget selection} -body {
+    pack [text .t]
+    .t insert end "There is a selection in this text widget,\n"
+    .t insert end "but it will not be impacted by the <<PasteSelection>> event received."
+    .t tag add sel 1.0 1.28
+    bind .t <<Selection>> "set ::retval <<Selection>>_fired"
+    update
+    set ::retval no_<<Selection>>_event_fired
+    event generate .t <<PasteSelection>> -x 15 -y 80
+    update
+    set ::retval
+} -cleanup {
+    destroy .t
+} -result {no_<<Selection>>_event_fired}
+test text-27.15d {<<Selection>> virtual event on <Delete> with cursor inside selection} -body {
+    pack [text .t]
+    .t insert end "There is a selection in this text widget,\n"
+    .t insert end "and it will be impacted by the <Delete> event received.\n"
+    .t insert end "Therefore a <<Selection>> event must fire back."
+    .t tag add sel 1.0 1.28
+    bind .t <<Selection>> "set ::retval <<Selection>>_fired"
+    update
+    set ::retval no_<<Selection>>_event_fired
+    .t mark set insert 1.15
+    focus .t
+    event generate .t <Delete>
+    update
+    set ::retval
+} -cleanup {
+    destroy .t
+} -result {<<Selection>>_fired}
+test text-27.15e {No <<Selection>> virtual event on <Delete> with cursor outside selection} -body {
+    pack [text .t]
+    .t insert end "There is a selection in this text widget,\n"
+    .t insert end "but it will not be impacted by the <Delete> event received."
+    .t tag add sel 1.0 1.28
+    bind .t <<Selection>> "set ::retval <<Selection>>_fired"
+    update
+    set ::retval no_<<Selection>>_event_fired
+    .t mark set insert 2.15
+    focus .t
+    event generate .t <Delete>
+    update
+    set ::retval
+} -cleanup {
+    destroy .t
+} -result {no_<<Selection>>_event_fired}
+test text-27.15f {<<Selection>> virtual event on <<Cut>> with a widget selection} -body {
+    pack [text .t]
+    .t insert end "There is a selection in this text widget,\n"
+    .t insert end "and it will be impacted by the <<Cut>> event received.\n"
+    .t insert end "Therefore a <<Selection>> event must fire back."
+    .t tag add sel 1.0 1.28
+    bind .t <<Selection>> "set ::retval <<Selection>>_fired"
+    update
+    set ::retval no_<<Selection>>_event_fired
+    event generate .t <<Cut>>
+    update
+    set ::retval
+} -cleanup {
+    destroy .t
+} -result {<<Selection>>_fired}
+test text-27.15g {No <<Selection>> virtual event on <<Cut>> without widget selection} -body {
+    pack [text .t]
+    .t insert end "There is a selection in this text widget,\n"
+    .t insert end "and it will be impacted by the <<Cut>> event received.\n"
+    .t insert end "Therefore a <<Selection>> event must fire back."
+    bind .t <<Selection>> "set ::retval <<Selection>>_fired"
+    update
+    set ::retval no_<<Selection>>_event_fired
+    event generate .t <<Cut>>
+    update
+    set ::retval
+} -cleanup {
+    destroy .t
+} -result {no_<<Selection>>_event_fired}
 test text-27.16 {-maxundo configuration option} -body {
     text .t -undo 1  -autoseparators 1 -maxundo 2
     pack .t
     .t insert end "line 1\n"
     .t delete 1.4 1.6
@@ -6617,10 +6956,70 @@
     .t edit reset
     update ; lappend res $nbUS
 } -cleanup {
     destroy .t
 } -result {0 0 1 2 3 4 4 5 6 6 7 8 8 9}
+test text-27.26 {edit undo and edit redo return ranges} -setup {
+    destroy .t
+    set res {}
+} -body {
+    text .t -undo true -autoseparators false
+    .t insert end "Hello "
+    .t edit separator
+    .t insert end "World!\n"
+    .t insert 1.6 "GREAT "
+    .t insert end "Another edit here!!"
+    lappend res [.t edit undo]
+    lappend res [.t edit redo]
+    .t edit separator
+    .t delete 1.6
+    .t delete 1.9 1.10
+    .t insert 1.9 L
+    lappend res [.t edit undo]
+    lappend res [.t edit redo]
+    .t replace 1.6 1.10 Tcl/Tk
+    .t replace 2.8 2.12 "one bites the dust"
+    lappend res [.t edit undo]
+    lappend res [.t edit redo]
+} -cleanup {
+    destroy .t
+} -result [list {1.6 2.0}           \
+                {1.6 2.19}          \
+                {1.6 1.7 1.10 1.12} \
+                {1.6 1.7 1.9 1.11}  \
+                {1.6 1.16 2.8 2.19} \
+                {1.6 1.16 2.8 2.30} ]
+test text-27.27 {edit undo and edit redo return ranges} -setup {
+    destroy .t
+    set res {}
+} -body {
+    text .t -undo true -autoseparators false
+    for {set i 3} {$i >= 1} {incr i -1} {
+        .t insert 1.0 "Line $i\n"
+    }
+    lappend res [.t edit undo]
+    lappend res [.t edit redo]
+} -cleanup {
+    destroy .t
+} -result [list {1.0 2.0} \
+                {1.0 4.0} ]
+test text-27.28 {edit undo and edit redo do not leave \
+                 spurious temporary marks behind them} -setup {
+    destroy .t
+    set res {}
+} -body {
+    pack [text .t -undo true -autoseparators false]
+    .t insert end "Hello World.\n"
+    .t edit separator
+    .t insert end "Again hello.\n"
+    .t edit undo
+    lappend res [lsearch [.t mark names] tk::undoMark*]
+    .t edit redo
+    lappend res [lsearch [.t mark names] tk::undoMark*]
+} -cleanup {
+    destroy .t
+} -result [list -1 -1]
 
 
 test text-28.1 {bug fix - 624372, ControlUtfProc long lines} -body {
     pack [text .t -wrap none]
     .t insert end [string repeat "\1" 500]
@@ -6887,11 +7286,11 @@
     set res {}
 } -body {
     for {set i 1} {$i < 20} {incr i} {
 	   .t insert end "Line $i\n"
     }
-    .t tag add sel 1.0 3.0 5.0 7.0 9.0 11.0 13.0 15.0 17.0 19.0 
+    .t tag add sel 1.0 3.0 5.0 7.0 9.0 11.0 13.0 15.0 17.0 19.0
     lappend res [.t tag prevrange sel 1.0]
     .t configure -start 6 -end 12
     lappend res [.t tag ranges sel]
     lappend res "next" [.t tag nextrange sel 4.0] \
       [.t tag nextrange sel 5.0] [.t tag nextrange sel 6.0] \
@@ -6908,11 +7307,11 @@
     set res {}
 } -body {
     for {set i 1} {$i < 20} {incr i} {
 	   .t insert end "Line $i\n"
     }
-    .t tag add sel 1.0 3.0 9.0 11.0 13.0 15.0 17.0 19.0 
+    .t tag add sel 1.0 3.0 9.0 11.0 13.0 15.0 17.0 19.0
     .t configure -start 6 -end 12
     lappend res [.t tag ranges sel]
     lappend res "next" [.t tag nextrange sel 4.0] \
       [.t tag nextrange sel 5.0] [.t tag nextrange sel 6.0] \
       [.t tag nextrange sel 7.0]
@@ -6928,11 +7327,11 @@
     set res {}
 } -body {
     for {set i 1} {$i < 20} {incr i} {
 	.t insert end "Line $i\n"
     }
-    .t tag add sel 1.0 7.0 9.0 11.0 13.0 15.0 17.0 19.0 
+    .t tag add sel 1.0 7.0 9.0 11.0 13.0 15.0 17.0 19.0
     .t configure -start 6 -end 12
     lappend res [.t tag ranges sel]
     lappend res "next" [.t tag nextrange sel 4.0] \
       [.t tag nextrange sel 5.0] [.t tag nextrange sel 6.0] \
       [.t tag nextrange sel 7.0]
@@ -6973,11 +7372,11 @@
     lappend res [.t index sel.first]
     lappend res [.t index sel.last]
     return $res
 } -cleanup {
     destroy .t
-} -result {1.0 11.0} 
+} -result {1.0 11.0}
 test text-31.19 {peer widgets} -body {
     pack [text .t]
     for {set i 1} {$i < 20} {incr i} {
 	   .t insert end "Line $i\n"
     }
@@ -7018,11 +7417,11 @@
     set before [$w count -ypixels 1.0 2.0]
     $w insert 1.0 "a"
     update
     set after [$w count -ypixels 1.0 2.0]
     destroy .g
-    expr {$before eq $after} 
+    expr {$before eq $after}
 } -cleanup {
     destroy .t
 } -result {1}
 
 
@@ -7294,11 +7693,13 @@
     destroy .t
 } -result {ok}
 
 
 test text-36.1 "bug #1777362: event handling with hyphenated windows" -setup {
-    proc bgerror {m} {set ::my_error $m}
+    set save [interp bgerror {}]
+    interp bgerror {} returnerror-36.1
+    proc returnerror-36.1 {m opts} {set ::my_error $m}
     set ::my_error {}
     pack [set w [text .t-1]]
 } -body {
     tkwait visibility $w
     event generate $w <1>
@@ -7305,13 +7706,18 @@
     event generate $w <1>
     update
     set ::my_error
 } -cleanup {
     destroy .t-1
+    rename returnerror-36.1 ""
+    interp bgerror {} $save
+    unset -nocomplain save ::my_error w
 } -result {}
 test text-36.2 "bug #1777362: event handling with hyphenated windows" -setup {
-    proc bgerror {m} {set ::my_error $m}
+    set save [interp bgerror {}]
+    interp bgerror {} returnerror-36.2
+    proc returnerror-36.2 {m opts} {set ::my_error $m}
     set ::my_error {}
     pack [set w [text .t+1]]
 } -body {
     tkwait visibility $w
     event generate $w <1>
@@ -7318,13 +7724,18 @@
     event generate $w <1>
     update
     set ::my_error
 } -cleanup {
     destroy $w
+    rename returnerror-36.2 ""
+    interp bgerror {} $save
+    unset -nocomplain save ::my_error w
 } -result {}
 test text-36.3 "bug #1777362: event handling with hyphenated windows" -setup {
-    proc bgerror {m} {set ::my_error $m}
+    set save [interp bgerror {}]
+    interp bgerror {} returnerror-36.3
+    proc returnerror-36.3 {m opts} {set ::my_error $m}
     set ::my_error {}
     pack [set w [text .t*1]]
 } -body {
     tkwait visibility $w
     event generate $w <1>
@@ -7331,14 +7742,40 @@
     event generate $w <1>
     update
     set ::my_error
 } -cleanup {
     destroy $w
+    rename returnerror-36.3 ""
+    interp bgerror {} $save
+    unset -nocomplain save ::my_error w
+} -result {}
+
+
+test text-37.1 "bug #dd9667635d: text anchor not set" -setup {
+    set save [interp bgerror {}]
+    interp bgerror {} returnerror-37.1
+    proc returnerror-37.1 {m opts} {set ::my_error $m}
+    destroy .t
+    set ::my_error {}
+    pack [text .t]
+} -body {
+    .t insert end "Hello world!"
+    .t tag add sel 1.0 end
+    # this line shall not trigger error:
+    #     bad text index "tk::anchorN"
+    event generate .t <<SelectPrevLine>>
+    update
+    set ::my_error
+} -cleanup {
+    destroy .t
+    rename returnerror-37.1 ""
+    interp bgerror {} $save
+    unset -nocomplain save ::my_error
 } -result {}
 
 # cleanup
 cleanupTests
 return
 
 # Local Variables:
 # mode: tcl
 # End:

Index: tests/textDisp.test
==================================================================
--- tests/textDisp.test
+++ tests/textDisp.test
@@ -37,13 +37,13 @@
 # because some window managers don't allow the overall width of a window
 # to get very narrow.
 
 catch {destroy .f .t}
 frame .f -width 100 -height 20
-pack append . .f left
+pack .f -side left
 
-set fixedFont {Courier -12}
+set fixedFont {"Courier New" -12}
 # 15 on XP, 13 on Solaris 8
 set fixedHeight [font metrics $fixedFont -linespace]
 # 7 on all platforms
 set fixedWidth [font measure $fixedFont m]
 # 12 on XP
@@ -63,11 +63,11 @@
 # 21 on XP
 set bigAscent [font metrics $bigFont -ascent]
 set ascentDiff [expr {$bigAscent - $fixedAscent}]
 
 text .t -font $fixedFont -width 20 -height 10 -yscrollcommand scroll
-pack append . .t {top expand fill}
+pack .t -expand 1 -fill both
 .t tag configure big -font $bigFont
 .t debug on
 wm geometry . {}
 
 # The statements below reset the main window;  it's needed if the window
@@ -251,12 +251,12 @@
 } [list [list 138 5 7 $fixedHeight] [list 5 [expr {$fixedDiff + 18}] 7 $fixedHeight]]
 test textDisp-2.5 {LayoutDLine, word wrap} {textfonts} {
     .t configure -wrap word
     .t delete 1.0 end
     .t insert 1.0 "This isx some sample text for testing."
-    list [.t bbox 1.13] [.t bbox 1.14] [.t bbox 1.19]
-} [list [list 96 5 49 $fixedHeight] [list 5 [expr {$fixedDiff + 18}] 7 $fixedHeight] [list 40 [expr {$fixedDiff + 18}] 7 $fixedHeight]]
+    list [.t bbox 1.13] [.t bbox 1.19] [.t bbox 1.20] [.t bbox 1.21]
+} [list [list 96 5 $fixedWidth $fixedHeight] [list 138 5 $fixedWidth $fixedHeight] [list 145 5 0  $fixedHeight] [list 5 [expr {$fixedDiff + 18}] $fixedWidth $fixedHeight]]
 test textDisp-2.6 {LayoutDLine, word wrap} {
     .t configure -wrap word
     .t delete 1.0 end
     .t insert 1.0 "This isxxx some sample text for testing."
     list [.t bbox 1.15] [.t bbox 1.16]
@@ -351,20 +351,20 @@
     .t delete 1.0 end
     .t insert 1.0 "Lots of long words, enough to force word wrap\nThen\nmore lines"
     .t tag configure x -justify center
     .t tag add x 1.1 1.20
     .t tag add x 1.21 1.end
-    list [.t bbox 1.0] [.t bbox 1.20] [.t bbox 1.36] [.t bbox 2.0]
-} [list [list 5 5 7 $fixedHeight] [list 5 [expr {$fixedDiff + 18}] 7 $fixedHeight] [list 43 [expr {2*$fixedDiff + 31}] 7 $fixedHeight] [list 5 [expr {3*$fixedDiff + 44}] 7 $fixedHeight]]
+    list [.t bbox 1.0] [.t bbox 1.20] [.t bbox 1.41] [.t bbox 2.0]
+} [list [list 5 5 7 $fixedHeight] [list 5 [expr {$fixedDiff + 18}] 7 $fixedHeight] [list 61 [expr {2*$fixedDiff + 31}] 7 $fixedHeight] [list 5 [expr {3*$fixedDiff + 44}] 7 $fixedHeight]]
 test textDisp-2.17 {LayoutDLine, justification} {textfonts} {
     .t configure -wrap word
     .t delete 1.0 end
-    .t insert 1.0 "Lots of long words, enough to force word wrap\nThen\nmore lines"
+    .t insert 1.0 "Lots of very long words, enough to force word wrap\nThen\nmore lines"
     .t tag configure x -justify center
-    .t tag add x 1.20
-    list [.t bbox 1.0] [.t bbox 1.20] [.t bbox 1.36] [.t bbox 2.0]
-} [list [list 5 5 7 $fixedHeight] [list 19 [expr {$fixedDiff + 18}] 7 $fixedHeight] [list 5 [expr {2*$fixedDiff + 31}] 7 $fixedHeight] [list 5 [expr {3*$fixedDiff + 44}] 7 $fixedHeight]]
+    .t tag add x 1.18
+    list [.t bbox 1.0] [.t bbox 1.18] [.t bbox 1.35] [.t bbox 2.0]
+} [list [list 5 5 7 $fixedHeight] [list 15 [expr {$fixedDiff + 18}] 7 $fixedHeight] [list 5 [expr {2*$fixedDiff + 31}] 7 $fixedHeight] [list 5 [expr {3*$fixedDiff + 44}] 7 $fixedHeight]]
 test textDisp-2.18 {LayoutDLine, justification} {textfonts} {
     .t configure -wrap none
     .t delete 1.0 end
     .t insert 1.0 "Lots of long words, enough to extend out of the window\n"
     .t insert end "Then\nmore lines\nThat are shorter"
@@ -588,20 +588,20 @@
     wm overrideredirect . 0
 }
 test textDisp-4.6 {UpdateDisplayInfo, tiny window} {
     # This test was failing on Windows because the title bar on .
     # was a certain minimum size and it was interfering with the size
-    # requested.  The "overrideredirect" gets rid of the titlebar so 
+    # requested.  The "overrideredirect" gets rid of the titlebar so
     # the toplevel can shrink to the appropriate size.  On Unix, setting
     # the overrideredirect on "." confuses the window manager and
     # causes subsequent tests to fail.
 
     if {$tcl_platform(platform) == "windows"} {
 	wm overrideredirect . 1
     }
     frame .f2 -width 20 -height 100
-    pack before .f .f2 top
+    pack .f2 -before .f
     wm geom . 103x103
     update
     .t configure -wrap none -borderwidth 2
     .t delete 1.0 end
     .t insert end "Line 1\nLine 2 is so long that it wraps around\nLine 3"
@@ -620,11 +620,11 @@
 set py [.t cget -pady]
 set hlth [.t cget -highlightthickness]
 test textDisp-4.7 {UpdateDisplayInfo, filling in extra vertical space} {
     # This test was failing on Windows because the title bar on .
     # was a certain minimum size and it was interfering with the size
-    # requested.  The "overrideredirect" gets rid of the titlebar so 
+    # requested.  The "overrideredirect" gets rid of the titlebar so
     # the toplevel can shrink to the appropriate size.  On Unix, setting
     # the overrideredirect on "." confuses the window manager and
     # causes subsequent tests to fail.
 
     if {$tcl_platform(platform) == "windows"} {
@@ -636,11 +636,11 @@
     update
     .t yview 16.0
     update
     set x [list [.t index @0,0] $tk_textRelayout $tk_textRedraw]
     wm overrideredirect . 0
-    update 
+    update
     set x
 } {8.0 {16.0 17.0 15.0 14.0 13.0 12.0 11.0 10.0 9.0 8.0} {8.0 9.0 10.0 11.0 12.0 13.0 14.0 15.0 16.0 17.0}}
 test textDisp-4.8 {UpdateDisplayInfo, filling in extra vertical space} {
     .t delete 1.0 end
     .t insert end "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17"
@@ -946,10 +946,32 @@
     .t insert end xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\n
     .t insert end xxxxxxxxxxxxxxxxxxxxxxxxxx
     update
     set scrollInfo
 } [list 0.0 [expr {4.0/11}]]
+test textDisp-6.10 {DisplayText, redisplay embedded windows after scroll.} {aqua} {
+    .t configure -wrap char
+    .t delete 1.0 end
+    .t insert 1.0 "Line 1"
+    foreach i {2 3 4} {
+	.t insert end "\nLine $i"
+    }
+    .t insert end "\n"
+    .t window create end -create {
+	button %W.button_one -text "Button 1"}
+    .t insert end "\nLine 6\n"
+    .t window create end -create {
+	button %W.button_two -text "Button 2"}
+    .t insert end "\nLine 8\n"
+    .t window create end -create {
+	button %W.button_three -text "Button 3"}
+    update
+    .t delete 2.0 3.0
+    update
+    list $tk_textEmbWinDisplay
+} {{4.0 6.0}}
+
 
 # The following group of tests is marked non-portable because
 # they result in a lot of extra redisplay under Ultrix.  I don't
 # know why this is so.
 
@@ -1861,11 +1883,11 @@
     .t delete 1.0 end
     .t insert end xxxxxxxxx\n
     .t insert end "a0 a1 a2 a3 a4 a5 a6 a7 a8 a9 b0 b1 b2 b3 b4 b5 b6 b7 b8 b9 c0 c1 c2 c3 c4 c5 c6 c7 c8 c9 c0 c1 c2 c3 c4 c5 c6 c7 c8 c9\n"
     .t insert end "xxxx xxxxxxxxx xxxxxxxxxxxxx"
     .t xview moveto 0
-    .t xview scroll 21 u  
+    .t xview scroll 21 u
     set x [.t index @0,22]
     .t xview scroll -1 u
     lappend x [.t index @0,22]
     .t xview scroll 100 units
     lappend x [.t index @0,22]
@@ -1950,17 +1972,19 @@
     .tf.f.t insert end "Foo" Header
     for {set i 1} {$i < $textheight} {incr i} {
 	.tf.f.t insert end "\nLine $i"
     }
     update ; after 1000 ; update
+    set refind [.tf.f.t index @0,[winfo height .tf.f.t]]
     # Should scroll and should not crash!
     .tf.f.t yview scroll 1 unit
     # Check that it has scrolled
-    set res [.tf.f.t index @0,[expr [winfo height .tf.f.t] - 15]]
+    set newind [.tf.f.t index @0,[winfo height .tf.f.t]]
+    set res [.tf.f.t compare $newind > $refind]
     destroy .tf
     set res
-} {12.0}
+} {1}
 
 .t configure -wrap char
 .t delete 1.0 end
 .t insert insert "Line 1"
 for {set i 2} {$i <= 200} {incr i} {
@@ -2315,11 +2339,11 @@
 test textDisp-17.8 {TkTextScanCmd procedure} {textfonts} {
     .t yview 1.0
     .t xview moveto 0
     .t scan mark 0 60
     .t scan dragto 30 100
-    .t scan dragto 25 95 
+    .t scan dragto 25 95
     .t index @0,0
 } {4.7}
 test textDisp-17.9 {TkTextScanCmd procedure} {textfonts} {
     .t yview end
     .t xview moveto 0
@@ -2335,11 +2359,11 @@
     .t scan mark -10 60
     .t scan dragto -5 65
     set x [.t index @0,0]
     .t scan dragto 0 [expr {70 + $fixedDiff}]
     list $x [.t index @0,0]
-} {9.15 8.31}
+} {9.0 8.0}
 .t configure -xscrollcommand scroll -yscrollcommand {}
 test textDisp-18.1 {GetXView procedure} {
     .t configure -wrap none
     .t delete 1.0 end
     .t insert end xxxxxxxxx\n
@@ -2561,11 +2585,11 @@
     .t insert 1.0 "Line 1"
     foreach i {2 3 4 5 6 7 8 9 10 11 12 13 14 15} {
 	.t insert end "\nLine $i"
     }
     .t insert end "\nThis last line wraps around four "
-    .t insert end "times with a bit left on the last line."
+    .t insert end "times with a little bit left on the last line."
     .t yview insert
     update
     .t count -update -ypixels 1.0 end
     set scrollInfo
 } {0.5 1.0}
@@ -2575,11 +2599,11 @@
     .t insert 1.0 "Line 1"
     foreach i {2 3 4 5 6 7 8 9 10 11 12 13 14 15} {
 	.t insert end "\nLine $i"
     }
     .t insert end "\nThis last line wraps around four "
-    .t insert end "times with a bit left on the last line."
+    .t insert end "times with a little bit left on the last line."
     .t yview insert
     update
     .t count -update -ypixels 1.0 end
     set scrollInfo
 } {0.5 1.0}
@@ -2597,11 +2621,11 @@
 } {0}
 test textDisp-19.11.5.1 {TextWidgetCmd procedure, "count -displaylines"} {
     .t count -displaylines 16.0 16.5
 } {0}
 test textDisp-19.11.6 {TextWidgetCmd procedure, "count -displaylines"} {
-    .t count -displaylines 16.0 16.20
+    .t count -displaylines 16.0 16.24
 } {1}
 test textDisp-19.11.7 {TextWidgetCmd procedure, "count -displaylines"} {
     .t count -displaylines 16.0 16.40
 } {2}
 test textDisp-19.11.8 {TextWidgetCmd procedure, "count -displaylines"} {
@@ -2650,18 +2674,18 @@
     .t tag add elide "12.0" "14.0"
     list [.t index "11.5 +2d lines"] \
       [.t index "12.0 +2d lines"] [.t index "11.0 +2d lines"] \
       [.t index "13.0 +2d lines"] [.t index "13.1 +3d lines"] \
       [.t index "13.0 +4d lines"]
-} {15.5 16.0 15.0 16.0 16.15 16.33}
+} {15.5 16.0 15.0 16.0 16.21 16.39}
 test textDisp-19.11.18 {TextWidgetCmd procedure, "index +displaylines"} {
     .t tag remove elide 1.0 end
     .t tag add elide "12.0" "14.0"
     list [.t index "15.5 -2d lines"] \
       [.t index "16.0 -2d lines"] [.t index "15.0 -2d lines"] \
-      [.t index "16.0 -3d lines"] [.t index "16.17 -4d lines"] \
-      [.t index "16.36 -5d lines"]
+      [.t index "16.0 -3d lines"] [.t index "16.23 -4d lines"] \
+      [.t index "16.42 -5d lines"]
 } {11.5 14.0 11.0 11.0 11.2 11.3}
 test textDisp-19.11.19 {TextWidgetCmd procedure, "count -displaylines"} {
     .t tag remove elide 1.0 end
     .t tag add elide "12.0" "16.0 +1displaylines"
     .t count -displaylines 12.0 17.0
@@ -2671,35 +2695,35 @@
     .t tag add elide "12.0" "16.0 +1displaylines"
     list [.t index "11.5 +2d lines"] \
       [.t index "12.0 +2d lines"] [.t index "11.0 +2d lines"] \
       [.t index "13.0 +2d lines"] [.t index "13.0 +3d lines"] \
       [.t index "13.0 +4d lines"]
-} {16.38 16.50 16.33 16.50 16.67 17.0}
+} {16.44 16.57 16.39 16.57 16.74 17.0}
 test textDisp-19.11.21 {TextWidgetCmd procedure, "index +displaylines"} {
     .t tag remove elide 1.0 end
     .t tag add elide "12.0" "16.0 +1displaylines"
-    list [.t index "16.38 -2d lines"] \
-      [.t index "16.50 -3d lines"] [.t index "16.33 -2d lines"] \
-      [.t index "16.53 -4d lines"] [.t index "16.69 -4d lines"] \
-      [.t index "17.1 -5d lines"]
+    list [.t index "16.44 -2d lines"] \
+      [.t index "16.57 -3d lines"] [.t index "16.39 -2d lines"] \
+      [.t index "16.60 -4d lines"] [.t index "16.76 -4d lines"] \
+      [.t index "17.0 -5d lines"]
 } {11.5 11.0 11.0 10.3 11.2 11.0}
 test textDisp-19.11.22 {TextWidgetCmd procedure, "index +displaylines"} {
     .t tag remove elide 1.0 end
     list [.t index "end +5d lines"] \
       [.t index "end -3d lines"] [.t index "1.0 -2d lines"] \
       [.t index "1.0 +4d lines"] [.t index "1.0 +50d lines"] \
       [.t index "end -50d lines"]
-} {17.0 16.33 1.0 5.0 17.0 1.0}
+} {17.0 16.39 1.0 5.0 17.0 1.0}
 test textDisp-19.11.23 {TextWidgetCmd procedure, "index +displaylines"} {
     .t tag remove elide 1.0 end
     .t tag add elide "12.3" "16.0 +1displaylines"
     list [.t index "11.5 +1d lines"] [.t index "11.5 +2d lines"] \
       [.t index "12.0 +1d lines"] \
       [.t index "12.0 +2d lines"] [.t index "11.0 +2d lines"] \
       [.t index "13.0 +2d lines"] [.t index "13.0 +3d lines"] \
       [.t index "13.0 +4d lines"]
-} {16.17 16.33 16.28 16.46 16.28 16.49 16.65 16.72}
+} {16.23 16.44 16.39 16.57 16.39 16.60 16.77 16.79}
 .t tag remove elide 1.0 end
 test textDisp-19.11.24 {TextWidgetCmd procedure, "index +/-displaylines"} {
     list [.t index "11.5 + -1 display lines"] \
       [.t index "11.5 + +1 disp lines"] \
       [.t index "11.5 - -1 disp lines"] \
@@ -2744,11 +2768,11 @@
     .t insert 1.0 "Line 1"
     foreach i {2 3 4 5 6 7 8 9 10 11 12 13 14 15} {
 	.t insert end "\nLine $i"
     }
     .t insert end "\nThis last line wraps around four "
-    .t insert end "times with a bit left on the last line."
+    .t insert end "times with a little bit left on the last line."
     # Need to update so everything is calculated.
     update ; .t count -update -ypixels 1.0 end
     update ; after 10 ; update
     set scrollInfo "unchanged"
     .t mark set insert 3.0
@@ -2764,11 +2788,11 @@
     .t insert 1.0 "Line 1"
     foreach i {2 3 4 5 6 7 8 9 10 11 12 13 14 15} {
 	.t insert end "\nLine $i"
     }
     .t insert end "\nThis last line wraps around four "
-    .t insert end "times with a bit left on the last line."
+    .t insert end "times with a bit little left on the last line."
     update
     .t configure -yscrollcommand scrollError
     proc bgerror args {
 	global x errorInfo errorCode
 	set x [list $args $errorInfo $errorCode]
@@ -2792,11 +2816,11 @@
     .t insert 1.0 "Line 1"
     foreach i {2 3 4 5 6 7 8 9 10 11 12 13 14 15} {
 	.t insert end "\nLine $i"
     }
     .t insert end "\nThis last line wraps around four "
-    .t insert end "times with a bit left on the last line."
+    .t insert end "times with a little bit left on the last line."
     # Need to update so everything is calculated.
     update ; .t count -update -ypixels 1.0 end ; update
     set res {}
     lappend res \
       [.t count -ypixels 1.0 end] \
@@ -2869,32 +2893,32 @@
     .t insert end "\nLine $i"
 }
 .t configure -wrap word
 .t delete 50.0 51.0
 .t insert 50.0 "This is a long line, one that will wrap around twice.\n"
-test textDisp-20.1 {FindDLine} {textfonts} {
+test textDisp-20.1 {FindDLine} {
     .t yview 48.0
     list [.t dlineinfo 46.0] [.t dlineinfo 47.0] [.t dlineinfo 49.0] \
 	    [.t dlineinfo 58.0]
 } [list {} {} [list 3 [expr {$fixedDiff + 16}] 49 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]] {}]
-test textDisp-20.2 {FindDLine} {textfonts} {
+test textDisp-20.2 {FindDLine} {
     .t yview 100.0
     .t yview -pickplace 53.0
-    list [.t dlineinfo 50.0] [.t dlineinfo 50.14] [.t dlineinfo 50.15]
-} [list [list 3 [expr {-1 - $fixedDiff/2}] 105 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]] [list 3 [expr {-1 - $fixedDiff/2}] 105 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]] [list 3 [expr {12 + $fixedDiff/2}] 140 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]]]
-test textDisp-20.3 {FindDLine} {textfonts} {
+    list [.t dlineinfo 50.0] [.t dlineinfo 50.14] [.t dlineinfo 50.21]
+} [list [list 3 [expr {-1 - $fixedDiff/2}] 140 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]] [list 3 [expr {-1 - $fixedDiff/2}] 140 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]] [list 3 [expr {12 + $fixedDiff/2}] 133 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]]]
+test textDisp-20.3 {FindDLine} {
     .t yview 100.0
     .t yview 49.0
-    list [.t dlineinfo 50.0] [.t dlineinfo 50.20] [.t dlineinfo 57.0]
-} [list [list 3 [expr {$fixedDiff + 16}] 105 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]] [list 3 [expr {2*$fixedDiff + 29}] 140 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]] {}]
-test textDisp-20.4 {FindDLine} {textfonts} {
+    list [.t dlineinfo 50.0] [.t dlineinfo 50.24] [.t dlineinfo 57.0]
+} [list [list 3 [expr {$fixedDiff + 16}] 140 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]] [list 3 [expr {2*$fixedDiff + 29}] 133 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]] {}]
+test textDisp-20.4 {FindDLine} {
     .t yview 100.0
     .t yview 42.0
-    list [.t dlineinfo 50.0] [.t dlineinfo 50.20] [.t dlineinfo 50.40]
-} [list [list 3 [expr {8*$fixedDiff + 107}] 105 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]] [list 3 [expr {9*$fixedDiff + 120}] 140 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]] {}]
+    list [.t dlineinfo 50.0] [.t dlineinfo 50.24] [.t dlineinfo 50.40]
+} [list [list 3 [expr {8*$fixedDiff + 107}] 140 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]] [list 3 [expr {9*$fixedDiff + 120}] 133 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]] {}]
 .t config -wrap none
-test textDisp-20.5 {FindDLine} {textfonts} {
+test textDisp-20.5 {FindDLine} {
     .t yview 100.0
     .t yview 48.0
     list [.t dlineinfo 50.0] [.t dlineinfo 50.20] [.t dlineinfo 50.40]
 } [list [list 3 [expr {3+2*$fixedHeight}] 371 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]] [list 3 [expr {3+2*$fixedHeight}] 371 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]] [list 3 [expr {3+2*$fixedHeight}] 371 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]]]
 
@@ -2901,11 +2925,11 @@
 .t config -wrap word
 test textDisp-21.1 {TkTextPixelIndex} {textfonts} {
     .t yview 48.0
     list [.t index @-10,-10] [.t index @6,6] [.t index @22,6] \
 	    [.t index @102,6] [.t index @38,[expr {$fixedHeight * 4 + 3}]] [.t index @44,67]
-} {48.0 48.0 48.2 48.7 50.40 50.40}
+} {48.0 48.0 48.2 48.7 50.45 50.45}
 .t insert end \n
 test textDisp-21.2 {TkTextPixelIndex} {textfonts} {
     .t yview 195.0
     list [.t index @11,[expr {$fixedHeight * 5 + 5}]] [.t index @11,[expr {$fixedHeight * 6 + 5}]] [.t index @11,[expr {$fixedHeight * 7 + 5}]] \
 	    [.t index @11,1002]
@@ -2923,11 +2947,11 @@
    QOTW:  "C/C++, which is used by 16% of users, is the most popular programming language, but Tcl, used by 0%, seems to be the language of choice for the highest scoring users."
 (new line)
 Use the Up (cursor) key to scroll up one line at a time.  At the second press, the cursor either gets locked or jumps several lines.
 
 Connect with Tkcon.  The command
-.u count -displaylines \ 
+.u count -displaylines \
 3.10 2.173
 should give answer -1; it gives me 5.
 
 Using 8.5a4 (ActiveState beta 4) under Linux.  No problem with ActiveState beta 3.
 }
@@ -2957,11 +2981,11 @@
 test textDisp-22.1 {TkTextCharBbox} {textfonts} {
     .t config -wrap word
     .t yview 48.0
     list [.t bbox 47.2] [.t bbox 48.0] [.t bbox 50.5] [.t bbox 50.40] \
 	    [.t bbox 58.0]
-} [list {} [list 3 3 7 $fixedHeight] [list 38 [expr {3+2*$fixedHeight}] 7 $fixedHeight] [list 38 [expr {3+4*$fixedHeight}] 7 $fixedHeight] {}]
+} [list {} [list 3 3 7 $fixedHeight] [list 38 [expr {3+2*$fixedHeight}] 7 $fixedHeight] [list 3 [expr {3+4*$fixedHeight}] 7 $fixedHeight] {}]
 test textDisp-22.2 {TkTextCharBbox} {textfonts} {
     .t config -wrap none
     .t yview 48.0
     list [.t bbox 50.5] [.t bbox 50.40] [.t bbox 57.0]
 } [list [list 38 [expr {3+2*$fixedHeight}] 7 $fixedHeight] {} [list 3 [expr {3+9*$fixedHeight}] 7 $fixedHeight]]
@@ -3081,17 +3105,17 @@
 test textDisp-23.1 {TkTextDLineInfo} {textfonts} {
     .t config -wrap word
     .t yview 48.0
     list [.t dlineinfo 47.3] [.t dlineinfo 48.0] [.t dlineinfo 50.40] \
 	    [.t dlineinfo 56.0]
-} [list {} [list 3 3 49 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]] [list 3 [expr {4*$fixedDiff + 55}] 126 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]] {}]
+} [list {} [list 3 3 49 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]] [list 3 [expr {4*$fixedDiff + 55}] 91 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]] {}]
 test textDisp-23.2 {TkTextDLineInfo} {textfonts} {
     .t config -bd 4 -wrap word
     update
     .t yview 48.0
     .t dlineinfo 50.40
-} [list 7 [expr {4*$fixedDiff + 59}] 126 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]]
+} [list 7 [expr {4*$fixedDiff + 59}] 91 [expr {$fixedDiff + 13}] [expr {$fixedDiff + 10}]]
 .t config -bd 0
 test textDisp-23.3 {TkTextDLineInfo} {textfonts} {
     .t config -wrap none
     update
     .t yview 48.0
@@ -3282,15 +3306,15 @@
     list [.t bbox 1.19] [.t bbox 1.20]
 } [list [list 136 3 7 $fixedHeight] [list 3 [expr {$fixedDiff + 16}] 7 $fixedHeight]]
 test textDisp-24.18 {TkTextCharLayoutProc, -wrap word} {textfonts} {
     .t configure -wrap word
     .t delete 1.0 end
-    .t insert 1.0 "xThis is a line that wraps around"
+    .t insert 1.0 "xxThis is a line that wraps around"
     wm geom . {}
     update
-    list [.t bbox 1.14] [.t bbox 1.15] [.t bbox 1.16]
-} [list [list 101 3 7 $fixedHeight] [list 108 3 35 $fixedHeight] [list 3 [expr {$fixedDiff + 16}] 7 $fixedHeight]]
+    list [.t bbox 1.15] [.t bbox 1.16] [.t bbox 1.17]
+} [list [list 108 3 7 $fixedHeight] [list 115 3 28 $fixedHeight] [list 3 [expr {$fixedDiff + 16}] 7 $fixedHeight]]
 test textDisp-24.19 {TkTextCharLayoutProc, -wrap word} {textfonts} {
     .t configure -wrap word
     .t delete 1.0 end
     .t insert 1.0 "xxThis is a line that wraps around"
     wm geom . {}
@@ -3348,10 +3372,20 @@
     .t tag configure x -justify center
     .t insert 1.0 aa\tbb\tcc\tdd\t
     .t tag add x 1.0 end
     list [.t bbox 1.0] [.t bbox 1.10]
 } [list [list 45 3 7 $fixedHeight] [list 94 3 7 $fixedHeight]]
+test textDisp-24.25 {TkTextCharLayoutProc, justification and tabs} -constraints {textfonts} -setup {
+    text .tt -tabs {40 right} -wrap none -font $fixedFont
+    pack .tt
+} -body {
+    .tt insert end \t9\n\t99\n\t999
+    update
+    list [.tt bbox 1.1] [.tt bbox 2.2] [.tt bbox 3.3]
+} -cleanup {
+    destroy .tt
+} -result [list [list 38 5 7 $fixedHeight] [list 38 20 7 $fixedHeight] [list 38 35 7 $fixedHeight]]
 
 .t configure -width 40 -bd 0 -relief flat -highlightthickness 0 -padx 0 \
     -tabs 100
 update
 test textDisp-25.1 {CharBboxProc procedure, check tab width} {textfonts} {
@@ -3817,11 +3851,11 @@
     set xd [expr {[lindex $xv 1] - [lindex $xv 0]}]
     .t2.t xview moveto [expr {1.0-$xd}]
     set iWidth [lindex [.t2.t bbox end-2c] 2]
     .t2.t xview scroll 2 units
     set iWidth2 [lindex [.t2.t bbox end-2c] 2]
-    
+
     if {($iWidth == $iWidth2) && $iWidth >= 2} {
 	set result "correct"
     } else {
 	set result "last character is not completely visible when it should be"
     }

Index: tests/textImage.test
==================================================================
--- tests/textImage.test
+++ tests/textImage.test
@@ -72,31 +72,31 @@
 test textImage-1.6 {configure argument checking} -setup {
     destroy .t
 } -body {
     text .t -font test_font -bd 0 -highlightthickness 0 -padx 0 -pady 0
     pack .t
-    .t image configure 
+    .t image configure
 } -cleanup {
     destroy .t
 } -returnCodes error -result {wrong # args: should be ".t image configure index ?-option value ...?"}
 
 test textImage-1.7 {configure argument checking} -setup {
     destroy .t
 } -body {
     text .t -font test_font -bd 0 -highlightthickness 0 -padx 0 -pady 0
     pack .t
-    .t image configure blurf 
+    .t image configure blurf
 } -cleanup {
     destroy .t
 } -returnCodes error -result {bad text index "blurf"}
 
 test textImage-1.8 {configure argument checking} -setup {
     destroy .t
 } -body {
     text .t -font test_font -bd 0 -highlightthickness 0 -padx 0 -pady 0
     pack .t
-    .t image configure 1.1 
+    .t image configure 1.1
 } -cleanup {
     destroy .t
 } -returnCodes error -result {no embedded image at index "1.1"}
 
 test textImage-1.9 {create argument checking} -setup {
@@ -112,11 +112,11 @@
 test textImage-1.10 {create argument checking} -setup {
     destroy .t
 } -body {
     text .t -font test_font -bd 0 -highlightthickness 0 -padx 0 -pady 0
     pack .t
-    .t image create blurf 
+    .t image create blurf
 } -cleanup {
     destroy .t
 } -returnCodes error -result {bad text index "blurf"}
 
 test textImage-1.11 {basic argument checking} -setup {
@@ -219,11 +219,11 @@
     text .t -font test_font -bd 0 -highlightthickness 0 -padx 0 -pady 0
     pack .t
     .t image create end -image small
     foreach i {align padx pady image name} {
         lappend result $i:[.t image cget small -$i]
-    } 
+    }
     return $result
 } -cleanup {
     destroy .t
     image delete small
 } -result {align:center padx:0 pady:0 image:small name:}
@@ -241,11 +241,11 @@
     text .t -font test_font -bd 0 -highlightthickness 0 -padx 0 -pady 0
     pack .t
     .t image create end -image small
     foreach {option value}  {align top padx 5 pady 7 image large name none} {
         .t image configure small -$option $value
-    } 
+    }
     update
     .t image configure small
 } -cleanup {
     destroy .t
     image delete small large
@@ -307,11 +307,11 @@
     lappend result base:[.t bbox vary]
     foreach i {10 20 40} {
         vary configure -width $i -height $i
         update
         lappend result $i:[.t bbox vary]
-    } 
+    }
     return $result
 } -cleanup {
     destroy .t
     image delete vary
 } -result {{base:0 0 5 5} {10:0 0 10 10} {20:0 0 20 20} {40:0 0 40 40}}

Index: tests/textIndex.test
==================================================================
--- tests/textIndex.test
+++ tests/textIndex.test
@@ -11,15 +11,15 @@
 tcltest::loadTestedCommands
 namespace import -force tcltest::test
 
 catch {destroy .t}
 text .t -font {Courier -12} -width 20 -height 10
-pack append . .t {top expand fill}
+pack .t -expand 1 -fill both
 update
 .t debug on
 wm geometry . {}
-  
+
 # The statements below reset the main window;  it's needed if the window
 # manager is mwm to make mwm forget about a previous minimum size setting.
 
 wm withdraw .
 wm minsize . 1 1
@@ -72,21 +72,21 @@
 test textIndex-1.9 {TkTextMakeByteIndex: shortcut for 0} {testtext} {
     # not (byteIndex == 0)
     testtext .t byteindex 3 80
 } {3.5 5}
 test textIndex-1.10 {TkTextMakeByteIndex: verify index is in range} {testtext} {
-    # for (segPtr = indexPtr->linePtr->segPtr; ; segPtr = segPtr->nextPtr) 
+    # for (segPtr = indexPtr->linePtr->segPtr; ; segPtr = segPtr->nextPtr)
     # one segment
 
     testtext .t byteindex 3 5
 } {3.5 5}
 test textIndex-1.11 {TkTextMakeByteIndex: verify index is in range} {testtext} {
     # for (segPtr = indexPtr->linePtr->segPtr; ; segPtr = segPtr->nextPtr)
     #     index += segPtr->size
     # Multiple segments, make sure add segment size to index.
 
-    .t mark set foo 3.2 
+    .t mark set foo 3.2
     set x [testtext .t byteindex 3 7]
     .t mark unset foo
     set x
 } {3.5 5}
 test textIndex-1.12 {TkTextMakeByteIndex: verify index is in range} {testtext} {
@@ -115,19 +115,19 @@
 test textIndex-1.16 {TkTextMakeByteIndex: UTF-8 characters} {testtext} {
     testtext .t byteindex 5 100
 } {5.18 20}
 test textIndex-1.17 {TkTextMakeByteIndex: prevent splitting UTF-8 character} \
 	{testtext} {
-    # ((byteIndex > index) && (segPtr->typePtr == &tkTextCharType)) 
+    # ((byteIndex > index) && (segPtr->typePtr == &tkTextCharType))
     # Wrong answer would be \xb9 (the 2nd byte of UTF rep of 0x4e4f).
 
     set x [testtext .t byteindex 5 2]
     list $x [.t get insert]
 } {{5.2 4} y}
 test textIndex-1.18 {TkTextMakeByteIndex: prevent splitting UTF-8 character} \
 	{testtext} {
-    # ((byteIndex > index) && (segPtr->typePtr == &tkTextCharType)) 
+    # ((byteIndex > index) && (segPtr->typePtr == &tkTextCharType))
     testtext .t byteindex 5 1
     .t get insert
 } "\u4e4f"
 
 test textIndex-2.1 {TkTextMakeCharIndex} {
@@ -166,11 +166,11 @@
 } 3.5
 test textIndex-2.9 {TkTextMakeCharIndex: verify index is in range} {
     # for (segPtr = indexPtr->linePtr->segPtr; ; segPtr = segPtr->nextPtr)
     # Multiple segments, make sure add segment size to index.
 
-    .t mark set foo 3.2 
+    .t mark set foo 3.2
     set x [.t index 3.7]
     .t mark unset foo
     set x
 } 3.5
 test textIndex-2.10 {TkTextMakeCharIndex: verify index is in range} {
@@ -437,11 +437,11 @@
     .t index {2.3 + 10 chars}
 } 2.13
 test textIndex-12.6 {TkTextIndexForwChars: find index} {
     # for ( ; segPtr != NULL; segPtr = segPtr->nextPtr)
     # border condition: segPtr == NULL -> beginning of next line
-    
+
     .t index {2.3 + 11 chars}
 } 3.0
 test textIndex-12.7 {TkTextIndexForwChars: find index} {
     # (segPtr->typePtr == &tkTextCharType)
     .t index {2.3 + 2 chars}
@@ -456,11 +456,11 @@
     # not (segPtr->typePtr == &tkTextCharType)
 
     .t image create 2.4 -image textimage
     set x [.t get {2.3 + 3 chars}]
     .t delete 2.4
-    set x    
+    set x
 } "f"
 test textIndex-12.10 {TkTextIndexForwChars: find index} {
     # dstPtr->byteIndex += segPtr->size - byteOffset
     # When moving to next segment, account for bytes in last segment.
     # Wrong answer would be 2.4
@@ -586,15 +586,15 @@
     set x [.t index {3.5 - 10 chars}]
     .t mark unset foo
     set x
 } 2.9
 test textIndex-14.12 {TkTextIndexBackChars: move to previous line} {
-    # (lineIndex == 0) 
+    # (lineIndex == 0)
     .t index {1.5 - 10 chars}
 } 1.0
 test textIndex-14.13 {TkTextIndexBackChars: move to previous line} {
-    # not (lineIndex == 0) 
+    # not (lineIndex == 0)
     .t index {2.5 - 10 chars}
 } 1.2
 test textIndex-14.14 {TkTextIndexBackChars: move to previous line} {
     # for (segPtr = oldPtr; segPtr != NULL; segPtr = segPtr->nextPtr)
     # Set byteIndex to end of previous line so we can subtract more
@@ -712,21 +712,21 @@
     catch {destroy .t2}
     set res
 } {3.4 3.0 1.0}
 
 frame .f -width 100 -height 20
-pack append . .f left
+pack .f -side left
 
 set fixedFont {Courier -12}
 set fixedHeight [font metrics $fixedFont -linespace]
 set fixedWidth [font measure $fixedFont m]
 
 set varFont {Times -14}
 set bigFont {Helvetica -24}
 destroy .t
 text .t -font $fixedFont -width 20 -height 10 -wrap char
-pack append . .t {top expand fill}
+pack .t -expand 1 -fill both
 .t tag configure big -font $bigFont
 .t debug on
 wm geometry . {}
 
 # The statements below reset the main window;  it's needed if the window

Index: tests/textMark.test
==================================================================
--- tests/textMark.test
+++ tests/textMark.test
@@ -11,11 +11,11 @@
 tcltest::configure {*}$argv
 tcltest::loadTestedCommands
 
 destroy .t
 text .t -width 20 -height 10
-pack append . .t {top expand fill}
+pack .t -expand 1 -fill both
 update
 .t debug on
 wm geometry . {}
 entry .t.e
 .t peer create .pt
@@ -25,11 +25,11 @@
 12345
 Line 4
 bOy GIrl .#@? x_yz
 !@#$%
 Line 7"
-  
+
 # The statements below reset the main window; it's needed if the window
 # manager is mwm to make mwm forget about a previous minimum size setting.
 
 wm withdraw .
 wm minsize . 1 1

Index: tests/textTag.test
==================================================================
--- tests/textTag.test
+++ tests/textTag.test
@@ -8,24 +8,35 @@
 
 package require tcltest 2.2
 namespace import ::tcltest::*
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
+
+set textWidgetFont {Courier 12}
+set bigFont        {Courier 24}
+
+# what is needed is a font that is both fixed-width and featuring a
+# specific size because in some tests (that will be constrained by
+# haveFontSizes), a tag applying the $bigFont will be set to some
+# characters, which action has the effect of changing what character
+# is under the mouse pointer, which is the purpose of the tests
+testConstraint haveFontSizes [expr {
+    [font metrics $textWidgetFont -fixed] &&
+    [font actual  $textWidgetFont -size] == 12 &&
+    [font metrics $bigFont -fixed] &&
+    [font actual  $bigFont -size] == 24 }
+]
 
 destroy .t
 text .t -width 20 -height 10
-testConstraint haveCourier12 [expr {[catch {
-    .t configure -font {Courier 12}
-}] == 0}]
 
-pack append . .t {top expand fill}
+pack .t -expand 1 -fill both
 update
 .t debug on
 
 wm geometry . {}
-set bigFont {Helvetica 24}
-  
+
 # The statements below reset the main window;  it's needed if the window
 # manager is mwm, to make mwm forget about a previous minimum size setting.
 
 wm withdraw .
 wm minsize . 1 1
@@ -38,134 +49,100 @@
 Line 4
 bOy GIrl .#@? x_yz
 !@#$%
 Line 7"
 
-test textTag-1.1 {tag configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.1 {tag configuration options} -body {
     .t tag configure x -background #012345
     .t tag cget x -background
 } -cleanup {
     .t tag configure x -background [lindex [.t tag configure x -background] 3]
 } -result {#012345}
-test textTag-1.2 {configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.2 {configuration options} -body {
     .t tag configure x -background non-existent
 } -cleanup {
     .t tag configure x -background [lindex [.t tag configure x -background] 3]
 } -returnCodes error -result {unknown color name "non-existent"}
-test textTag-1.3 {tag configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.3 {tag configuration options} -body {
     .t tag configure x -bgstipple gray50
     .t tag cget x -bgstipple
 } -cleanup {
     .t tag configure x -bgstipple [lindex [.t tag configure x -bgstipple] 3]
 } -result {gray50}
-test textTag-1.4 {configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.4 {configuration options} -body {
     .t tag configure x -bgstipple badStipple
 } -cleanup {
     .t tag configure x -bgstipple [lindex [.t tag configure x -bgstipple] 3]
 } -returnCodes error -result {bitmap "badStipple" not defined}
-test textTag-1.5 {tag configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.5 {tag configuration options} -body {
     .t tag configure x -borderwidth 2
     .t tag cget x -borderwidth
 } -cleanup {
     .t tag configure x -borderwidth [lindex [.t tag configure x -borderwidth] 3]
 } -result {2}
-test textTag-1.6 {configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.6 {configuration options} -body {
     .t tag configure x -borderwidth 46q
 } -cleanup {
     .t tag configure x -borderwidth [lindex [.t tag configure x -borderwidth] 3]
 } -returnCodes error -result {bad screen distance "46q"}
-test textTag-1.7 {tag configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.7 {tag configuration options} -body {
     .t tag configure x -fgstipple gray25
     .t tag cget x -fgstipple
 } -cleanup {
     .t tag configure x -fgstipple [lindex [.t tag configure x -fgstipple] 3]
 } -result {gray25}
-test textTag-1.8 {configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.8 {configuration options} -body {
     .t tag configure x -fgstipple bogus
 } -cleanup {
     .t tag configure x -fgstipple [lindex [.t tag configure x -fgstipple] 3]
 } -returnCodes error -result {bitmap "bogus" not defined}
-test textTag-1.9 {tag configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.9 {tag configuration options} -body {
     .t tag configure x -font fixed
     .t tag cget x -font
 } -cleanup {
     .t tag configure x -font [lindex [.t tag configure x -font] 3]
 } -result {fixed}
-test textTag-1.10 {tag configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.10 {tag configuration options} -body {
     .t tag configure x -foreground #001122
     .t tag cget x -foreground
 } -cleanup {
     .t tag configure x -foreground [lindex [.t tag configure x -foreground] 3]
 } -result {#001122}
-test textTag-1.11 {configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.11 {configuration options} -body {
     .t tag configure x -foreground {silly color}
 } -cleanup {
     .t tag configure x -foreground [lindex [.t tag configure x -foreground] 3]
 } -returnCodes error -result {unknown color name "silly color"}
-test textTag-1.12 {tag configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.12 {tag configuration options} -body {
     .t tag configure x -justify left
     .t tag cget x -justify
 } -cleanup {
     .t tag configure x -justify [lindex [.t tag configure x -justify] 3]
 } -result {left}
-test textTag-1.13 {configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.13 {configuration options} -body {
     .t tag configure x -justify middle
 } -cleanup {
     .t tag configure x -justify [lindex [.t tag configure x -justify] 3]
 } -returnCodes error -result {bad justification "middle": must be left, right, or center}
-test textTag-1.14 {tag configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.14 {tag configuration options} -body {
     .t tag configure x -lmargin1 10
     .t tag cget x -lmargin1
 } -cleanup {
     .t tag configure x -lmargin1 [lindex [.t tag configure x -lmargin1] 3]
 } -result {10}
-test textTag-1.15 {configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.15 {configuration options} -body {
     .t tag configure x -lmargin1 bad
 } -cleanup {
     .t tag configure x -lmargin1 [lindex [.t tag configure x -lmargin1] 3]
 } -returnCodes error -result {bad screen distance "bad"}
-test textTag-1.16 {tag configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.16 {tag configuration options} -body {
     .t tag configure x -lmargin2 10
     .t tag cget x -lmargin2
 } -cleanup {
     .t tag configure x -lmargin2 [lindex [.t tag configure x -lmargin2] 3]
 } -result {10}
-test textTag-1.17 {configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.17 {configuration options} -body {
     .t tag configure x -lmargin2 bad
 } -cleanup {
     .t tag configure x -lmargin2 [lindex [.t tag configure x -lmargin2] 3]
 } -returnCodes error -result {bad screen distance "bad"}
 test textTag-1.17a {tag configuration options} -body {
@@ -177,36 +154,28 @@
 test textTag-1.17b {configuration options} -body {
     .t tag configure x -lmargincolor non-existent
 } -cleanup {
     .t tag configure x -lmargincolor [lindex [.t tag configure x -lmargincolor] 3]
 } -returnCodes error -result {unknown color name "non-existent"}
-test textTag-1.18 {tag configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.18 {tag configuration options} -body {
     .t tag configure x -offset 2
     .t tag cget x -offset
 } -cleanup {
     .t tag configure x -offset [lindex [.t tag configure x -offset] 3]
 } -result {2}
-test textTag-1.19 {configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.19 {configuration options} -body {
     .t tag configure x -offset 100xyz
 } -cleanup {
     .t tag configure x -offset [lindex [.t tag configure x -offset] 3]
 } -returnCodes error -result {bad screen distance "100xyz"}
-test textTag-1.20 {tag configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.20 {tag configuration options} -body {
     .t tag configure x -overstrike on
     .t tag cget x -overstrike
 } -cleanup {
     .t tag configure x -overstrike [lindex [.t tag configure x -overstrike] 3]
 } -result {on}
-test textTag-1.21 {configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.21 {configuration options} -body {
     .t tag configure x -overstrike stupid
 } -cleanup {
     .t tag configure x -overstrike [lindex [.t tag configure x -overstrike] 3]
 } -returnCodes error -result {expected boolean value but got "stupid"}
 test textTag-1.21a {tag configuration options} -body {
@@ -218,36 +187,28 @@
 test textTag-1.21b {configuration options} -body {
     .t tag configure x -overstrikefg stupid
 } -cleanup {
     .t tag configure x -overstrikefg [lindex [.t tag configure x -overstrikefg] 3]
 } -returnCodes error -result {unknown color name "stupid"}
-test textTag-1.22 {tag configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.22 {tag configuration options} -body {
     .t tag configure x -relief raised
     .t tag cget x -relief
 } -cleanup {
     .t tag configure x -relief [lindex [.t tag configure x -relief] 3]
 } -result {raised}
-test textTag-1.23 {configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.23 {configuration options} -body {
     .t tag configure x -relief stupid
 } -cleanup {
     .t tag configure x -relief [lindex [.t tag configure x -relief] 3]
 } -returnCodes error -result {bad relief "stupid": must be flat, groove, raised, ridge, solid, or sunken}
-test textTag-1.24 {tag configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.24 {tag configuration options} -body {
     .t tag configure x -rmargin 10
     .t tag cget x -rmargin
 } -cleanup {
     .t tag configure x -rmargin [lindex [.t tag configure x -rmargin] 3]
 } -result {10}
-test textTag-1.25 {configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.25 {configuration options} -body {
     .t tag configure x -rmargin bad
 } -cleanup {
     .t tag configure x -rmargin [lindex [.t tag configure x -rmargin] 3]
 } -returnCodes error -result {bad screen distance "bad"}
 test textTag-1.25a {tag configuration options} -body {
@@ -281,81 +242,61 @@
 test textTag-1.25f {configuration options} -body {
     .t tag configure x -selectforeground non-existent
 } -cleanup {
     .t tag configure x -selectforeground [lindex [.t tag configure x -selectforeground] 3]
 } -returnCodes error -result {unknown color name "non-existent"}
-test textTag-1.26 {tag configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.26 {tag configuration options} -body {
     .t tag configure x -spacing1 10
     .t tag cget x -spacing1
 } -cleanup {
     .t tag configure x -spacing1 [lindex [.t tag configure x -spacing1] 3]
 } -result {10}
-test textTag-1.27 {configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.27 {configuration options} -body {
     .t tag configure x -spacing1 bad
 } -cleanup {
     .t tag configure x -spacing1 [lindex [.t tag configure x -spacing1] 3]
 } -returnCodes error -result {bad screen distance "bad"}
-test textTag-1.28 {tag configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.28 {tag configuration options} -body {
     .t tag configure x -spacing2 10
     .t tag cget x -spacing2
 } -cleanup {
     .t tag configure x -spacing2 [lindex [.t tag configure x -spacing2] 3]
 } -result {10}
-test textTag-1.29 {configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.29 {configuration options} -body {
     .t tag configure x -spacing2 bad
 } -cleanup {
     .t tag configure x -spacing2 [lindex [.t tag configure x -spacing2] 3]
 } -returnCodes error -result {bad screen distance "bad"}
-test textTag-1.30 {tag configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.30 {tag configuration options} -body {
     .t tag configure x -spacing3 10
     .t tag cget x -spacing3
 } -cleanup {
     .t tag configure x -spacing3 [lindex [.t tag configure x -spacing3] 3]
 } -result {10}
-test textTag-1.31 {configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.31 {configuration options} -body {
     .t tag configure x -spacing3 bad
 } -cleanup {
     .t tag configure x -spacing3 [lindex [.t tag configure x -spacing3] 3]
 } -returnCodes error -result {bad screen distance "bad"}
-test textTag-1.32 {tag configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.32 {tag configuration options} -body {
     .t tag configure x -tabs {10 20 30}
     .t tag cget x -tabs
 } -cleanup {
     .t tag configure x -tabs [lindex [.t tag configure x -tabs] 3]
 } -result {10 20 30}
-test textTag-1.33 {configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.33 {configuration options} -body {
     .t tag configure x -tabs {10 fork}
 } -cleanup {
     .t tag configure x -tabs [lindex [.t tag configure x -tabs] 3]
 } -returnCodes error -result {bad tab alignment "fork": must be left, right, center, or numeric}
-test textTag-1.34 {tag configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.34 {tag configuration options} -body {
     .t tag configure x -underline no
     .t tag cget x -underline
 } -cleanup {
     .t tag configure x -underline [lindex [.t tag configure x -underline] 3]
 } -result {no}
-test textTag-1.35 {configuration options} -constraints {
-    haveCourier12
-} -body {
+test textTag-1.35 {configuration options} -body {
     .t tag configure x -underline stupid
 } -cleanup {
     .t tag configure x -underline [lindex [.t tag configure x -underline] 3]
 } -returnCodes error -result {expected boolean value but got "stupid"}
 test textTag-1.36 {tag configuration options} -body {
@@ -369,67 +310,49 @@
 } -cleanup {
     .t tag configure x -underlinefg [lindex [.t tag configure x -underlinefg] 3]
 } -returnCodes error -result {unknown color name "stupid"}
 
 
-test textTag-2.1 {TkTextTagCmd - "add" option} -constraints {
-	haveCourier12 
-} -body {
+test textTag-2.1 {TkTextTagCmd - "add" option} -body {
     .t tag
 } -returnCodes error -result {wrong # args: should be ".t tag option ?arg ...?"}
-test textTag-2.2 {TkTextTagCmd - "add" option} -constraints {
-	haveCourier12 
-} -body {
+test textTag-2.2 {TkTextTagCmd - "add" option} -body {
     .t tag gorp
 } -returnCodes error -result {bad tag option "gorp": must be add, bind, cget, configure, delete, lower, names, nextrange, prevrange, raise, ranges, or remove}
-test textTag-2.3 {TkTextTagCmd - "add" option} -constraints {
-	haveCourier12 
-} -body {
+test textTag-2.3 {TkTextTagCmd - "add" option} -body {
     .t tag add foo
 } -returnCodes error -result {wrong # args: should be ".t tag add tagName index1 ?index2 index1 index2 ...?"}
-test textTag-2.4 {TkTextTagCmd - "add" option} -constraints {
-	haveCourier12 
-} -body {
+test textTag-2.4 {TkTextTagCmd - "add" option} -body {
     .t tag add x gorp
 } -returnCodes error -result {bad text index "gorp"}
-test textTag-2.5 {TkTextTagCmd - "add" option} -constraints {
-	haveCourier12 
-} -body {
+test textTag-2.5 {TkTextTagCmd - "add" option} -body {
     .t tag add x 1.2 gorp
 } -returnCodes error -result {bad text index "gorp"}
-test textTag-2.6 {TkTextTagCmd - "add" option} -constraints {
-	haveCourier12 
-} -setup {
+test textTag-2.6 {TkTextTagCmd - "add" option} -setup {
     .t tag delete sel
 } -body {
     .t tag add sel 3.2 3.4
     .t tag add sel 3.2 3.0
     .t tag ranges sel
 } -result {3.2 3.4}
-test textTag-2.7 {TkTextTagCmd - "add" option} -constraints {
-	haveCourier12 
-} -setup {
+test textTag-2.7 {TkTextTagCmd - "add" option} -setup {
     .t tag delete x
 } -body {
     .t tag add x 1.0 1.end
     .t tag ranges x
 } -cleanup {
     .t tag delete x
 } -result {1.0 1.6}
-test textTag-2.8 {TkTextTagCmd - "add" option} -constraints {
-	haveCourier12 
-} -setup {
+test textTag-2.8 {TkTextTagCmd - "add" option} -setup {
     .t tag remove x 1.0 end
 } -body {
     .t tag add x 1.2
     .t tag ranges x
 } -cleanup {
     .t tag delete x
 } -result {1.2 1.3}
-test textTag-2.9 {TkTextTagCmd - "add" option} -constraints {
-	haveCourier12 
-} -setup {
+test textTag-2.9 {TkTextTagCmd - "add" option} -setup {
     destroy .t.e
 } -body {
     entry .t.e
     .t.e insert 0 "Text"
     .t.e select from 0
@@ -437,13 +360,11 @@
     .t tag add sel 3.2 3.4
     selection get
 } -cleanup {
     destroy .t.e
 } -result 34
-test textTag-2.10 {TkTextTagCmd - "add" option} -constraints {
-	haveCourier12 
-} -setup {
+test textTag-2.10 {TkTextTagCmd - "add" option} -setup {
     destroy .t.e
 } -body {
     entry .t.e
     .t.e insert 0 "Text"
     .t.e select from 0
@@ -452,27 +373,23 @@
     .t tag add sel 3.2 3.4
     selection get
 } -cleanup {
     destroy .t.e
 }  -result {Text}
-test textTag-2.11 {TkTextTagCmd - "add" option} -constraints {
-	haveCourier12 
-} -body {
+test textTag-2.11 {TkTextTagCmd - "add" option} -body {
     .t tag remove sel 1.0 end
     .t tag add sel 1.1 1.5 2.4 3.1 4.2 4.4
     .t tag ranges sel
 } -result {1.1 1.5 2.4 3.1 4.2 4.4}
-test textTag-2.12 {TkTextTagCmd - "add" option} -constraints {
-	haveCourier12 
-} -body {
+test textTag-2.12 {TkTextTagCmd - "add" option} -body {
     .t tag remove sel 1.0 end
     .t tag add sel 1.1 1.5 2.4
     .t tag ranges sel
 } -cleanup {
     .t tag remove sel 1.0 end
 } -result {1.1 1.5 2.4 2.5}
-test textTag-2.14 {tag add before -startline - Bug 1615425} haveCourier12 {
+test textTag-2.14 {tag add before -startline - Bug 1615425} -body {
     text .tt
     for {set i 1} {$i <10} {incr i} {
         .tt insert end "Line $i\n"
     }
     .tt tag configure mytag -font {Courier 12 bold}
@@ -480,147 +397,109 @@
     .ptt configure -startline 3 -endline 7
     # the test succeeds if next line does not crash
     .tt tag add mytag 1.0 1.end
     destroy .ptt .tt
     set res 1
-} {1}
+} -result {1}
 
 
-test textTag-3.1 {TkTextTagCmd - "bind" option} -constraints {
-	haveCourier12 
-} -body {
+test textTag-3.1 {TkTextTagCmd - "bind" option} -body {
     .t tag bind
 } -returnCodes error -result {wrong # args: should be ".t tag bind tagName ?sequence? ?command?"}
-test textTag-3.2 {TkTextTagCmd - "bind" option} -constraints {
-	haveCourier12 
-} -body {
+test textTag-3.2 {TkTextTagCmd - "bind" option} -body {
     .t tag bind 1 2 3 4
 } -returnCodes error -result {wrong # args: should be ".t tag bind tagName ?sequence? ?command?"}
-test textTag-3.3 {TkTextTagCmd - "bind" option} -constraints {
-	haveCourier12 
-} -body {
+test textTag-3.3 {TkTextTagCmd - "bind" option} -body {
     .t tag bind x <Enter> script1
     .t tag bind x <Enter>
 } -cleanup {
     .t tag delete x
 } -result {script1}
-test textTag-3.4 {TkTextTagCmd - "bind" option} -constraints {
-	haveCourier12 
-} -body {
+test textTag-3.4 {TkTextTagCmd - "bind" option} -body {
     .t tag bind x <Gorp> script2
 } -returnCodes error -result {bad event type or keysym "Gorp"}
-test textTag-3.5 {TkTextTagCmd - "bind" option} -constraints {
-	haveCourier12 
-} -body {
+test textTag-3.5 {TkTextTagCmd - "bind" option} -body {
     .t tag delete x
     .t tag bind x <Enter> script1
     .t tag bind x <FocusIn> script2
 } -cleanup {
     .t tag delete x
 } -returnCodes error -result {requested illegal events; only key, button, motion, enter, leave, and virtual events may be used}
-test textTag-3.6 {TkTextTagCmd - "bind" option} -constraints {
-    haveCourier12 
-} -body {
+test textTag-3.6 {TkTextTagCmd - "bind" option} -body {
     .t tag delete x
     .t tag bind x <Enter> script1
-    catch {.t tag bind x <FocusIn> script2} 
+    catch {.t tag bind x <FocusIn> script2}
     .t tag bind x
 } -cleanup {
     .t tag delete x
 } -result {<Enter>}
-test textTag-3.7 {TkTextTagCmd - "bind" option} -constraints {
-	haveCourier12 
-} -body {
+test textTag-3.7 {TkTextTagCmd - "bind" option} -body {
     .t tag delete x
     .t tag bind x <Enter> script1
     .t tag bind x <Leave> script2
     .t tag bind x a xyzzy
     list [lsort [.t tag bind x]] [.t tag bind x <Enter>] [.t tag bind x a]
 } -cleanup {
     .t tag delete x
 } -result {{<Enter> <Leave> a} script1 xyzzy}
-test textTag-3.8 {TkTextTagCmd - "bind" option} -constraints {
-	haveCourier12 
-} -body {
+test textTag-3.8 {TkTextTagCmd - "bind" option} -body {
     .t tag delete x
     .t tag bind x <Enter> script1
     .t tag bind x <Enter> +script2
     .t tag bind x <Enter>
 } -cleanup {
     .t tag delete x
 } -result {script1
 script2}
-test textTag-3.9 {TkTextTagCmd - "bind" option} -constraints {
-	haveCourier12 
-} -body {
+test textTag-3.9 {TkTextTagCmd - "bind" option} -body {
     .t tag delete x
     .t tag bind x <Enter>
 } -cleanup {
     .t tag delete x
 } -returnCodes ok -result {}
-test textTag-3.10 {TkTextTagCmd - "bind" option} -constraints {
-	haveCourier12 
-} -body {
+test textTag-3.10 {TkTextTagCmd - "bind" option} -body {
     .t tag delete x
     .t tag bind x <
 } -cleanup {
     .t tag delete x
 } -returnCodes error -result {no event type or button # or keysym}
 
 
-test textTag-4.1 {TkTextTagCmd - "cget" option} -constraints {
-	haveCourier12 
-} -body {
+test textTag-4.1 {TkTextTagCmd - "cget" option} -body {
     .t tag cget a
 } -returnCodes error -result {wrong # args: should be ".t tag cget tagName option"}
-test textTag-4.2 {TkTextTagCmd - "cget" option} -constraints {
-	haveCourier12 
-} -body {
+test textTag-4.2 {TkTextTagCmd - "cget" option} -body {
     .t tag cget a b c
 } -returnCodes error -result {wrong # args: should be ".t tag cget tagName option"}
-test textTag-4.3 {TkTextTagCmd - "cget" option} -constraints {
-	haveCourier12 
-} -body {
+test textTag-4.3 {TkTextTagCmd - "cget" option} -body {
     .t tag delete foo
     .t tag cget foo bar
 } -returnCodes error -result {tag "foo" isn't defined in text widget}
-test textTag-4.4 {TkTextTagCmd - "cget" option} -constraints {
-	haveCourier12 
-} -body {
+test textTag-4.4 {TkTextTagCmd - "cget" option} -body {
     .t tag cget sel bogus
 } -returnCodes error -result {unknown option "bogus"}
-test textTag-4.5 {TkTextTagCmd - "cget" option} -constraints {
-	haveCourier12 
-} -body {
+test textTag-4.5 {TkTextTagCmd - "cget" option} -body {
     .t tag delete x
     .t tag configure x -background red
     .t tag cget x -background
 } -cleanup {
     .t tag delete x
 } -result {red}
 
 
-test textTag-5.1 {TkTextTagCmd - "configure" option} -constraints {
-	haveCourier12 
-} -body {
+test textTag-5.1 {TkTextTagCmd - "configure" option} -body {
     .t tag configure
 } -returnCodes error -result {wrong # args: should be ".t tag configure tagName ?-option? ?value? ?-option value ...?"}
-test textTag-5.2 {TkTextTagCmd - "configure" option} -constraints {
-	haveCourier12 
-} -body {
+test textTag-5.2 {TkTextTagCmd - "configure" option} -body {
     .t tag configure x -foo
 } -returnCodes error -result {unknown option "-foo"}
-test textTag-5.3 {TkTextTagCmd - "configure" option} -constraints {
-	haveCourier12 
-} -body {
+test textTag-5.3 {TkTextTagCmd - "configure" option} -body {
     .t tag configure x -background red -underline
 } -cleanup {
     .t tag delete x
 } -returnCodes error -result {value for "-underline" missing}
-test textTag-5.4 {TkTextTagCmd - "configure" option} -constraints {
-	haveCourier12 
-} -body {
+test textTag-5.4 {TkTextTagCmd - "configure" option} -body {
     .t tag delete x
     .t tag configure x -underline yes
     .t tag configure x -underline
 } -cleanup {
     .t tag delete x
@@ -630,13 +509,11 @@
     .t tag configure x -underlinefg lightgreen
     .t tag configure x -underlinefg
 } -cleanup {
     .t tag delete x
 } -result {-underlinefg {} {} {} lightgreen}
-test textTag-5.5 {TkTextTagCmd - "configure" option} -constraints {
-	haveCourier12 
-} -body {
+test textTag-5.5 {TkTextTagCmd - "configure" option} -body {
     .t tag delete x
     .t tag configure x -overstrike on
     .t tag cget x -overstrike
 } -cleanup {
     .t tag delete x
@@ -646,62 +523,48 @@
     .t tag configure x -overstrikefg lightgreen
     .t tag configure x -overstrikefg
 } -cleanup {
     .t tag delete x
 } -result {-overstrikefg {} {} {} lightgreen}
-test textTag-5.6 {TkTextTagCmd - "configure" option} -constraints {
-	haveCourier12 
-} -body {
+test textTag-5.6 {TkTextTagCmd - "configure" option} -body {
     .t tag configure x -overstrike foo
 } -cleanup {
     .t tag delete x
 } -returnCodes error -result {expected boolean value but got "foo"}
-test textTag-5.7 {TkTextTagCmd - "configure" option} -constraints {
-	haveCourier12 
-} -body {
+test textTag-5.7 {TkTextTagCmd - "configure" option} -body {
     .t tag delete x
     .t tag configure x -underline stupid
 } -cleanup {
     .t tag delete x
 } -returnCodes error -result {expected boolean value but got "stupid"}
-test textTag-5.8 {TkTextTagCmd - "configure" option} -constraints {
-	haveCourier12 
-} -body {
+test textTag-5.8 {TkTextTagCmd - "configure" option} -body {
     .t tag delete x
     .t tag configure x -justify left
     .t tag configure x -justify
 } -cleanup {
     .t tag delete x
 } -result {-justify {} {} {} left}
-test textTag-5.9 {TkTextTagCmd - "configure" option} -constraints {
-	haveCourier12 
-} -body {
+test textTag-5.9 {TkTextTagCmd - "configure" option} -body {
     .t tag delete x
     .t tag configure x -justify bogus
 } -cleanup {
     .t tag delete x
 } -returnCodes error -result {bad justification "bogus": must be left, right, or center}
-test textTag-5.10 {TkTextTagCmd - "configure" option} -constraints {
-	haveCourier12 
-} -body {
+test textTag-5.10 {TkTextTagCmd - "configure" option} -body {
     .t tag delete x
     .t tag configure x -justify fill
 } -cleanup {
     .t tag delete x
 } -returnCodes error -result {bad justification "fill": must be left, right, or center}
-test textTag-5.11 {TkTextTagCmd - "configure" option} -constraints {
-    haveCourier12 
-} -body {
+test textTag-5.11 {TkTextTagCmd - "configure" option} -body {
     .t tag delete x
     .t tag configure x -offset 2
     .t tag configure x -offset
 } -cleanup {
     .t tag delete x
 } -result {-offset {} {} {} 2}
-test textTag-5.12 {TkTextTagCmd - "configure" option} -constraints {
-    haveCourier12 
-} -body {
+test textTag-5.12 {TkTextTagCmd - "configure" option} -body {
     .t tag delete x
     .t tag configure x -offset 1.0q
 } -cleanup {
     .t tag delete x
 } -returnCodes error -result {bad screen distance "1.0q"}
@@ -716,21 +579,17 @@
     .t tag delete x
 } -result [list {-lmargin1 {} {} {} 2} {-lmargin2 {} {} {} 4} \
                 {-rmargin {} {} {} 5} \
                 {-lmargincolor {} {} {} darkblue} {-rmargincolor {} {} {} lightgreen} \
           ]
-test textTag-5.14 {TkTextTagCmd - "configure" option} -constraints {
-    haveCourier12 
-} -body {
+test textTag-5.14 {TkTextTagCmd - "configure" option} -body {
     .t tag delete x
     .t tag configure x -lmargin1 2.0x
 } -cleanup {
     .t tag delete x
 } -returnCodes error -result {bad screen distance "2.0x"}
-test textTag-5.15 {TkTextTagCmd - "configure" option} -constraints {
-    haveCourier12 
-} -body {
+test textTag-5.15 {TkTextTagCmd - "configure" option} -body {
     .t tag delete x
     .t tag configure x -lmargin2 gorp
 } -cleanup {
     .t tag delete x
 } -returnCodes error -result {bad screen distance "gorp"}
@@ -738,13 +597,11 @@
     .t tag delete x
     .t tag configure x -lmargincolor rainbow
 } -cleanup {
     .t tag delete x
 } -returnCodes error -result {unknown color name "rainbow"}
-test textTag-5.16 {TkTextTagCmd - "configure" option} -constraints {
-    haveCourier12 
-} -body {
+test textTag-5.16 {TkTextTagCmd - "configure" option} -body {
     .t tag delete x
     .t tag configure x -rmargin 140.1.1
 } -cleanup {
     .t tag delete x
 } -returnCodes error -result {bad screen distance "140.1.1"}
@@ -753,59 +610,47 @@
     .t tag configure x -rmargincolor rainbow
 } -cleanup {
     .t tag delete x
 } -returnCodes error -result {unknown color name "rainbow"}
 .t tag delete x
-test textTag-5.17 {TkTextTagCmd - "configure" option} -constraints {
-    haveCourier12 
-} -body {
+test textTag-5.17 {TkTextTagCmd - "configure" option} -body {
     .t tag delete x
     .t tag configure x -spacing1 2 -spacing2 4 -spacing3 6
     list [.t tag configure x -spacing1] [.t tag configure x -spacing2] \
         [.t tag configure x -spacing3]
 } -cleanup {
     .t tag delete x
 } -result {{-spacing1 {} {} {} 2} {-spacing2 {} {} {} 4} {-spacing3 {} {} {} 6}}
-test textTag-5.18 {TkTextTagCmd - "configure" option} -constraints {
-    haveCourier12 
-} -body {
+test textTag-5.18 {TkTextTagCmd - "configure" option} -body {
     .t tag delete x
     .t tag configure x -spacing1 2.0x
 } -cleanup {
     .t tag delete x
 } -returnCodes error -result {bad screen distance "2.0x"}
-test textTag-5.19 {TkTextTagCmd - "configure" option} -constraints {
-    haveCourier12 
-} -body {
+test textTag-5.19 {TkTextTagCmd - "configure" option} -body {
     .t tag delete x
     .t tag configure x -spacing1 lousy
 } -cleanup {
     .t tag delete x
 } -returnCodes error -result {bad screen distance "lousy"}
-test textTag-5.20 {TkTextTagCmd - "configure" option} -constraints {
-    haveCourier12 
-} -body {
+test textTag-5.20 {TkTextTagCmd - "configure" option} -body {
     .t tag delete x
     .t tag configure x -spacing1 4.2.3
 } -cleanup {
     .t tag delete x
 } -returnCodes error -result {bad screen distance "4.2.3"}
-test textTag-5.21 {TkTextTagCmd - "configure" option} -constraints {
-    haveCourier12 
-} -body {
+test textTag-5.21 {TkTextTagCmd - "configure" option} -body {
     .t configure -selectborderwidth 2 -selectforeground blue \
         -selectbackground black
     .t tag configure sel -borderwidth 4 -foreground green -background yellow
     set x {}
     foreach i {-selectborderwidth -selectforeground -selectbackground} {
         lappend x [lindex [.t configure $i] 4]
     }
     return $x
 } -result {4 green yellow}
-test textTag-5.22 {TkTextTagCmd - "configure" option} -constraints {
-    haveCourier12 
-} -body {
+test textTag-5.22 {TkTextTagCmd - "configure" option} -body {
     .t configure -selectborderwidth 20
     .t tag configure sel -borderwidth {}
     .t cget -selectborderwidth
 } -result {}
 test textTag-5.23 {TkTextTagCmd - "configure" option} -body {
@@ -853,23 +698,17 @@
     .t tag configure sel -selectforeground white
     lappend x [.t cget -selectforeground]
     return $x
 } -result {yellow blue red white}
 
-test textTag-6.1 {TkTextTagCmd - "delete" option} -constraints {
-    haveCourier12 
-} -body {
+test textTag-6.1 {TkTextTagCmd - "delete" option} -body {
     .t tag delete
 } -returnCodes error -result {wrong # args: should be ".t tag delete tagName ?tagName ...?"}
-test textTag-6.2 {TkTextTagCmd - "delete" option} -constraints {
-    haveCourier12 
-} -body {
+test textTag-6.2 {TkTextTagCmd - "delete" option} -body {
     .t tag delete zork
 } -returnCodes ok -result {}
-test textTag-6.3 {TkTextTagCmd - "delete" option} -constraints {
-    haveCourier12 
-} -setup {
+test textTag-6.3 {TkTextTagCmd - "delete" option} -setup {
     .t tag delete {*}[.t tag names]
 } -body {
     .t tag config x -background black
     .t tag config y -foreground white
     .t tag config z -background black
@@ -876,51 +715,39 @@
     .t tag delete y z
     lsort [.t tag names]
 } -cleanup {
     .t tag delete x
 } -result {sel x}
-test textTag-6.4 {TkTextTagCmd - "delete" option} -constraints {
-    haveCourier12 
-} -setup {
+test textTag-6.4 {TkTextTagCmd - "delete" option} -setup {
     .t tag delete {*}[.t tag names]
 } -body {
     .t tag config x -background black
     .t tag config y -foreground white
     .t tag config z -background black
     eval .t tag delete [.t tag names]
     .t tag names
 } -result {sel}
-test textTag-6.5 {TkTextTagCmd - "delete" option} -constraints {
-    haveCourier12 
-} -body {
+test textTag-6.5 {TkTextTagCmd - "delete" option} -body {
     .t tag bind x <Enter> foo
     .t tag delete x
     .t tag configure x -background black
     .t tag bind x
 } -cleanup {
     .t tag delete x
 } -result {}
 
 
-test textTag-7.1 {TkTextTagCmd - "lower" option} -constraints {
-    haveCourier12 
-} -body {
+test textTag-7.1 {TkTextTagCmd - "lower" option} -body {
     .t tag lower
 } -returnCodes error -result {wrong # args: should be ".t tag lower tagName ?belowThis?"}
-test textTag-7.2 {TkTextTagCmd - "lower" option} -constraints {
-    haveCourier12 
-} -body {
+test textTag-7.2 {TkTextTagCmd - "lower" option} -body {
     .t tag lower foo
 } -returnCodes error -result {tag "foo" isn't defined in text widget}
-test textTag-7.3 {TkTextTagCmd - "lower" option} -constraints {
-    haveCourier12 
-} -body {
+test textTag-7.3 {TkTextTagCmd - "lower" option} -body {
     .t tag lower sel bar
 } -returnCodes error -result {tag "bar" isn't defined in text widget}
-test textTag-7.4 {TkTextTagCmd - "lower" option} -constraints {
-    haveCourier12 
-} -setup {
+test textTag-7.4 {TkTextTagCmd - "lower" option} -setup {
     .t tag delete {*}[.t tag names]
     .t tag remove sel 1.0 end
     foreach i {a b c d} {
         .t tag configure $i -background black
     }
@@ -928,13 +755,11 @@
     .t tag lower c
     .t tag names
 } -cleanup {
     .t tag delete {*}[.t tag names]
 } -result {c sel a b d}
-test textTag-7.5 {TkTextTagCmd - "lower" option} -constraints {
-    haveCourier12 
-} -setup {
+test textTag-7.5 {TkTextTagCmd - "lower" option} -setup {
     .t tag delete {*}[.t tag names]
     .t tag remove sel 1.0 end
     foreach i {a b c d} {
         .t tag configure $i -background black
     }
@@ -942,13 +767,11 @@
     .t tag lower d b
     .t tag names
 } -cleanup {
     .t tag delete {*}[.t tag names]
 } -result {sel a d b c}
-test textTag-7.6 {TkTextTagCmd - "lower" option} -constraints {
-    haveCourier12 
-} -setup {
+test textTag-7.6 {TkTextTagCmd - "lower" option} -setup {
     .t tag delete {*}[.t tag names]
     .t tag remove sel 1.0 end
     foreach i {a b c d} {
         .t tag configure $i -background black
     }
@@ -958,20 +781,16 @@
 } -cleanup {
     .t tag delete {*}[.t tag names]
 } -result {sel b a c d}
 
 
-test textTag-8.1 {TkTextTagCmd - "names" option} -constraints {
-    haveCourier12 
-} -body {
+test textTag-8.1 {TkTextTagCmd - "names" option} -body {
     .t tag names a b
 } -cleanup {
     .t tag delete {*}[.t tag names]
 } -returnCodes error -result {wrong # args: should be ".t tag names ?index?"}
-test textTag-8.2 {TkTextTagCmd - "names" option} -constraints {
-    haveCourier12 
-} -setup {
+test textTag-8.2 {TkTextTagCmd - "names" option} -setup {
     .t tag delete {*}[.t tag names]
     .t tag remove sel 1.0 end
     foreach i {a b c d} {
         .t tag configure $i -background black
     }
@@ -978,13 +797,11 @@
 } -body {
     .t tag names
 } -cleanup {
     .t tag delete {*}[.t tag names]
 } -result {sel a b c d}
-test textTag-8.3 {TkTextTagCmd - "names" option} -constraints {
-    haveCourier12 
-} -setup {
+test textTag-8.3 {TkTextTagCmd - "names" option} -setup {
     .t tag delete {*}[.t tag names]
     .t tag remove sel 1.0 end
     foreach i {a b c d} {
         .t tag configure $i -background black
     }
@@ -995,146 +812,118 @@
 } -cleanup {
     .t tag delete {*}[.t tag names]
 } -result {c {a b}}
 
 
-test textTag-9.1 {TkTextTagCmd - "nextrange" option} -constraints {
-    haveCourier12 
-} -body {
+test textTag-9.1 {TkTextTagCmd - "nextrange" option} -body {
     .t tag nextrange x
 } -returnCodes error -result {wrong # args: should be ".t tag nextrange tagName index1 ?index2?"}
-test textTag-9.2 {TkTextTagCmd - "nextrange" option} -constraints {
-    haveCourier12 
-} -body {
+test textTag-9.2 {TkTextTagCmd - "nextrange" option} -body {
     .t tag nextrange x 1 2 3
 } -returnCodes error -result {wrong # args: should be ".t tag nextrange tagName index1 ?index2?"}
-test textTag-9.3 {TkTextTagCmd - "nextrange" option} -constraints {
-    haveCourier12 
-} -body {
+test textTag-9.3 {TkTextTagCmd - "nextrange" option} -body {
     .t tag nextrange foo 1.0
 } -returnCodes ok -result {}
-test textTag-9.4 {TkTextTagCmd - "nextrange" option} -constraints {
-    haveCourier12 
-} -setup {
+test textTag-9.4 {TkTextTagCmd - "nextrange" option} -setup {
     .t tag delete x
 } -body {
     .t tag add x 2.3 2.5
     .t tag nextrange x foo
 } -cleanup {
     .t tag delete x
 } -returnCodes error -result {bad text index "foo"}
-test textTag-9.5 {TkTextTagCmd - "nextrange" option} -constraints {
-    haveCourier12 
-} -setup {
+test textTag-9.5 {TkTextTagCmd - "nextrange" option} -setup {
     .t tag delete x
 } -body {
     .t tag add x 2.3 2.5
     .t tag add x 2.9 3.1
     .t tag add x 7.2
     .t tag nextrange x 1.0 bar
 } -cleanup {
     .t tag delete x
 } -returnCodes error -result {bad text index "bar"}
-test textTag-9.6 {TkTextTagCmd - "nextrange" option} -constraints {
-    haveCourier12 
-} -setup {
+test textTag-9.6 {TkTextTagCmd - "nextrange" option} -setup {
     .t tag delete x
 } -body {
     .t tag add x 2.3 2.5
     .t tag add x 2.9 3.1
     .t tag add x 7.2
     .t tag nextrange x 1.0
 } -cleanup {
     .t tag delete x
 } -result {2.3 2.5}
-test textTag-9.7 {TkTextTagCmd - "nextrange" option} -constraints {
-    haveCourier12 
-} -setup {
+test textTag-9.7 {TkTextTagCmd - "nextrange" option} -setup {
     .t tag delete x
 } -body {
     .t tag add x 2.3 2.5
     .t tag add x 2.9 3.1
     .t tag add x 7.2
     .t tag nextrange x 2.2
 } -cleanup {
     .t tag delete x
 } -result {2.3 2.5}
-test textTag-9.8 {TkTextTagCmd - "nextrange" option} -constraints {
-    haveCourier12 
-} -setup {
+test textTag-9.8 {TkTextTagCmd - "nextrange" option} -setup {
     .t tag delete x
 } -body {
     .t tag add x 2.3 2.5
     .t tag add x 2.9 3.1
     .t tag add x 7.2
     .t tag nextrange x 2.3
 } -cleanup {
     .t tag delete x
 } -result {2.3 2.5}
-test textTag-9.9 {TkTextTagCmd - "nextrange" option} -constraints {
-    haveCourier12 
-} -setup {
+test textTag-9.9 {TkTextTagCmd - "nextrange" option} -setup {
     .t tag delete x
 } -body {
     .t tag add x 2.3 2.5
     .t tag add x 2.9 3.1
     .t tag add x 7.2
     .t tag nextrange x 2.4
 } -cleanup {
     .t tag delete x
 } -result {2.9 3.1}
-test textTag-9.10 {TkTextTagCmd - "nextrange" option} -constraints {
-    haveCourier12 
-} -setup {
+test textTag-9.10 {TkTextTagCmd - "nextrange" option} -setup {
     .t tag delete x
 } -body {
     .t tag add x 2.3 2.5
     .t tag add x 2.9 3.1
     .t tag add x 7.2
     .t tag nextrange x 2.4 2.9
 } -cleanup {
     .t tag delete x
 } -result {}
-test textTag-9.11 {TkTextTagCmd - "nextrange" option} -constraints {
-    haveCourier12 
-} -setup {
+test textTag-9.11 {TkTextTagCmd - "nextrange" option} -setup {
     .t tag delete x
 } -body {
     .t tag add x 2.3 2.5
     .t tag add x 2.9 3.1
     .t tag add x 7.2
     .t tag nextrange x 2.4 2.10
 } -cleanup {
     .t tag delete x
 } -result {2.9 3.1}
-test textTag-9.12 {TkTextTagCmd - "nextrange" option} -constraints {
-    haveCourier12 
-} -setup {
+test textTag-9.12 {TkTextTagCmd - "nextrange" option} -setup {
     .t tag delete x
 } -body {
     .t tag add x 2.3 2.5
     .t tag add x 2.9 3.1
     .t tag add x 7.2
     .t tag nextrange x 2.4 2.11
 } -cleanup {
     .t tag delete x
 } -result {2.9 3.1}
-test textTag-9.13 {TkTextTagCmd - "nextrange" option} -constraints {
-    haveCourier12 
-} -setup {
+test textTag-9.13 {TkTextTagCmd - "nextrange" option} -setup {
     .t tag delete x
 } -body {
     .t tag add x 2.3 2.5
     .t tag add x 2.9 3.1
     .t tag add x 7.2
     .t tag nextrange x 7.0
 } -cleanup {
     .t tag delete x
 } -result {7.2 7.3}
-test textTag-9.14 {TkTextTagCmd - "nextrange" option} -constraints {
-    haveCourier12 
-} -setup {
+test textTag-9.14 {TkTextTagCmd - "nextrange" option} -setup {
     .t tag delete x
 } -body {
     .t tag add x 2.3 2.5
     .t tag add x 2.9 3.1
     .t tag add x 7.2
@@ -1142,152 +931,124 @@
 } -cleanup {
     .t tag delete x
 } -result {}
 
 
-test textTag-10.1 {TkTextTagCmd - "prevrange" option} -constraints {
-    haveCourier12 
-} -body {
+test textTag-10.1 {TkTextTagCmd - "prevrange" option} -body {
     .t tag prevrange x
 } -returnCodes error -result {wrong # args: should be ".t tag prevrange tagName index1 ?index2?"}
-test textTag-10.2 {TkTextTagCmd - "prevrange" option} -constraints {
-    haveCourier12 
-} -body {
+test textTag-10.2 {TkTextTagCmd - "prevrange" option} -body {
     .t tag prevrange x 1 2 3
 } -returnCodes error -result {wrong # args: should be ".t tag prevrange tagName index1 ?index2?"}
-test textTag-10.3 {TkTextTagCmd - "prevrange" option} -constraints {
-    haveCourier12 
-} -setup {
+test textTag-10.3 {TkTextTagCmd - "prevrange" option} -setup {
     .t tag delete x
 } -body {
     .t tag prevrange foo end
 } -cleanup {
     .t tag delete x
 } -returnCodes ok -result {}
-test textTag-10.4 {TkTextTagCmd - "prevrange" option} -constraints {
-    haveCourier12 
-} -setup {
+test textTag-10.4 {TkTextTagCmd - "prevrange" option} -setup {
     .t tag delete x
 } -body {
     .t tag add x 2.3 2.5
     .t tag add x 2.9 3.1
     .t tag add x 7.2
     .t tag prevrange x foo
 } -cleanup {
     .t tag delete x
 } -returnCodes error -result {bad text index "foo"}
-test textTag-10.5 {TkTextTagCmd - "prevrange" option} -constraints {
-    haveCourier12 
-} -setup {
+test textTag-10.5 {TkTextTagCmd - "prevrange" option} -setup {
     .t tag delete x
 } -body {
     .t tag add x 2.3 2.5
     .t tag add x 2.9 3.1
     .t tag add x 7.2
     .t tag prevrange x end bar
 } -cleanup {
     .t tag delete x
 } -returnCodes error -result {bad text index "bar"}
-test textTag-10.6 {TkTextTagCmd - "prevrange" option} -constraints {
-    haveCourier12 
-} -setup {
+test textTag-10.6 {TkTextTagCmd - "prevrange" option} -setup {
     .t tag delete x
 } -body {
     .t tag add x 2.3 2.5
     .t tag add x 2.9 3.1
     .t tag add x 7.2
     .t tag prevrange x end
 } -cleanup {
     .t tag delete x
 } -result {7.2 7.3}
-test textTag-10.7 {TkTextTagCmd - "prevrange" option} -constraints {
-    haveCourier12 
-} -setup {
+test textTag-10.7 {TkTextTagCmd - "prevrange" option} -setup {
     .t tag delete x
 } -body {
     .t tag add x 2.3 2.5
     .t tag add x 2.9 3.1
     .t tag add x 7.2
     .t tag prevrange x 2.4
 } -cleanup {
     .t tag delete x
 } -result {2.3 2.5}
-test textTag-10.8 {TkTextTagCmd - "prevrange" option} -constraints {
-    haveCourier12 
-} -setup {
+test textTag-10.8 {TkTextTagCmd - "prevrange" option} -setup {
     .t tag delete x
 } -body {
     .t tag add x 2.3 2.5
     .t tag add x 2.9 3.1
     .t tag add x 7.2
     .t tag prevrange x 2.5
 } -cleanup {
     .t tag delete x
 } -result {2.3 2.5}
-test textTag-10.9 {TkTextTagCmd - "prevrange" option} -constraints {
-    haveCourier12 
-} -setup {
+test textTag-10.9 {TkTextTagCmd - "prevrange" option} -setup {
     .t tag delete x
 } -body {
     .t tag add x 2.3 2.5
     .t tag add x 2.9 3.1
     .t tag add x 7.2
     .t tag prevrange x 2.9
 } -cleanup {
     .t tag delete x
 } -result {2.3 2.5}
-test textTag-10.10 {TkTextTagCmd - "prevrange" option} -constraints {
-    haveCourier12 
-} -setup {
+test textTag-10.10 {TkTextTagCmd - "prevrange" option} -setup {
     .t tag delete x
 } -body {
     .t tag add x 2.3 2.5
     .t tag add x 2.9 3.1
     .t tag add x 7.2
     .t tag prevrange x 2.9 2.6
 } -cleanup {
     .t tag delete x
 } -result {}
-test textTag-10.11 {TkTextTagCmd - "prevrange" option} -constraints {
-    haveCourier12 
-} -setup {
+test textTag-10.11 {TkTextTagCmd - "prevrange" option} -setup {
     .t tag delete x
 } -body {
     .t tag add x 2.3 2.5
     .t tag add x 2.9 3.1
     .t tag add x 7.2
     .t tag prevrange x 2.9 2.5
 } -cleanup {
     .t tag delete x
 } -result {}
-test textTag-10.12 {TkTextTagCmd - "prevrange" option} -constraints {
-    haveCourier12 
-} -setup {
+test textTag-10.12 {TkTextTagCmd - "prevrange" option} -setup {
     .t tag delete x
 } -body {
     .t tag add x 2.3 2.5
     .t tag add x 2.9 3.1
     .t tag add x 7.2
     .t tag prevrange x 2.9 2.3
 } -cleanup {
     .t tag delete x
 } -result {2.3 2.5}
-test textTag-10.13 {TkTextTagCmd - "prevrange" option} -constraints {
-    haveCourier12 
-} -setup {
+test textTag-10.13 {TkTextTagCmd - "prevrange" option} -setup {
     .t tag delete x
 } -body {
     .t tag add x 2.3 2.5
     .t tag add x 2.9 3.1
     .t tag add x 7.2
     .t tag prevrange x 7.0
 } -cleanup {
     .t tag delete x
 } -result {2.9 3.1}
-test textTag-10.14 {TkTextTagCmd - "prevrange" option} -constraints {
-    haveCourier12 
-} -setup {
+test textTag-10.14 {TkTextTagCmd - "prevrange" option} -setup {
     .t tag delete x
 } -body {
     .t tag add x 2.3 2.5
     .t tag add x 2.9 3.1
     .t tag add x 7.2
@@ -1295,28 +1056,20 @@
 } -cleanup {
     .t tag delete x
 } -result {}
 
 
-test textTag-11.1 {TkTextTagCmd - "raise" option} -constraints {
-    haveCourier12 
-} -body {
+test textTag-11.1 {TkTextTagCmd - "raise" option} -body {
     .t tag raise
 } -returnCodes error -result {wrong # args: should be ".t tag raise tagName ?aboveThis?"}
-test textTag-11.2 {TkTextTagCmd - "raise" option} -constraints {
-    haveCourier12 
-} -body {
+test textTag-11.2 {TkTextTagCmd - "raise" option} -body {
     .t tag raise foo
 } -returnCodes error -result {tag "foo" isn't defined in text widget}
-test textTag-11.3 {TkTextTagCmd - "raise" option} -constraints {
-    haveCourier12 
-} -body {
+test textTag-11.3 {TkTextTagCmd - "raise" option} -body {
     .t tag raise sel bar
 } -returnCodes error -result {tag "bar" isn't defined in text widget}
-test textTag-11.4 {TkTextTagCmd - "raise" option} -constraints {
-    haveCourier12 
-} -setup {
+test textTag-11.4 {TkTextTagCmd - "raise" option} -setup {
     .t tag delete {*}[.t tag names]
     .t tag remove sel 1.0 end
     foreach i {a b c d} {
         .t tag configure $i -background black
     }
@@ -1324,13 +1077,11 @@
     .t tag raise c
     .t tag names
 } -cleanup {
     .t tag delete {*}[.t tag names]
 } -result {sel a b d c}
-test textTag-11.5 {TkTextTagCmd - "raise" option} -constraints {
-    haveCourier12 
-} -setup {
+test textTag-11.5 {TkTextTagCmd - "raise" option} -setup {
     .t tag delete {*}[.t tag names]
     .t tag remove sel 1.0 end
     foreach i {a b c d} {
         .t tag configure $i -background black
     }
@@ -1338,13 +1089,11 @@
     .t tag raise d b
     .t tag names
 } -cleanup {
     .t tag delete {*}[.t tag names]
 } -result {sel a b d c}
-test textTag-11.6 {TkTextTagCmd - "raise" option} -constraints {
-    haveCourier12 
-} -setup {
+test textTag-11.6 {TkTextTagCmd - "raise" option} -setup {
     .t tag delete {*}[.t tag names]
     .t tag remove sel 1.0 end
     foreach i {a b c d} {
         .t tag configure $i -background black
     }
@@ -1354,36 +1103,28 @@
 } -cleanup {
     .t tag delete {*}[.t tag names]
 } -result {sel b c a d}
 
 
-test textTag-12.1 {TkTextTagCmd - "ranges" option} -constraints {
-    haveCourier12 
-} -body {
+test textTag-12.1 {TkTextTagCmd - "ranges" option} -body {
     .t tag ranges
 } -returnCodes error -result {wrong # args: should be ".t tag ranges tagName"}
-test textTag-12.2 {TkTextTagCmd - "ranges" option} -constraints {
-    haveCourier12 
-} -body {
+test textTag-12.2 {TkTextTagCmd - "ranges" option} -body {
     .t tag delete x
     .t tag ranges x
 } -result {}
-test textTag-12.3 {TkTextTagCmd - "ranges" option} -constraints {
-    haveCourier12 
-} -setup {
+test textTag-12.3 {TkTextTagCmd - "ranges" option} -setup {
     .t tag delete x
 } -body {
     .t tag add x 2.2
     .t tag add x 2.7 4.15
     .t tag add x 5.2 5.5
     .t tag ranges x
 } -cleanup {
     .t tag delete x
 } -result {2.2 2.3 2.7 4.6 5.2 5.5}
-test textTag-12.4 {TkTextTagCmd - "ranges" option} -constraints {
-    haveCourier12 
-} -setup {
+test textTag-12.4 {TkTextTagCmd - "ranges" option} -setup {
     .t tag delete x
 } -body {
     .t tag add x 1.0 3.0
     .t tag add x 4.0 end
     .t tag ranges x
@@ -1390,29 +1131,23 @@
 } -cleanup {
     .t tag delete x
 } -result {1.0 3.0 4.0 8.0}
 
 
-test textTag-13.1 {TkTextTagCmd - "remove" option} -constraints {
-    haveCourier12 
-} -body {
+test textTag-13.1 {TkTextTagCmd - "remove" option} -body {
     .t tag remove
 } -returnCodes error -result {wrong # args: should be ".t tag remove tagName index1 ?index2 index1 index2 ...?"}
-test textTag-13.2 {TkTextTagCmd - "remove" option} -constraints {
-    haveCourier12 
-} -setup {
+test textTag-13.2 {TkTextTagCmd - "remove" option} -setup {
     .t tag delete x
 } -body {
     .t tag add x 2.2 2.11
     .t tag remove x 2.3 2.7
     .t tag ranges x
 } -cleanup {
     .t tag delete x
 } -result {2.2 2.3 2.7 2.11}
-test textTag-13.3 {TkTextTagCmd - "remove" option} -constraints {
-    haveCourier12 
-} -setup {
+test textTag-13.3 {TkTextTagCmd - "remove" option} -setup {
     destroy .t.e
 } -body {
     entry .t.e
     .t.e insert 0 "Text"
     .t configure -exportselection 1
@@ -1424,11 +1159,11 @@
 } -cleanup {
     destroy .t.e
 } -result {Text}
 
 
-test textTag-14.1 {SortTags} -constraints haveCourier12 -setup {
+test textTag-14.1 {SortTags} -setup {
     .t tag delete a b c d
 } -body {
     foreach i {a b c d} {
         .t tag add $i 2.0 2.2
     }
@@ -1435,11 +1170,11 @@
     .t tag names 2.1
 } -cleanup {
     .t tag delete a b c d
 } -result {a b c d}
 .t tag delete a b c d
-test textTag-14.2 {SortTags} -constraints haveCourier12 -setup {
+test textTag-14.2 {SortTags} -setup {
     .t tag delete a b c d
 } -body {
     foreach i {a b c d} {
         .t tag configure $i -background black
     }
@@ -1448,21 +1183,21 @@
     }
     .t tag names 2.1
 } -cleanup {
     .t tag delete a b c d
 } -result {a b c d}
-test textTag-14.3 {SortTags} -constraints haveCourier12 -setup {
+test textTag-14.3 {SortTags} -setup {
     .t tag delete {*}[.t tag names]
 } -body {
     for {set i 0} {$i < 30} {incr i} {
         .t tag add x$i 2.0 2.2
     }
     .t tag names 2.1
 } -cleanup {
     .t tag delete {*}[.t tag names]
 } -result {x0 x1 x2 x3 x4 x5 x6 x7 x8 x9 x10 x11 x12 x13 x14 x15 x16 x17 x18 x19 x20 x21 x22 x23 x24 x25 x26 x27 x28 x29}
-test textTag-14.4 {SortTags} -constraints haveCourier12 -setup {
+test textTag-14.4 {SortTags} -setup {
     .t tag delete {*}[.t tag names]
 } -body {
     for {set i 0} {$i < 30} {incr i} {
         .t tag configure x$i -background black
     }
@@ -1473,22 +1208,32 @@
 } -cleanup {
     .t tag delete {*}[.t tag names]
 } -result {x0 x1 x2 x3 x4 x5 x6 x7 x8 x9 x10 x11 x12 x13 x14 x15 x16 x17 x18 x19 x20 x21 x22 x23 x24 x25 x26 x27 x28 x29}
 
 
-
+set curFont [.t cget -font]
+set curWrap [.t cget -wrap]
 set c [.t bbox 2.1]
 set x1 [expr [lindex $c 0] + [lindex $c 2]/2]
 set y1 [expr [lindex $c 1] + [lindex $c 3]/2]
 set c [.t bbox 3.2]
 set x2 [expr [lindex $c 0] + [lindex $c 2]/2]
 set y2 [expr [lindex $c 1] + [lindex $c 3]/2]
 set c [.t bbox 4.3]
 set x3 [expr [lindex $c 0] + [lindex $c 2]/2]
 set y3 [expr [lindex $c 1] + [lindex $c 3]/2]
+.t configure -font $textWidgetFont -wrap none
+update
+set c [.t bbox 2.1]
+set x4 [expr [lindex $c 0] + [lindex $c 2]/2]
+set y4 [expr [lindex $c 1] + [lindex $c 3]/2]
+set c [.t bbox 3.2]
+set x5 [expr [lindex $c 0] + [lindex $c 2]/2]
+set y5 [expr [lindex $c 1] + [lindex $c 3]/2]
+.t configure -font $curFont -wrap $curWrap
 
-test textTag-15.1 {TkTextBindProc} -constraints haveCourier12 -setup {
+test textTag-15.1 {TkTextBindProc} -setup {
     .t tag delete x y
     event generate {} <Motion> -warp 1 -x -1 -y -1; update
 } -body {
     bind .t <ButtonRelease> {lappend x up}
     .t tag bind x <ButtonRelease> {lappend x x-up}
@@ -1509,11 +1254,11 @@
 } -cleanup {
     .t tag delete x y
     bind .t <ButtonRelease> {}
 } -result {x-up up up y-up up}
 
-test textTag-15.2 {TkTextBindProc} -constraints haveCourier12 -setup {
+test textTag-15.2 {TkTextBindProc} -setup {
     .t tag delete x y
     event generate {} <Motion> -warp 1 -x -1 -y -1; update
 } -body {
     .t tag bind x <Enter> {lappend x x-enter}
     .t tag bind x <ButtonPress> {lappend x x-down}
@@ -1537,11 +1282,11 @@
     return $x
 } -cleanup {
     .t tag delete x y
 } -result {x-enter | x-down | | x-up x-leave y-enter}
 
-test textTag-15.3 {TkTextBindProc} -constraints haveCourier12 -setup {
+test textTag-15.3 {TkTextBindProc} -setup {
     .t tag delete x y
     event generate {} <Motion> -warp 1 -x -1 -y -1; update
 } -body {
     .t tag bind x <Enter> {lappend x x-enter}
     .t tag bind x <Any-ButtonPress-1> {lappend x x-down}
@@ -1570,13 +1315,11 @@
 } -cleanup {
     .t tag delete x y
 } -result {x-enter | x-down | | | x-up | x-leave y-enter}
 
 
-test textTag-16.1 {TkTextPickCurrent procedure} -constraints {
-    haveCourier12 
-} -setup {
+test textTag-16.1 {TkTextPickCurrent procedure} -setup {
     .t tag delete {*}[.t tag names]
     event generate {} <Motion> -warp 1 -x -1 -y -1; update
 } -body {
     event gen .t <ButtonRelease-1> -state 0x100 -x $x1 -y $y1
     set x [.t index current]
@@ -1593,29 +1336,29 @@
     event gen .t <ButtonRelease-1> -state 0x100 -x $x3 -y $y3
     lappend x [.t index current]
 } -result {2.1 3.2 3.2 3.2 3.2 3.2 4.3}
 
 test textTag-16.2 {TkTextPickCurrent procedure} -constraints {
-    haveCourier12 
+    haveFontSizes
 } -setup {
     .t tag delete {*}[.t tag names]
     event generate {} <Motion> -warp 1 -x -1 -y -1; update
+    .t configure -font $textWidgetFont -wrap none
 } -body {
     .t tag configure big -font $bigFont
-    event gen .t <ButtonRelease-1> -state 0x100 -x $x1 -y $y1
-    event gen .t <Motion> -x $x2 -y $y2
+    event gen .t <ButtonRelease-1> -state 0x100 -x $x4 -y $y4
+    event gen .t <Motion> -x $x5 -y $y5
     set x [.t index current]
     .t tag add big 3.0
     update
     lappend x [.t index current]
 } -cleanup {
     .t tag delete big
+    .t configure -font $curFont -wrap $curWrap
 } -result {3.2 3.1}
 
-test textTag-16.3 {TkTextPickCurrent procedure} -constraints {
-    haveCourier12 
-} -setup {
+test textTag-16.3 {TkTextPickCurrent procedure} -setup {
     foreach i {a b c d} {
         .t tag remove $i 1.0 end
     }
     event generate {} <Motion> -warp 1 -x -1 -y -1; update
 } -body {
@@ -1638,13 +1381,11 @@
     return $x
 } -cleanup {
     .t tag delete {*}[.t tag names]
 } -result {enter-a enter-b | leave-b enter-c | leave-a leave-c}
 
-test textTag-16.4 {TkTextPickCurrent procedure} -constraints {
-    haveCourier12 
-} -setup {
+test textTag-16.4 {TkTextPickCurrent procedure} -setup {
     foreach i {a b c d} {
         .t tag remove $i 1.0 end
     }
     event generate {} <Motion> -warp 1 -x -1 -y -1; update
 } -body {
@@ -1667,66 +1408,72 @@
 } -cleanup {
     .t tag delete {*}[.t tag names]
 } -result {enter-a enter-b enter-c | leave-c leave-b}
 
 test textTag-16.5 {TkTextPickCurrent procedure} -constraints {
-    haveCourier12 
-} -setup {
-    foreach i {big a b c d} {
-        .t tag remove $i 1.0 end
-    }
-    event generate {} <Motion> -warp 1 -x -1 -y -1; update
-} -body {
-    .t tag configure big -font $bigFont
-    event gen .t <Motion> -x $x1 -y $y1
-    .t tag bind a <Enter> {.t tag add big 3.0 3.2}
-    .t tag add a 3.2
-    event gen .t <Motion> -x $x2 -y $y2
-    .t index current
-} -cleanup {
-    .t tag delete a big
-} -result {3.2}
-
-test textTag-16.6 {TkTextPickCurrent procedure} -constraints {
-    haveCourier12 
-} -setup {
-    foreach i {big a b c d} {
-        .t tag remove $i 1.0 end
-    }
-    event generate {} <Motion> -warp 1 -x -1 -y -1; update
-} -body {
-    .t tag configure big -font $bigFont
-    event gen .t <Motion> -x $x1 -y $y1
-    .t tag bind a <Enter> {.t tag add big 3.0 3.2}
-    .t tag add a 3.2
-    event gen .t <Motion> -x $x2 -y $y2
-    update
-    .t index current
-} -cleanup {
-    .t tag delete a big
-} -result {3.1}
-
-test textTag-16.7 {TkTextPickCurrent procedure} -constraints {
-    haveCourier12 
-} -setup {
-    foreach i {big a b c d} {
-        .t tag remove $i 1.0 end
-    }
-    event generate {} <Motion> -warp 1 -x -1 -y -1; update
-} -body {
-    .t tag configure big -font $bigFont
-    .t tag bind a <Enter> {.t tag add big 3.0 3.2}
-    .t tag add a 3.2
-
-    event gen .t <Motion> -x $x1 -y $y1
-    .t tag bind a <Leave> {.t tag add big 3.0 3.2}
-    .t tag add a 2.1
-    event gen .t <Motion> -x $x2 -y $y2
-    update
-    .t index current
-} -cleanup {
-    .t tag delete a big
+    haveFontSizes
+} -setup {
+    foreach i {big a b c d} {
+        .t tag remove $i 1.0 end
+    }
+    event generate {} <Motion> -warp 1 -x -1 -y -1; update
+    .t configure -font $textWidgetFont -wrap none
+} -body {
+    .t tag configure big -font $bigFont
+    event gen .t <Motion> -x $x4 -y $y4
+    .t tag bind a <Enter> {.t tag add big 3.0 3.2}
+    .t tag add a 3.2
+    event gen .t <Motion> -x $x5 -y $y5
+    .t index current
+} -cleanup {
+    .t tag delete a big
+    .t configure -font $curFont -wrap $curWrap
+} -result {3.2}
+
+test textTag-16.6 {TkTextPickCurrent procedure} -constraints {
+    haveFontSizes
+} -setup {
+    foreach i {big a b c d} {
+        .t tag remove $i 1.0 end
+    }
+    event generate {} <Motion> -warp 1 -x -1 -y -1; update
+    .t configure -font $textWidgetFont -wrap none
+} -body {
+    .t tag configure big -font $bigFont
+    event gen .t <Motion> -x $x4 -y $y4
+    .t tag bind a <Enter> {.t tag add big 3.0 3.2}
+    .t tag add a 3.2
+    event gen .t <Motion> -x $x5 -y $y5
+    update
+    .t index current
+} -cleanup {
+    .t tag delete a big
+    .t configure -font $curFont -wrap $curWrap
+} -result {3.1}
+
+test textTag-16.7 {TkTextPickCurrent procedure} -constraints {
+    haveFontSizes
+} -setup {
+    foreach i {big a b c d} {
+        .t tag remove $i 1.0 end
+    }
+    event generate {} <Motion> -warp 1 -x -1 -y -1; update
+    .t configure -font $textWidgetFont -wrap none
+} -body {
+    .t tag configure big -font $bigFont
+    .t tag bind a <Enter> {.t tag add big 3.0 3.2}
+    .t tag add a 3.2
+
+    event gen .t <Motion> -x $x4 -y $y4
+    .t tag bind a <Leave> {.t tag add big 3.0 3.2}
+    .t tag add a 2.1
+    event gen .t <Motion> -x $x5 -y $y5
+    update
+    .t index current
+} -cleanup {
+    .t tag delete a big
+    .t configure -font $curFont -wrap $curWrap
 } -result {3.1}
 
 
 test textTag-17.1 {insert procedure inserts tags} -setup {
     .t delete 1.0 end
@@ -1744,11 +1491,12 @@
     event generate {} <Motion> -warp 1 -x -1 -y -1; update
 } -body {
     text .t -width 30 -height 4 -relief sunken -borderwidth 10 \
       -highlightthickness 10 -pady 2
     pack .t
-    
+    update ; # map the window, otherwise -warp can't be done
+
     .t insert end " Tag here " TAG " no tag here"
     .t tag configure TAG -borderwidth 4 -relief raised
     .t tag bind TAG <Enter>  {lappend res "%x %y tag-Enter"}
     .t tag bind TAG <Leave>  {lappend res "%x %y tag-Leave"}
     bind .t <Enter> {lappend res Enter}

Index: tests/textWind.test
==================================================================
--- tests/textWind.test
+++ tests/textWind.test
@@ -8,103 +8,130 @@
 
 package require tcltest 2.2
 namespace import ::tcltest::*
 tcltest::configure {*}$argv
 tcltest::loadTestedCommands
-
-# Create entries in the option database to be sure that geometry options
-# like border width have predictable values.
-
-option add *Text.borderWidth 2
-option add *Text.highlightThickness 2
-option add *Text.font {Courier -12}
-
 
 deleteWindows
-# Widget used in tests 1.* - 16.*
-text .t -width 30 -height 6 -bd 2 -highlightthickness 2
-pack append . .t {top expand fill}
+
+set fixedFont {"Courier New" -12}
+set fixedHeight [font metrics $fixedFont -linespace]
+set fixedWidth [font measure $fixedFont m]
+set fixedAscent [font metrics $fixedFont -ascent]
+
+# Widget used in almost all tests
+set tWidth 30
+set tHeight 6
+text .t -width $tWidth -height $tHeight -bd 2 -highlightthickness 2 \
+        -font $fixedFont
+pack .t -expand 1 -fill both
 update
 .t debug on
 
-# 15 on XP, 13 on Solaris 8
-set fixedHeight [font metrics {Courier -12} -linespace]
-set fixedDiff [expr {$fixedHeight - 13}] ;# 2 on XP
 set color [expr {[winfo depth .t] > 1 ? "green" : "black"}]
 
 wm geometry . {}
- 
+
 # The statements below reset the main window;  it's needed if the window
 # manager is mwm to make mwm forget about a previous minimum size setting.
 
 wm withdraw .
 wm minsize . 1 1
 wm positionfrom . user
 wm deiconify .
 
+set bw [.t cget -borderwidth]
+set px [.t cget -padx]
+set py [.t cget -pady]
+set hlth [.t cget -highlightthickness]
+set padx [expr {$bw+$px+$hlth}]
+set pady [expr {$bw+$py+$hlth}]
+
 # ----------------------------------------------------------------------
 
-test textWind-1.1 {basic tests of options} -constraints fonts -setup {
+test textWind-1.1 {basic tests of options} -setup {
     .t delete 1.0 end
 } -body {
     .t insert end "This is the first line"
     .t insert end "\nAnd this is a second line, which wraps around"
     frame .f -width 3 -height 3 -bg $color
     .t window create 2.2 -window .f
     update
     list [winfo ismapped .f] [winfo geom .f] [.t bbox .f] \
         [.t window configure .f -window]
-} -result {1 3x3+19+23 {19 23 3 3} {-window {} {} {} .f}}
-test textWind-1.2 {basic tests of options} -constraints fonts -setup {
+} -result [list \
+    1 \
+    3x3+[expr {$padx+2*$fixedWidth}]+[expr {$pady+$fixedHeight+(($fixedHeight-3)/2)}] \
+    [list [expr {$padx+2*$fixedWidth}] [expr {$pady+$fixedHeight+(($fixedHeight-3)/2)}] 3 3] \
+    {-window {} {} {} .f}]
+
+test textWind-1.2 {basic tests of options} -setup {
     .t delete 1.0 end
 } -body {
     .t insert end "This is the first line"
     .t insert end "\nAnd this is a second line, which wraps around"
     frame .f -width 3 -height 3 -bg $color
     .t window create 2.2 -window .f -align top
     update
     list [winfo ismapped .f] [winfo geom .f] [.t bbox .f] \
         [.t window configure .f -align]
-} -result {1 3x3+19+18 {19 18 3 3} {-align {} {} center top}}
+} -result [list \
+    1 \
+    3x3+[expr {$padx+2*$fixedWidth}]+[expr {$pady+$fixedHeight}] \
+    [list [expr {$padx+2*$fixedWidth}] [expr {$pady+$fixedHeight}] 3 3] \
+    {-align {} {} center top}]
+
 test textWind-1.3 {basic tests of options} -setup {
     .t delete 1.0 end
 } -body {
     .t insert end "This is the first line"
     .t insert end "\nAnd this is a second line, which wraps around"
     .t window create 2.2 -create "Test script"
     .t window configure 2.2 -create
 } -result {-create {} {} {} {Test script}}
-test textWind-1.4 {basic tests of options} -constraints fonts -setup {
+
+test textWind-1.4 {basic tests of options} -setup {
     .t delete 1.0 end
 } -body {
     .t insert end "This is the first line"
     .t insert end "\nAnd this is a second line, which wraps around"
+    # the window .f should be wider than the fixed width
     frame .f -width 10 -height 20 -bg $color
     .t window create 2.2 -window .f -padx 5
     update
     list [winfo geom .f] [.t window configure .f -padx] [.t bbox 2.3]
-} -result {10x20+24+18 {-padx {} {} 0 5} {39 21 7 13}}
-test textWind-1.5 {basic tests of options} -constraints fonts -setup {
+} -result [list \
+    10x20+[expr {$padx+2*$fixedWidth+5}]+[expr {$pady+$fixedHeight}] \
+    {-padx {} {} 0 5} \
+    [list [expr {$padx+2*$fixedWidth+10+2*5}] [expr {$pady+$fixedHeight+((20-$fixedHeight)/2)}] $fixedWidth $fixedHeight]]
+
+test textWind-1.5 {basic tests of options} -setup {
     .t delete 1.0 end
 } -body {
     .t insert end "This is the first line"
     .t insert end "\nAnd this is a second line, which wraps around"
     frame .f -width 10 -height 20 -bg $color
     .t window create 2.2 -window .f -pady 4
     update
     list [winfo geom .f] [.t window configure .f -pady] [.t bbox 2.31]
-} -result {10x20+19+22 {-pady {} {} 0 4} {19 46 7 13}}
-test textWind-1.6 {basic tests of options} -constraints fonts -setup {
+} -result [list \
+    10x20+[expr {$padx+2*$fixedWidth}]+[expr {$pady+$fixedHeight+4}] \
+    {-pady {} {} 0 4} \
+    [list [expr {$padx+2*$fixedWidth}] [expr {$pady+$fixedHeight+20+2*4}] $fixedWidth $fixedHeight]]
+
+test textWind-1.6 {basic tests of options} -setup {
     .t delete 1.0 end
 } -body {
     .t insert end "This is the first line"
     .t insert end "\nAnd this is a second line, which wraps around"
     frame .f -width 5 -height 5 -bg $color
     .t window create 2.2 -window .f -stretch 1
     update
     list [winfo geom .f] [.t window configure .f -stretch]
-} -result {5x13+19+18 {-stretch {} {} 0 1}}
+} -result [list \
+    5x$fixedHeight+[expr {$padx+2*$fixedWidth}]+[expr {$pady+$fixedHeight}] \
+    {-stretch {} {} 0 1}]
 
 
 .t delete 1.0 end
 .t insert end "This is the first line"
 test textWind-2.1 {TkTextWindowCmd procedure} -body {
@@ -299,11 +326,12 @@
     .t window create 1.0 -window .f
     .t window configure 1.0 -foo bar
 } -cleanup {
     destroy .f
 } -returnCodes error -result {unknown option "-foo"}
-test textWind-3.2 {EmbWinConfigure procedure} -constraints fonts -setup {
+
+test textWind-3.2 {EmbWinConfigure procedure} -setup {
     destroy .f
 } -body {
     .t insert 1.0 "Some sample text"
     frame .f -width 10 -height 20 -bg $color
     .t window create 1.3 -window .f
@@ -312,11 +340,12 @@
     update
     .t index .f
 } -cleanup {
     destroy .f
 } -returnCodes error -result {bad text index ".f"}
-test textWind-3.3 {EmbWinConfigure procedure} -constraints fonts -setup {
+
+test textWind-3.3 {EmbWinConfigure procedure} -setup {
     destroy .f
 } -body {
     .t insert 1.0 "Some sample text"
     frame .f -width 10 -height 20 -bg $color
     .t window create 1.3 -window .f
@@ -325,12 +354,14 @@
     update
     catch {.t index .f}
     list [winfo ismapped .f] [.t bbox 1.4]
 } -cleanup {
     destroy .f
-} -result {0 {26 5 7 13}}
-test textWind-3.4 {EmbWinConfigure procedure} -constraints fonts -setup {
+} -result [list 0 \
+    [list [expr {$padx+3*$fixedWidth}] $pady $fixedWidth $fixedHeight]]
+
+test textWind-3.4 {EmbWinConfigure procedure} -setup {
     destroy .t.f
 } -body {
     .t insert 1.0 "Some sample text"
     frame .t.f -width 10 -height 20 -bg $color
     .t window create 1.3 -window .t.f
@@ -339,11 +370,12 @@
     update
     .t index .t.f
 } -cleanup {
     destroy .t.f
 } -returnCodes error -result {bad text index ".t.f"}
-test textWind-3.5 {EmbWinConfigure procedure} -constraints fonts -setup {
+
+test textWind-3.5 {EmbWinConfigure procedure} -setup {
     destroy .t.f
 } -body {
     .t insert 1.0 "Some sample text"
     frame .t.f -width 10 -height 20 -bg $color
     .t window create 1.3 -window .t.f
@@ -352,12 +384,14 @@
     update
     catch {.t index .t.f}
     list [winfo ismapped .t.f] [.t bbox 1.4]
 } -cleanup {
     destroy .t.f
-} -result {0 {26 5 7 13}}
-test textWind-3.6 {EmbWinConfigure procedure} -constraints fonts -setup {
+} -result [list 0 \
+    [list [expr {$padx+3*$fixedWidth}] $pady $fixedWidth $fixedHeight]]
+
+test textWind-3.6 {EmbWinConfigure procedure} -setup {
     destroy .f
 } -body {
     .t insert 1.0 "Some sample text"
     frame .f -width 10 -height 20 -bg $color
     .t window create 1.3
@@ -365,11 +399,13 @@
     .t window configure 1.3 -window .f
     update
     list [catch {.t index .f} msg] $msg [winfo ismapped .f] [.t bbox 1.4]
 } -cleanup {
     destroy .f
-} -result {0 1.3 1 {36 8 7 13}}
+} -result [list 0 1.3 1 \
+    [list [expr {$padx+3*$fixedWidth+10}] [expr {$pady+((20-$fixedHeight)/2)}] $fixedWidth $fixedHeight]]
+
 test textWind-3.7 {EmbWinConfigure procedure} -setup {
     destroy .f
 } -body {
     .t insert 1.0 "Some sample text"
     frame .f
@@ -448,12 +484,11 @@
     .t window configure 1.0 -align top
     catch {.t window configure 1.0 -align gorp}
     .t window configure 1.0 -align
 } -result {-align {} {} center top}
 
-
-test textWind-5.1 {EmbWinStructureProc procedure} -constraints fonts -setup {
+test textWind-5.1 {EmbWinStructureProc procedure} -setup {
     .t delete 1.0 end
     destroy .f
 } -body {
     .t insert 1.0 "Some sample text"
     frame .f -width 10 -height 20 -bg $color
@@ -460,11 +495,12 @@
     .t window create 1.2 -window .f
     update
     destroy .f
     .t index .f
 } -returnCodes error -result {bad text index ".f"}
-test textWind-5.2 {EmbWinStructureProc procedure} -constraints fonts -setup {
+
+test textWind-5.2 {EmbWinStructureProc procedure} -setup {
     .t delete 1.0 end
     destroy .f
 } -body {
     .t insert 1.0 "Some sample text"
     frame .f -width 10 -height 20 -bg $color
@@ -471,12 +507,15 @@
     .t window create 1.2 -window .f
     update
     destroy .f
     catch {.t index .f}
     list [.t bbox 1.2] [.t bbox 1.3]
-} -result {{19 11 0 0} {19 5 7 13}}
-test textWind-5.3 {EmbWinStructureProc procedure} -constraints fonts -setup {
+} -result [list \
+    [list [expr {$padx+2*$fixedWidth}] [expr {$pady+($fixedHeight/2)}] 0 0] \
+    [list [expr {$padx+2*$fixedWidth}] $pady $fixedWidth $fixedHeight]]
+
+test textWind-5.3 {EmbWinStructureProc procedure} -setup {
     .t delete 1.0 end
     destroy .f
 } -body {
     .t insert 1.0 "Some sample text"
     frame .f -width 10 -height 20 -bg $color
@@ -484,11 +523,12 @@
     .t window configure 1.2 -window .f
     update
     destroy .f
     .t index .f
 } -returnCodes error -result {bad text index ".f"}
-test textWind-5.4 {EmbWinStructureProc procedure} -constraints fonts -setup {
+
+test textWind-5.4 {EmbWinStructureProc procedure} -setup {
     .t delete 1.0 end
 } -body {
     .t insert 1.0 "Some sample text"
     frame .f -width 10 -height 20 -bg $color
     .t window create 1.2 -align bottom
@@ -495,12 +535,15 @@
     .t window configure 1.2 -window .f
     update
     destroy .f
     catch {.t index .f}
     list [.t bbox 1.2] [.t bbox 1.3]
-} -result {{19 18 0 0} {19 5 7 13}}
-test textWind-5.5 {EmbWinStructureProc procedure} -constraints fonts -setup {
+} -result [list \
+    [list [expr {$padx+2*$fixedWidth}] [expr {$pady+$fixedHeight}] 0 0] \
+    [list [expr {$padx+2*$fixedWidth}] $pady $fixedWidth $fixedHeight]]
+
+test textWind-5.5 {EmbWinStructureProc procedure} -setup {
     .t delete 1.0 end
     destroy .f
 } -body {
     .t insert 1.0 "Some sample text"
     .t window create 1.2 -create {frame .f -width 10 -height 20 -bg $color}
@@ -507,14 +550,16 @@
     update
     .t window configure 1.2 -create {frame .f -width 20 -height 10 -bg $color}
     destroy .f
     update
     list [catch {.t index .f} msg] $msg [.t bbox 1.2] [.t bbox 1.3]
-} -result {0 1.2 {19 6 20 10} {39 5 7 13}}
+} -result [list 0 1.2 \
+    [list [expr {$padx+2*$fixedWidth}] [expr {$pady+(($fixedHeight-10)/2)}] 20 10] \
+    [list [expr {$padx+2*$fixedWidth+20}] $pady $fixedWidth $fixedHeight]]
 
 
-test textWind-6.1 {EmbWinRequestProc procedure} -constraints fonts -setup {
+test textWind-6.1 {EmbWinRequestProc procedure} -setup {
     .t delete 1.0 end
     destroy .f
     set result {}
 } -body {
     .t insert 1.0 "Some sample text"
@@ -523,16 +568,18 @@
     lappend result [.t bbox 1.2] [.t bbox 1.3]
     .f configure -width 25 -height 30
     lappend result [.t bbox 1.2] [.t bbox 1.3]
 } -cleanup {
     destroy .f
-} -result {{19 5 10 20} {29 8 7 13} {19 5 25 30} {44 13 7 13}}
+} -result [list \
+    [list [expr {$padx+2*$fixedWidth}] $pady 10 20] \
+    [list [expr {$padx+2*$fixedWidth+10}] [expr {$pady+((20-$fixedHeight)/2)}] $fixedWidth $fixedHeight] \
+    [list [expr {$padx+2*$fixedWidth}] $pady 25 30] \
+    [list [expr {$padx+2*$fixedWidth+25}] [expr {$pady+((30-$fixedHeight)/2)}] $fixedWidth $fixedHeight]]
 
 
-test textWind-7.1 {EmbWinLostSlaveProc procedure} -constraints {
-    textfonts
-} -setup {
+test textWind-7.1 {EmbWinLostSlaveProc procedure} -setup {
     .t delete 1.0 end
     destroy .f
 } -body {
     .t insert 1.0 "Some sample text"
     frame .f -width 10 -height 20 -bg $color
@@ -541,14 +588,15 @@
     place .f -in .t -x 100 -y 50
     update
     list [winfo geom .f] [.t bbox 1.2]
 } -cleanup {
     destroy .f
-} -result [list 10x20+105+55 [list 19 [expr {11+$fixedDiff/2}] 0 0]]
-test textWind-7.2 {EmbWinLostSlaveProc procedure} -constraints {
-    textfonts
-} -setup {
+} -result [list \
+    10x20+[expr {$padx+100}]+[expr {$pady+50}] \
+    [list [expr {$padx+2*$fixedWidth}] [expr {$pady+($fixedHeight/2)}] 0 0]]
+
+test textWind-7.2 {EmbWinLostSlaveProc procedure} -setup {
     .t delete 1.0 end
     destroy .t.f
 } -body {
     .t insert 1.0 "Some sample text"
     frame .t.f -width 10 -height 20 -bg $color
@@ -557,14 +605,15 @@
     place .t.f -x 100 -y 50
     update
     list [winfo geom .t.f] [.t bbox 1.2]
 } -cleanup {
     destroy .t.f
-} -result [list 10x20+105+55 [list 19 [expr {11+$fixedDiff/2}] 0 0]]
-
+} -result [list \
+    10x20+[expr {$padx+100}]+[expr {$pady+50}] \
+    [list [expr {$padx+2*$fixedWidth}] [expr {$pady+($fixedHeight/2)}] 0 0]]
 
-test textWind-8.1 {EmbWinDeleteProc procedure} -constraints fonts -setup {
+test textWind-8.1 {EmbWinDeleteProc procedure} -setup {
     .t delete 1.0 end
     destroy .f
 } -body {
     .t insert 1.0 "Some sample text"
     frame .f -width 10 -height 20 -bg $color
@@ -571,12 +620,16 @@
     .t window create 1.2 -window .f
     bind .f <Destroy> {set x destroyed}
     set x XXX
     .t delete 1.2
     list $x [.t bbox 1.2] [.t bbox 1.3] [winfo exists .f]
-} -result {destroyed {19 5 7 13} {26 5 7 13} 0}
-test textWind-8.2 {EmbWinDeleteProc procedure} -constraints fonts -setup {
+} -result [list destroyed \
+    [list [expr {$padx+2*$fixedWidth}] $pady $fixedWidth $fixedHeight] \
+    [list [expr {$padx+3*$fixedWidth}] $pady $fixedWidth $fixedHeight] \
+    0]
+
+test textWind-8.2 {EmbWinDeleteProc procedure} -setup {
     .t delete 1.0 end
     destroy .f
 } -body {
     .t insert 1.0 "Some sample text"
     frame .f -width 10 -height 20 -bg $color
@@ -613,32 +666,32 @@
     update
     list [winfo exists .f] [winfo width .f] [winfo height .f] [.t index .f]
 } -cleanup {
     destroy .f
 } -result {1 10 20 1.5}
-test textWind-10.2 {EmbWinLayoutProc procedure, error in creating window} -constraints {
-    fonts
-} -setup {
+
+test textWind-10.2 {EmbWinLayoutProc procedure, error in creating window} -setup {
     .t delete 1.0 end
     proc bgerror args {
         global msg
         set msg $args
     }
 } -body {
     .t insert 1.0 "Some sample text"
-        .t window create 1.5 -create {
+    .t window create 1.5 -create {
         error "couldn't create window"
     }
     set msg xyzzy
     update
     list $msg [.t bbox 1.5]
 } -cleanup {
     rename bgerror {}
-} -result {{{couldn't create window}} {40 11 0 0}}
-test textWind-10.3 {EmbWinLayoutProc procedure, error in creating window} -constraints {
-    fonts
-} -setup {
+} -result [list \
+    {{couldn't create window}} \
+    [list [expr {$padx+5*$fixedWidth}] [expr {$pady+($fixedHeight/2)}] 0 0]]
+
+test textWind-10.3 {EmbWinLayoutProc procedure, error in creating window} -setup {
     .t delete 1.0 end
     proc bgerror args {
         global msg
         set msg $args
     }
@@ -650,30 +703,20 @@
     set msg xyzzy
     update
     list $msg [.t bbox 1.5]
 } -cleanup {
     rename bgerror {}
-} -result {{{bad window path name "gorp"}} {40 11 0 0}}
+} -result [list \
+    {{bad window path name "gorp"}} \
+    [list [expr {$padx+5*$fixedWidth}] [expr {$pady+($fixedHeight/2)}] 0 0]]
+
+test textWind-10.4 {EmbWinLayoutProc procedure, error in creating window} -setup {
     .t delete 1.0 end
     destroy .t.f
     proc bgerror args {
         global msg
-        if {[lsearch -exact $msg $args] == -1} {
-            lappend msg $args
-        }
-    }
-
-test textWind-10.4 {EmbWinLayoutProc procedure, error in creating window} -constraints {
-    textfonts
-} -setup {
-    .t delete 1.0 end
-    destroy .t.f
-    proc bgerror args {
-        global msg
-        if {[lsearch -exact $msg $args] == -1} {
-            lappend msg $args
-        }
+	lappend msg $args
     }
 } -body {
     .t insert 1.0 "Some sample text"
     set msg {}
     after idle {
@@ -691,21 +734,21 @@
     }
     lappend msg [.t bbox 1.5] [winfo exists .t.f.f]
 } -cleanup {
     destroy .t.f
     rename bgerror {}
-} -result [list {{can't embed .t.f.f relative to .t}} {{window name "f" already exists in parent}} [list 40 [expr {11+$fixedDiff/2}] 0 0] 1]
-test textWind-10.5 {EmbWinLayoutProc procedure, error in creating window} -constraints {
-    textfonts
-} -setup {
+} -result [list \
+    {{can't embed .t.f.f relative to .t}} {{window name "f" already exists in parent}} \
+    [list [expr {$padx+5*$fixedWidth}] [expr {$pady+($fixedHeight/2)}] 0 0] \
+    1]
+
+test textWind-10.5 {EmbWinLayoutProc procedure, error in creating window} -setup {
     .t delete 1.0 end
     destroy .t.f
     proc bgerror args {
         global msg
-        if {[lsearch -exact $msg $args] == -1} {
-            lappend msg $args
-        }
+	lappend msg $args
     }
 } -body {
     .t insert 1.0 "Some sample text"
     .t window create 1.5 -create {
         frame .t.f
@@ -716,42 +759,40 @@
     lappend msg [winfo exists .t.f.f]
 } -cleanup {
     destroy .t.f
     rename bgerror {}
 } -result {{{can't embed .t.f.f relative to .t}} 1}
-catch {destroy .t.f}
-test textWind-10.6 {EmbWinLayoutProc procedure, error in creating window} -constraints {
-    textfonts
-} -setup {
+
+test textWind-10.6 {EmbWinLayoutProc procedure, error in creating window} -setup {
     .t delete 1.0 end
     proc bgerror args {
         global msg
         if {[lsearch -exact $msg $args] == -1} {
             lappend msg $args
         }
     }
 } -body {
     .t insert 1.0 "Some sample text"
+    update
     .t window create 1.5 -create {
         concat .t
     }
     set msg {}
     update
     lappend msg [.t bbox 1.5]
 } -cleanup {
     rename bgerror {}
-} -result [list {{can't embed .t relative to .t}} [list 40 [expr {11+$fixedDiff/2}] 0 0]]
-test textWind-10.7 {EmbWinLayoutProc procedure, error in creating window} -constraints {
-    textfonts
-} -setup {
+} -result [list \
+    {{can't embed .t relative to .t}} \
+    [list [expr {$padx+5*$fixedWidth}] [expr {$pady+($fixedHeight/2)}] 0 0]]
+
+test textWind-10.7 {EmbWinLayoutProc procedure, error in creating window} -setup {
     .t delete 1.0 end
     destroy .t2
     proc bgerror args {
         global msg
-        if {[lsearch -exact $msg $args] == -1} {
-            lappend msg $args
-        }
+	lappend msg $args
     }
 } -body {
     .t insert 1.0 "Some sample text"
     .t window create 1.5 -create {
         toplevel .t2 -width 100 -height 150
@@ -761,19 +802,20 @@
     set msg {}
     update
     lappend msg [.t bbox 1.5]
 } -cleanup {
     rename bgerror {}
-} -result [list {{can't embed .t2 relative to .t}} {{window name "t2" already exists in parent}} [list 40 [expr {11+$fixedDiff/2}] 0 0]]
+} -result [list \
+    {{can't embed .t2 relative to .t}} {{window name "t2" already exists in parent}} \
+    [list [expr {$padx+5*$fixedWidth}] [expr {$pady+($fixedHeight/2)}] 0 0]]
+
 test textWind-10.8 {EmbWinLayoutProc procedure, error in creating window} -setup {
     .t delete 1.0 end
     destroy .t2
     proc bgerror args {
         global msg
-        if {[lsearch -exact $msg $args] == -1} {
-            lappend msg $args
-        }
+	lappend msg $args
     }
 } -body {
     .t insert 1.0 "Some sample text"
     .t window create 1.5 -create {
         toplevel .t2 -width 100 -height 150
@@ -802,13 +844,12 @@
     update
     .t index .t.b
 } -cleanup {
     destroy .t.b
 } -result {1.3}
-test textWind-10.10 {EmbWinLayoutProc procedure, doesn't fit on line} -constraints {
-    fonts
-} -setup {
+
+test textWind-10.10 {EmbWinLayoutProc procedure, doesn't fit on line} -setup {
     .t delete 1.0 end
     destroy .f
 } -body {
     .t configure -wrap char
     .t insert 1.0 "Some sample text"
@@ -815,14 +856,15 @@
     frame .f -width 125 -height 20 -bg $color -bd 2 -relief raised
     .t window create 1.12 -window .f
     list [.t bbox .f] [.t bbox 1.13]
 } -cleanup {
     destroy .f
-} -result {{89 5 126 20} {5 25 7 13}}
-test textWind-10.11 {EmbWinLayoutProc procedure, doesn't fit on line} -constraints {
-    fonts
-} -setup {
+} -result [list \
+    [list [expr {$padx+12*$fixedWidth}] $pady [expr {$tWidth*$fixedWidth-12*$fixedWidth}] 20] \
+    [list $padx [expr {$pady+20}] $fixedWidth $fixedHeight]]
+
+test textWind-10.11 {EmbWinLayoutProc procedure, doesn't fit on line} -setup {
     .t delete 1.0 end
     destroy .f
 } -body {
     .t configure -wrap char
     .t insert 1.0 "Some sample text"
@@ -830,14 +872,15 @@
     .t window create 1.12 -window .f
     update
     list [.t bbox .f] [.t bbox 1.13]
 } -cleanup {
     destroy .f
-} -result {{89 5 126 20} {5 25 7 13}}
-test textWind-10.12 {EmbWinLayoutProc procedure, doesn't fit on line} -constraints {
-    fonts
-} -setup {
+} -result [list \
+    [list [expr {$padx+12*$fixedWidth}] $pady [expr {$tWidth*$fixedWidth-12*$fixedWidth}] 20] \
+    [list $padx [expr {$pady+20}] $fixedWidth $fixedHeight]]
+
+test textWind-10.12 {EmbWinLayoutProc procedure, doesn't fit on line} -setup {
     .t delete 1.0 end
     destroy .f
 } -body {
     .t configure -wrap char
     .t insert 1.0 "Some sample text"
@@ -845,11 +888,14 @@
     .t window create 1.12 -window .f
     update
     list [.t bbox .f] [.t bbox 1.13]
 } -cleanup {
     destroy .f
-} -result {{5 18 127 20} {132 21 7 13}}
+} -result [list \
+    [list $padx [expr {$pady+$fixedHeight}] 127 20] \
+    [list [expr {$padx+127}] [expr {$pady+$fixedHeight+((20-$fixedHeight)/2)}] $fixedWidth $fixedHeight]]
+
 test textWind-10.13 {EmbWinLayoutProc procedure, doesn't fit on line} -setup {
     .t delete 1.0 end
     destroy .f
 } -body {
     .t configure -wrap none
@@ -858,14 +904,15 @@
     .t window create 1.12 -window .f
     update
     list [.t bbox .f] [.t bbox 1.13]
 } -cleanup {
     destroy .f
-} -result {{89 5 126 20} {}}
-test textWind-10.14 {EmbWinLayoutProc procedure, doesn't fit on line} -constraints {
-    fonts
-} -setup {
+} -result [list \
+    [list [expr {$padx+12*$fixedWidth}] $pady [expr {$tWidth*$fixedWidth-12*$fixedWidth}] 20] \
+    {}]
+
+test textWind-10.14 {EmbWinLayoutProc procedure, doesn't fit on line} -setup {
     .t delete 1.0 end
     destroy .f
 } -body {
     .t configure -wrap none
     .t insert 1.0 "Some sample text"
@@ -873,14 +920,15 @@
     .t window create 1.12 -window .f
     update
     list [.t bbox .f] [.t bbox 1.13]
 } -cleanup {
     destroy .f
-} -result {{89 5 126 78} {}}
-test textWind-10.15 {EmbWinLayoutProc procedure, doesn't fit on line} -constraints {
-    fonts
-} -setup {
+} -result [list \
+    [list [expr {$padx+12*$fixedWidth}] $pady [expr {$tWidth*$fixedWidth-12*$fixedWidth}] [expr {$tHeight*$fixedHeight}]] \
+    {}]
+
+test textWind-10.15 {EmbWinLayoutProc procedure, doesn't fit on line} -setup {
     .t delete 1.0 end
     destroy .f
 } -body {
     .t configure -wrap char
     .t insert 1.0 "Some sample text"
@@ -888,12 +936,13 @@
     .t window create 1.12 -window .f
     update
     list [.t bbox .f] [.t bbox 1.13]
 } -cleanup {
     destroy .f
-} -result {{5 18 210 65} {}}
-
+} -result [list \
+    [list $padx [expr {$pady+$fixedHeight}] [expr {$tWidth*$fixedWidth}] [expr {($tHeight-1)*$fixedHeight}]] \
+    {}]
 
 test textWind-11.1 {EmbWinDisplayProc procedure, geometry transforms} -setup {
     .t delete 1.0 end
     destroy .f
     place forget .t
@@ -907,11 +956,12 @@
     update
     winfo geom .f
 } -cleanup {
     destroy .f
     place forget .t
-} -result {30x20+119+55}
+} -result [list 30x20+[expr {$padx+30+12*$fixedWidth}]+[expr {$pady+50}]]
+
 test textWind-11.2 {EmbWinDisplayProc procedure, geometry transforms} -setup {
     .t delete 1.0 end
     destroy .t.f
     place forget .t
     pack .t
@@ -925,11 +975,12 @@
     winfo geom .t.f
 } -cleanup {
     destroy .t.f
     place forget .t
     pack .t
-} -result {30x20+89+5}
+} -result [list 30x20+[expr {$padx+12*$fixedWidth}]+$pady]
+
 test textWind-11.3 {EmbWinDisplayProc procedure, configuration optimization} -setup {
     .t delete 1.0 end
     destroy .f
     place forget .t
     pack .t
@@ -947,13 +998,12 @@
 } -cleanup {
     destroy .f
     place forget .t
     pack .t
 } -result {no configures}
-test textWind-11.4 {EmbWinDisplayProc procedure, horizontal scrolling} -constraints {
-    fonts
-} -setup {
+
+test textWind-11.4 {EmbWinDisplayProc procedure, horizontal scrolling} -setup {
     .t delete 1.0 end
     destroy .f .f2
 } -body {
     .t insert 1.0 "xyzzy\nFirst window here: "
     .t configure -wrap none
@@ -967,14 +1017,16 @@
     .t xview scroll 5 units
     update
     list [winfo ismapped .f] [winfo geom .f] [.t bbox .f] [winfo ismapped .f2]
 } -cleanup {
     destroy .f .f2
-} -result {1 30x20+103+18 {103 18 30 20} 0}
-test textWind-11.5 {EmbWinDisplayProc procedure, horizontal scrolling} -constraints {
-    fonts
-} -setup {
+} -result [list 1 \
+    30x20+[expr {$padx+14*$fixedWidth}]+[expr {$pady+$fixedHeight}] \
+    [list [expr {$padx+14*$fixedWidth}] [expr {$pady+$fixedHeight}] 30 20] \
+    0]
+
+test textWind-11.5 {EmbWinDisplayProc procedure, horizontal scrolling} -setup {
     .t delete 1.0 end
     destroy .f .f2
 } -body {
     .t insert 1.0 "xyzzy\nFirst window here: "
     .t configure -wrap none
@@ -988,14 +1040,15 @@
     .t xview moveto 0
     .t xview scroll 25 units
     update
     list [winfo ismapped .f] [winfo ismapped .f2] [winfo geom .f2] [.t bbox .f2]
 } -cleanup {
-    destroy .f .f2
-} -result {0 1 40x10+119+23 {119 23 40 10}}
-.t configure -wrap char
-
+  destroy .f .f2
+  .t configure -wrap char
+} -result [list 0 1 \
+    40x10+[expr {$padx+37*$fixedWidth+30-25*$fixedWidth}]+[expr {$pady+$fixedHeight+((20-10)/2)}] \
+    [list [expr {$padx+37*$fixedWidth+30-25*$fixedWidth}] [expr {$pady+$fixedHeight+((20-10)/2)}] 40 10]]
 
 test textWind-12.1 {EmbWinUndisplayProc procedure, mapping/unmapping} -setup {
     .t delete 1.0 end
     destroy .f
 } -body {
@@ -1033,12 +1086,15 @@
     .t window create 1.2 -window .f -align top -padx 2 -pady 1
     update
     list [winfo geom .f] [.t bbox .f]
 } -cleanup {
     destroy .f
-} -result {5x5+21+6 {21 6 5 5}}
-test textWind-13.2 {EmbWinBboxProc procedure} -constraints fonts -setup {
+} -result [list \
+    5x5+[expr {$padx+2*$fixedWidth+2}]+[expr {$pady+1}] \
+    [list [expr {$padx+2*$fixedWidth+2}] [expr {$pady+1}] 5 5]]
+
+test textWind-13.2 {EmbWinBboxProc procedure} -setup {
     .t delete 1.0 end
     destroy .f
 } -body {
     .t insert 1.0 "Some sample text"
     frame .f -width 5 -height 5 -bg $color
@@ -1045,12 +1101,15 @@
     .t window create 1.2 -window .f -align center -padx 2 -pady 1
     update
     list [winfo geom .f] [.t bbox .f]
 } -cleanup {
     destroy .f
-} -result {5x5+21+9 {21 9 5 5}}
-test textWind-13.3 {EmbWinBboxProc procedure} -constraints fonts -setup {
+} -result [list \
+    5x5+[expr {$padx+2*$fixedWidth+2}]+[expr {$pady+1+(($fixedHeight-7)/2)}] \
+    [list [expr {$padx+2*$fixedWidth+2}] [expr {$pady+1+(($fixedHeight-7)/2)}] 5 5]]
+
+test textWind-13.3 {EmbWinBboxProc procedure} -setup {
     .t delete 1.0 end
     destroy .f
 } -body {
     .t insert 1.0 "Some sample text"
     frame .f -width 5 -height 5 -bg $color
@@ -1057,12 +1116,15 @@
     .t window create 1.2 -window .f -align baseline -padx 2 -pady 1
     update
     list [winfo geom .f] [.t bbox .f]
 } -cleanup {
     destroy .f
-} -result {5x5+21+10 {21 10 5 5}}
-test textWind-13.4 {EmbWinBboxProc procedure} -constraints fonts -setup {
+} -result [list \
+    5x5+[expr {$padx+2*$fixedWidth+2}]+[expr {$pady+1+($fixedAscent-6)}] \
+    [list [expr {$padx+2*$fixedWidth+2}] [expr {$pady+1+($fixedAscent-6)}] 5 5]]
+
+test textWind-13.4 {EmbWinBboxProc procedure} -setup {
     .t delete 1.0 end
     destroy .f
 } -body {
     .t insert 1.0 "Some sample text"
     frame .f -width 5 -height 5 -bg $color
@@ -1069,12 +1131,15 @@
     .t window create 1.2 -window .f -align bottom -padx 2 -pady 1
     update
     list [winfo geom .f] [.t bbox .f]
 } -cleanup {
     destroy .f
-} -result {5x5+21+12 {21 12 5 5}}
-test textWind-13.5 {EmbWinBboxProc procedure} -constraints fonts -setup {
+} -result [list \
+    5x5+[expr {$padx+2*$fixedWidth+2}]+[expr {$pady+1+($fixedHeight-7)}] \
+    [list [expr {$padx+2*$fixedWidth+2}] [expr {$pady+1+($fixedHeight-7)}] 5 5]]
+
+test textWind-13.5 {EmbWinBboxProc procedure} -setup {
     .t delete 1.0 end
     destroy .f
 } -body {
     .t insert 1.0 "Some sample text"
     frame .f -width 5 -height 5 -bg $color
@@ -1081,12 +1146,15 @@
     .t window create 1.2 -window .f -align top -padx 2 -pady 1 -stretch 1
     update
     list [winfo geom .f] [.t bbox .f]
 } -cleanup {
     destroy .f
-} -result {5x11+21+6 {21 6 5 11}}
-test textWind-13.6 {EmbWinBboxProc procedure} -constraints fonts -setup {
+} -result [list \
+    5x[expr {$fixedHeight-2}]+[expr {$padx+2*$fixedWidth+2}]+[expr {$pady+1}] \
+    [list [expr {$padx+2*$fixedWidth+2}] [expr {$pady+1}] 5 [expr {$fixedHeight-2}]]]
+
+test textWind-13.6 {EmbWinBboxProc procedure} -setup {
     .t delete 1.0 end
     destroy .f
 } -body {
     .t insert 1.0 "Some sample text"
     frame .f -width 5 -height 5 -bg $color
@@ -1093,12 +1161,15 @@
     .t window create 1.2 -window .f -align center -padx 2 -pady 1 -stretch 1
     update
     list [winfo geom .f] [.t bbox .f]
 } -cleanup {
     destroy .f
-} -result {5x11+21+6 {21 6 5 11}}
-test textWind-13.7 {EmbWinBboxProc procedure} -constraints fonts -setup {
+} -result [list \
+    5x[expr {$fixedHeight-2}]+[expr {$padx+2*$fixedWidth+2}]+[expr {$pady+1}] \
+    [list [expr {$padx+2*$fixedWidth+2}] [expr {$pady+1}] 5 [expr {$fixedHeight-2}]]]
+
+test textWind-13.7 {EmbWinBboxProc procedure} -setup {
     .t delete 1.0 end
     destroy .f
 } -body {
     .t insert 1.0 "Some sample text"
     frame .f -width 5 -height 5 -bg $color
@@ -1105,12 +1176,15 @@
     .t window create 1.2 -window .f -align baseline -padx 2 -pady 1 -stretch 1
     update
     list [winfo geom .f] [.t bbox .f]
 } -cleanup {
     destroy .f
-} -result {5x9+21+6 {21 6 5 9}}
-test textWind-13.8 {EmbWinBboxProc procedure} -constraints fonts -setup {
+} -result [list \
+    5x[expr {$fixedAscent-1}]+[expr {$padx+2*$fixedWidth+2}]+[expr {$pady+1}] \
+    [list [expr {$padx+2*$fixedWidth+2}] [expr {$pady+1}] 5 [expr {$fixedAscent-1}]]]
+
+test textWind-13.8 {EmbWinBboxProc procedure} -setup {
     .t delete 1.0 end
     destroy .f
 } -body {
     .t insert 1.0 "Some sample text"
     frame .f -width 5 -height 5 -bg $color
@@ -1117,14 +1191,15 @@
     .t window create 1.2 -window .f -align bottom -padx 2 -pady 1 -stretch 1
     update
     list [winfo geom .f] [.t bbox .f]
 } -cleanup {
     destroy .f
-} -result {5x11+21+6 {21 6 5 11}}
-test textWind-13.9 {EmbWinBboxProc procedure, spacing options} -constraints {
-    fonts
-} -setup {
+} -result [list \
+    5x[expr {$fixedHeight-2}]+[expr {$padx+2*$fixedWidth+2}]+[expr {$pady+1}] \
+    [list [expr {$padx+2*$fixedWidth+2}] [expr {$pady+1}] 5 [expr {$fixedHeight-2}]]]
+
+test textWind-13.9 {EmbWinBboxProc procedure, spacing options} -setup {
     .t delete 1.0 end
     destroy .f
 } -body {
     .t configure -spacing1 5 -spacing3 2
     .t delete 1.0 end
@@ -1132,12 +1207,15 @@
     frame .f -width 5 -height 5 -bg $color
     .t window create 1.2 -window .f -align center -padx 2 -pady 1
     update
     list [winfo geom .f] [.t bbox .f]
 } -cleanup {
+    .t configure -spacing1 0 -spacing3 0
     destroy .f
-} -result {5x5+21+14 {21 14 5 5}}
+} -result [list \
+    5x5+[expr {$padx+2*$fixedWidth+2}]+[expr {$pady+5+(($fixedHeight-5)/2)}] \
+    [list [expr {$padx+2*$fixedWidth+2}] [expr {$pady+5+(($fixedHeight-5)/2)}] 5 5]]
 
 
 test textWind-14.1 {EmbWinDelayedUnmap procedure} -setup {
     .t delete 1.0 end
     destroy .f
@@ -1155,10 +1233,11 @@
     update
     return $x
 } -cleanup {
     destroy .f
 } -result {modified removed unmapped updated}
+
 test textWind-14.2 {EmbWinDelayedUnmap procedure} -setup {
     .t delete 1.0 end
     destroy .f
 } -body {
     .t insert 1.0 "Some sample text"
@@ -1174,10 +1253,11 @@
     update
     return $x
 } -cleanup {
     destroy .f
 } -result {modified deleted updated}
+
 test textWind-14.3 {EmbWinDelayedUnmap procedure} -setup {
     .t delete 1.0 end
     destroy .f
 } -body {
     .t insert 1.0 "Some sample text\nAnother line\n3\n4\n5\n6\n7\n8\n9"
@@ -1189,10 +1269,11 @@
     update ; after 10
     list $result [winfo ismapped .f]
 } -cleanup {
     destroy .f
 } -result {1 0}
+
 test textWind-14.4 {EmbWinDelayedUnmap procedure} -setup {
     .t delete 1.0 end
     destroy .t.f
 } -body {
     .t insert 1.0 "Some sample text\nAnother line\n3\n4\n5\n6\n7\n8\n9"
@@ -1205,17 +1286,17 @@
     list $result [winfo ismapped .t.f]
 } -cleanup {
     destroy .t.f
 } -result {1 0}
 
-
 test textWind-15.1 {TkTextWindowIndex procedure} -setup {
     .t delete 1.0 end
 } -body {
     .t index .foo
 } -returnCodes error -result {bad text index ".foo"}
-test textWind-15.2 {TkTextWindowIndex procedure} -constraints fonts -setup {
+
+test textWind-15.2 {TkTextWindowIndex procedure} -setup {
     .t delete 1.0 end
     destroy .f
 } -body {
     .t configure -spacing1 0 -spacing2 0 -spacing3 0 \
         -wrap none
@@ -1225,11 +1306,12 @@
     .t tag add a 1.1
     .t tag add a 1.3
     list [.t index .f] [.t bbox 1.7]
 } -cleanup {
     destroy .f
-} -result {1.6 {77 8 7 13}}
+} -result [list 1.6 \
+    [list [expr {$padx+6*$fixedWidth+30}] [expr {$pady+((20-$fixedHeight)/2)}] $fixedWidth $fixedHeight]]
 
 
 test textWind-16.1 {EmbWinTextStructureProc procedure} -setup {
     .t delete 1.0 end
     destroy .f
@@ -1243,10 +1325,11 @@
     update
     winfo ismapped .f
 } -cleanup {
     pack .t
 } -result 0
+
 test textWind-16.2 {EmbWinTextStructureProc procedure} -setup {
     .t delete 1.0 end
     destroy .f .f2
 } -body {
     .t configure -spacing1 0 -spacing2 0 -spacing3 0 \
@@ -1261,11 +1344,16 @@
     pack .f2 -before .t
     update
     lappend result [winfo geom .f] [.t bbox .f]
 } -cleanup {
     destroy .f .f2
-} -result {30x20+47+5 {47 5 30 20} 30x20+47+35 {47 5 30 20}}
+} -result [list \
+    30x20+[expr {$padx+6*$fixedWidth}]+$pady \
+    [list [expr {$padx+6*$fixedWidth}] $pady 30 20] \
+    30x20+[expr {$padx+6*$fixedWidth}]+[expr {$pady+30}] \
+    [list [expr {$padx+6*$fixedWidth}] $pady 30 20]]
+
 test textWind-16.3 {EmbWinTextStructureProc procedure} -setup {
     .t delete 1.0 end
 } -body {
     .t configure -wrap none
     .t insert 1.0 "Some sample text"
@@ -1274,10 +1362,11 @@
     pack forget .t
     update
 } -cleanup {
     pack .t
 } -result {}
+
 test textWind-16.4 {EmbWinTextStructureProc procedure} -setup {
     .t delete 1.0 end
 } -body {
     .t configure -spacing1 0 -spacing2 0 -spacing3 0 \
         -wrap none
@@ -1288,11 +1377,11 @@
     pack forget .t
     update
     list [winfo ismapped .t.f] [.t bbox .t.f]
 } -cleanup {
     pack .t
-} -result {1 {47 5 30 20}}
+} -result [list 1 [list [expr {$padx+6*$fixedWidth}] $pady 30 20]]
 
 
 test textWind-17.1 {peer widgets and embedded windows} -setup {
     destroy .t .tt .f
 } -body {

Index: tests/tk.test
==================================================================
--- tests/tk.test
+++ tests/tk.test
@@ -8,10 +8,12 @@
 package require tcltest 2.2
 eval tcltest::configure $argv
 tcltest::loadTestedCommands
 namespace import -force tcltest::test
 
+testConstraint testprintf [llength [info command testprintf]]
+
 test tk-1.1 {tk command: general} -body {
     tk
 } -returnCodes error -result {wrong # args: should be "tk subcommand ?arg ...?"}
 test tk-1.2 {tk command: general} -body {
     tk xyz
@@ -174,11 +176,15 @@
     safe::loadTk foo
     foo eval {tk inactive reset}
 } -cleanup {
     ::safe::interpDelete foo
 } -returnCodes 1 -result {resetting the user inactivity timer is not allowed in a safe interpreter}
+
+test tk-8.1 {Test for ticket [1cc44617e2], see if TCL_LL_MODIFIER works as expected on all platforms} -constraints testprintf -body {
+    testprintf -21474836480
+} -result {-21474836480 18446744052234715136}
 
 # tests of [tk busy] in busy.test
 
 # cleanup
 cleanupTests
 return

Index: tests/ttk/checkbutton.test
==================================================================
--- tests/ttk/checkbutton.test
+++ tests/ttk/checkbutton.test
@@ -58,7 +58,16 @@
     update
     event generate .top.mb <1>
     event generate .top.mb <ButtonRelease-1>
     update  ; # shall not trigger error  invalid command name ".top.b"
 } -result {}
+
+# Bug [fa8de77936]
+test checkbutton-1.8 "Empty -variable" -body {
+    # shall simply not crash
+    ttk::checkbutton .cbev -variable {}
+    .cbev invoke
+} -cleanup {
+    destroy .cbev
+} -result {}
 
 tcltest::cleanupTests

Index: tests/ttk/combobox.test
==================================================================
--- tests/ttk/combobox.test
+++ tests/ttk/combobox.test
@@ -36,17 +36,26 @@
 test combobox-2.3 "current -- change value" -body {
     .cb set "b"
     .cb current
 } -result 1
 
-test combobox-2.4 "current -- value not in list" -body { 
+test combobox-2.4 "current -- value not in list" -body {
     .cb set "z"
     .cb current
 } -result -1
 
 test combobox-2.end "Cleanup" -body { destroy .cb }
 
+test combobox-3 "Read postoffset value dynamically from current style" -body {
+    ttk::combobox .cb -values [list a b c] -style "DerivedStyle.TCombobox"
+    pack .cb -expand true -fill both
+    ttk::style configure DerivedStyle.TCombobox -postoffset [list 25 0 0 0]
+    ttk::combobox::Post .cb
+    expr {[winfo rootx .cb.popdown] - [winfo rootx .cb]}
+} -result 25 -cleanup {
+    destroy .cb
+}
 
 test combobox-1890211 "ComboboxSelected event after listbox unposted" -body {
     # whitebox test...
     pack [ttk::combobox .cb -values [list a b c]]
     set result [list]

Index: tests/ttk/entry.test
==================================================================
--- tests/ttk/entry.test
+++ tests/ttk/entry.test
@@ -83,11 +83,11 @@
 # NOTE: result can vary depending on font.
 
 # Bounding box / scrolling tests.
 test entry-3.0 "Series 3 setup" -body {
     ttk::style theme use default
-    variable fixed fixed
+    variable fixed TkFixedFont
     variable cw [font measure $fixed a]
     variable ch [font metrics $fixed -linespace]
     variable bd 2	;# border + padding
     variable ux [font measure $fixed \u4e4e]
 
@@ -277,7 +277,25 @@
     set result
 } -result [list 1 3  2 3  3 3  3 3  3 3] -cleanup {
     unset V
     destroy .e
 }
+
+test entry-10.1 {configuration option: "-placeholder"} -setup {
+    pack [ttk::entry .e]
+} -body {
+    .e configure -placeholder {Some text}
+    .e cget -placeholder
+} -cleanup {
+    destroy .e
+} -result {Some text}
+
+test entry-10.2 {configuration option: "-placeholderforeground"} -setup {
+    pack [ttk::entry .e]
+} -body {
+    .e configure -placeholder {Some text} -placeholderforeground red
+    .e cget -placeholderforeground
+} -cleanup {
+    destroy .e
+} -result {red}
 
 tcltest::cleanupTests

Index: tests/ttk/image.test
==================================================================
--- tests/ttk/image.test
+++ tests/ttk/image.test
@@ -21,11 +21,11 @@
     image delete test.image
     update
 } -cleanup {
     destroy .ttk_image20
 } -result {}
-    
+
 test image-2.1 "Deletion of displayed image (checkbutton)" -setup {
      image create photo test.image -width 10 -height 10
 } -body {
     pack [set w [ttk::checkbutton .ttk_image21 -image test.image]]
     tkwait visibility $w

Index: tests/ttk/labelframe.test
==================================================================
--- tests/ttk/labelframe.test
+++ tests/ttk/labelframe.test
@@ -68,11 +68,11 @@
 # @@@ ODDITY, 14 Nov 2005:
 # @@@ labelframe-4.1 fails if .cb is a [checkbutton],
 # @@@ but seems to succeed if it's some other widget class.
 # @@@ I suspect a race condition; unable to track it down ATM.
 #
-# @@@ FOLLOWUP: This *may* have been caused by a bug in ManagerIdleProc 
+# @@@ FOLLOWUP: This *may* have been caused by a bug in ManagerIdleProc
 # @@@ (see manager.c r1.11). There's still probably a race condition in here.
 #
 test labelframe-4.1 "Add nonchild slave" -body {
     checkbutton .cb -text "abcde"
     .lf configure -labelwidget .cb

Index: tests/ttk/layout.test
==================================================================
--- tests/ttk/layout.test
+++ tests/ttk/layout.test
@@ -19,7 +19,10 @@
 
     list [winfo reqwidth .b] [winfo reqheight .b]
 
 } -cleanup { destroy .b } -result [list 24 24]
 
+test layout-2 "Empty -children not allowed" -body {
+    ttk::style layout Test.Tentry {Entry.field -children {}}
+} -returnCodes error -result {Invalid -children value}
 
 tcltest::cleanupTests

Index: tests/ttk/panedwindow.test
==================================================================
--- tests/ttk/panedwindow.test
+++ tests/ttk/panedwindow.test
@@ -108,12 +108,12 @@
 #
 # ...
 #
 test panedwindow-3.0 "configure pane" -body {
     ttk::panedwindow .pw
-    .pw add [listbox .pw.lb1] 
-    .pw add [listbox .pw.lb2] 
+    .pw add [listbox .pw.lb1]
+    .pw add [listbox .pw.lb2]
     .pw pane 1 -weight 2
     .pw pane 1 -weight
 } -result 2
 
 test panedwindow-3.1 "configure pane -- errors" -body {
@@ -251,11 +251,11 @@
 
     frame .pw.f1 -width 100 -height 50
     frame .pw.f2 -width 100 -height 50
 
     list [winfo reqwidth .pw.f1] [winfo reqheight .pw.f1]
-} -result [list 100 50] 
+} -result [list 100 50]
 
 test paned-propagation-1 "Initial request size" -body {
     .pw add .pw.f1
     .pw add .pw.f2
     propagate-geometry

Index: tests/ttk/progressbar.test
==================================================================
--- tests/ttk/progressbar.test
+++ tests/ttk/progressbar.test
@@ -80,6 +80,45 @@
 
 test progressbar-end "Cleanup" -body {
     destroy .pb
 }
 
+# check existence and default value of each non-core option of the widget
+test progressbar-3.1 "progressbar non-core options" -setup {
+    set res {}
+    ttk::progressbar .defaultpb
+} -body {
+    foreach option {-anchor -foreground -justify -style -text -wraplength \
+                    -length -maximum -mode -orient -phase -value -variable} {
+        lappend res [.defaultpb cget $option]
+    }
+    set res
+} -cleanup {
+    unset res
+    destroy .defaultpb
+} -result {w black left {} {} 0 100 100 determinate horizontal 0 0.0 {}}
+
+test progressbar-3.2 "TIP #442 options are taken into account" -setup {
+    set res {}
+    pack [ttk::progressbar .p -value 0 -maximum 50 -orient horizontal -mode determinate -length 500]
+    set thefont [font actual {Arial 10}]
+} -body {
+    .p configure -anchor c -foreground blue -justify right \
+            -text "TIP #442\noptions are now tested" -wraplength 100
+    update
+    .p step 10
+    .p configure -anchor e -font $thefont -foreground green -justify center \
+            -text "Changing the value of each option\nfrom TIP #442" -wraplength 250
+    update
+    .p step 20
+    .p configure -orient vertical -text "Cannot be seen"
+    update
+    foreach option {-anchor -foreground -justify -text -wraplength} {
+        lappend res [list $option [.p cget $option]]
+    }
+    set res
+} -cleanup {
+    unset res thefont
+    destroy .p
+} -result {{-anchor e} {-foreground green} {-justify center} {-text {Cannot be seen}} {-wraplength 250}}
+
 tcltest::cleanupTests

Index: tests/ttk/scrollbar.test
==================================================================
--- tests/ttk/scrollbar.test
+++ tests/ttk/scrollbar.test
@@ -7,29 +7,29 @@
 test scrollbar-swapout-1 "Use core scrollbars on OSX..." -constraints {
     coreScrollbar
 } -body {
     ttk::scrollbar .sb -command "yadda"
     list [winfo class .sb] [.sb cget -command]
-} -result [list Scrollbar yadda] -cleanup { 
-    destroy .sb 
+} -result [list Scrollbar yadda] -cleanup {
+    destroy .sb
 }
 
 test scrollbar-swapout-2 "... unless -style is specified ..." -constraints {
     coreScrollbar
 } -body {
     ttk::style layout Vertical.Custom.TScrollbar \
     	[ttk::style layout Vertical.TScrollbar] ; # See #1833339
-    ttk::scrollbar .sb -command "yadda" -style Custom.TScrollbar 
+    ttk::scrollbar .sb -command "yadda" -style Custom.TScrollbar
     list [winfo class .sb] [.sb cget -command] [.sb cget -style]
 } -result [list TScrollbar yadda Custom.TScrollbar] -cleanup {
     destroy .sb
 }
 
 test scrollbar-swapout-3 "... or -class." -constraints {
     coreScrollbar
 } -body {
-    ttk::scrollbar .sb -command "yadda" -class Custom.TScrollbar 
+    ttk::scrollbar .sb -command "yadda" -class Custom.TScrollbar
     list [winfo class .sb] [.sb cget -command]
 } -result [list Custom.TScrollbar yadda] -cleanup {
     destroy .sb
 }
 
@@ -63,7 +63,30 @@
     ttk::scale .s -variable v
     pack .s ; update
     .s set 1 ; update
 } -returnCodes 1 -match glob -result "*"
 
+test scale-2.1 "-state option" -setup {
+    ttk::scale .s
+    set res ""
+} -body {
+    # defaults
+    lappend res [.s instate disabled] [.s cget -state]
+    # set -state: instate returns accordingly
+    .s configure -state disabled
+    lappend res [.s instate disabled] [.s cget -state]
+    # back to normal
+    .s configure -state normal
+    lappend res [.s instate disabled] [.s cget -state]
+    # use state command: -state does NOT reflect it
+    .s state disabled
+    lappend res [.s instate disabled] [.s cget -state]
+    # further use state command
+    .s state readonly
+    lappend res [.s state] [.s cget -state]
+} -cleanup {
+    destroy .s
+    unset -nocomplain res
+} -result {0 normal 1 disabled 0 normal 1 normal {disabled readonly} normal}
+
 tcltest::cleanupTests
 

Index: tests/ttk/spinbox.test
==================================================================
--- tests/ttk/spinbox.test
+++ tests/ttk/spinbox.test
@@ -196,10 +196,31 @@
     .sb set "z"
     .sb current
 } -cleanup {
     destroy .sb
 } -result -1
+
+test spinbox-3.0 "textarea should expand to fill widget" -setup {
+    set SBV 5
+    set ::spinbox_test {}
+    ttk::spinbox .sb -from 0 -to 10 -textvariable SBV
+} -body {
+    grid .sb -sticky ew
+    grid columnconfigure . 0 -weight 1
+    bind . <Map> {
+        after idle {
+            wm geometry . "210x80"
+            after 100 {set ::spinbox_test [.sb identify element 5 5]}
+        }
+        bind . <Map> {}
+    }
+    after 500 {set ::spinbox_wait 1} ; vwait ::spinbox_wait
+    set ::spinbox_test
+} -cleanup {
+    destroy .sb
+    unset -nocomplain ::spinbox_test SBV
+} -result {textarea}
 
 # nostomp: NB intentional difference between ttk::spinbox and tk::spinbox;
 # see also #1439266
 #
 test spinbox-nostomp-1 "don't stomp on -variable (init; -from/to)" -body {
@@ -230,11 +251,11 @@
    destroy .sb
 } -result [list 55 55]
 
 test spinbox-nostomp-4 "don't stomp on -variable (configure; -values)" -body {
     set SBV Apr
-    ttk::spinbox .sb 
+    ttk::spinbox .sb
     .sb configure -textvariable SBV -values {Jan Feb Mar Apr May Jun Jul Aug}
     list $SBV [.sb get]
 } -cleanup {
    unset SBV
    destroy .sb
@@ -255,11 +276,11 @@
     event generate .sb <<Decrement>>; lappend result $secs
     event generate .sb <<Decrement>>; lappend result $secs
     event generate .sb <<Decrement>>; lappend result $secs
 
     set result
-} -result [list 07 08 09 10 11 10 09 08 07] -cleanup { 
+} -result [list 07 08 09 10 11 10 09 08 07] -cleanup {
     destroy .sb
     unset secs
 }
 
 test spinbox-dieoctaldie-2 "Cope with general bad input" -body {

Index: tests/ttk/treetags.test
==================================================================
--- tests/ttk/treetags.test
+++ tests/ttk/treetags.test
@@ -103,11 +103,11 @@
 test treetags-1.8 "tag names" -body {
     lsort [$tv tag names]
 } -result [list tag1 tag2 tag3]
 
 test treetags-1.9 "tag names - tag added to item" -body {
-    $tv item item1 -tags tag4 
+    $tv item item1 -tags tag4
     lsort [$tv tag names]
 } -result [list tag1 tag2 tag3 tag4]
 
 test treetags-1.10 "tag names - tag configured" -body {
     $tv tag configure tag5
@@ -199,16 +199,16 @@
 
 test treetags-3.4 "stomp tags in tag binding procedure" -body {
     set result [list]
     $tv tag bind rm1 <<Remove>> { lappend ::result rm1 [%W focus] <<Remove>> }
     $tv tag bind rm2 <<Remove>> {
-    	lappend ::result rm2 [%W focus] <<Remove>> 
+    	lappend ::result rm2 [%W focus] <<Remove>>
 	%W item [%W focus] -tags {tag1}
     }
     $tv tag bind rm3 <<Remove>> { lappend ::result rm3 [%W focus] <<Remove>> }
 
-    $tv item item1 -tags {rm1 rm2 rm3} 
+    $tv item item1 -tags {rm1 rm2 rm3}
     $tv focus item1
     event generate $tv <<Remove>>
     set result
 } -cleanup {
     treeConstraints $tv

Index: tests/ttk/ttk.test
==================================================================
--- tests/ttk/ttk.test
+++ tests/ttk/ttk.test
@@ -132,12 +132,12 @@
 } -result [list 0 0]
 
 #
 # Basic tests.
 #
-test ttk-1.1 "Create button" -body {
-    pack [ttk::button .t] -expand true -fill both
+test ttk-1.1 "Create multiline button showing justified text" -body {
+    pack [ttk::button .t -text "Hello\nWorld!!" -justify center] -expand true -fill both
     update
 }
 
 test ttk-1.2 "Check style" -body {
     .t cget -style
@@ -204,11 +204,11 @@
 
 test ttk-2.8 "bug 3223850: button state disabled during click" -setup {
     destroy .b
     set ttk28 {}
     pack [ttk::button .b -command {set ::ttk28 failed}]
-} -body { 
+} -body {
     bind .b <ButtonPress-1> {after 0 {.b configure -state disabled}}
     after 1 {event generate .b <ButtonPress-1>}
     after 20 {event generate .b <ButtonRelease-1>}
     set aid [after 100 {set ::ttk28 [.b instate {disabled !pressed}]}]
     vwait ::ttk28

Index: tests/ttk/validate.test
==================================================================
--- tests/ttk/validate.test
+++ tests/ttk/validate.test
@@ -159,11 +159,11 @@
     .e configure -validate all
     set ::e nextdata
     list [.e cget -validate] $::vVals
 } -result {none {.e -1 -1 nextdata newdata {} all forced}}
 # DIFFERENCE: ttk::entry doesn't validate when setting linked -variable
-# DIFFERENCE: ttk::entry doesn't disable validation 
+# DIFFERENCE: ttk::entry doesn't disable validation
 
 proc doval {W d i P s S v V} {
     set ::vVals [list $W $d $i $P $s $S $v $V]
     set ::e mydata
     return 1

Index: tests/unixButton.test
==================================================================
--- tests/unixButton.test
+++ tests/unixButton.test
@@ -14,11 +14,11 @@
 namespace import -force tcltest::test
 imageInit
 
 # Create entries in the option database to be sure that geometry options
 # like border width have predictable values.
- 
+
 option add *Label.borderWidth 2
 option add *Label.highlightThickness 0
 option add *Label.font {Helvetica -12 bold}
 option add *Button.borderWidth 2
 option add *Button.highlightThickness 2
@@ -57,11 +57,11 @@
 } -cleanup {
     deleteWindows
     image delete image1
 } -result {68 48 74 54 112 52 112 52}
 test unixbutton-1.2 {TkpComputeButtonGeometry procedure} -constraints {
-    unix 
+    unix
 } -setup {
     deleteWindows
 } -body {
     label .b1 -bitmap question -bd 3 -padx 0 -pady 2
     button .b2 -bitmap question -bd 3 -padx 0 -pady 2
@@ -75,11 +75,11 @@
         [winfo reqwidth .b4] [winfo reqheight .b4]
 } -cleanup {
     deleteWindows
 } -result {23 33 29 39 54 37 54 37}
 test unixbutton-1.3 {TkpComputeButtonGeometry procedure} -constraints {
-    unix 
+    unix
 } -setup {
     deleteWindows
 } -body {
     label .b1 -bitmap question -bd 3 -highlightthickness 4
     button .b2 -bitmap question -bd 3 -highlightthickness 0
@@ -176,31 +176,31 @@
         [winfo reqwidth .b4] [winfo reqheight .b4]
 } -cleanup {
     deleteWindows
 } -result {62 30 56 24 58 22 62 22}
 test unixbutton-1.9 {TkpComputeButtonGeometry procedure} -constraints {
-    unix 
+    unix
 } -setup {
     deleteWindows
 } -body {
     button .b2 -bitmap question -default active
     list [winfo reqwidth .b2] [winfo reqheight .b2]
 } -cleanup {
     deleteWindows
 } -result {37 47}
 test unixbutton-1.10 {TkpComputeButtonGeometry procedure} -constraints {
-    unix 
+    unix
 } -setup {
     deleteWindows
 } -body {
     button .b2 -bitmap question -default normal
     list [winfo reqwidth .b2] [winfo reqheight .b2]
 } -cleanup {
     deleteWindows
 } -result {37 47}
 test unixbutton-1.11 {TkpComputeButtonGeometry procedure} -constraints {
-    unix 
+    unix
 } -setup {
     deleteWindows
 } -body {
     button .b2 -bitmap question -default disabled
     list [winfo reqwidth .b2] [winfo reqheight .b2]
@@ -208,11 +208,11 @@
     deleteWindows
 } -result {27 37}
 
 
 test unixbutton-2.1 {disabled coloring check, bug 669595} -constraints {
-    unix 
+    unix
 } -setup {
     deleteWindows
     catch {unset value}
 } -body {
     # this was just a visual bug, but at least this shows the visual

Index: tests/unixEmbed.test
==================================================================
--- tests/unixEmbed.test
+++ tests/unixEmbed.test
@@ -1,6 +1,6 @@
-# This file is a Tcl script to test out the procedures in the file 
+# This file is a Tcl script to test out the procedures in the file
 # tkUnixEmbed.c.  It is organized in the standard fashion for Tcl
 # tests.
 #
 # Copyright (c) 1996-1997 Sun Microsystems, Inc.
 # Copyright (c) 1998-1999 by Scriptics Corporation.
@@ -53,18 +53,18 @@
     expr ([lindex $vals 0]/256 == $red) && ([lindex $vals 1]/256 == $green) \
 	    && ([lindex $vals 2]/256 == $blue)
 }
 
 test unixEmbed-1.1 {TkpUseWindow procedure, bad window identifier} -constraints {
-	unix 
+	unix
 } -setup {
 	deleteWindows
 } -body {
     toplevel .t -use xyz
 } -returnCodes error -result {expected integer but got "xyz"}
 test unixEmbed-1.2 {TkpUseWindow procedure, bad window identifier} -constraints {
-	unix 
+	unix
 } -setup {
 	deleteWindows
 } -body {
     toplevel .t -use 47
 } -returnCodes error -result {couldn't create child of window "47"}
@@ -235,11 +235,11 @@
     list $x [testembed]
 } -cleanup {
 	deleteWindows
 } -result {{{XXX .f1 {} {}}} {{XXX .f1 XXX {}}}}
 test unixEmbed-3.2 {ContainerEventProc procedure, set size on creation} -constraints {
-	unix 
+	unix
 } -setup {
 	deleteWindows
 } -body {
     toplevel .t1 -container 1
     wm geometry .t1 +0+0
@@ -248,11 +248,11 @@
     wm geometry .t2
 } -cleanup {
 	deleteWindows
 } -result {200x200+0+0}
 test unixEmbed-3.3 {ContainerEventProc procedure, disallow position changes} -constraints {
-	unix 
+	unix
 } -setup {
 	deleteWindows
 } -body {
     frame .f1 -container 1 -width 200 -height 50
     pack .f1
@@ -269,11 +269,11 @@
     }
 } -cleanup {
 	deleteWindows
 } -result {200x200+0+0}
 test unixEmbed-3.4 {ContainerEventProc procedure, disallow position changes} -constraints {
-	unix 
+	unix
 } -setup {
 	deleteWindows
 } -body {
     frame .f1 -container 1 -width 200 -height 50
     pack .f1
@@ -290,11 +290,11 @@
     }
 } -cleanup {
 	deleteWindows
 } -result {300x100+0+0}
 test unixEmbed-3.5 {ContainerEventProc procedure, geometry requests} -constraints {
-	unix 
+	unix
 } -setup {
 	deleteWindows
 } -body {
     frame .f1 -container 1 -width 200 -height 50
     pack .f1
@@ -311,11 +311,11 @@
     list [winfo width .f1] [winfo height .f1] [dobg {wm geometry .t1}]
 } -cleanup {
 	deleteWindows
 } -result {300 80 300x80+0+0}
 test unixEmbed-3.6 {ContainerEventProc procedure, map requests} -constraints {
-	unix 
+	unix
 } -setup {
 	deleteWindows
 } -body {
     frame .f1 -container 1 -width 200 -height 50
     pack .f1
@@ -334,11 +334,11 @@
     }
 } -cleanup {
 	deleteWindows
 } -result {mapped}
 test unixEmbed-3.7 {ContainerEventProc procedure, destroy events} -constraints {
-	unix 
+	unix
 } -setup {
 	deleteWindows
 } -body {
     frame .f1 -container 1 -width 200 -height 50
     pack .f1
@@ -359,11 +359,11 @@
 	deleteWindows
 } -result {dead 0}
 
 
 test unixEmbed-4.1 {EmbedStructureProc procedure, configure events} -constraints {
-	unix 
+	unix
 } -setup {
 	deleteWindows
 } -body {
     frame .f1 -container 1 -width 200 -height 50
     pack .f1
@@ -403,11 +403,11 @@
 	deleteWindows
 } -result {{{XXX .f1 XXX {}}} {}}
 
 
 test unixEmbed-5.1 {EmbedFocusProc procedure, FocusIn events} -constraints {
-	unix 
+	unix
 } -setup {
 	deleteWindows
 } -body {
     frame .f1 -container 1 -width 200 -height 50
     pack .f1
@@ -424,11 +424,11 @@
     dobg {set x}
 } -cleanup {
 	deleteWindows
 } -result {{focus in .t1}}
 test unixEmbed-5.2 {EmbedFocusProc procedure, focusing on dead window} -constraints {
-	unix 
+	unix
 } -setup {
 	deleteWindows
 } -body {
     frame .f1 -container 1 -width 200 -height 50
     pack .f1
@@ -446,11 +446,11 @@
     update
 } -cleanup {
 	deleteWindows
 } -result {}
 test unixEmbed-5.3 {EmbedFocusProc procedure, FocusOut events} -constraints {
-	unix 
+	unix
 } -setup {
 	deleteWindows
 } -body {
     frame .f1 -container 1 -width 200 -height 50
     pack .f1
@@ -472,11 +472,11 @@
 	deleteWindows
 } -result {{{focus in .t1}} {{focus in .t1} {focus out .t1}}}
 
 
 test unixEmbed-6.1 {EmbedGeometryRequest procedure, window changes size} -constraints {
-	unix 
+	unix
 } -setup {
 	deleteWindows
 } -body {
     frame .f1 -container 1 -width 200 -height 50
     pack .f1
@@ -495,11 +495,11 @@
     }
 } -cleanup {
 	deleteWindows
 } -result {{{configure .t1 300 120}} 300x120+0+0}
 test unixEmbed-6.2 {EmbedGeometryRequest procedure, window changes size} -constraints {
-	unix 
+	unix
 } -setup {
 	deleteWindows
 } -body {
     frame .f1 -container 1 -width 200 -height 50
     place .f1 -width 200 -height 200
@@ -523,11 +523,11 @@
 
 # Can't think up any tests for TkpGetOtherWindow procedure.
 
 
 test unixEmbed-7.1 {TkpRedirectKeyEvent procedure, forward keystroke} -constraints {
-	unix 
+	unix
 } -setup {
 	deleteWindows
 } -body {
     deleteWindows
     frame .f1 -container 1 -width 200 -height 50
@@ -552,11 +552,11 @@
 } -cleanup {
 	deleteWindows
     bind . <KeyPress> {}
 } -result {{{key a 1}} {}}
 test unixEmbed-7.2 {TkpRedirectKeyEvent procedure, don't forward keystroke width} -constraints {
-	unix 
+	unix
 } -setup {
 	deleteWindows
 } -body {
     frame .f1 -container 1 -width 200 -height 50
     pack .f1
@@ -677,11 +677,11 @@
 	deleteWindows
 } -result {{{XXX {} {} .t1}} {}}
 
 
 test unixEmbed-10.1 {geometry propagation in tkUnixWm.c/UpdateGeometryInfo} -constraints {
-	unix 
+	unix
 } -setup {
 	deleteWindows
 } -body {
     frame .f1 -container 1 -width 200 -height 50
     pack .f1
@@ -692,11 +692,11 @@
     wm geometry .t1
 } -cleanup {
 	deleteWindows
 } -result {150x80+0+0}
 test unixEmbed-10.2 {geometry propagation in tkUnixWm.c/UpdateGeometryInfo} -constraints {
-	unix 
+	unix
 } -setup {
 	deleteWindows
 } -body {
     frame .f1 -container 1 -width 200 -height 50
     pack .f1

Index: tests/unixFont.test
==================================================================
--- tests/unixFont.test
+++ tests/unixFont.test
@@ -1,14 +1,14 @@
-# This file is a Tcl script to test out the procedures in tkUnixFont.c. 
+# This file is a Tcl script to test out the procedures in tkUnixFont.c.
 # It is organized in the standard fashion for Tcl tests.
 #
 # Many of these tests are visually oriented and cannot be checked
 # programmatically (such as "does an underlined font appear to be
 # underlined?"); these tests attempt to exercise the code in question,
 # but there are no results that can be checked.  Some tests depend on the
 # fonts having or not having certain properties, which may not be valid
-# at all sites.  
+# at all sites.
 #
 # Copyright (c) 1996 Sun Microsystems, Inc.
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
@@ -64,246 +64,246 @@
 proc getsize {} {
     update
     return "[winfo reqwidth .b.l] [winfo reqheight .b.l]"
 }
 
-test unixfont-1.1 {TkpGetNativeFont procedure: not native} {unix noExceed} {
+test unixfont-1.1 {TkpGetNativeFont procedure: not native} {x11 noExceed} {
     list [catch {font measure {} xyz} msg] $msg
 } {1 {font "" doesn't exist}}
-test unixfont-1.2 {TkpGetNativeFont procedure: native} unix {
+test unixfont-1.2 {TkpGetNativeFont procedure: native} x11 {
     font measure fixed 0
 } {6}
 
-test unixfont-2.1 {TkpGetFontFromAttributes procedure: no family} unix {
+test unixfont-2.1 {TkpGetFontFromAttributes procedure: no family} x11 {
     font actual {-size 10}
     set x {}
 } {}
 test unixfont-2.2 {TkpGetFontFromAttributes procedure: Times relatives} \
-	{unix noExceed hasTimesNew} {
+	{x11 noExceed hasTimesNew} {
     set x {}
     lappend x [lindex [font actual {-family "Times New Roman"}] 1]
     lappend x [lindex [font actual {-family "New York"}] 1]
     lappend x [lindex [font actual {-family "Times"}] 1]
 } {times times times}
 test unixfont-2.3 {TkpGetFontFromAttributes procedure: Courier relatives} \
-	{unix noExceed hasCourierNew} {
+	{x11 noExceed hasCourierNew} {
     set x {}
     lappend x [lindex [font actual {-family "Courier New"}] 1]
     lappend x [lindex [font actual {-family "Monaco"}] 1]
     lappend x [lindex [font actual {-family "Courier"}] 1]
 } {courier courier courier}
 test unixfont-2.4 {TkpGetFontFromAttributes procedure: Helvetica relatives} \
-	{unix noExceed hasArial} {
+	{x11 noExceed hasArial} {
     set x {}
     lappend x [lindex [font actual {-family "Arial"}] 1]
     lappend x [lindex [font actual {-family "Geneva"}] 1]
     lappend x [lindex [font actual {-family "Helvetica"}] 1]
 } {helvetica helvetica helvetica}
-test unixfont-2.5 {TkpGetFontFromAttributes procedure: fallback} unix {
+test unixfont-2.5 {TkpGetFontFromAttributes procedure: fallback} x11 {
     font actual {-xyz-xyz-*-*-*-*-*-*-*-*-*-*-*-*}
     set x {}
 } {}
-test unixfont-2.6 {TkpGetFontFromAttributes: fallback to fixed family} unix {
+test unixfont-2.6 {TkpGetFontFromAttributes: fallback to fixed family} x11 {
     lindex [font actual {-family fixed -size 10}] 1
 } {fixed}
-test unixfont-2.7 {TkpGetFontFromAttributes: fixed family not available!} unix {
+test unixfont-2.7 {TkpGetFontFromAttributes: fixed family not available!} x11 {
     # no test available
 } {}
-test unixfont-2.8 {TkpGetFontFromAttributes: loop over returned font names} unix {
+test unixfont-2.8 {TkpGetFontFromAttributes: loop over returned font names} x11 {
     lindex [font actual {-family fixed -size 31}] 1
 } {fixed}
-test unixfont-2.9 {TkpGetFontFromAttributes: reject adobe courier if possible} {unix noExceed} {
+test unixfont-2.9 {TkpGetFontFromAttributes: reject adobe courier if possible} {x11 noExceed} {
     lindex [font actual {-family courier}] 1
 } {courier}
-test unixfont-2.10 {TkpGetFontFromAttributes: scalable font found} unix {
+test unixfont-2.10 {TkpGetFontFromAttributes: scalable font found} x11 {
     lindex [font actual {-family courier -size 37}] 3
 } {37}
-test unixfont-2.11 {TkpGetFontFromAttributes: font cannot be loaded} unix {
+test unixfont-2.11 {TkpGetFontFromAttributes: font cannot be loaded} x11 {
     # On Linux, XListFonts() was returning names for fonts that do not
     # actually exist, causing the subsequent XLoadQueryFont() to fail
     # unexpectedly.  Now falls back to another font if that happens.
 
     font actual {-size 14}
     set x {}
-} {}    
+} {}
 
-test unixfont-3.1 {TkpDeleteFont procedure} unix {
+test unixfont-3.1 {TkpDeleteFont procedure} x11 {
     font actual {-family xyz}
     set x {}
 } {}
 
-test unixfont-4.1 {TkpGetFontFamilies procedure} unix {
+test unixfont-4.1 {TkpGetFontFamilies procedure} x11 {
     font families
     set x {}
 } {}
 
-test unixfont-5.1 {Tk_MeasureChars procedure: no chars to be measured} unix {
+test unixfont-5.1 {Tk_MeasureChars procedure: no chars to be measured} x11 {
     .b.l config -text "000000" -wrap [expr $ax*3]
     .b.l config -wrap 0
 } {}
-test unixfont-5.2 {Tk_MeasureChars procedure: no right margin} unix {
+test unixfont-5.2 {Tk_MeasureChars procedure: no right margin} x11 {
     .b.l config -text "000000"
 } {}
-test unixfont-5.3 {Tk_MeasureChars procedure: loop over chars} unix {
+test unixfont-5.3 {Tk_MeasureChars procedure: loop over chars} x11 {
     .b.l config -text "0"
     .b.l config -text "\377"
     .b.l config -text "0\3770\377"
     .b.l config -text "000000000000000"
 } {}
 .b.l config -wrap [expr $ax*10]
-test unixfont-5.4 {Tk_MeasureChars procedure: reached right edge} unix {
+test unixfont-5.4 {Tk_MeasureChars procedure: reached right edge} x11 {
     .b.l config -text "0000000000000"
     getsize
 } "[expr $ax*10] [expr $ay*2]"
-test unixfont-5.5 {Tk_MeasureChars procedure: ran out of chars} unix {
+test unixfont-5.5 {Tk_MeasureChars procedure: ran out of chars} x11 {
     .b.l config -text "000000"
     getsize
 } "[expr $ax*6] $ay"
-test unixfont-5.6 {Tk_MeasureChars procedure: find last word} unix {
+test unixfont-5.6 {Tk_MeasureChars procedure: find last word} x11 {
     .b.l config -text "000000 00000"
     getsize
 } "[expr $ax*6] [expr $ay*2]"
-test unixfont-5.7 {Tk_MeasureChars procedure: already saw space in line} unix {
+test unixfont-5.7 {Tk_MeasureChars procedure: already saw space in line} x11 {
     .b.l config -text "000000     00000"
     getsize
 } "[expr $ax*6] [expr $ay*2]"
-test unixfont-5.8 {Tk_MeasureChars procedure: internal spaces significant} unix {
+test unixfont-5.8 {Tk_MeasureChars procedure: internal spaces significant} x11 {
     .b.l config -text "00  000     00000"
     getsize
 } "[expr $ax*7] [expr $ay*2]"
-test unixfont-5.9 {Tk_MeasureChars procedure: TK_PARTIAL_OK} unix {
+test unixfont-5.9 {Tk_MeasureChars procedure: TK_PARTIAL_OK} x11 {
     .b.c dchars $t 0 end
     .b.c insert $t 0 "0000"
     .b.c index $t @[expr int($ax*2.5)],1
 } {2}
-test unixfont-5.10 {Tk_MeasureChars procedure: TK_AT_LEAST_ONE} unix {
+test unixfont-5.10 {Tk_MeasureChars procedure: TK_AT_LEAST_ONE} x11 {
     .b.l config -text "000000000000"
     getsize
 } "[expr $ax*10] [expr $ay*2]"
-test unixfont-5.11 {Tk_MeasureChars: TK_AT_LEAST_ONE + not even one char fit!} unix {
+test unixfont-5.11 {Tk_MeasureChars: TK_AT_LEAST_ONE + not even one char fit!} x11 {
     set a [.b.l cget -wrap]
     .b.l config -text "000000" -wrap 1
     set x [getsize]
     .b.l config -wrap $a
     set x
 } "$ax [expr $ay*6]"
-test unixfont-5.12 {Tk_MeasureChars procedure: include eol spaces} unix {
+test unixfont-5.12 {Tk_MeasureChars procedure: include eol spaces} x11 {
     .b.l config -text "000   \n000"
     getsize
 } "[expr $ax*6] [expr $ay*2]"
 
-test unixfont-6.1 {Tk_DrawChars procedure: loop test} unix {
+test unixfont-6.1 {Tk_DrawChars procedure: loop test} x11 {
     .b.l config -text "a"
     update
 } {}
-test unixfont-6.2 {Tk_DrawChars procedure: loop test} unix {
+test unixfont-6.2 {Tk_DrawChars procedure: loop test} x11 {
     .b.l config -text "abcd"
     update
 } {}
-test unixfont-6.3 {Tk_DrawChars procedure: special char} unix {
+test unixfont-6.3 {Tk_DrawChars procedure: special char} x11 {
     .b.l config -text "\001"
     update
 } {}
-test unixfont-6.4 {Tk_DrawChars procedure: normal then special} unix {
+test unixfont-6.4 {Tk_DrawChars procedure: normal then special} x11 {
     .b.l config -text "ab\001"
     update
 } {}
-test unixfont-6.5 {Tk_DrawChars procedure: ends with special} unix {
+test unixfont-6.5 {Tk_DrawChars procedure: ends with special} x11 {
     .b.l config -text "ab\001"
     update
 } {}
-test unixfont-6.6 {Tk_DrawChars procedure: more normal chars at end} unix {
+test unixfont-6.6 {Tk_DrawChars procedure: more normal chars at end} x11 {
     .b.l config -text "ab\001def"
     update
 } {}
 
-test unixfont-7.1 {DrawChars procedure: no effects} unix {
+test unixfont-7.1 {DrawChars procedure: no effects} x11 {
     .b.l config -text "abc"
     update
 } {}
-test unixfont-7.2 {DrawChars procedure: underlining} unix {
+test unixfont-7.2 {DrawChars procedure: underlining} x11 {
     set f [.b.l cget -font]
     .b.l config -text "abc" -font "courier 10 underline"
     update
     .b.l config -font $f
 } {}
-test unixfont-7.3 {DrawChars procedure: overstrike} unix {
+test unixfont-7.3 {DrawChars procedure: overstrike} x11 {
     set f [.b.l cget -font]
     .b.l config -text "abc" -font "courier 10 overstrike"
     update
     .b.l config -font $f
 } {}
 
-test unixfont-8.1 {AllocFont procedure: use old font} unix {
+test unixfont-8.1 {AllocFont procedure: use old font} x11 {
     font create xyz
     button .c -font xyz
     font configure xyz -family times
     update
     destroy .c
     font delete xyz
 } {}
-test unixfont-8.2 {AllocFont procedure: parse information from XLFD} unix {
+test unixfont-8.2 {AllocFont procedure: parse information from XLFD} x11 {
     expr {[lindex [font actual {-family times -size 0}] 3] == 0}
 } {0}
-test unixfont-8.3 {AllocFont procedure: can't parse info from name} unix {
+test unixfont-8.3 {AllocFont procedure: can't parse info from name} x11 {
     catch {unset fontArray}
     # check that font actual returns the correct attributes.
     # the values of those attributes are system dependent.
     array set fontArray [font actual a12biluc]
     set result [lsort [array names fontArray]]
     catch {unset fontArray}
     set result
 } {-family -overstrike -size -slant -underline -weight}
-test unixfont-8.4 {AllocFont procedure: classify characters} unix {
+test unixfont-8.4 {AllocFont procedure: classify characters} x11 {
     set x 0
     incr x [font measure $courier "\u4000"]   ;# 6
     incr x [font measure $courier "\002"]   ;# 4
     incr x [font measure $courier "\012"]   ;# 2
     incr x [font measure $courier "\101"]   ;# 1
     set x
 } [expr $cx*13]
-test unixfont-8.5 {AllocFont procedure: setup widths of normal chars} unix {
+test unixfont-8.5 {AllocFont procedure: setup widths of normal chars} x11 {
     font metrics $courier -fixed
 } {1}
-test unixfont-8.6 {AllocFont procedure: setup widths of special chars} unix {
+test unixfont-8.6 {AllocFont procedure: setup widths of special chars} x11 {
     set x 0
     incr x [font measure $courier "\001"]   ;# 4
     incr x [font measure $courier "\002"]   ;# 4
     incr x [font measure $courier "\012"]   ;# 2
     set x
 } [expr $cx*10]
-test unixfont-8.7 {AllocFont procedure: XA_UNDERLINE_POSITION} unix {
+test unixfont-8.7 {AllocFont procedure: XA_UNDERLINE_POSITION} x11 {
     catch {font actual -adobe-courier-bold-i-normal--0-0-0-0-m-0-iso8859-1}
     set x {}
 } {}
-test unixfont-8.8 {AllocFont procedure: no XA_UNDERLINE_POSITION} unix {
+test unixfont-8.8 {AllocFont procedure: no XA_UNDERLINE_POSITION} x11 {
     catch {font actual --symbol-medium-r-normal--0-0-0-0-p-0-sun-fontspecific}
     set x {}
 } {}
-test unixfont-8.9 {AllocFont procedure: XA_UNDERLINE_THICKNESS} unix {
+test unixfont-8.9 {AllocFont procedure: XA_UNDERLINE_THICKNESS} x11 {
     catch {font actual -adobe-courier-bold-i-normal--0-0-0-0-m-0-iso8859-1}
     set x {}
 } {}
-test unixfont-8.10 {AllocFont procedure: no XA_UNDERLINE_THICKNESS} unix {
+test unixfont-8.10 {AllocFont procedure: no XA_UNDERLINE_THICKNESS} x11 {
     catch {font actual --symbol-medium-r-normal--0-0-0-0-p-0-sun-fontspecific}
     set x {}
 } {}
-test unixfont-8.11 {AllocFont procedure: XA_UNDERLINE_POSITION was 0} unix {
+test unixfont-8.11 {AllocFont procedure: XA_UNDERLINE_POSITION was 0} x11 {
     catch {font actual -adobe-courier-bold-i-normal--0-0-0-0-m-0-iso8859-1}
     set x {}
 } {}
 
-test unixfont-9.1 {GetControlCharSubst procedure: 2 chars subst} unix {
+test unixfont-9.1 {GetControlCharSubst procedure: 2 chars subst} x11 {
     .b.c dchars $t 0 end
     .b.c insert $t 0 "0\a0"
     set x {}
     lappend x [.b.c index $t @[expr $ax*0],0]
     lappend x [.b.c index $t @[expr $ax*1],0]
     lappend x [.b.c index $t @[expr $ax*2],0]
     lappend x [.b.c index $t @[expr $ax*3],0]
 } {0 1 1 2}
-test unixfont-9.2 {GetControlCharSubst procedure: 4 chars subst} unix {
+test unixfont-9.2 {GetControlCharSubst procedure: 4 chars subst} x11 {
     .b.c dchars $t 0 end
     .b.c insert $t 0 "0\0010"
     set x {}
     lappend x [.b.c index $t @[expr $ax*0],0]
     lappend x [.b.c index $t @[expr $ax*1],0]

Index: tests/unixMenu.test
==================================================================
--- tests/unixMenu.test
+++ tests/unixMenu.test
@@ -33,20 +33,20 @@
 
 test unixMenu-3.1 {TkpDestroymenuEntry - nothing to do} -constraints unix -body {}
 
 
 test unixMenu-4.1 {TkpConfigureMenuEntry - non-cascade entry} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1 -tearoff 0
     .m1 add command -label test
     list [.m1 entryconfigure test -label foo] [destroy .m1]
 } -returnCodes ok -result {{} {}}
 test unixMenu-4.2 {TkpConfigureMenuEntry - cascade entry} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1 -tearoff 0
     .m1 add cascade -menu .m2 -label test
@@ -77,21 +77,21 @@
 
 test unixMenu-7.1 {TkpSetMainMenubar - nothing to do} -constraints unix -body {}
 
 
 test unixMenu-8.1 {GetMenuIndicatorGeometry - indicator off} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1
     .m1 add checkbutton -label foo -indicatoron 0
     tk::TearOffMenu .m1 40 40
     destroy .m1
 } -returnCodes ok
 test unixMenu-8.2 {GetMenuIndicatorGeometry - not checkbutton or radio} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1
     .m1 add command -label foo
@@ -110,13 +110,13 @@
     .m1 invoke foo
     tk::TearOffMenu .m1 40 40
     destroy .m1
 } -cleanup {
     image delete image1
-} -returnCodes ok 
+} -returnCodes ok
 test unixMenu-8.4 {GetMenuIndicatorGeometry - checkbutton bitmap} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1
     .m1 add checkbutton -bitmap questhead -label foo
@@ -123,11 +123,11 @@
     .m1 invoke foo
     tk::TearOffMenu .m1 40 40
     destroy .m1
 } -returnCodes ok
 test unixMenu-8.5 {GetMenuIndicatorGeometry - checkbutton} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1
     .m1 add checkbutton -label foo
@@ -148,22 +148,22 @@
     tk::TearOffMenu .m1 40 40
     destroy .m1
     image delete image1
 } -returnCodes ok
 test unixMenu-8.7 {GetMenuIndicatorGeometry - radiobutton bitmap} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1
     .m1 add radiobutton -bitmap questhead -label foo
     .m1 invoke foo
     tk::TearOffMenu .m1 40 40
     destroy .m1
-} -returnCodes ok 
+} -returnCodes ok
 test unixMenu-8.8 {GetMenuIndicatorGeometry - radiobutton} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1
     .m1 add radiobutton -label foo
@@ -170,34 +170,34 @@
     .m1 invoke foo
     tk::TearOffMenu .m1 40 40
     destroy .m1
 } -returnCodes ok
 test unixMenu-8.9 {GetMenuIndicatorGeometry - hideMargin} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1
     .m1 add radiobutton -label foo -hidemargin 1
     .m1 invoke foo
     tk::TearOffMenu .m1 40 40
     destroy .m1
-} -returnCodes ok 
+} -returnCodes ok
 
 
 test unixMenu-9.1 {GetMenuAccelGeometry - cascade entry} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1
     .m1 add cascade -label foo
     tk::TearOffMenu .m1 40 40
     destroy .m1
 } -returnCodes ok
 test unixMenu-9.2 {GetMenuAccelGeometry - non-null label} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1
     .m1 add command -label foo -accel "Ctrl+S"
@@ -213,11 +213,11 @@
     destroy .m1
 } -returnCodes ok
 
 
 test unixMenu-10.1 {DrawMenuEntryBackground - active menubar} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1
     .m1 add cascade -label foo
@@ -233,11 +233,11 @@
     set tearoff [tk::TearOffMenu .m1 40 40]
     $tearoff activate 0
     list [update] [destroy .m1]
 } -returnCodes ok -result {{} {}}
 test unixMenu-10.3 {DrawMenuEntryBackground - non-active} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1
     .m1 add command -label foo
@@ -245,11 +245,11 @@
     list [update] [destroy .m1]
 } -returnCodes ok -result {{} {}}
 
 
 test unixMenu-11.1 {DrawMenuEntryAccelerator - menubar} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1
     .m1 add command -label foo -accel "Ctrl+U"
@@ -256,31 +256,31 @@
     . configure -menu .m1
     list [update] [. configure -menu ""] [destroy .m1]
 } -result {{} {} {}}
 # drawArrow parameter is never false under Unix
 test unixMenu-11.2 {DrawMenuEntryAccelerator - cascade entry} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1
     .m1 add cascade -label foo
     set tearoff [tk::TearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 }  -result {{} {}}
 test unixMenu-11.3 {DrawMenuEntryAccelerator - normal entry} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1
     .m1 add command -label foo -accel "Ctrl+U"
     set tearoff [tk::TearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } -result {{} {}}
 test unixMenu-11.4 {DrawMenuEntryAccelerator - null entry} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1
     .m1 add command -label foo
@@ -288,41 +288,41 @@
     list [update] [destroy .m1]
 } -result {{} {}}
 
 
 test unixMenu-12.1 {DrawMenuEntryIndicator - non-check or radio} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1
     .m1 add command -label foo
     set tearoff [tk::TearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } -result {{} {}}
 test unixMenu-12.2 {DrawMenuEntryIndicator - checkbutton - indicator off} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1
     .m1 add checkbutton -label foo -indicatoron 0
     set tearoff [tk::TearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } -result {{} {}}
 test unixMenu-12.3 {DrawMenuEntryIndicator - checkbutton - not selected} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1
     .m1 add checkbutton -label foo
     set tearoff [tk::TearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } -result {{} {}}
 test unixMenu-12.4 {DrawMenuEntryIndicator - checkbutton - selected} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1
     .m1 add checkbutton -label foo
@@ -329,31 +329,31 @@
     .m1 invoke 1
     set tearoff [tk::TearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } -result {{} {}}
 test unixMenu-12.5 {DrawMenuEntryIndicator - radiobutton - indicator off} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1
     .m1 add radiobutton -label foo -indicatoron 0
     set tearoff [tk::TearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } -result {{} {}}
 test unixMenu-12.6 {DrawMenuEntryIndicator - radiobutton - not selected} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1
     .m1 add radiobutton -label foo
     set tearoff [tk::TearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } -result {{} {}}
 test unixMenu-12.7 {DrawMenuEntryIndicator - radiobutton - selected} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1
     .m1 add radiobutton -label foo
@@ -444,61 +444,61 @@
 
 
 # Don't know how to reproduce the case where the tkwin has been deleted.
 
 test unixMenu-19.1 {TkpComputeMenubarGeometry - zero entries} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1
     . configure -menu .m1
     list [update] [. configure -menu ""] [destroy .m1]
 } -result {{} {} {}}
 # Don't know how to generate one width windows
 test unixMenu-19.2 {TkpComputeMenubarGeometry - one entry} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1
     .m1 add cascade -label File
     . configure -menu .m1
     list [update] [. configure -menu ""] [destroy .m1]
 } -result {{} {} {}}
 test unixMenu-19.3 {TkpComputeMenubarGeometry - entry with different font} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1 -font "Courier 24"
     .m1 add cascade -label File -font "Helvetica 18"
     . configure -menu .m1
     list [update] [. configure -menu ""] [destroy .m1]
 } -result {{} {} {}}
 test unixMenu-19.4 {TkpComputeMenubarGeometry - separator} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1
     .m1 add separator
     . configure -menu .m1
     list [update] [. configure -menu ""] [destroy .m1]
 } -result {{} {} {}}
 test unixMenu-19.5 {TkpComputeMenubarGeometry - First entry} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1 -tearoff 0
     .m1 add cascade -label File
     . configure -menu .m1
     list [update] [. configure -menu ""] [destroy .m1]
 } -result {{} {} {}}
 test unixMenu-19.6 {TkpComputeMenubarGeometry - First entry too wide} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1 -tearoff 0
     .m1 add cascade -label File -font "Times 72"
@@ -505,11 +505,11 @@
     . configure -menu .m1
     wm geometry . 10x10
     list [update] [. configure -menu ""] [destroy .m1]
 } -result {{} {} {}}
 test unixMenu-19.7 {TkpComputeMenubarGeometry - two entries fit} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1 -tearoff 0
     .m1 add cascade -label File
@@ -517,11 +517,11 @@
     . configure -menu .m1
     wm geometry . 200x200
     list [update] [. configure -menu ""] [destroy .m1]
 } -result {{} {} {}}
 test unixMenu-19.8 {TkpComputeMenubarGeometry - two entries; 2nd don't fit} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1 -tearoff 0
     .m1 add cascade -label File
@@ -529,11 +529,11 @@
     . configure -menu .m1
     wm geometry . 100x100
     list [update] [. configure -menu ""] [destroy .m1]
 } -result {{} {} {}}
 test unixMenu-19.9 {TkpComputeMenubarGeometry - two entries; 1st dont fit} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1 -tearoff 0
     .m1 add cascade -label File -font "Times 72"
@@ -541,11 +541,11 @@
     . configure -menu .m1
     wm geometry . 100x100
     list [update] [. configure -menu ""] [destroy .m1]
 } -result {{} {} {}}
 test unixMenu-19.10 {TkpComputeMenubarGeometry - two entries; neither fit} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1 -tearoff 0 -font "Times 72"
     .m1 add cascade -label File
@@ -643,11 +643,11 @@
     . configure -menu .m1
     wm geometry . 100x10
     list [update] [. configure -menu ""] [destroy .m1]
 } -result {{} {} {}}
 test unixMenu-19.19 {TkpComputeMenubarGeometry - help menu in first position} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1 -tearoff 0
     .m1 add cascade -label Help -menu .m1.help
@@ -659,11 +659,11 @@
     . configure -menu .m1
     wm geometry . 100x10
     list [update] [. configure -menu ""] [destroy .m1]
 } -result {{} {} {}}
 test unixMenu-19.20 {TkpComputeMenubarGeometry - help menu in middle} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1 -tearoff 0
     .m1 add cascade -label Edit -menu .m1.edit
@@ -675,11 +675,11 @@
     . configure -menu .m1
     wm geometry . 100x10
     list [update] [. configure -menu ""] [destroy .m1]
 } -result {{} {} {}}
 test unixMenu-19.21 {TkpComputeMenubarGeometry - help menu in first position} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1 -tearoff 0
     .m1 add cascade -label File -menu .m1.file
@@ -691,11 +691,11 @@
     . configure -menu .m1
     wm geometry . 100x10
     list [update] [. configure -menu ""] [destroy .m1]
 } -result {{} {} {}}
 test unixMenu-19.22 {TkpComputeMenubarGeometry - help item fits} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1 -tearoff 0
     .m1 add cascade -label File -menu .m1.file
@@ -705,11 +705,11 @@
     . configure -menu .m1
     wm geometry . 100x10
     list [update] [. configure -menu ""] [destroy .m1]
 } -result {{} {} {}}
 test unixMenu-19.23 {TkpComputeMenubarGeometry - help item does not fit} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1 -tearoff 0
     .m1 add cascade -label File -menu .m1.file
@@ -719,11 +719,11 @@
     . configure -menu .m1
     wm geometry . 100x10
     list [update] [. configure -menu ""] [destroy .m1]
 } -result {{} {} {}}
 test unixMenu-19.24 {TkpComputeMenubarGeometry - help item only one} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1 -tearoff 0
     .m1 add cascade -label Help -menu .m1.help
@@ -764,31 +764,31 @@
     .m1 add cascade -label test -menu .m1.test
     list [menu .m1.test] [destroy .m1]
 } -result {.m1.test {}}
 # Don't know how to automate missing tkwins
 test unixMenu-22.2 {SetHelpMenu - menubar but no help menu} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1 -tearoff 0
     . configure -menu .m1
     .m1 add cascade -label .m1.file
     list [menu .m1.file] [. configure -menu ""] [destroy .m1]
 } -result {.m1.file {} {}}
 test unixMenu-22.3 {SetHelpMenu - menubar with help menu} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1 -tearoff 0
     . configure -menu .m1
     .m1 add cascade -label .m1.help
     list [menu .m1.help] [. configure -menu ""] [destroy .m1]
 } -result {.m1.help {} {}}
 test unixMenu-22.4 {SetHelpMenu - multiple menubars with same help menu} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1 .t2
 } -body {
     toplevel .t2
     wm geometry .t2 +40+40
@@ -799,11 +799,11 @@
     list [menu .m1.help] [. configure -menu ""] [destroy .m1] [destroy .t2]
 } -result {.m1.help {} {} {}}
 
 
 test unixMenu-23.1 {TkpDrawMenuEntry - gc for active and not strict motif} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1
     .m1 add command -label foo
@@ -810,11 +810,11 @@
     set tearoff [tk::TearOffMenu .m1 40 40]
     .m1 entryconfigure 1 -state active
     list [update] [destroy .m1]
 } -result {{} {}}
 test unixMenu-23.2 {TkpDrawMenuEntry - gc for active menu item with its own gc} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1
     .m1 add command -label foo -activeforeground red
@@ -821,11 +821,11 @@
     set tearoff [tk::TearOffMenu .m1 40 40]
     .m1 entryconfigure 1 -state active
     list [update] [destroy .m1]
 } -result {{} {}}
 test unixMenu-23.3 {TkpDrawMenuEntry - gc for active and strict motif} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1
     set tk_strictMotif 1
@@ -833,41 +833,41 @@
     set tearoff [tk::TearOffMenu .m1 40 40]
     .m1 entryconfigure 1 -state active
     list [update] [destroy .m1] [set tk_strictMotif 0]
 } -result {{} {} 0}
 test unixMenu-23.4 {TkpDrawMenuEntry - gc for disabled with disabledfg and custom entry} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1 -disabledforeground blue
     .m1 add command -label foo -state disabled -background red
     set tearoff [tk::TearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } -result {{} {}}
 test unixMenu-23.5 {TkpDrawMenuEntry - gc for disabled with disabledFg} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1 -disabledforeground blue
     .m1 add command -label foo -state disabled
     set tearoff [tk::TearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } -result {{} {}}
 test unixMenu-23.6 {TkpDrawMenuEntry - gc for disabled - no disabledFg} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1 -disabledforeground ""
     .m1 add command -label foo -state disabled
     set tearoff [tk::TearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } -result {{} {}}
 test unixMenu-23.7 {TkpDrawMenuEntry - gc for normal - custom entry} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1
     .m1 add command -label foo -foreground red
@@ -881,11 +881,11 @@
     .m1 add command -label foo
     set tearoff [tk::TearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } -result {{} {}}
 test unixMenu-23.9 {TkpDrawMenuEntry - gc for indicator - custom entry} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1
     .m1 add checkbutton -label foo -selectcolor orange
@@ -892,11 +892,11 @@
     .m1 invoke 1
     set tearoff [tk::TearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } -result {{} {}}
 test unixMenu-23.10 {TkpDrawMenuEntry - gc for indicator} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1
     .m1 add checkbutton -label foo
@@ -903,11 +903,11 @@
     .m1 invoke 1
     set tearoff [tk::TearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } -result {{} {}}
 test unixMenu-23.11 {TkpDrawMenuEntry - border - custom entry} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1
     .m1 add command -label foo -activebackground green
@@ -923,11 +923,11 @@
     set tearoff [tk::TearOffMenu .m1 40 40]
     .m1 entryconfigure 1 -state active
     list [update] [destroy .m1]
 } -result {{} {}}
 test unixMenu-23.13 {TkpDrawMenuEntry - active border - strict motif} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     set tk_strictMotif 1
     menu .m1
@@ -935,11 +935,11 @@
     set tearoff [tk::TearOffMenu .m1 40 40]
     .m1 entryconfigure 1 -state active
     list [update] [destroy .m1] [set tk_strictMotif 0]
 } -result {{} {} 0}
 test unixMenu-23.14 {TkpDrawMenuEntry - active border - custom entry} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1
     .m1 add command -label foo -activeforeground yellow
@@ -955,11 +955,11 @@
     set tearoff [tk::TearOffMenu .m1 40 40]
     .m1 entryconfigure 1 -state active
     list [update] [destroy .m1]
 } -result {{} {}}
 test unixMenu-23.16 {TkpDrawMenuEntry - font - custom entry} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1
     .m1 add command -label foo -font "Helvectica 72"
@@ -989,11 +989,11 @@
     .m1 add command -label foo
     set tearoff [tk::TearOffMenu .m1 40 40]
     list [update] [destroy .m1]
 } -result {{} {}}
 test unixMenu-23.20 {TkpDrawMenuEntry - disabled cascade item} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1
     .m1 add cascade -label File -menu .m1.file
@@ -1056,38 +1056,38 @@
     list [update idletasks] [destroy .m1]
 } -result {{} {}}
 
 
 test unixMenu-25.1 {TkpComputeStandardMenuGeometry - no entries} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1
     list [update idletasks] [destroy .m1]
 } -result {{} {}}
 test unixMenu-25.2 {TkpComputeStandardMenuGeometry - one entry} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1
     .m1 add command -label "one"
     list [update idletasks] [destroy .m1]
 } -result {{} {}}
 test unixMenu-25.3 {TkpComputeStandardMenuGeometry - more than one entry} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1
     .m1 add command -label "one"
     .m1 add command -label "two"
     list [update idletasks] [destroy .m1]
 } -result {{} {}}
 test unixMenu-25.4 {TkpComputeStandardMenuGeometry - separator} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1
     .m1 add separator
@@ -1104,78 +1104,78 @@
     pack .mb
     catch {tk::MbPost .mb}
     list [update] [tk::MenuUnpost .mb.m] [destroy .mb]
 } -result {{} {} {}}
 test unixMenu-25.6 {TkpComputeStandardMenuGeometry - standard label geometry} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1
     .m1 add command -label "test"
     list [update idletasks] [destroy .m1]
 } -result {{} {}}
 test unixMenu-25.7 {TkpComputeStandardMenuGeometry - different font for entry} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1 -font "Helvetica 12"
     .m1 add command -label "test" -font "Courier 12"
     list [update idletasks] [destroy .m1]
 } -result {{} {}}
 test unixMenu-25.8 {TkpComputeStandardMenuGeometry - second entry larger} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1
     .m1 add command -label "test"
     .m1 add command -label "test test"
     list [update idletasks] [destroy .m1]
 } -result {{} {}}
 test unixMenu-25.9 {TkpComputeStandardMenuGeometry - first entry larger} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1
     .m1 add command -label "test test"
     .m1 add command -label "test"
     list [update idletasks] [destroy .m1]
 } -result {{} {}}
 test unixMenu-25.10 {TkpComputeStandardMenuGeometry - accelerator} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1
     .m1 add command -label "test" -accel "Ctrl+S"
     list [update idletasks] [destroy .m1]
 } -result {{} {}}
 test unixMenu-25.11 {TkpComputeStandardMenuGeometry - second accel larger} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1
     .m1 add command -label "test" -accel "1"
     .m1 add command -label "test" -accel "1 1"
     list [update idletasks] [destroy .m1]
 } -result {{} {}}
 test unixMenu-25.12 {TkpComputeStandardMenuGeometry - second accel smaller} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1
     .m1 add command -label "test" -accel "1 1"
     .m1 add command -label "test" -accel "1"
     list [update idletasks] [destroy .m1]
 } -result {{} {}}
 test unixMenu-25.13 {TkpComputeStandardMenuGeometry - indicator} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1
     .m1 add checkbutton -label test
@@ -1209,19 +1209,19 @@
     .m1 add checkbutton -label test
     .m1 invoke 2
     list [update idletasks] [destroy .m1] [image delete image1]
 } -result {{} {} {}}
 test unixMenu-25.16 {TkpComputeStandardMenuGeometry - zero sized menus} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1 -tearoff 0
     list [update idletasks] [destroy .m1]
 } -result {{} {}}
 test unixMenu-25.17 {TkpComputeStandardMenuGeometry - first column bigger} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1
     .m1 add command -label one
@@ -1228,11 +1228,11 @@
     .m1 add command -label two
     .m1 add command -label three -columnbreak 1
     list [update idletasks] [destroy .m1]
 } -result {{} {}}
 test unixMenu-25.18 {TkpComputeStandardMenuGeometry - second column bigger} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1 -tearoff 0
     .m1 add command -label one
@@ -1239,11 +1239,11 @@
     .m1 add command -label two -columnbreak 1
     .m1 add command -label three
     list [update idletasks] [destroy .m1]
 } -result {{} {}}
 test unixMenu-25.19 {TkpComputeStandardMenuGeometry - three columns} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1 -tearoff 0
     .m1 add command -label one
@@ -1250,14 +1250,14 @@
     .m1 add command -label two -columnbreak 1
     .m1 add command -label three
     .m1 add command -label four
     .m1 add command -label five -columnbreak 1
     .m1 add command -label six
-    list [update idletasks] [destroy .m1]    
+    list [update idletasks] [destroy .m1]
 } -result {{} {}}
 test unixMenu-25.20 {TkpComputeStandardMenuGeometry - hide margin} -constraints {
-    unix 
+    unix
 } -setup {
     destroy .m1
 } -body {
     menu .m1 -tearoff 0
     .m1 add checkbutton -label one -hidemargin 1

Index: tests/unixSelect.test
==================================================================
--- tests/unixSelect.test
+++ tests/unixSelect.test
@@ -106,11 +106,11 @@
 }
 
 # ----------------------------------------------------------------------
 
 test unixSelect-1.1 {TkSelGetSelection procedure: simple i18n text} -constraints {
-    unix
+    x11
 } -setup {
     destroy .e
     setupbg
 } -body {
     pack [entry .e]
@@ -122,11 +122,11 @@
     cleanupbg
     destroy .e
 } -result {4}
 
 test unixSelect-1.2 {TkSelGetSelection procedure: simple i18n text, iso8859-1} -constraints {
-    unix
+    x11
 } -setup {
     setupbg
 } -body {
     dobg {
         pack [entry .e]
@@ -138,11 +138,11 @@
 } -cleanup {
     cleanupbg
 } -result \u00fc?
 
 test unixSelect-1.3 {TkSelGetSelection procedure: simple i18n text, iso2022} -constraints {
-    unix
+    x11
 } -setup {
     setupbg
     setup
 } -body {
     selection handle -type COMPOUND_TEXT -format COMPOUND_TEXT . \
@@ -158,11 +158,11 @@
 } -cleanup {
     cleanupbg
 } -result {1 2 {COMPOUND_TEXT 0 4000}}
 
 test unixSelect-1.4 {TkSelGetSelection procedure: INCR i18n text, iso2022} -constraints {
-    unix
+    x11
 } -setup {
     setupbg
     setup
 } -body {
     # This test is subtle.  The selection ends up getting fetched twice by
@@ -184,11 +184,11 @@
 } -cleanup {
     cleanupbg
 } -result {1 8000 {COMPOUND_TEXT 0 4000 COMPOUND_TEXT 4000 3999 COMPOUND_TEXT 7998 4000 COMPOUND_TEXT 0 4000 COMPOUND_TEXT 4000 3998 COMPOUND_TEXT 7997 4000}}
 
 test unixSelect-1.5 {TkSelGetSelection procedure: simple i18n text, iso2022} -constraints {
-    unix
+    x11
 } -setup {
     setupbg
     setup
 } -body {
     selection handle -type COMPOUND_TEXT -format COMPOUND_TEXT . \
@@ -204,11 +204,11 @@
 } -cleanup {
     cleanupbg
 } -result {1 2 {COMPOUND_TEXT 0 4000}}
 
 test unixSelect-1.6 {TkSelGetSelection procedure: INCR i18n text} -constraints {
-    unix
+    x11
 } -setup {
     setupbg
 } -body {
     dobg [subst -nobackslashes {entry .e; pack .e; update
     .e insert 0 \u00fcber$longValue
@@ -217,11 +217,11 @@
 } -cleanup {
     cleanupbg
 } -result [expr {4 + [string length $longValue]}]
 
 test unixSelect-1.7 {TkSelGetSelection procedure: INCR i18n text} -constraints {
-    unix
+    x11
 } -setup {
     setupbg
 } -body {
     dobg {
         pack [entry .e]
@@ -233,11 +233,11 @@
 } -cleanup {
     cleanupbg
 } -result [string repeat x 3999]\u00fc
 
 test unixSelect-1.8 {TkSelGetSelection procedure: INCR i18n text} -constraints {
-    unix
+    x11
 } -setup {
     setupbg
 } -body {
     dobg {
         pack [entry .e]
@@ -249,11 +249,11 @@
 } -cleanup {
     cleanupbg
 } -result \u00fc[string repeat x 3999]
 
 test unixSelect-1.9 {TkSelGetSelection procedure: INCR i18n text} -constraints {
-    unix
+    x11
 } -setup {
     setupbg
 } -body {
     dobg {
         pack [entry .e]
@@ -268,11 +268,11 @@
 # Now some tests to make sure that the right thing is done when
 # transferring UTF8 selections, to prevent [Bug 614650] and its ilk
 # from rearing its ugly head again.
 
 test unixSelect-1.10 {TkSelGetSelection procedure: INCR i18n text, utf-8} -constraints {
-    unix
+    x11
 } -setup {
     setupbg
 } -body {
     dobg {
         pack [entry .e]
@@ -284,11 +284,11 @@
 } -cleanup {
     cleanupbg
 } -result [string repeat x 3999]\u00fc
 
 test unixSelect-1.11 {TkSelGetSelection procedure: INCR i18n text, utf-8} -constraints {
-    unix
+    x11
 } -setup {
     setupbg
 } -body {
     dobg {
         pack [entry .e]
@@ -300,11 +300,11 @@
 } -cleanup {
     cleanupbg
 } -result \u00fc[string repeat x 3999]
 
 test unixSelect-1.12 {TkSelGetSelection procedure: INCR i18n text, utf-8} -constraints {
-    unix
+    x11
 } -setup {
     setupbg
 } -body {
     dobg {
         pack [entry .e]
@@ -316,11 +316,11 @@
 } -cleanup {
     cleanupbg
 } -result [string repeat x 3999]\u00fc[string repeat x 4000]
 
 test unixSelect-1.13 {TkSelGetSelection procedure: simple i18n text, utf-8} -constraints {
-    unix
+    x11
 } -setup {
     destroy .e
     setupbg
 } -body {
     pack [entry .e]
@@ -332,11 +332,11 @@
     destroy .e
     cleanupbg
 } -result {5}
 
 test unixSelect-1.14 {TkSelGetSelection procedure: simple i18n text, utf-8} -constraints {
-    unix
+    x11
 } -setup {
     setupbg
 } -body {
     dobg {
         pack [entry .e]
@@ -348,11 +348,11 @@
 } -cleanup {
     cleanupbg
 } -result \u00fc\u0444
 
 test unixSelect-1.15 {TkSelGetSelection procedure: INCR i18n text, utf-8} -constraints {
-    unix
+    x11
 } -setup {
     setupbg
 } -body {
     dobg {
         pack [entry .e]
@@ -364,11 +364,11 @@
 } -cleanup {
     cleanupbg
 } -result [string repeat [string repeat \u00c4\u00e4 50]\n 21]
 
 test unixSelect-1.16 {TkSelGetSelection procedure: INCR i18n text, utf-8} -constraints {
-    unix
+    x11
 } -setup {
     setupbg
 } -body {
     dobg {
         pack [entry .e]
@@ -380,11 +380,11 @@
 } -cleanup {
     cleanupbg
 } -result i[string repeat [string repeat \u00c4\u00e4 50]\n 21]
 
 test unixSelect-1.17 {TkSelGetSelection procedure: INCR i18n text, utf-8} -constraints {
-    unix
+    x11
 } -setup {
     setupbg
 } -body {
     dobg {
         pack [text .t]
@@ -398,11 +398,11 @@
 } -cleanup {
     cleanupbg
 } -result [string repeat [string repeat \u00c4\u00e4 50]\n 21]
 
 test unixSelect-1.18 {TkSelGetSelection procedure: INCR i18n text, utf-8} -constraints {
-    unix
+    x11
 } -setup {
     setupbg
 } -body {
     dobg {
         pack [text .t]

Index: tests/unixWm.test
==================================================================
--- tests/unixWm.test
+++ tests/unixWm.test
@@ -628,11 +628,11 @@
 } {1 {wrong # args: should be "wm focusmodel window ?active|passive?"}}
 test unixWm-17.2 {Tk_WmCmd procedure, "focusmodel" option} unix {
     list [catch {wm focusmodel .t bogus} msg] $msg
 } {1 {bad argument "bogus": must be active or passive}}
 test unixWm-17.3 {Tk_WmCmd procedure, "focusmodel" option} unix {
-    set result {} 
+    set result {}
     lappend result [wm focusmodel .t]
     wm focusmodel .t active
     lappend result [wm focusmodel .t]
     wm focusmodel .t passive
     lappend result [wm focusmodel .t]
@@ -1324,20 +1324,20 @@
 
 test unixWm-40.1 {Tk_SetGrid procedure, set grid dimensions before turning on grid} {unix nonPortable} {
     destroy .t
     toplevel .t
     wm geometry .t 30x10+0+0
-    listbox .t.l -height 20 -width 20 -setgrid 1 
+    listbox .t.l -height 20 -width 20 -setgrid 1
     pack .t.l -fill both -expand 1
     update
     wm geometry .t
 } {30x10+0+0}
 test unixWm-40.2 {Tk_SetGrid procedure, turning on grid when dimensions already set} unix {
     destroy .t
     toplevel .t
     wm geometry .t 200x100+0+0
-    listbox .t.l -height 20 -width 20 
+    listbox .t.l -height 20 -width 20
     pack .t.l -fill both -expand 1
     update
     .t.l configure -setgrid 1
     update
     wm geometry .t
@@ -1746,11 +1746,11 @@
     frame .t.f -width 20 -height 30 -bd 2 -relief raised
     place .t.f -x 10 -y 30
     testmenubar window .t .t.m
     update
     list [expr [winfo rootx .t.m.f] - $x] [expr [winfo rooty .t.m.f] - $y] \
-	    [expr [winfo rootx .t.f] - $x] [expr [winfo rooty .t.f] - $y] 
+	    [expr [winfo rootx .t.f] - $x] [expr [winfo rooty .t.f] - $y]
 } {52 7 12 62}
 
 deleteWindows
 wm iconify .
 test unixWm-50.1 {Tk_CoordsToWindow procedure, finding a toplevel, x-coords} unix {

Index: tests/visual_bb.test
==================================================================
--- tests/visual_bb.test
+++ tests/visual_bb.test
@@ -50,11 +50,11 @@
     #-------------------------------------------------------
 
     frame .menu -relief raised -borderwidth 1
     message .msg -font {Times 18} -relief raised -width 4i \
         -borderwidth 1 -text "This application provides a collection of visual tests for the Tk toolkit.  Each menu entry invokes a test, which displays information on the screen.  You can then verify visually that the information is being displayed in the correct way.  The tests under the \"Postscript\" menu exercise the Postscript-generation capabilities of canvas widgets."
-   
+
     pack .menu -side top -fill x
     pack .msg -side bottom -expand yes -fill both
 
     #-------------------------------------------------------
     # The code below creates all the menus, which invoke procedures
@@ -62,11 +62,11 @@
     #-------------------------------------------------------
 
     menubutton .menu.file -text "File" -menu .menu.file.m
     menu .menu.file.m
     .menu.file.m add command -label "Quit" -command end
-   
+
     menubutton .menu.group1 -text "Group 1" -menu .menu.group1.m
     menu .menu.group1.m
     .menu.group1.m add command -label "Canvas arcs" -command {runTest arc.tcl}
     .menu.group1.m add command -label "Beveled borders in text widgets" \
         -command {runTest bevel.tcl}
@@ -74,11 +74,11 @@
         -command {runTest cmap.tcl}
     .menu.group1.m add command -label "Label/button geometry" \
         -command {runTest butGeom.tcl}
     .menu.group1.m add command -label "Label/button colors" \
         -command {runTest butGeom2.tcl}
-   
+
     menubutton .menu.ps -text "Canvas Postscript" -menu .menu.ps.m
     menu .menu.ps.m
     .menu.ps.m add command -label "Rectangles and other graphics" \
         -command {runTest canvPsGrph.tcl}
     .menu.ps.m add command -label "Text" \
@@ -87,15 +87,15 @@
         -command {runTest canvPsBmap.tcl}
     .menu.ps.m add command -label "Images" \
         -command {runTest canvPsImg.tcl}
     .menu.ps.m add command -label "Arcs" \
         -command {runTest canvPsArc.tcl}
-   
+
     pack .menu.file .menu.group1 .menu.ps -side left -padx 1m
-   
+
     # Set up for keyboard-based menu traversal
-   
+
     bind . <Any-FocusIn> {
     if {("%d" == "NotifyVirtual") && ("%m" == "NotifyNormal")} {
         focus .menu
     }
     }

Index: tests/winDialog.test
==================================================================
--- tests/winDialog.test
+++ tests/winDialog.test
@@ -253,11 +253,11 @@
 } -body {
     start {set x [tk_getOpenFile -title bar]}
     set y [then {
         Click cancel
     }]
-    # Note this also tests fix for 
+    # Note this also tests fix for
     # http://core.tcl.tk/tk/tktview/4a0451f5291b3c9168cc560747dae9264e1d2ef6
     # $x is expected to be empty
     append x $y
 } -result {0}
 test winDialog-5.6 {GetFileName: valid option, but missing value} -constraints {
@@ -439,11 +439,11 @@
 } -result bar.foo
 test winDialog-5.9 {GetFileName: file types} -constraints {
     nt testwinevent
 } -body {
     #        case FILE_TYPES:
-    
+
     start {tk_getSaveFile -filetypes {{"foo files" .foo FOOF}} -title Foo}
     # XXX - currently disabled for vista style dialogs because the file
     # types control has no control ID and we don't have a mechanism to
     # locate it.
     if {[vista?]} {
@@ -502,11 +502,11 @@
 } -result [file normalize [file join ~ "5 12 1"]]
 
 test winDialog-5.12.2 {tk_getSaveFile: initial directory: ~user} -constraints {
     nt testwinevent
 } -body {
-    
+
     # Note: this test will fail on Tcl versions 8.6.4 and earlier due
     # to a bug in file normalize for names of the form ~xxx that
     # returns the wrong dir on Windows.  In particular (in Win8 at
     # least) it returned /users/Default instead of /users/USERNAME...
 
@@ -729,11 +729,11 @@
 } -result {1}
 test winDialog-5.17 {GetFileName: title} -constraints {
     nt testwinevent
 } -body {
 #        case FILE_TITLE:
-   
+
     start {tk_getOpenFile -title Narf}
     then {
         Click cancel
     }
 } -result {0}
@@ -792,11 +792,11 @@
 } -result {}
 test winDialog-5.21 {GetFileName: call GetOpenFileName} -constraints {
     nt testwinevent english
 } -body {
 #        winCode = GetOpenFileName(&ofn);
-   
+
     start {tk_getOpenFile -title Open}
     then {
         set x [GetText ok]
         Click cancel
     }
@@ -925,11 +925,11 @@
 test winDialog-9.8 {Tk_ChooseDirectoryObjCmd: initial directory: Tcl_TranslateFilename()} -constraints {
     nt
 } -body {
 #        if (Tcl_TranslateFileName(interp, string,
 #            &utfDirString) == NULL)
-   
+
     tk_chooseDirectory -initialdir ~12x/455
 } -returnCodes error -result {user "12x" doesn't exist}
 
 
 test winDialog-10.1 {Tk_FontchooserObjCmd: no arguments} -constraints {

Index: tests/winFont.test
==================================================================
--- tests/winFont.test
+++ tests/winFont.test
@@ -2,11 +2,11 @@
 # It is organized in the standard fashion for Tcl tests.
 #
 # Many of these tests are visually oriented and cannot be checked
 # programmatically (such as "does an underlined font appear to be
 # underlined?"); these tests attempt to exercise the code in question,
-# but there are no results that can be checked. 
+# but there are no results that can be checked.
 #
 # Copyright (c) 1996-1997 Sun Microsystems, Inc.
 # Copyright (c) 1998-1999 by Scriptics Corporation.
 # All rights reserved.
 
@@ -69,29 +69,29 @@
     set x {}
 } -body {
     lappend x [font actual {-family "Times"} -family]
     lappend x [font actual {-family "New York"} -family]
     lappend x [font actual {-family "Times New Roman"} -family]
-} -result {{Times New Roman} {Times New Roman} {Times New Roman}}
+} -result {Times Times {Times New Roman}}
 test winfont-2.8 {TkpGetFontFromAttributes procedure: Courier fonts} -constraints {
     win
 } -setup {
     set x {}
 } -body {
     lappend x [font actual {-family "Courier"} -family]
     lappend x [font actual {-family "Monaco"} -family]
     lappend x [font actual {-family "Courier New"} -family]
-} -result {{Courier New} {Courier New} {Courier New}}
+} -match regexp -result {Courier (Courier|Monaco) {Courier New}}
 test winfont-2.9 {TkpGetFontFromAttributes procedure: Helvetica fonts} -constraints {
     win
 } -setup {
     set x {}
 } -body {
     lappend x [font actual {-family "Helvetica"} -family]
     lappend x [font actual {-family "Geneva"} -family]
     lappend x [font actual {-family "Arial"} -family]
-} -result {Arial Arial Arial}
+} -match regexp -result {Helvetica (Helvetica|Geneva) Arial}
 test winfont-2.10 {TkpGetFontFromAttributes procedure: fallback} -constraints {
     win
 } -body {
     # No way to get it to fail! Any font name is acceptable.
 } -result {}
@@ -139,11 +139,11 @@
         -text "0" -font systemfixed
     pack .t.l
     update
     set ax [winfo reqwidth .t.l]
     set ay [winfo reqheight .t.l]
-   
+
     .t.l config -wrap 0 -text "000000"
     list [expr {[winfo reqwidth .t.l] eq 6*$ax}] \
         [expr {[winfo reqheight .t.l] eq $ay}]
 } -cleanup {
     destroy .t.l
@@ -158,11 +158,11 @@
         -text "0" -font systemfixed
     pack .t.l
     update
     set ax [winfo reqwidth .t.l]
     set ay [winfo reqheight .t.l]
-   
+
     .t.l config -wrap 100000 -text "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
     list [expr {[winfo reqwidth .t.l] eq 256*$ax}] \
         [expr {[winfo reqheight .t.l] eq $ay}]
 } -cleanup {
     destroy .t.l
@@ -177,11 +177,11 @@
         -text "0" -font systemfixed
     pack .t.l
     update
     set ax [winfo reqwidth .t.l]
     set ay [winfo reqheight .t.l]
-   
+
     .t.l config -wrap [expr $ax*10] -text "00000000"
     list [expr {[winfo reqwidth .t.l] eq 8*$ax}] \
         [expr {[winfo reqheight .t.l] eq $ay}]
 } -cleanup {
     destroy .t.l
@@ -196,11 +196,11 @@
         -text "0" -font systemfixed
     pack .t.l
     update
     set ax [winfo reqwidth .t.l]
     set ay [winfo reqheight .t.l]
-   
+
     .t.l config -wrap [expr $ax*6] -text "00000000"
     list [expr {[winfo reqwidth .t.l] eq 6*$ax}] \
         [expr {[winfo reqheight .t.l] eq 2*$ay}]
 } -cleanup {
     destroy .t.l
@@ -232,11 +232,11 @@
         -text "0" -font systemfixed
     pack .t.l
     update
     set ax [winfo reqwidth .t.l]
     set ay [winfo reqheight .t.l]
-   
+
     .t.l config -text "000000" -wrap 1
     list [expr {[winfo reqwidth .t.l] eq $ax}] \
         [expr {[winfo reqheight .t.l] eq 6*$ay}]
 } -cleanup {
     destroy .t.l
@@ -251,11 +251,11 @@
         -text "0" -font systemfixed
     pack .t.l
     update
     set ax [winfo reqwidth .t.l]
     set ay [winfo reqheight .t.l]
-   
+
     .t.l config -wrap [expr $ax*8] -text "000000 0000"
     list [expr {[winfo reqwidth .t.l] eq 6*$ax}] \
         [expr {[winfo reqheight .t.l] eq 2*$ay}]
 } -cleanup {
     destroy .t.l
@@ -270,11 +270,11 @@
         -text "0" -font systemfixed
     pack .t.l
     update
     set ax [winfo reqwidth .t.l]
     set ay [winfo reqheight .t.l]
-   
+
     .t.l config -wrap [expr $ax*12] -text "000000    0000000"
     list [expr {[winfo reqwidth .t.l] eq 7*$ax}] \
         [expr {[winfo reqheight .t.l] eq 2*$ay}]
 } -cleanup {
     destroy .t.l
@@ -289,11 +289,11 @@
         -text "0" -font systemfixed
     pack .t.l
     update
     set ax [winfo reqwidth .t.l]
     set ay [winfo reqheight .t.l]
-   
+
     .t.l config -wrap [expr $ax*12] -text "000  00   00000"
     list [expr {[winfo reqwidth .t.l] eq 7*$ax}] \
         [expr {[winfo reqheight .t.l] eq 2*$ay}]
 } -cleanup {
     destroy .t.l
@@ -308,11 +308,11 @@
         -text "0" -font systemfixed
     pack .t.l
     update
     set ax [winfo reqwidth .t.l]
     set ay [winfo reqheight .t.l]
-   
+
     .t.l config -wrap [expr $ax*12] -text "0000000000000000"
     list [expr {[winfo reqwidth .t.l] eq 12*$ax}] \
         [expr {[winfo reqheight .t.l] eq 2*$ay}]
 } -cleanup {
     destroy .t.l
@@ -325,11 +325,11 @@
 }  -body {
     label .t.l -padx 0 -pady 0 -bd 0 -highlightthickness 0 -justify left \
         -text "0" -font systemfixed
     pack .t.l
     update
-   
+
     set font [.t.l cget -font]
     .t.l config -font {{MS Sans Serif} 8} -text "W"
     set width [winfo reqwidth .t.l]
     .t.l config -text "XaYoYaKaWx"
     set x [lindex [getsize] 0]

Index: tests/winMenu.test
==================================================================
--- tests/winMenu.test
+++ tests/winMenu.test
@@ -479,11 +479,11 @@
 } -result {{} {} {1 {1
     while executing
 "error 1"
     (menu invoke)}} {} {}}
 
-   
+
 # Can't test WM_MENUCHAR
 
 test winMenu-11.4 {TkWinHandleMenuEvent - WM_MEASUREITEM} -constraints {
     win userInteraction
 } -setup {
@@ -786,11 +786,11 @@
 } -body {
     menu .m1
     .m1 add command -label foo -underline 0
     set tearoff [tk::TearOffMenu .m1 40 40]
     list [update] [destroy .m1]
-} -result {{} {}}  
+} -result {{} {}}
 
 
 test winMenu-23.1 {Don't know how to test MenuKeyBindProc} -constraints {
     win emptyTest
 } -body {}
@@ -1341,11 +1341,11 @@
     .m1 add command -label two -columnbreak 1
     .m1 add command -label three
     .m1 add command -label four
     .m1 add command -label five -columnbreak 1
     .m1 add command -label six
-    list [update idletasks] [destroy .m1]   
+    list [update idletasks] [destroy .m1]
 } -result {{} {}}
 
 
 test winMenu-33.1 {TkpNotifyTopLevelCreate - no menu yet} -constraints {
     win

Index: tests/winWm.test
==================================================================
--- tests/winWm.test
+++ tests/winWm.test
@@ -243,11 +243,11 @@
     pack .t.f
     wm geometry .t -0-0
     update
     set y [winfo rooty .t]
     lappend result [winfo height .t]
-    menu .t.m
+    menu .t.m -tearoff 1
     .t configure -menu .t.m
     .t.m add command -label foo
     .t.m add command -label "thisisreallylong"
     .t.m add command -label "thisisreallylong"
     update
@@ -472,11 +472,11 @@
         bind $w.b <Map> {bind %W <Map> {}; after idle {winwm90click %W}}
     }
     global winwm90done
     set winwm90done wait
     toplevel .t
-} -body {    
+} -body {
     pack [button .t.b -text "Show" -command {winwm90proc1 .tx}]
     bind .t.b <Map> {bind %W <Map> {}; after idle {winwm90click %W}}
     after 5000 {set winwm90done timeout}
     vwait winwm90done
     set winwm90done
@@ -483,11 +483,11 @@
 } -cleanup {
     foreach cmd {proc1 proc2 proc3 click} {
         rename winwm90$cmd {}
     }
     destroy .tx .t .sd
-} -result {ok} 
+} -result {ok}
 
 test winWm-9.1 "delayed activation of grabbed destroyed window" -constraints win -setup {
     proc winwm91click {w} {
         if {![winfo ismapped $w]} { update }
         event generate $w <Enter>
@@ -517,11 +517,11 @@
     }
     destroy .t
     global winwm91done
     set winwm91done wait
     toplevel .t
-} -body {    
+} -body {
     pack [button .t.b -text "Show" -command {winwm91proc1 .tx}]
     bind .t.b <Map> {bind %W <Map> {}; after idle {winwm91click %W}}
     after 5000 {set winwm91done timeout}
     vwait winwm91done
     set winwm91done

Index: tests/wm.test
==================================================================
--- tests/wm.test
+++ tests/wm.test
@@ -138,11 +138,11 @@
 test wm-attributes-1.2.4 {usage} -constraints {unix notAqua} -returnCodes error -body {
     wm attributes . _
 } -result {bad attribute "_": must be -alpha, -topmost, -zoomed, -fullscreen, or -type}
 test wm-attributes-1.2.5 {usage} -constraints aqua -returnCodes error -body {
     wm attributes . _
-} -result {bad attribute "_": must be -alpha, -modified, -notify, or -titlepath}
+} -result {bad attribute "_": must be -alpha, -fullscreen, -modified, -notify, -titlepath, -topmost, or -transparent}
 
 
 ### wm client ###
 test wm-client-1.1 {usage} -returnCodes error -body {
     wm client
@@ -735,15 +735,15 @@
     wm iconbitmap .t 12 13 14
 } -result {wrong # args: should be "wm iconbitmap window ?-default? ?image?"}
 test wm-iconbitmap-1.3 {usage} -constraints win -returnCodes error -body {
     wm iconbitmap .t 12 13
 } -result {illegal option "12" must be "-default"}
-test wm-iconbitmap-1.4 {usage} -returnCodes error -body {
+test wm-iconbitmap-1.4 {usage} -constraints notAqua -returnCodes error -body {
     wm iconbitmap .t bad-bitmap
 } -result {bitmap "bad-bitmap" not defined}
 
-test wm-iconbitmap-2.1 {setting and reading values} -setup {
+test wm-iconbitmap-2.1 {setting and reading values} -constraints notAqua -setup {
     set result {}
 } -body {
     lappend result [wm iconbitmap .t]
     wm iconbitmap .t hourglass
     lappend result [wm iconbitmap .t]
@@ -1240,17 +1240,19 @@
 test wm-resizable-1.5 {usage} -returnCodes error -body {
     wm resizable .t 1 bad
 } -result {expected boolean value but got "bad"}
 
 test wm-resizable-2.1 {setting and reading values} {
-    wm resizable .t 0 1
+    wm resizable .t 0 0
     set result [wm resizable .t]
+    wm resizable .t 0 1
+    lappend result [wm resizable .t]
     wm resizable .t 1 0
     lappend result [wm resizable .t]
     wm resizable .t 1 1
     lappend result [wm resizable .t]
-} {0 1 {1 0} {1 1}}
+} {0 0 {0 1} {1 0} {1 1}}
 
 
 ### wm sizefrom ###
 test wm-sizefrom-1.1 {usage} -returnCodes error -body {
     wm sizefrom

Index: unix/Makefile.in
==================================================================
--- unix/Makefile.in
+++ unix/Makefile.in
@@ -225,11 +225,11 @@
 INSTALL_LIBRARY		= ${INSTALL}
 INSTALL_DATA		= ${INSTALL} -m 644
 INSTALL_DATA_DIR	= ${INSTALL} -d -m 755
 
 # The symbol below provides support for dynamic loading and shared
-# libraries.  See configure.in for a description of what it means.
+# libraries.  See configure.ac for a description of what it means.
 # The value of the symbol is normally set by the configure script.
 
 SHLIB_CFLAGS		= @SHLIB_CFLAGS@ -DBUILD_tk
 
 # To enable support for stubs in Tcl.
@@ -264,11 +264,11 @@
 # configure script.
 LIBS = @LIBS@ $(X11_LIB_SWITCHES) @TCL_LIBS@
 WISH_LIBS = $(TCL_LIB_SPEC) @LIBS@ $(X11_LIB_SWITCHES) @TCL_LIBS@ @EXTRA_WISH_LIBS@
 
 # The symbols below provide support for dynamic loading and shared
-# libraries.  See configure.in for a description of what the
+# libraries.  See configure.ac for a description of what the
 # symbols mean.  The values of the symbols are normally set by the
 # configure script.  You shouldn't normally need to modify any of
 # these definitions by hand.
 
 STLIB_LD		= @STLIB_LD@
@@ -354,11 +354,11 @@
 CANV_OBJS = tkCanvas.o tkCanvArc.o tkCanvBmap.o tkCanvImg.o \
 	tkCanvLine.o tkCanvPoly.o tkCanvPs.o tkCanvText.o \
 	tkCanvUtil.o tkCanvWind.o tkRectOval.o tkTrig.o
 
 IMAGE_OBJS = tkImage.o tkImgBmap.o tkImgGIF.o tkImgPNG.o tkImgPPM.o \
-	tkImgPhoto.o tkImgPhInstance.o
+	tkImgPhoto.o tkImgPhInstance.o tkImgListFormat.o
 
 TEXT_OBJS = tkText.o tkTextBTree.o tkTextDisp.o tkTextImage.o tkTextIndex.o \
 	tkTextMark.o tkTextTag.o tkTextWind.o
 
 # either tkUnixFont.o (default) or tkUnixRFont.o (if --enable-xft)
@@ -392,12 +392,12 @@
 	tkUnixSend.o tkUnixWm.o tkUnixXId.o
 
 AQUA_OBJS = tkMacOSXBitmap.o tkMacOSXButton.o tkMacOSXClipboard.o \
 	tkMacOSXColor.o tkMacOSXConfig.o tkMacOSXCursor.o tkMacOSXDebug.o \
 	tkMacOSXDialog.o tkMacOSXDraw.o tkMacOSXEmbed.o tkMacOSXEntry.o \
-	tkMacOSXEvent.o tkMacOSXFont.o tkMacOSXHLEvents.o tkMacOSXInit.o \
-	tkMacOSXKeyboard.o tkMacOSXKeyEvent.o tkMacOSXMenu.o \
+	tkMacOSXEvent.o tkMacOSXFont.o tkMacOSXHLEvents.o tkMacOSXImage.o \
+	tkMacOSXInit.o tkMacOSXKeyboard.o tkMacOSXKeyEvent.o tkMacOSXMenu.o \
 	tkMacOSXMenubutton.o tkMacOSXMenus.o tkMacOSXMouseEvent.o \
 	tkMacOSXNotify.o tkMacOSXRegion.o tkMacOSXScrlbr.o tkMacOSXSend.o \
 	tkMacOSXSubwindows.o tkMacOSXWindowEvent.o \
 	tkMacOSXWm.o tkMacOSXXStubs.o \
 	tkFileFilter.o tkMacWinMenu.o tkPointer.o tkUnix3d.o tkUnixScale.o \
@@ -448,11 +448,11 @@
 	$(GENERIC_DIR)/tkCanvWind.c $(GENERIC_DIR)/tkRectOval.c \
 	$(GENERIC_DIR)/tkTrig.c $(GENERIC_DIR)/tkImage.c \
 	$(GENERIC_DIR)/tkImgBmap.c $(GENERIC_DIR)/tkImgGIF.c \
 	$(GENERIC_DIR)/tkImgPNG.c $(GENERIC_DIR)/tkImgPPM.c \
 	$(GENERIC_DIR)/tkImgPhoto.c $(GENERIC_DIR)/tkImgPhInstance.c \
-	$(GENERIC_DIR)/tkText.c \
+	$(GENERIC_DIR)/tkImgListFormat.c $(GENERIC_DIR)/tkText.c \
 	$(GENERIC_DIR)/tkTextBTree.c $(GENERIC_DIR)/tkTextDisp.c \
 	$(GENERIC_DIR)/tkTextImage.c \
 	$(GENERIC_DIR)/tkTextIndex.c $(GENERIC_DIR)/tkTextMark.c \
 	$(GENERIC_DIR)/tkTextTag.c $(GENERIC_DIR)/tkTextWind.c \
 	$(GENERIC_DIR)/tkOldConfig.c $(GENERIC_DIR)/tkOldTest.c \
@@ -517,10 +517,11 @@
 	$(MAC_OSX_DIR)/tkMacOSXConfig.c $(MAC_OSX_DIR)/tkMacOSXCursor.c \
 	$(MAC_OSX_DIR)/tkMacOSXDebug.c $(MAC_OSX_DIR)/tkMacOSXDialog.c \
 	$(MAC_OSX_DIR)/tkMacOSXDraw.c $(MAC_OSX_DIR)/tkMacOSXEmbed.c \
 	$(MAC_OSX_DIR)/tkMacOSXEntry.c $(MAC_OSX_DIR)/tkMacOSXEvent.c \
 	$(MAC_OSX_DIR)/tkMacOSXFont.c $(MAC_OSX_DIR)/tkMacOSXHLEvents.c \
+	$(MAC_OSX_DIR)/tkMacOSXImage.c \
 	$(MAC_OSX_DIR)/tkMacOSXInit.c $(MAC_OSX_DIR)/tkMacOSXKeyboard.c \
 	$(MAC_OSX_DIR)/tkMacOSXKeyEvent.c $(MAC_OSX_DIR)/tkMacOSXMenu.c \
 	$(MAC_OSX_DIR)/tkMacOSXMenubutton.c $(MAC_OSX_DIR)/tkMacOSXMenus.c \
 	$(MAC_OSX_DIR)/tkMacOSXMouseEvent.c $(MAC_OSX_DIR)/tkMacOSXNotify.c \
 	$(MAC_OSX_DIR)/tkMacOSXRegion.c $(MAC_OSX_DIR)/tkMacOSXScrlbr.c \
@@ -721,11 +722,11 @@
 	    done;
 	@if test "x$(TK_SHARED_BUILD)" = "x1"; then \
 	    echo "Creating package index $(PKG_INDEX)"; \
 	    rm -f "$(PKG_INDEX)"; \
 	    (\
-	    echo "if {[catch {package present Tcl 8.6.0}]} return";\
+	    echo "if {[catch {package present Tcl 8.6-}]} return";\
 	    relative=`echo | awk '{ORS=" "; split("$(TK_PKG_DIR)",a,"/"); for (f in a) {print ".."}}'`;\
 	    if test "x$(DLL_INSTALL_DIR)" != "x$(BIN_INSTALL_DIR)"; then \
 	    echo "package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL) [list load [file normalize [file join \$$dir $${relative}$(TK_LIB_FILE)]] Tk]";\
 	    else \
 	    echo "if {(\$$::tcl_platform(platform) eq \"unix\") && ([info exists ::env(DISPLAY)]";\
@@ -1103,10 +1104,13 @@
 	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkImage.c
 
 tkImgBmap.o: $(GENERIC_DIR)/tkImgBmap.c
 	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkImgBmap.c
 
+tkImgListFormat.o: $(GENERIC_DIR)/tkImgListFormat.c
+	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkImgListFormat.c
+
 tkImgGIF.o: $(GENERIC_DIR)/tkImgGIF.c
 	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkImgGIF.c
 
 tkImgPNG.o: $(GENERIC_DIR)/tkImgPNG.c
 	$(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tkImgPNG.c
@@ -1270,10 +1274,13 @@
 	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXFont.c
 
 tkMacOSXHLEvents.o: $(MAC_OSX_DIR)/tkMacOSXHLEvents.c
 	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXHLEvents.c
 
+tkMacOSXImage.o: $(MAC_OSX_DIR)/tkMacOSXImage.c
+	$(CC) -c $(CC_SWITCHES) $(MAC_OSX_DIR)/tkMacOSXImage.c
+
 tkMacOSXInit.o: $(MAC_OSX_DIR)/tkMacOSXInit.c tkConfig.sh
 	$(CC) -c $(CC_SWITCHES) -DTK_LIBRARY=\"${TK_LIBRARY}\" \
 	    $(MAC_OSX_DIR)/tkMacOSXInit.c
 
 tkMacOSXKeyboard.o: $(MAC_OSX_DIR)/tkMacOSXKeyboard.c
@@ -1463,11 +1470,11 @@
 	@echo "This warning can be safely ignored, do not report as a bug!"
 
 genstubs:
 	$(TCL_EXE) $(TOOL_DIR)/genStubs.tcl $(GENERIC_DIR) \
 		$(GENERIC_DIR)/tk.decls $(GENERIC_DIR)/tkInt.decls
-	$(TCL_EXE) $(TTK_DIR)/ttkGenStubs.tcl $(TTK_DIR) $(TTK_DIR)/ttk.decls
+	$(TCL_EXE) $(TOOL_DIR)/genStubs.tcl $(TTK_DIR) $(TTK_DIR)/ttk.decls
 
 #
 # Target to check that all exported functions have an entry in the stubs
 # tables.
 #
@@ -1526,108 +1533,110 @@
 DISTROOT = /tmp/dist
 DISTNAME = tk${VERSION}${PATCH_LEVEL}
 ZIPNAME	 = tk${MAJOR_VERSION}${MINOR_VERSION}${PATCH_LEVEL}-src.zip
 DISTDIR	 = $(DISTROOT)/$(DISTNAME)
 TCLDIR   = @TCL_SRC_DIR@
-$(UNIX_DIR)/configure: $(UNIX_DIR)/configure.in $(UNIX_DIR)/tcl.m4 \
+DIST_INSTALL_DATA   = CPPROG='cp -p' $(INSTALL) -m 644
+DIST_INSTALL_SCRIPT = CPPROG='cp -p' $(INSTALL) -m 755
+
+$(UNIX_DIR)/configure: $(UNIX_DIR)/configure.ac $(UNIX_DIR)/tcl.m4 \
 		$(UNIX_DIR)/aclocal.m4
 	cd $(UNIX_DIR); autoconf
 $(MAC_OSX_DIR)/configure: $(MAC_OSX_DIR)/configure.ac $(UNIX_DIR)/configure
 	cd $(MAC_OSX_DIR); autoconf
 $(UNIX_DIR)/tkConfig.h.in: $(MAC_OSX_DIR)/configure
 	cd $(MAC_OSX_DIR); autoheader; touch $@
 
-dist:   $(UNIX_DIR)/configure $(UNIX_DIR)/tkConfig.h.in $(UNIX_DIR)/tk.pc.in $(MAC_OSX_DIR)/configure genstubs
+dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tkConfig.h.in $(UNIX_DIR)/tk.pc.in $(MAC_OSX_DIR)/configure genstubs
 	rm -rf $(DISTDIR)
-	mkdir -p $(DISTDIR)/unix
-	cp -p $(UNIX_DIR)/*.c $(UNIX_DIR)/*.h $(DISTDIR)/unix
-	cp $(TOP_DIR)/license.terms $(UNIX_DIR)/Makefile.in $(DISTDIR)/unix
-	chmod 664 $(DISTDIR)/unix/Makefile.in
-	cp $(UNIX_DIR)/configure $(UNIX_DIR)/configure.in $(UNIX_DIR)/tk.spec \
+	$(INSTALL_DATA_DIR) $(DISTDIR)/unix
+	$(DIST_INSTALL_DATA) $(UNIX_DIR)/*.c $(UNIX_DIR)/*.h $(DISTDIR)/unix
+	$(DIST_INSTALL_DATA) $(TOP_DIR)/license.terms $(UNIX_DIR)/Makefile.in $(DISTDIR)/unix
+	$(DIST_INSTALL_DATA) $(UNIX_DIR)/configure.ac $(UNIX_DIR)/tk.spec \
 		$(UNIX_DIR)/aclocal.m4 $(UNIX_DIR)/tcl.m4 \
 		$(UNIX_DIR)/tkConfig.sh.in $(TCLDIR)/unix/install-sh \
 		$(UNIX_DIR)/README $(UNIX_DIR)/installManPage \
 		$(UNIX_DIR)/tkConfig.h.in $(UNIX_DIR)/tk.pc.in $(DISTDIR)/unix
-	chmod 775 $(DISTDIR)/unix/configure $(DISTDIR)/unix/configure.in
-	mkdir $(DISTDIR)/bitmaps
+	$(DIST_INSTALL_SCRIPT) $(UNIX_DIR)/configure $(DISTDIR)/unix
+	$(INSTALL_DATA_DIR) $(DISTDIR)/bitmaps
 	@(cd $(TOP_DIR); for i in bitmaps/* ; do \
 	    if [ -f $$i ] ; then \
 		sed -e 's/static char/static unsigned char/' \
 		       $$i > $(DISTDIR)/$$i; \
 	    fi; \
 	done;)
-	mkdir $(DISTDIR)/generic
-	cp -p $(GENERIC_DIR)/*.[ch] $(DISTDIR)/generic
-	cp -p $(GENERIC_DIR)/*.decls $(DISTDIR)/generic
-	cp -p $(GENERIC_DIR)/README $(DISTDIR)/generic
-	cp -p $(TOP_DIR)/changes $(TOP_DIR)/ChangeLog \
+	$(INSTALL_DATA_DIR) $(DISTDIR)/generic
+	$(DIST_INSTALL_DATA) $(GENERIC_DIR)/*.[ch] $(DISTDIR)/generic
+	$(DIST_INSTALL_DATA) $(GENERIC_DIR)/*.decls $(DISTDIR)/generic
+	$(DIST_INSTALL_DATA) $(GENERIC_DIR)/README $(DISTDIR)/generic
+	$(DIST_INSTALL_DATA) $(TOP_DIR)/changes $(TOP_DIR)/ChangeLog \
 		$(TOP_DIR)/ChangeLog.2??? $(TOP_DIR)/README \
 		$(TOP_DIR)/license.terms $(DISTDIR)
 	rm -f $(DISTDIR)/generic/blt*.[ch]
-	mkdir $(DISTDIR)/generic/ttk
-	cp -p $(TTK_DIR)/*.[ch] $(TTK_DIR)/ttk.decls \
-		$(TTK_DIR)/ttkGenStubs.tcl $(DISTDIR)/generic/ttk
-	mkdir $(DISTDIR)/win
-	cp $(TOP_DIR)/win/Makefile.in $(DISTDIR)/win
-	cp $(TOP_DIR)/win/configure.in \
-		$(TOP_DIR)/win/configure \
+	$(INSTALL_DATA_DIR) $(DISTDIR)/generic/ttk
+	$(DIST_INSTALL_DATA) $(TTK_DIR)/*.[ch] $(TTK_DIR)/ttk.decls \
+		$(DISTDIR)/generic/ttk
+	$(INSTALL_DATA_DIR) $(DISTDIR)/win
+	$(DIST_INSTALL_DATA) $(TOP_DIR)/win/Makefile.in $(DISTDIR)/win
+	$(DIST_INSTALL_DATA) $(TOP_DIR)/win/configure.ac \
 		$(TOP_DIR)/win/tkConfig.sh.in \
 		$(TOP_DIR)/win/aclocal.m4 $(TOP_DIR)/win/tcl.m4 \
 		$(DISTDIR)/win
-	cp -p $(TOP_DIR)/win/*.[ch] $(TOP_DIR)/win/*.bat $(DISTDIR)/win
-	cp -p $(TOP_DIR)/win/makefile.* $(DISTDIR)/win
-	cp -p $(TOP_DIR)/win/rules.vc $(DISTDIR)/win
-	cp -p $(TOP_DIR)/win/README $(DISTDIR)/win
-	cp -p $(TOP_DIR)/license.terms $(DISTDIR)/win
-	mkdir $(DISTDIR)/win/rc
-	cp -p $(TOP_DIR)/win/wish.exe.manifest.in $(DISTDIR)/win/
-	cp -p $(TOP_DIR)/win/rc/*.{rc,cur,ico,bmp} $(DISTDIR)/win/rc
-	mkdir $(DISTDIR)/macosx
-	cp -p $(MAC_OSX_DIR)/GNUmakefile $(MAC_OSX_DIR)/README \
+	$(DIST_INSTALL_SCRIPT) $(TOP_DIR)/win/configure $(DISTDIR)/win
+	$(DIST_INSTALL_DATA) $(TOP_DIR)/win/*.[ch] $(TOP_DIR)/win/*.bat $(DISTDIR)/win
+	$(DIST_INSTALL_DATA) $(TOP_DIR)/win/*.vc $(DISTDIR)/win
+	$(DIST_INSTALL_DATA) $(TOP_DIR)/win/README $(DISTDIR)/win
+	$(DIST_INSTALL_DATA) $(TOP_DIR)/license.terms $(DISTDIR)/win
+	$(INSTALL_DATA_DIR) $(DISTDIR)/win/rc
+	$(DIST_INSTALL_DATA) $(TOP_DIR)/win/wish.exe.manifest.in $(DISTDIR)/win/
+	$(DIST_INSTALL_DATA) $(TOP_DIR)/win/rc/*.{rc,cur,ico,bmp} $(DISTDIR)/win/rc
+	$(INSTALL_DATA_DIR) $(DISTDIR)/macosx
+	$(DIST_INSTALL_DATA) $(MAC_OSX_DIR)/GNUmakefile $(MAC_OSX_DIR)/README \
 		$(MAC_OSX_DIR)/*.icns $(MAC_OSX_DIR)/*.tiff \
 		$(MAC_OSX_DIR)/*.[ch] $(MAC_OSX_DIR)/*.in \
 		$(MAC_OSX_DIR)/*.ac $(MAC_OSX_DIR)/*.xcconfig \
-		$(MAC_OSX_DIR)/*.sdef $(MAC_OSX_DIR)/configure \
+		$(MAC_OSX_DIR)/*.sdef \
 		$(DISTDIR)/macosx
-	cp -p $(TOP_DIR)/license.terms $(DISTDIR)/macosx
-	mkdir $(DISTDIR)/macosx/Tk.xcode
-	cp -p $(MAC_OSX_DIR)/Tk.xcode/project.pbxproj \
+	$(DIST_INSTALL_SCRIPT) $(MAC_OSX_DIR)/configure $(DISTDIR)/macosx
+	$(DIST_INSTALL_DATA) $(TOP_DIR)/license.terms $(DISTDIR)/macosx
+	$(INSTALL_DATA_DIR) $(DISTDIR)/macosx/Tk.xcode
+	$(DIST_INSTALL_DATA) $(MAC_OSX_DIR)/Tk.xcode/project.pbxproj \
 		$(MAC_OSX_DIR)/Tk.xcode/default.pbxuser \
 		$(DISTDIR)/macosx/Tk.xcode
-	mkdir $(DISTDIR)/macosx/Tk.xcodeproj
-	cp -p $(MAC_OSX_DIR)/Tk.xcodeproj/project.pbxproj \
+	$(INSTALL_DATA_DIR) $(DISTDIR)/macosx/Tk.xcodeproj
+	$(DIST_INSTALL_DATA) $(MAC_OSX_DIR)/Tk.xcodeproj/project.pbxproj \
 		$(MAC_OSX_DIR)/Tk.xcodeproj/default.pbxuser \
 		$(DISTDIR)/macosx/Tk.xcodeproj
-	mkdir $(DISTDIR)/compat
-	cp -p $(TOP_DIR)/license.terms $(TCLDIR)/compat/unistd.h \
+	$(INSTALL_DATA_DIR) $(DISTDIR)/compat
+	$(DIST_INSTALL_DATA) $(TOP_DIR)/license.terms $(TCLDIR)/compat/unistd.h \
 		$(TCLDIR)/compat/stdlib.h \
 		$(DISTDIR)/compat
-	mkdir $(DISTDIR)/xlib
-	cp -p $(XLIB_DIR)/*.[ch] $(DISTDIR)/xlib
-	cp -p $(TOP_DIR)/license.terms $(DISTDIR)/xlib
-	mkdir $(DISTDIR)/xlib/X11
-	cp -p $(XLIB_DIR)/X11/*.h $(DISTDIR)/xlib/X11
-	cp -p $(TOP_DIR)/license.terms $(DISTDIR)/xlib/X11
-	mkdir $(DISTDIR)/library
-	cp -p $(TOP_DIR)/license.terms $(TOP_DIR)/library/*.tcl \
+	$(INSTALL_DATA_DIR) $(DISTDIR)/xlib
+	$(DIST_INSTALL_DATA) $(XLIB_DIR)/*.[ch] $(DISTDIR)/xlib
+	$(DIST_INSTALL_DATA) $(TOP_DIR)/license.terms $(DISTDIR)/xlib
+	$(INSTALL_DATA_DIR) $(DISTDIR)/xlib/X11
+	$(DIST_INSTALL_DATA) $(XLIB_DIR)/X11/*.h $(DISTDIR)/xlib/X11
+	$(DIST_INSTALL_DATA) $(TOP_DIR)/license.terms $(DISTDIR)/xlib/X11
+	$(INSTALL_DATA_DIR) $(DISTDIR)/library
+	$(DIST_INSTALL_DATA) $(TOP_DIR)/license.terms $(TOP_DIR)/library/*.tcl \
 		$(TOP_DIR)/library/tclIndex \
 		$(DISTDIR)/library
-	mkdir $(DISTDIR)/library/ttk
-	cp -p $(TOP_DIR)/library/ttk/*.tcl $(DISTDIR)/library/ttk
-	mkdir $(DISTDIR)/library/images
+	$(INSTALL_DATA_DIR) $(DISTDIR)/library/ttk
+	$(DIST_INSTALL_DATA) $(TOP_DIR)/library/ttk/*.tcl $(DISTDIR)/library/ttk
+	$(INSTALL_DATA_DIR) $(DISTDIR)/library/images
 	@(cd $(TOP_DIR); for i in library/images/* ; do \
 	    if [ -f $$i ] ; then \
-		cp $$i $(DISTDIR)/$$i; \
+		$(DIST_INSTALL_DATA) $$i $(DISTDIR)/$$i; \
 	    fi; \
 	done;)
-	mkdir $(DISTDIR)/library/msgs
+	$(INSTALL_DATA_DIR) $(DISTDIR)/library/msgs
 	@(cd $(TOP_DIR); for i in library/msgs/*.msg ; do \
 	    if [ -f $$i ] ; then \
-		cp $$i $(DISTDIR)/$$i; \
+		$(DIST_INSTALL_DATA) $$i $(DISTDIR)/$$i; \
 	    fi; \
 	done;)
-	mkdir $(DISTDIR)/library/demos
+	$(INSTALL_DATA_DIR) $(DISTDIR)/library/demos
 	cp -pr $(TOP_DIR)/library/demos/*.tcl \
 		$(TOP_DIR)/library/demos/*.msg \
 		$(TOP_DIR)/library/demos/tclIndex \
 		$(TOP_DIR)/library/demos/browse \
 		$(TOP_DIR)/library/demos/hello $(TOP_DIR)/library/demos/ixset \
@@ -1636,25 +1645,25 @@
 		$(TOP_DIR)/library/demos/tcolor \
 		$(TOP_DIR)/library/demos/timer \
 		$(TOP_DIR)/library/demos/widget \
 		$(TOP_DIR)/library/demos/README \
 		$(TOP_DIR)/license.terms $(DISTDIR)/library/demos
-	mkdir $(DISTDIR)/library/demos/images
+	$(INSTALL_DATA_DIR) $(DISTDIR)/library/demos/images
 	@(cd $(TOP_DIR); for i in library/demos/images/* ; do \
 	    if [ -f $$i ] ; then \
-		cp $$i $(DISTDIR)/$$i; \
+		$(DIST_INSTALL_DATA) $$i $(DISTDIR)/$$i; \
 	    fi; \
 	done;)
-	mkdir $(DISTDIR)/doc
-	cp -p $(TOP_DIR)/license.terms $(TOP_DIR)/doc/*.[13n] \
+	$(INSTALL_DATA_DIR) $(DISTDIR)/doc
+	$(DIST_INSTALL_DATA) $(TOP_DIR)/license.terms $(TOP_DIR)/doc/*.[13n] \
 		$(TCLDIR)/doc/man.macros $(DISTDIR)/doc
-	mkdir $(DISTDIR)/tests
-	cp -p $(TOP_DIR)/license.terms $(TEST_DIR)/*.{test,tcl} \
-		$(TEST_DIR)/README $(TEST_DIR)/*.{gif,ppm,xbm} \
+	$(INSTALL_DATA_DIR) $(DISTDIR)/tests
+	$(DIST_INSTALL_DATA) $(TOP_DIR)/license.terms $(TEST_DIR)/*.{test,tcl} \
+		$(TEST_DIR)/README $(TEST_DIR)/*.{gif,png,ppm,xbm} \
 		$(TEST_DIR)/option.file* $(DISTDIR)/tests
-	mkdir $(DISTDIR)/tests/ttk
-	cp -p $(TEST_DIR)/ttk/*.{test,tcl} $(DISTDIR)/tests/ttk
+	$(INSTALL_DATA_DIR) $(DISTDIR)/tests/ttk
+	$(DIST_INSTALL_DATA) $(TEST_DIR)/ttk/*.{test,tcl} $(DISTDIR)/tests/ttk
 
 alldist: dist
 	rm -f $(DISTROOT)/$(DISTNAME)-src.tar.gz $(DISTROOT)/$(ZIPNAME)
 	cd $(DISTROOT); tar cf $(DISTNAME)-src.tar $(DISTNAME); \
 		gzip -9 $(DISTNAME)-src.tar; zip -qr8 $(ZIPNAME) $(DISTNAME)

Index: unix/configure
==================================================================
--- unix/configure
+++ unix/configure
@@ -1,321 +1,802 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for tk 8.6.
+# Generated by GNU Autoconf 2.69 for tk 8.7.
+#
+#
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
 #
-# Copyright (C) 2003 Free Software Foundation, Inc.
+#
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
 
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
+  setopt NO_GLOB_SUBST
 else
-  as_unset=false
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
 fi
 
 
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
+case $0 in #((
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
+fi
+
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
 PS1='$ '
 PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+# Use a proper internal environment variable to ensure we don't fall
+  # into an infinite loop, continuously re-executing ourselves.
+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+    _as_can_reexec=no; export _as_can_reexec;
+    # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+  fi
+  # We don't want this to propagate to other subprocesses.
+          { _as_can_reexec=; unset _as_can_reexec;}
+if test "x$CONFIG_SHELL" = x; then
+  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
+else
+  case \`(set -o) 2>/dev/null\` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+"
+  as_required="as_fn_return () { (exit \$1); }
+as_fn_success () { as_fn_return 0; }
+as_fn_failure () { as_fn_return 1; }
+as_fn_ret_success () { return 0; }
+as_fn_ret_failure () { return 1; }
+
+exitcode=0
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+
+else
+  exitcode=1; echo positional parameters were not saved.
+fi
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
+  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+test \$(( 1 + 1 )) = 2 || exit 1"
+  if (eval "$as_required") 2>/dev/null; then :
+  as_have_required=yes
+else
+  as_have_required=no
+fi
+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
+
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  as_found=:
+  case $as_dir in #(
+	 /*)
+	   for as_base in sh bash ksh sh5; do
+	     # Try only shells that exist, to save several forks.
+	     as_shell=$as_dir/$as_base
+	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  CONFIG_SHELL=$as_shell as_have_required=yes
+		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  break 2
+fi
+fi
+	   done;;
+       esac
+  as_found=false
+done
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
+  CONFIG_SHELL=$SHELL as_have_required=yes
+fi; }
+IFS=$as_save_IFS
+
+
+      if test "x$CONFIG_SHELL" != x; then :
+  export CONFIG_SHELL
+             # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
+fi
+
+    if test x$as_have_required = xno; then :
+  $as_echo "$0: This script requires a shell more modern than all"
+  $as_echo "$0: the shells that I found on your system."
+  if test x${ZSH_VERSION+set} = xset ; then
+    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
   else
-    $as_unset $as_var
+    $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
+$0: including any error possibly output before this
+$0: message. Then install a modern shell, or manually run
+$0: the script under such a shell if you do have one."
+  fi
+  exit 1
+fi
+fi
+fi
+SHELL=${CONFIG_SHELL-/bin/sh}
+export SHELL
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
+
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
+
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-done
+  $as_echo "$as_me: error: $2" >&2
+  as_fn_exit $as_status
+} # as_fn_error
 
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
 else
   as_expr=false
 fi
 
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
   as_basename=basename
 else
   as_basename=false
 fi
 
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
 
-# Name of the executable.
-as_me=`$as_basename "$0" ||
+as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
 # Avoid depending upon Character Ranges.
 as_cr_letters='abcdefghijklmnopqrstuvwxyz'
 as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
 as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
+
+  as_lineno_1=$LINENO as_lineno_1a=$LINENO
+  as_lineno_2=$LINENO as_lineno_2a=$LINENO
+  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
+  sed -n '
+    p
+    /[$]LINENO/=
+  ' <$as_myself |
+    sed '
+      s/[$]LINENO.*/&-/
+      t lineno
+      b
+      :lineno
+      N
+      :loop
+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+      t loop
+      s/-\n.*//
+    ' >$as_me.lineno &&
+  chmod +x "$as_me.lineno" ||
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+
+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+  # already done that, so ensure we don't try to do so again and fall
+  # in an infinite loop.  This has already happened in practice.
+  _as_can_reexec=no; export _as_can_reexec
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
+  # original and so on.  Autoconf is especially sensitive to this).
+  . "./$as_me.lineno"
   # Exit status is that of the last command.
   exit
 }
 
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in #(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
+  esac;;
+*)
+  ECHO_N='-n';;
 esac
 
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
 rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
     as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -pR'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -pR'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -pR'
   fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
-rm -f conf$$ conf$$.exe conf$$.file
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
 
 if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
+  as_mkdir_p='mkdir -p "$as_dir"'
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
 fi
 
-as_executable_p="test -f"
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
 
 # Sed expression to map a string onto a valid variable name.
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1
 
 # Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 
-exec 6>&1
-
 #
 # Initializations.
 #
 ac_default_prefix=/usr/local
+ac_clean_files=
 ac_config_libobj_dir=.
+LIBOBJS=
 cross_compiling=no
 subdirs=
 MFLAGS=
 MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-# Maximum number of lines to put in a shell here document.
-# This variable seems obsolete.  It should probably be removed, and
-# only ac_max_sed_lines should be used.
-: ${ac_max_here_lines=38}
 
 # Identity of this package.
 PACKAGE_NAME='tk'
 PACKAGE_TARNAME='tk'
-PACKAGE_VERSION='8.6'
-PACKAGE_STRING='tk 8.6'
+PACKAGE_VERSION='8.7'
+PACKAGE_STRING='tk 8.7'
 PACKAGE_BUGREPORT=''
+PACKAGE_URL=''
 
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
-#if HAVE_SYS_TYPES_H
+#ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
-#if HAVE_SYS_STAT_H
+#ifdef HAVE_SYS_STAT_H
 # include <sys/stat.h>
 #endif
-#if STDC_HEADERS
+#ifdef STDC_HEADERS
 # include <stdlib.h>
 # include <stddef.h>
 #else
-# if HAVE_STDLIB_H
+# ifdef HAVE_STDLIB_H
 #  include <stdlib.h>
 # endif
 #endif
-#if HAVE_STRING_H
-# if !STDC_HEADERS && HAVE_MEMORY_H
+#ifdef HAVE_STRING_H
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
 #  include <memory.h>
 # endif
 # include <string.h>
 #endif
-#if HAVE_STRINGS_H
+#ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif
-#if HAVE_INTTYPES_H
+#ifdef HAVE_INTTYPES_H
 # include <inttypes.h>
-#else
-# if HAVE_STDINT_H
-#  include <stdint.h>
-# endif
+#endif
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
 #endif
-#if HAVE_UNISTD_H
+#ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS TCL_VERSION TCL_PATCH_LEVEL TCL_BIN_DIR TCL_SRC_DIR TCL_LIB_FILE TCL_LIB_FLAG TCL_LIB_SPEC TCL_STUB_LIB_FILE TCL_STUB_LIB_FLAG TCL_STUB_LIB_SPEC TCLSH_PROG BUILD_TCLSH MAN_FLAGS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP TCL_THREADS RANLIB ac_ct_RANLIB AR ac_ct_AR LIBOBJS TCL_LIBS DL_LIBS DL_OBJS PLAT_OBJS PLAT_SRCS LDAIX_SRC CFLAGS_DEBUG CFLAGS_OPTIMIZE CFLAGS_WARNING LDFLAGS_DEBUG LDFLAGS_OPTIMIZE CC_SEARCH_FLAGS LD_SEARCH_FLAGS STLIB_LD SHLIB_LD TCL_SHLIB_LD_EXTRAS TK_SHLIB_LD_EXTRAS SHLIB_LD_LIBS SHLIB_CFLAGS SHLIB_SUFFIX MAKE_LIB MAKE_STUB_LIB INSTALL_LIB DLL_INSTALL_DIR INSTALL_STUB_LIB CFLAGS_DEFAULT LDFLAGS_DEFAULT XFT_CFLAGS XFT_LIBS UNIX_FONT_OBJS TK_VERSION TK_MAJOR_VERSION TK_MINOR_VERSION TK_PATCH_LEVEL TK_YEAR TK_LIB_FILE TK_LIB_FLAG TK_LIB_SPEC TK_STUB_LIB_FILE TK_STUB_LIB_FLAG TK_STUB_LIB_SPEC TK_STUB_LIB_PATH TK_INCLUDE_SPEC TK_BUILD_STUB_LIB_SPEC TK_BUILD_STUB_LIB_PATH TK_SRC_DIR TK_SHARED_BUILD LD_LIBRARY_PATH_VAR TK_BUILD_LIB_SPEC TCL_STUB_FLAGS XINCLUDES XLIBSW LOCALES TK_WINDOWINGSYSTEM TK_PKG_DIR TK_LIBRARY LIB_RUNTIME_DIR PRIVATE_INCLUDE_DIR HTML_DIR EXTRA_CC_SWITCHES EXTRA_APP_CC_SWITCHES EXTRA_INSTALL EXTRA_INSTALL_BINARIES EXTRA_BUILD_HTML EXTRA_WISH_LIBS CFBUNDLELOCALIZATIONS TK_RSRC_FILE WISH_RSRC_FILE LIB_RSRC_FILE APP_RSRC_FILE REZ REZ_FLAGS LTLIBOBJS'
+ac_subst_vars='LTLIBOBJS
+REZ_FLAGS
+REZ
+APP_RSRC_FILE
+LIB_RSRC_FILE
+WISH_RSRC_FILE
+TK_RSRC_FILE
+CFBUNDLELOCALIZATIONS
+EXTRA_WISH_LIBS
+EXTRA_BUILD_HTML
+EXTRA_INSTALL_BINARIES
+EXTRA_INSTALL
+EXTRA_APP_CC_SWITCHES
+EXTRA_CC_SWITCHES
+HTML_DIR
+PRIVATE_INCLUDE_DIR
+LIB_RUNTIME_DIR
+TK_LIBRARY
+TK_PKG_DIR
+TK_WINDOWINGSYSTEM
+LOCALES
+XLIBSW
+XINCLUDES
+TCL_STUB_FLAGS
+TK_BUILD_LIB_SPEC
+LD_LIBRARY_PATH_VAR
+TK_SHARED_BUILD
+TK_SRC_DIR
+TK_BUILD_STUB_LIB_PATH
+TK_BUILD_STUB_LIB_SPEC
+TK_INCLUDE_SPEC
+TK_STUB_LIB_PATH
+TK_STUB_LIB_SPEC
+TK_STUB_LIB_FLAG
+TK_STUB_LIB_FILE
+TK_LIB_SPEC
+TK_LIB_FLAG
+TK_LIB_FILE
+TK_YEAR
+TK_PATCH_LEVEL
+TK_MINOR_VERSION
+TK_MAJOR_VERSION
+TK_VERSION
+UNIX_FONT_OBJS
+XFT_LIBS
+XFT_CFLAGS
+XMKMF
+LDFLAGS_DEFAULT
+CFLAGS_DEFAULT
+INSTALL_STUB_LIB
+DLL_INSTALL_DIR
+INSTALL_LIB
+MAKE_STUB_LIB
+MAKE_LIB
+SHLIB_SUFFIX
+SHLIB_CFLAGS
+SHLIB_LD_LIBS
+TK_SHLIB_LD_EXTRAS
+TCL_SHLIB_LD_EXTRAS
+SHLIB_LD
+STLIB_LD
+LD_SEARCH_FLAGS
+CC_SEARCH_FLAGS
+LDFLAGS_OPTIMIZE
+LDFLAGS_DEBUG
+CFLAGS_WARNING
+CFLAGS_OPTIMIZE
+CFLAGS_DEBUG
+LDAIX_SRC
+PLAT_SRCS
+PLAT_OBJS
+DL_OBJS
+DL_LIBS
+TCL_LIBS
+LIBOBJS
+AR
+RANLIB
+SHARED_BUILD
+EGREP
+GREP
+CPP
+OBJEXT
+EXEEXT
+ac_ct_CC
+CPPFLAGS
+LDFLAGS
+CFLAGS
+CC
+MAN_FLAGS
+BUILD_TCLSH
+TCLSH_PROG
+TCL_STUB_LIB_SPEC
+TCL_STUB_LIB_FLAG
+TCL_STUB_LIB_FILE
+TCL_LIB_SPEC
+TCL_LIB_FLAG
+TCL_LIB_FILE
+TCL_SRC_DIR
+TCL_BIN_DIR
+TCL_PATCH_LEVEL
+TCL_VERSION
+target_alias
+host_alias
+build_alias
+LIBS
+ECHO_T
+ECHO_N
+ECHO_C
+DEFS
+mandir
+localedir
+libdir
+psdir
+pdfdir
+dvidir
+htmldir
+infodir
+docdir
+oldincludedir
+includedir
+localstatedir
+sharedstatedir
+sysconfdir
+datadir
+datarootdir
+libexecdir
+sbindir
+bindir
+program_transform_name
+prefix
+exec_prefix
+PACKAGE_URL
+PACKAGE_BUGREPORT
+PACKAGE_STRING
+PACKAGE_VERSION
+PACKAGE_TARNAME
+PACKAGE_NAME
+PATH_SEPARATOR
+SHELL
+OBJEXT_FOR_BUILD'
 ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+with_tcl
+enable_man_symlinks
+enable_man_compression
+enable_man_suffix
+enable_shared
+enable_64bit
+enable_64bit_vis
+enable_rpath
+enable_corefoundation
+enable_load
+enable_symbols
+enable_aqua
+with_x
+enable_xft
+enable_xss
+enable_framework
+'
+      ac_precious_vars='build_alias
+host_alias
+target_alias
+CC
+CFLAGS
+LDFLAGS
+LIBS
+CPPFLAGS
+CPP
+XMKMF'
+
 
 # Initialize some variables set by options.
 ac_init_help=
 ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
 # The variables have the same names as the options, with
 # dashes changed to underlines.
 cache_file=/dev/null
 exec_prefix=NONE
 no_create=
@@ -334,38 +815,53 @@
 # Installation directory options.
 # These are left unexpanded so users can "make install exec_prefix=/foo"
 # and all the variables that are supposed to be based on exec_prefix
 # by default will actually change.
 # Use braces instead of parens because sh, perl, etc. also accept them.
+# (The list follows the same order as the GNU Coding Standards.)
 bindir='${exec_prefix}/bin'
 sbindir='${exec_prefix}/sbin'
 libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
+datarootdir='${prefix}/share'
+datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+infodir='${datarootdir}/info'
+htmldir='${docdir}'
+dvidir='${docdir}'
+pdfdir='${docdir}'
+psdir='${docdir}'
+libdir='${exec_prefix}/lib'
+localedir='${datarootdir}/locale'
+mandir='${datarootdir}/man'
 
 ac_prev=
+ac_dashdash=
 for ac_option
 do
   # If the previous option needs an argument, assign it.
   if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
+    eval $ac_prev=\$ac_option
     ac_prev=
     continue
   fi
 
-  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
+  case $ac_option in
+  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *=)   ac_optarg= ;;
+  *)    ac_optarg=yes ;;
+  esac
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
 
-  case $ac_option in
+  case $ac_dashdash$ac_option in
+  --)
+    ac_dashdash=yes ;;
 
   -bindir | --bindir | --bindi | --bind | --bin | --bi)
     ac_prev=bindir ;;
   -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
     bindir=$ac_optarg ;;
@@ -383,37 +879,63 @@
     cache_file=$ac_optarg ;;
 
   --config-cache | -C)
     cache_file=config.cache ;;
 
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
+  -datadir | --datadir | --datadi | --datad)
     ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
+  -datadir=* | --datadir=* | --datadi=* | --datad=*)
     datadir=$ac_optarg ;;
 
+  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
+  | --dataroo | --dataro | --datar)
+    ac_prev=datarootdir ;;
+  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
+  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
+    datarootdir=$ac_optarg ;;
+
   -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    eval "enable_$ac_feature=no" ;;
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid feature name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=no ;;
+
+  -docdir | --docdir | --docdi | --doc | --do)
+    ac_prev=docdir ;;
+  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
+    docdir=$ac_optarg ;;
+
+  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
+    ac_prev=dvidir ;;
+  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
+    dvidir=$ac_optarg ;;
 
   -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) ac_optarg=yes ;;
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid feature name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
     esac
-    eval "enable_$ac_feature='$ac_optarg'" ;;
+    eval enable_$ac_useropt=\$ac_optarg ;;
 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
   | --exec | --exe | --ex)
     ac_prev=exec_prefix ;;
@@ -435,10 +957,16 @@
 
   -host | --host | --hos | --ho)
     ac_prev=host_alias ;;
   -host=* | --host=* | --hos=* | --ho=*)
     host_alias=$ac_optarg ;;
+
+  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
+    ac_prev=htmldir ;;
+  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
+  | --ht=*)
+    htmldir=$ac_optarg ;;
 
   -includedir | --includedir | --includedi | --included | --include \
   | --includ | --inclu | --incl | --inc)
     ac_prev=includedir ;;
   -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
@@ -459,18 +987,21 @@
   | --libexe | --libex | --libe)
     ac_prev=libexecdir ;;
   -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
   | --libexe=* | --libex=* | --libe=*)
     libexecdir=$ac_optarg ;;
+
+  -localedir | --localedir | --localedi | --localed | --locale)
+    ac_prev=localedir ;;
+  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
+    localedir=$ac_optarg ;;
 
   -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
+  | --localstate | --localstat | --localsta | --localst | --locals)
     ac_prev=localstatedir ;;
   -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
+  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
     localstatedir=$ac_optarg ;;
 
   -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
     ac_prev=mandir ;;
   -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
@@ -530,10 +1061,20 @@
   | --program-transform=* | --program-transfor=* \
   | --program-transfo=* | --program-transf=* \
   | --program-trans=* | --program-tran=* \
   | --progr-tra=* | --program-tr=* | --program-t=*)
     program_transform_name=$ac_optarg ;;
+
+  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
+    ac_prev=pdfdir ;;
+  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
+    pdfdir=$ac_optarg ;;
+
+  -psdir | --psdir | --psdi | --psd | --ps)
+    ac_prev=psdir ;;
+  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
+    psdir=$ac_optarg ;;
 
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
@@ -581,30 +1122,40 @@
 
   -version | --version | --versio | --versi | --vers | -V)
     ac_init_version=: ;;
 
   -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) ac_optarg=yes ;;
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid package name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
     esac
-    eval "with_$ac_package='$ac_optarg'" ;;
+    eval with_$ac_useropt=\$ac_optarg ;;
 
   -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/-/_/g'`
-    eval "with_$ac_package=no" ;;
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid package name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=no ;;
 
   --x)
     # Obsolete; use --with-x.
     with_x=yes ;;
 
@@ -620,63 +1171,67 @@
     ac_prev=x_libraries ;;
   -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) { echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
+  -*) as_fn_error $? "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information"
     ;;
 
   *=*)
     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
-    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
-    eval "$ac_envvar='$ac_optarg'"
+    case $ac_envvar in #(
+      '' | [0-9]* | *[!_$as_cr_alnum]* )
+      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+    esac
+    eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     ;;
 
   esac
 done
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
-fi
-
-# Be sure to have absolute paths.
-for ac_var in exec_prefix prefix
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# Be sure to have absolute paths.
-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-	      localstatedir libdir includedir oldincludedir infodir mandir
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
+  as_fn_error $? "missing argument to $ac_option"
+fi
+
+if test -n "$ac_unrecognized_opts"; then
+  case $enable_option_checking in
+    no) ;;
+    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
+    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+  esac
+fi
+
+# Check all directory arguments for consistency.
+for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
+		datadir sysconfdir sharedstatedir localstatedir includedir \
+		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+		libdir localedir mandir
+do
+  eval ac_val=\$$ac_var
+  # Remove trailing slashes.
+  case $ac_val in
+    */ )
+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+      eval $ac_var=\$ac_val;;
+  esac
+  # Be sure to have absolute directory names.
+  case $ac_val in
+    [\\/$]* | ?:[\\/]* )  continue;;
+    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+  esac
+  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
 done
 
 # There might be people who depend on the old broken behavior: `$host'
 # used to hold the argument of --host etc.
 # FIXME: To remove some day.
@@ -686,12 +1241,10 @@
 
 # FIXME: To remove some day.
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
 fi
 
@@ -698,88 +1251,86 @@
 ac_tool_prefix=
 test -n "$host_alias" && ac_tool_prefix=$host_alias-
 
 test "$silent" = yes && exec 6>/dev/null
 
+
+ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ac_ls_di=`ls -di .` &&
+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+  as_fn_error $? "working directory cannot be determined"
+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+  as_fn_error $? "pwd does not report name of working directory"
+
 
 # Find the source files, if location was not specified.
 if test -z "$srcdir"; then
   ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_confdir=`(dirname "$0") 2>/dev/null ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$0" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
+  # Try the directory containing this script, then the parent directory.
+  ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_myself" : 'X\(//\)[^/]' \| \
+	 X"$as_myself" : 'X\(//\)$' \| \
+	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
   srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
+  if test ! -r "$srcdir/$ac_unique_file"; then
     srcdir=..
   fi
 else
   ac_srcdir_defaulted=no
 fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
-   { (exit 1); exit 1; }; }
-  else
-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-   { (exit 1); exit 1; }; }
-  fi
-fi
-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
-  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
-   { (exit 1); exit 1; }; }
-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
-ac_env_build_alias_set=${build_alias+set}
-ac_env_build_alias_value=$build_alias
-ac_cv_env_build_alias_set=${build_alias+set}
-ac_cv_env_build_alias_value=$build_alias
-ac_env_host_alias_set=${host_alias+set}
-ac_env_host_alias_value=$host_alias
-ac_cv_env_host_alias_set=${host_alias+set}
-ac_cv_env_host_alias_value=$host_alias
-ac_env_target_alias_set=${target_alias+set}
-ac_env_target_alias_value=$target_alias
-ac_cv_env_target_alias_set=${target_alias+set}
-ac_cv_env_target_alias_value=$target_alias
-ac_env_CC_set=${CC+set}
-ac_env_CC_value=$CC
-ac_cv_env_CC_set=${CC+set}
-ac_cv_env_CC_value=$CC
-ac_env_CFLAGS_set=${CFLAGS+set}
-ac_env_CFLAGS_value=$CFLAGS
-ac_cv_env_CFLAGS_set=${CFLAGS+set}
-ac_cv_env_CFLAGS_value=$CFLAGS
-ac_env_LDFLAGS_set=${LDFLAGS+set}
-ac_env_LDFLAGS_value=$LDFLAGS
-ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
-ac_cv_env_LDFLAGS_value=$LDFLAGS
-ac_env_CPPFLAGS_set=${CPPFLAGS+set}
-ac_env_CPPFLAGS_value=$CPPFLAGS
-ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
-ac_cv_env_CPPFLAGS_value=$CPPFLAGS
-ac_env_CPP_set=${CPP+set}
-ac_env_CPP_value=$CPP
-ac_cv_env_CPP_set=${CPP+set}
-ac_cv_env_CPP_value=$CPP
+if test ! -r "$srcdir/$ac_unique_file"; then
+  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
+fi
+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ac_abs_confdir=`(
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
+	pwd)`
+# When building in place, set srcdir=.
+if test "$ac_abs_confdir" = "$ac_pwd"; then
+  srcdir=.
+fi
+# Remove unnecessary trailing slashes from srcdir.
+# Double slashes in file names in object file debugging info
+# mess up M-x gdb in Emacs.
+case $srcdir in
+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
+esac
+for ac_var in $ac_precious_vars; do
+  eval ac_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_env_${ac_var}_value=\$${ac_var}
+  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_cv_env_${ac_var}_value=\$${ac_var}
+done
 
 #
 # Report the --help message.
 #
 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 tk 8.6 to adapt to many kinds of systems.
+\`configure' configures tk 8.7 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
 To assign environment variables (e.g., CC, CFLAGS...), specify them as
 VAR=VALUE.  See below for descriptions of some of the useful variables.
@@ -789,45 +1340,49 @@
 Configuration:
   -h, --help              display this help and exit
       --help=short        display options specific to this package
       --help=recursive    display the short help of all the included packages
   -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
+  -q, --quiet, --silent   do not print \`checking ...' messages
       --cache-file=FILE   cache test results in FILE [disabled]
   -C, --config-cache      alias for \`--cache-file=config.cache'
   -n, --no-create         do not create output files
       --srcdir=DIR        find the sources in DIR [configure dir or \`..']
 
-_ACEOF
-
-  cat <<_ACEOF
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
+                          [$ac_default_prefix]
   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
+                          [PREFIX]
 
 By default, \`make install' will install all the files in
 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
 an installation prefix other than \`$ac_default_prefix' using \`--prefix',
 for instance \`--prefix=\$HOME'.
 
 For better control, use the options below.
 
 Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --infodir=DIR          info documentation [PREFIX/info]
-  --mandir=DIR           man documentation [PREFIX/man]
+  --bindir=DIR            user executables [EPREFIX/bin]
+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR        program executables [EPREFIX/libexec]
+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --libdir=DIR            object code libraries [EPREFIX/lib]
+  --includedir=DIR        C header files [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR           info documentation [DATAROOTDIR/info]
+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR            man documentation [DATAROOTDIR/man]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/tk]
+  --htmldir=DIR           html documentation [DOCDIR]
+  --dvidir=DIR            dvi documentation [DOCDIR]
+  --pdfdir=DIR            pdf documentation [DOCDIR]
+  --psdir=DIR             ps documentation [DOCDIR]
 _ACEOF
 
   cat <<\_ACEOF
 
 X features:
@@ -836,25 +1391,25 @@
 _ACEOF
 fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of tk 8.6:";;
+     short | recursive ) echo "Configuration of tk 8.7:";;
    esac
   cat <<\_ACEOF
 
 Optional Features:
+  --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-man-symlinks   use symlinks for the manpages (default: off)
   --enable-man-compression=PROG
                           compress the manpages with PROG (default: off)
   --enable-man-suffix=STRING
                           use STRING as a suffix to manpage file names
                           (default: no, tk if enabled without
                           specifying STRING)
-  --enable-threads        build with threads (default: on)
   --enable-shared         build and link with shared libraries (default: on)
   --enable-64bit          enable 64bit support (default: off)
   --enable-64bit-vis      enable 64bit Sparc VIS support (default: off)
   --disable-rpath         disable rpath support (default: on)
   --enable-corefoundation use CoreFoundation API on MacOSX (default: on)
@@ -877,132 +1432,508 @@
 Some influential environment variables:
   CC          C compiler command
   CFLAGS      C compiler flags
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
               nonstandard directory <lib dir>
-  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
-              headers in a nonstandard directory <include dir>
+  LIBS        libraries to pass to the linker, e.g. -l<library>
+  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
+              you have headers in a nonstandard directory <include dir>
   CPP         C preprocessor
+  XMKMF       Path to xmkmf, Makefile generator for X Window System
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
+Report bugs to the package provider.
 _ACEOF
+ac_status=$?
 fi
 
 if test "$ac_init_help" = "recursive"; then
   # If there are subdirs, report their specific --help.
-  ac_popdir=`pwd`
   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d $ac_dir || continue
+    test -d "$ac_dir" ||
+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+      continue
     ac_builddir=.
 
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
 
 case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
+  .)  # We are building in place.
     ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
     ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-    cd $ac_dir
-    # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f $ac_srcdir/configure.gnu; then
-      echo
-      $SHELL $ac_srcdir/configure.gnu  --help=recursive
-    elif test -f $ac_srcdir/configure; then
-      echo
-      $SHELL $ac_srcdir/configure  --help=recursive
-    elif test -f $ac_srcdir/configure.ac ||
-	   test -f $ac_srcdir/configure.in; then
-      echo
-      $ac_configure --help
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+    cd "$ac_dir" || { ac_status=$?; continue; }
+    # Check for guested configure.
+    if test -f "$ac_srcdir/configure.gnu"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
+    elif test -f "$ac_srcdir/configure"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure" --help=recursive
     else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi
-    cd $ac_popdir
+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+    fi || ac_status=$?
+    cd "$ac_pwd" || { ac_status=$?; break; }
   done
 fi
 
-test -n "$ac_init_help" && exit 0
+test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-tk configure 8.6
-generated by GNU Autoconf 2.59
+tk configure 8.7
+generated by GNU Autoconf 2.69
 
-Copyright (C) 2003 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
-  exit 0
+  exit
 fi
-exec 5>config.log
-cat >&5 <<_ACEOF
+
+## ------------------------ ##
+## Autoconf initialization. ##
+## ------------------------ ##
+
+# ac_fn_c_try_compile LINENO
+# --------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext
+  if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_compile
+
+# ac_fn_c_try_cpp LINENO
+# ----------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_cpp ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } > conftest.i && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+    ac_retval=1
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_cpp
+
+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
+# the include files in INCLUDES and setting the cache variable VAR
+# accordingly.
+ac_fn_c_check_header_mongrel ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if eval \${$3+:} false; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
+$as_echo_n "checking $2 usability... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_header_compiler=yes
+else
+  ac_header_compiler=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
+$as_echo_n "checking $2 presence... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <$2>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  ac_header_preproc=yes
+else
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
+  yes:no: )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+    ;;
+esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=\$ac_header_compiler"
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_header_mongrel
+
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+# that executables *can* be run.
+ac_fn_c_try_run ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+       $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_retval=$ac_status
+fi
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_run
+
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists and can be compiled using the include files in
+# INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_c_check_header_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_header_compile
+
+# ac_fn_c_try_link LINENO
+# -----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_link ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext conftest$ac_exeext
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 test -x conftest$ac_exeext
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+  # interfere with the next link command; also delete a directory that is
+  # left behind by Apple's compiler.  We do this before executing the actions.
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_link
+
+# ac_fn_c_check_func LINENO FUNC VAR
+# ----------------------------------
+# Tests whether FUNC exists, setting the cache variable VAR accordingly
+ac_fn_c_check_func ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $2 innocuous_$2
+
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $2 (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $2
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $2 ();
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined __stub_$2 || defined __stub___$2
+choke me
+#endif
+
+int
+main ()
+{
+return $2 ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_func
+
+# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
+# -------------------------------------------
+# Tests whether TYPE exists after having included INCLUDES, setting cache
+# variable VAR accordingly.
+ac_fn_c_check_type ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=no"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+if (sizeof ($2))
+	 return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+if (sizeof (($2)))
+	    return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+  eval "$3=yes"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_type
+cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by tk $as_me 8.6, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
+It was created by tk $as_me 8.7, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
 
 _ACEOF
+exec 5>>config.log
 {
 cat <<_ASUNAME
 ## --------- ##
 ## Platform. ##
 ## --------- ##
@@ -1017,11 +1948,11 @@
 /bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
 
 /bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
 /usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
 /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
+/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
 /bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
 /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
 /bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
 
 _ASUNAME
@@ -1029,12 +1960,13 @@
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
-done
+    $as_echo "PATH: $as_dir"
+  done
+IFS=$as_save_IFS
 
 } >&5
 
 cat >&5 <<_ACEOF
 
@@ -1052,11 +1984,10 @@
 # Also quote any args containing shell meta-characters.
 # Make two passes to allow for proper duplicate-argument suppression.
 ac_configure_args=
 ac_configure_args0=
 ac_configure_args1=
-ac_sep=
 ac_must_keep_next=false
 for ac_pass in 1 2
 do
   for ac_arg
   do
@@ -1063,17 +1994,17 @@
     case $ac_arg in
     -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
     -q | -quiet | --quiet | --quie | --qui | --qu | --q \
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*)
+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
+    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
     2)
-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
+      as_fn_append ac_configure_args1 " '$ac_arg'"
       if test $ac_must_keep_next = true; then
 	ac_must_keep_next=false # Got value, back to normal.
       else
 	case $ac_arg in
 	  *=* | --config-cache | -C | -disable-* | --disable-* \
@@ -1085,221 +2016,257 @@
 	    esac
 	    ;;
 	  -* ) ac_must_keep_next=true ;;
 	esac
       fi
-      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
-      # Get rid of the leading space.
-      ac_sep=" "
+      as_fn_append ac_configure_args " '$ac_arg'"
       ;;
     esac
   done
 done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
+{ ac_configure_args0=; unset ac_configure_args0;}
+{ ac_configure_args1=; unset ac_configure_args1;}
 
 # When interrupted or exit'd, cleanup temporary files, and complete
 # config.log.  We remove comments because anyway the quotes in there
 # would cause problems or look ugly.
-# WARNING: Be sure not to use single quotes in there, as some shells,
-# such as our DU 5.0 friend, will then `close' the trap.
+# WARNING: Use '\'' to represent an apostrophe within the trap.
+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
 trap 'exit_status=$?
   # Save into config.log some information that might help in debugging.
   {
     echo
 
-    cat <<\_ASBOX
-## ---------------- ##
+    $as_echo "## ---------------- ##
 ## Cache variables. ##
-## ---------------- ##
-_ASBOX
+## ---------------- ##"
     echo
     # The following way of writing the cache mishandles newlines in values,
-{
-  (set) 2>&1 |
-    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      sed -n \
-	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
-      ;;
-    *)
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-}
+(
+  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
+      esac ;;
+    esac
+  done
+  (set) 2>&1 |
+    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      sed -n \
+	"s/'\''/'\''\\\\'\'''\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
+      ;; #(
+    *)
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
+      ;;
+    esac |
+    sort
+)
     echo
 
-    cat <<\_ASBOX
-## ----------------- ##
+    $as_echo "## ----------------- ##
 ## Output variables. ##
-## ----------------- ##
-_ASBOX
+## ----------------- ##"
     echo
     for ac_var in $ac_subst_vars
     do
-      eval ac_val=$`echo $ac_var`
-      echo "$ac_var='"'"'$ac_val'"'"'"
+      eval ac_val=\$$ac_var
+      case $ac_val in
+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      esac
+      $as_echo "$ac_var='\''$ac_val'\''"
     done | sort
     echo
 
     if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------- ##
-## Output files. ##
-## ------------- ##
-_ASBOX
+      $as_echo "## ------------------- ##
+## File substitutions. ##
+## ------------------- ##"
       echo
       for ac_var in $ac_subst_files
       do
-	eval ac_val=$`echo $ac_var`
-	echo "$ac_var='"'"'$ac_val'"'"'"
+	eval ac_val=\$$ac_var
+	case $ac_val in
+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	esac
+	$as_echo "$ac_var='\''$ac_val'\''"
       done | sort
       echo
     fi
 
     if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
+      $as_echo "## ----------- ##
 ## confdefs.h. ##
-## ----------- ##
-_ASBOX
+## ----------- ##"
       echo
-      sed "/^$/d" confdefs.h | sort
+      cat confdefs.h
       echo
     fi
     test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
+      $as_echo "$as_me: caught signal $ac_signal"
+    $as_echo "$as_me: exit $exit_status"
   } >&5
-  rm -f core *.core &&
-  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
+  rm -f core *.core core.conftest.* &&
+    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
     exit $exit_status
-     ' 0
+' 0
 for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
 done
 ac_signal=0
 
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo >confdefs.h
+rm -f -r conftest* confdefs.h
+
+$as_echo "/* confdefs.h */" > confdefs.h
 
 # Predefined preprocessor variables.
 
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_NAME "$PACKAGE_NAME"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_TARNAME "$PACKAGE_TARNAME"
 _ACEOF
-
 
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_VERSION "$PACKAGE_VERSION"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_STRING "$PACKAGE_STRING"
 _ACEOF
-
 
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
 _ACEOF
 
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_URL "$PACKAGE_URL"
+_ACEOF
+
 
 # Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
+if test -n "$CONFIG_SITE"; then
+  # We do not want a PATH search for config.site.
+  case $CONFIG_SITE in #((
+    -*)  ac_site_file1=./$CONFIG_SITE;;
+    */*) ac_site_file1=$CONFIG_SITE;;
+    *)   ac_site_file1=./$CONFIG_SITE;;
+  esac
+elif test "x$prefix" != xNONE; then
+  ac_site_file1=$prefix/share/config.site
+  ac_site_file2=$prefix/etc/config.site
+else
+  ac_site_file1=$ac_default_prefix/share/config.site
+  ac_site_file2=$ac_default_prefix/etc/config.site
+fi
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+do
+  test "x$ac_site_file" = xNONE && continue
+  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
+    . "$ac_site_file" \
+      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "failed to load site script $ac_site_file
+See \`config.log' for more details" "$LINENO" 5; }
   fi
 done
 
 if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
+  # Some versions of bash will fail to source /dev/null (special files
+  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
+  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
-      [\\/]* | ?:[\\/]* ) . $cache_file;;
-      *)                      . ./$cache_file;;
+      [\\/]* | ?:[\\/]* ) . "$cache_file";;
+      *)                      . "./$cache_file";;
     esac
   fi
 else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
 # Check that the precious variables saved in the cache have kept the same
 # value.
 ac_cache_corrupted=false
-for ac_var in `(set) 2>&1 |
-	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
+for ac_var in $ac_precious_vars; do
   eval ac_old_set=\$ac_cv_env_${ac_var}_set
   eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
-  eval ac_new_val="\$ac_env_${ac_var}_value"
+  eval ac_old_val=\$ac_cv_env_${ac_var}_value
+  eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
+	# differences in whitespace do not lead to failure.
+	ac_old_val_w=`echo x $ac_old_val`
+	ac_new_val_w=`echo x $ac_new_val`
+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  ac_cache_corrupted=:
+	else
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  eval $ac_var=\$ac_old_val
+	fi
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
       fi;;
   esac
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
       *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
     esac
   fi
 done
 if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-   { (exit 1); exit 1; }; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
 fi
+## -------------------- ##
+## Main body of script. ##
+## -------------------- ##
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -1308,39 +2275,14 @@
 
 
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-TK_VERSION=8.6
+TK_VERSION=8.7
 TK_MAJOR_VERSION=8
-TK_MINOR_VERSION=6
-TK_PATCH_LEVEL=".6"
+TK_MINOR_VERSION=7
+TK_PATCH_LEVEL="a2"
 VERSION=${TK_VERSION}
 LOCALES="cs da de el en en_gb eo es fr hu it nl pl pt ru sv"
 
 #--------------------------------------------------------------------
 # Find and load the tclConfig.sh file
@@ -1355,38 +2297,36 @@
 
     if test x"${no_tcl}" = x ; then
 	# we reset no_tcl in case something fails here
 	no_tcl=true
 
-# Check whether --with-tcl or --without-tcl was given.
-if test "${with_tcl+set}" = set; then
-  withval="$with_tcl"
-  with_tclconfig="${withval}"
-fi;
-	echo "$as_me:$LINENO: checking for Tcl configuration" >&5
-echo $ECHO_N "checking for Tcl configuration... $ECHO_C" >&6
-	if test "${ac_cv_c_tclconfig+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+# Check whether --with-tcl was given.
+if test "${with_tcl+set}" = set; then :
+  withval=$with_tcl; with_tclconfig="${withval}"
+fi
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Tcl configuration" >&5
+$as_echo_n "checking for Tcl configuration... " >&6; }
+	if ${ac_cv_c_tclconfig+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
 
 
 	    # First check to see if --with-tcl was specified.
 	    if test x"${with_tclconfig}" != x ; then
 		case "${with_tclconfig}" in
 		    */tclConfig.sh )
 			if test -f "${with_tclconfig}"; then
-			    { echo "$as_me:$LINENO: WARNING: --with-tcl argument should refer to directory containing tclConfig.sh, not to tclConfig.sh itself" >&5
-echo "$as_me: WARNING: --with-tcl argument should refer to directory containing tclConfig.sh, not to tclConfig.sh itself" >&2;}
+			    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-tcl argument should refer to directory containing tclConfig.sh, not to tclConfig.sh itself" >&5
+$as_echo "$as_me: WARNING: --with-tcl argument should refer to directory containing tclConfig.sh, not to tclConfig.sh itself" >&2;}
 			    with_tclconfig="`echo "${with_tclconfig}" | sed 's!/tclConfig\.sh$!!'`"
 			fi ;;
 		esac
 		if test -f "${with_tclconfig}/tclConfig.sh" ; then
 		    ac_cv_c_tclconfig="`(cd "${with_tclconfig}"; pwd)`"
 		else
-		    { { echo "$as_me:$LINENO: error: ${with_tclconfig} directory doesn't contain tclConfig.sh" >&5
-echo "$as_me: error: ${with_tclconfig} directory doesn't contain tclConfig.sh" >&2;}
-   { (exit 1); exit 1; }; }
+		    as_fn_error $? "${with_tclconfig} directory doesn't contain tclConfig.sh" "$LINENO" 5
 		fi
 	    fi
 
 	    # then check for a private Tcl installation
 	    if test x"${ac_cv_c_tclconfig}" = x ; then
@@ -1429,12 +2369,15 @@
 		for i in `ls -d ${libdir} 2>/dev/null` \
 			`ls -d ${exec_prefix}/lib 2>/dev/null` \
 			`ls -d ${prefix}/lib 2>/dev/null` \
 			`ls -d /usr/local/lib 2>/dev/null` \
 			`ls -d /usr/contrib/lib 2>/dev/null` \
+			`ls -d /usr/pkg/lib 2>/dev/null` \
 			`ls -d /usr/lib 2>/dev/null` \
 			`ls -d /usr/lib64 2>/dev/null` \
+			`ls -d /usr/local/lib/tcl8.7 2>/dev/null` \
+			`ls -d /usr/local/lib/tcl/tcl8.7 2>/dev/null` \
 			; do
 		    if test -f "$i/tclConfig.sh" ; then
 			ac_cv_c_tclconfig="`(cd $i; pwd)`"
 			break
 		    fi
@@ -1458,32 +2401,30 @@
 fi
 
 
 	if test x"${ac_cv_c_tclconfig}" = x ; then
 	    TCL_BIN_DIR="# no Tcl configs found"
-	    { { echo "$as_me:$LINENO: error: Can't find Tcl configuration definitions. Use --with-tcl to specify a directory containing tclConfig.sh" >&5
-echo "$as_me: error: Can't find Tcl configuration definitions. Use --with-tcl to specify a directory containing tclConfig.sh" >&2;}
-   { (exit 1); exit 1; }; }
+	    as_fn_error $? "Can't find Tcl configuration definitions. Use --with-tcl to specify a directory containing tclConfig.sh" "$LINENO" 5
 	else
 	    no_tcl=
 	    TCL_BIN_DIR="${ac_cv_c_tclconfig}"
-	    echo "$as_me:$LINENO: result: found ${TCL_BIN_DIR}/tclConfig.sh" >&5
-echo "${ECHO_T}found ${TCL_BIN_DIR}/tclConfig.sh" >&6
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: found ${TCL_BIN_DIR}/tclConfig.sh" >&5
+$as_echo "found ${TCL_BIN_DIR}/tclConfig.sh" >&6; }
 	fi
     fi
 
 
-    echo "$as_me:$LINENO: checking for existence of ${TCL_BIN_DIR}/tclConfig.sh" >&5
-echo $ECHO_N "checking for existence of ${TCL_BIN_DIR}/tclConfig.sh... $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for existence of ${TCL_BIN_DIR}/tclConfig.sh" >&5
+$as_echo_n "checking for existence of ${TCL_BIN_DIR}/tclConfig.sh... " >&6; }
 
     if test -f "${TCL_BIN_DIR}/tclConfig.sh" ; then
-        echo "$as_me:$LINENO: result: loading" >&5
-echo "${ECHO_T}loading" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: loading" >&5
+$as_echo "loading" >&6; }
 	. "${TCL_BIN_DIR}/tclConfig.sh"
     else
-        echo "$as_me:$LINENO: result: could not find ${TCL_BIN_DIR}/tclConfig.sh" >&5
-echo "${ECHO_T}could not find ${TCL_BIN_DIR}/tclConfig.sh" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: could not find ${TCL_BIN_DIR}/tclConfig.sh" >&5
+$as_echo "could not find ${TCL_BIN_DIR}/tclConfig.sh" >&6; }
     fi
 
     # eval is required to do the TCL_DBGX substitution
     eval "TCL_LIB_FILE=\"${TCL_LIB_FILE}\""
     eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\""
@@ -1539,30 +2480,26 @@
 
 
 
 
 
+if test "${TCL_MAJOR_VERSION}" -lt 9 ; then
 if test "${TCL_MAJOR_VERSION}" -ne 8 ; then
-    { { echo "$as_me:$LINENO: error: ${PACKAGE_NAME} ${PACKAGE_VERSION} requires Tcl 8.6+
-Found config for Tcl ${TCL_VERSION}" >&5
-echo "$as_me: error: ${PACKAGE_NAME} ${PACKAGE_VERSION} requires Tcl 8.6+
-Found config for Tcl ${TCL_VERSION}" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error $? "${PACKAGE_NAME} ${PACKAGE_VERSION} requires Tcl 8.6+
+Found config for Tcl ${TCL_VERSION}" "$LINENO" 5
 fi
 if test "${TCL_MINOR_VERSION}" -lt 6 ; then
-    { { echo "$as_me:$LINENO: error: ${PACKAGE_NAME} ${PACKAGE_VERSION} requires Tcl 8.6+
-Found config for Tcl ${TCL_VERSION}" >&5
-echo "$as_me: error: ${PACKAGE_NAME} ${PACKAGE_VERSION} requires Tcl 8.6+
-Found config for Tcl ${TCL_VERSION}" >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error $? "${PACKAGE_NAME} ${PACKAGE_VERSION} requires Tcl 8.6+
+Found config for Tcl ${TCL_VERSION}" "$LINENO" 5
+fi
 fi
 
 
-    echo "$as_me:$LINENO: checking for tclsh" >&5
-echo $ECHO_N "checking for tclsh... $ECHO_C" >&6
-    if test "${ac_cv_path_tclsh+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tclsh" >&5
+$as_echo_n "checking for tclsh... " >&6; }
+    if ${ac_cv_path_tclsh+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
 
 	search_path=`echo ${PATH} | sed -e 's/:/ /g'`
 	for dir in $search_path ; do
 	    for j in `ls -r $dir/tclsh[8-9]* 2> /dev/null` \
@@ -1579,26 +2516,26 @@
 fi
 
 
     if test -f "$ac_cv_path_tclsh" ; then
 	TCLSH_PROG="$ac_cv_path_tclsh"
-	echo "$as_me:$LINENO: result: $TCLSH_PROG" >&5
-echo "${ECHO_T}$TCLSH_PROG" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $TCLSH_PROG" >&5
+$as_echo "$TCLSH_PROG" >&6; }
     else
 	# It is not an error if an installed version of Tcl can't be located.
 	TCLSH_PROG=""
-	echo "$as_me:$LINENO: result: No tclsh found on PATH" >&5
-echo "${ECHO_T}No tclsh found on PATH" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: No tclsh found on PATH" >&5
+$as_echo "No tclsh found on PATH" >&6; }
     fi
 
 
 
-    echo "$as_me:$LINENO: checking for tclsh in Tcl build directory" >&5
-echo $ECHO_N "checking for tclsh in Tcl build directory... $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tclsh in Tcl build directory" >&5
+$as_echo_n "checking for tclsh in Tcl build directory... " >&6; }
     BUILD_TCLSH="${TCL_BIN_DIR}"/tclsh
-    echo "$as_me:$LINENO: result: $BUILD_TCLSH" >&5
-echo "${ECHO_T}$BUILD_TCLSH" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILD_TCLSH" >&5
+$as_echo "$BUILD_TCLSH" >&6; }
 
 
 
 #------------------------------------------------------------------------
 # Handle the --prefix=... option
@@ -1617,66 +2554,64 @@
 #------------------------------------------------------------------------
 # Compress and/or soft link the manpages?
 #------------------------------------------------------------------------
 
 
-    echo "$as_me:$LINENO: checking whether to use symlinks for manpages" >&5
-echo $ECHO_N "checking whether to use symlinks for manpages... $ECHO_C" >&6
-    # Check whether --enable-man-symlinks or --disable-man-symlinks was given.
-if test "${enable_man_symlinks+set}" = set; then
-  enableval="$enable_man_symlinks"
-  test "$enableval" != "no" && MAN_FLAGS="$MAN_FLAGS --symlinks"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use symlinks for manpages" >&5
+$as_echo_n "checking whether to use symlinks for manpages... " >&6; }
+    # Check whether --enable-man-symlinks was given.
+if test "${enable_man_symlinks+set}" = set; then :
+  enableval=$enable_man_symlinks; test "$enableval" != "no" && MAN_FLAGS="$MAN_FLAGS --symlinks"
 else
   enableval="no"
-fi;
-    echo "$as_me:$LINENO: result: $enableval" >&5
-echo "${ECHO_T}$enableval" >&6
-
-    echo "$as_me:$LINENO: checking whether to compress the manpages" >&5
-echo $ECHO_N "checking whether to compress the manpages... $ECHO_C" >&6
-    # Check whether --enable-man-compression or --disable-man-compression was given.
-if test "${enable_man_compression+set}" = set; then
-  enableval="$enable_man_compression"
-  case $enableval in
-	    yes) { { echo "$as_me:$LINENO: error: missing argument to --enable-man-compression" >&5
-echo "$as_me: error: missing argument to --enable-man-compression" >&2;}
-   { (exit 1); exit 1; }; };;
+fi
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enableval" >&5
+$as_echo "$enableval" >&6; }
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to compress the manpages" >&5
+$as_echo_n "checking whether to compress the manpages... " >&6; }
+    # Check whether --enable-man-compression was given.
+if test "${enable_man_compression+set}" = set; then :
+  enableval=$enable_man_compression; case $enableval in
+	    yes) as_fn_error $? "missing argument to --enable-man-compression" "$LINENO" 5;;
 	    no)  ;;
 	    *)   MAN_FLAGS="$MAN_FLAGS --compress $enableval";;
 	esac
 else
   enableval="no"
-fi;
-    echo "$as_me:$LINENO: result: $enableval" >&5
-echo "${ECHO_T}$enableval" >&6
+fi
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enableval" >&5
+$as_echo "$enableval" >&6; }
     if test "$enableval" != "no"; then
-	echo "$as_me:$LINENO: checking for compressed file suffix" >&5
-echo $ECHO_N "checking for compressed file suffix... $ECHO_C" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for compressed file suffix" >&5
+$as_echo_n "checking for compressed file suffix... " >&6; }
 	touch TeST
 	$enableval TeST
 	Z=`ls TeST* | sed 's/^....//'`
 	rm -f TeST*
 	MAN_FLAGS="$MAN_FLAGS --extension $Z"
-	echo "$as_me:$LINENO: result: $Z" >&5
-echo "${ECHO_T}$Z" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $Z" >&5
+$as_echo "$Z" >&6; }
     fi
 
-    echo "$as_me:$LINENO: checking whether to add a package name suffix for the manpages" >&5
-echo $ECHO_N "checking whether to add a package name suffix for the manpages... $ECHO_C" >&6
-    # Check whether --enable-man-suffix or --disable-man-suffix was given.
-if test "${enable_man_suffix+set}" = set; then
-  enableval="$enable_man_suffix"
-  case $enableval in
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to add a package name suffix for the manpages" >&5
+$as_echo_n "checking whether to add a package name suffix for the manpages... " >&6; }
+    # Check whether --enable-man-suffix was given.
+if test "${enable_man_suffix+set}" = set; then :
+  enableval=$enable_man_suffix; case $enableval in
 	    yes) enableval="tk" MAN_FLAGS="$MAN_FLAGS --suffix $enableval";;
 	    no)  ;;
 	    *)   MAN_FLAGS="$MAN_FLAGS --suffix $enableval";;
 	esac
 else
   enableval="no"
-fi;
-    echo "$as_me:$LINENO: result: $enableval" >&5
-echo "${ECHO_T}$enableval" >&6
+fi
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enableval" >&5
+$as_echo "$enableval" >&6; }
 
 
 
 
 #------------------------------------------------------------------------
@@ -1695,174 +2630,147 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
+
 
 fi
 if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-  CC=$ac_ct_CC
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
 else
   CC="$ac_cv_prog_CC"
 fi
 
 if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+          if test -n "$ac_tool_prefix"; then
+    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  CC=$ac_ct_CC
-else
-  CC="$ac_cv_prog_CC"
-fi
-
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  fi
 fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
   ac_prog_rejected=no
@@ -1869,22 +2777,23 @@
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
      fi
     ac_cv_prog_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 if test $ac_prog_rejected = yes; then
   # We found a bogon in the path, so make sure we never use it.
   set dummy $ac_cv_prog_CC
   shift
@@ -1898,139 +2807,154 @@
 fi
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
+
 
 fi
 if test -z "$CC"; then
   if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl
+  for ac_prog in cl.exe
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
+
 
     test -n "$CC" && break
   done
 fi
 if test -z "$CC"; then
   ac_ct_CC=$CC
-  for ac_prog in cl
+  for ac_prog in cl.exe
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
+
 
   test -n "$ac_ct_CC" && break
 done
 
-  CC=$ac_ct_CC
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
 fi
 
 fi
 
 
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
-echo "$as_me:$LINENO:" \
-     "checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-  (eval $ac_compiler --version </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-  (eval $ac_compiler -v </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-  (eval $ac_compiler -V </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+  { { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+  fi
+  rm -f conftest.er1 conftest.err
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
@@ -2038,155 +2962,203 @@
   ;
   return 0;
 }
 _ACEOF
 ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
-  (eval $ac_link_default) 2>&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
+ac_rmfiles=
+for ac_file in $ac_files
+do
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
+  esac
+done
+rm -f $ac_rmfiles
+
+if { { ac_try="$ac_link_default"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link_default") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # Find the output, starting from the most likely.  This scheme is
-# not robust to junk in `.', hence go to wildcards (a.*) only as a last
-# resort.
-
-# Be careful to initialize this variable, since it used to be cached.
-# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
-ac_cv_exeext=
-# b.out is created by i960 compilers.
-for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
+# in a Makefile.  We should not override ac_cv_exeext if it was cached,
+# so that the user can short-circuit this test for compilers unknown to
+# Autoconf.
+for ac_file in $ac_files ''
 do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
-	;;
-    conftest.$ac_ext )
-	# This is the source file.
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
 	;;
     [ab].out )
 	# We found the default executable, but exeext='' is most
 	# certainly right.
 	break;;
     *.* )
-	ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	# FIXME: I believe we export ac_cv_exeext for Libtool,
-	# but it would be cool to find out if it's true.  Does anybody
-	# maintain Libtool? --akim.
-	export ac_cv_exeext
+	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+	then :; else
+	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	fi
+	# We set ac_cv_exeext here because the later test for it is not
+	# safe: cross compilers may not add the suffix if given an `-o'
+	# argument, so we may need to know it at that point already.
+	# Even if this section looks crufty: it has the advantage of
+	# actually working.
 	break;;
     * )
 	break;;
   esac
 done
+test "$ac_cv_exeext" = no && ac_cv_exeext=
+
 else
-  echo "$as_me: failed program was:" >&5
+  ac_file=''
+fi
+if test -z "$ac_file"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
-See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-fi
-
-ac_exeext=$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6
-
-# Check the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
-  if { ac_try='./$ac_file'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-  fi
-fi
-echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
-ac_clean_files=$ac_clean_files_save
-# Check the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6
-
-echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "C compiler cannot create executables
+See \`config.log' for more details" "$LINENO" 5; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
+ac_exeext=$ac_cv_exeext
+
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
+ac_clean_files=$ac_clean_files_save
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
+if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
 # work properly (i.e., refer to `conftest.exe'), while it won't with
 # `rm'.
 for ac_file in conftest.exe conftest conftest.*; do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	  export ac_cv_exeext
 	  break;;
     * ) break;;
   esac
 done
 else
-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details" "$LINENO" 5; }
 fi
-
-rm -f conftest$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6
+rm -f conftest conftest$ac_cv_exeext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
-if test "${ac_cv_objext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdio.h>
+int
+main ()
+{
+FILE *f = fopen ("conftest.out", "w");
+ return ferror (f) || fclose (f) != 0;
+
+  ;
+  return 0;
+}
+_ACEOF
+ac_clean_files="$ac_clean_files conftest.out"
+# Check that the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+if test "$cross_compiling" != yes; then
+  { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+  if { ac_try='./conftest$ac_cv_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
+    cross_compiling=no
+  else
+    if test "$cross_compiling" = maybe; then
+	cross_compiling=yes
+    else
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details" "$LINENO" 5; }
+    fi
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+ac_clean_files=$ac_clean_files_save
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
+if ${ac_cv_objext+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
@@ -2194,49 +3166,50 @@
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  for ac_file in conftest.o conftest.obj conftest.*; do
+  test -f "$ac_file" || continue;
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
        break;;
   esac
 done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details" "$LINENO" 5; }
 fi
-
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+if ${ac_cv_c_compiler_gnu+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
@@ -2246,59 +3219,69 @@
 
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_compiler_gnu=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_compiler_gnu=no
+  ac_compiler_gnu=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
-GCC=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-CFLAGS="-g"
-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if ${ac_cv_prog_cc_g+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
+  ac_save_c_werror_flag=$ac_c_werror_flag
+   ac_c_werror_flag=yes
+   ac_cv_prog_cc_g=no
+   CFLAGS="-g"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
 _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_g=yes
+else
+  CFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+  ac_c_werror_flag=$ac_save_c_werror_flag
+	 CFLAGS="-g"
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
@@ -2305,43 +3288,22 @@
 
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_prog_cc_g=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
   if test "$GCC" = yes; then
     CFLAGS="-g -O2"
@@ -2353,27 +3315,22 @@
     CFLAGS="-O2"
   else
     CFLAGS=
   fi
 fi
-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+if ${ac_cv_prog_cc_c89+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  ac_cv_prog_cc_stdc=no
+  ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
 struct buf { int x; };
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
 static char *e (p, i)
      char **p;
@@ -2392,15 +3349,20 @@
 }
 
 /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
    function prototypes and stuff, but not '\xHH' hex character constants.
    These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std1 is added to get
+   as 'x'.  The following induces an error, until -std is added to get
    proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
    array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std1.  */
+   that's true only with -std.  */
 int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
 
 int test (int i, double x);
 struct s1 {int (*f) (int a);};
 struct s2 {int (*f) (double a);};
 int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
@@ -2412,271 +3374,74 @@
 return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
   ;
   return 0;
 }
 _ACEOF
-# Don't try gcc -ansi; that turns off useful extensions and
-# breaks some systems' header files.
-# AIX			-qlanglvl=ansi
-# Ultrix and OSF/1	-std1
-# HP-UX 10.20 and later	-Ae
-# HP-UX older versions	-Aa -D_HPUX_SOURCE
-# SVR4			-Xc -D__EXTENSIONS__
-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
   CC="$ac_save_CC $ac_arg"
-  rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_prog_cc_stdc=$ac_arg
-break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+  if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_c89=$ac_arg
 fi
-rm -f conftest.err conftest.$ac_objext
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c89" != "xno" && break
 done
-rm -f conftest.$ac_ext conftest.$ac_objext
+rm -f conftest.$ac_ext
 CC=$ac_save_CC
 
 fi
-
-case "x$ac_cv_prog_cc_stdc" in
-  x|xno)
-    echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6 ;;
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+  x)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+  xno)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
   *)
-    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
-    CC="$CC $ac_cv_prog_cc_stdc" ;;
+    CC="$CC $ac_cv_prog_cc_c89"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
 esac
-
-# Some people use a C++ compiler to compile C.  Since we use `exit',
-# in C++ we need to declare it.  In case someone uses the same compiler
-# for both compiling C and C++ we need to have the C++ compiler decide
-# the declaration of exit, since it's the most demanding environment.
-cat >conftest.$ac_ext <<_ACEOF
-#ifndef __cplusplus
-  choke me
-#endif
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  for ac_declaration in \
-   '' \
-   'extern "C" void std::exit (int) throw (); using std::exit;' \
-   'extern "C" void std::exit (int); using std::exit;' \
-   'extern "C" void exit (int) throw ();' \
-   'extern "C" void exit (int);' \
-   'void exit (int);'
-do
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-#include <stdlib.h>
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-continue
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
-  echo '#ifdef __cplusplus' >>confdefs.h
-  echo $ac_declaration      >>confdefs.h
-  echo '#endif'             >>confdefs.h
-fi
-
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+if test "x$ac_cv_prog_cc_c89" != xno; then :
+
+fi
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-echo "$as_me:$LINENO: checking for inline" >&5
-echo $ECHO_N "checking for inline... $ECHO_C" >&6
-if test "${ac_cv_c_inline+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
+$as_echo_n "checking for inline... " >&6; }
+if ${ac_cv_c_inline+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifndef __cplusplus
 typedef int foo_t;
 static $ac_kw foo_t static_foo () {return 0; }
 $ac_kw foo_t foo () {return 0; }
 #endif
 
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_c_inline=$ac_kw; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_c_inline=$ac_kw
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  test "$ac_cv_c_inline" != no && break
 done
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
-echo "${ECHO_T}$ac_cv_c_inline" >&6
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
+$as_echo "$ac_cv_c_inline" >&6; }
 
 case $ac_cv_c_inline in
   inline | yes) ;;
   *)
     case $ac_cv_c_inline in
@@ -2700,19 +3465,19 @@
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  if ${ac_cv_prog_CPP+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
     for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
     do
       ac_preproc_ok=false
@@ -2722,95 +3487,47 @@
   # with a fresh cross-compiler works.
   # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
 #else
 # include <assert.h>
 #endif
 		     Syntax error
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
-  # OK, works on sane cases.  Now check whether non-existent headers
+  # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+if ac_fn_c_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
   break
 fi
 
     done
     ac_cv_prog_CPP=$CPP
@@ -2818,147 +3535,209 @@
 fi
   CPP=$ac_cv_prog_CPP
 else
   ac_cv_prog_CPP=$CPP
 fi
-echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
   # Use a header file that comes with gcc, so configuring glibc
   # with a fresh cross-compiler works.
   # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
 #else
 # include <assert.h>
 #endif
 		     Syntax error
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
-  # OK, works on sane cases.  Now check whether non-existent headers
+  # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+if ac_fn_c_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+
 else
-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6
-if test "${ac_cv_prog_egrep+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
-    then ac_cv_prog_egrep='grep -E'
-    else ac_cv_prog_egrep='egrep'
-    fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
- EGREP=$ac_cv_prog_egrep
-
-
-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
-if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+if ${ac_cv_path_GREP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$GREP"; then
+  ac_path_GREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in grep ggrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_GREP" || continue
+# Check for GNU ac_path_GREP and select it if it is found.
+  # Check for GNU $ac_path_GREP
+case `"$ac_path_GREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'GREP' >> "conftest.nl"
+    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_GREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_GREP="$ac_path_GREP"
+      ac_path_GREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_GREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_GREP"; then
+    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_GREP=$GREP
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
+if ${ac_cv_path_EGREP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+   then ac_cv_path_EGREP="$GREP -E"
+   else
+     if test -z "$EGREP"; then
+  ac_path_EGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in egrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_EGREP" || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
+  # Check for GNU $ac_path_EGREP
+case `"$ac_path_EGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'EGREP' >> "conftest.nl"
+    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_EGREP="$ac_path_EGREP"
+      ac_path_EGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_EGREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_EGREP"; then
+    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_EGREP=$EGREP
+fi
+
+   fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if ${ac_cv_header_stdc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
 #include <float.h>
@@ -2969,95 +3748,60 @@
 
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_header_stdc=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_header_stdc=no
+  ac_cv_header_stdc=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <string.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then
-  :
+  $EGREP "memchr" >/dev/null 2>&1; then :
+
 else
   ac_cv_header_stdc=no
 fi
 rm -f conftest*
 
 fi
 
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then
-  :
+  $EGREP "free" >/dev/null 2>&1; then :
+
 else
   ac_cv_header_stdc=no
 fi
 rm -f conftest*
 
 fi
 
 if test $ac_cv_header_stdc = yes; then
   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
   :
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ctype.h>
+#include <stdlib.h>
 #if ((' ' & 0x0FF) == 0x020)
 # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
 # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
 #else
 # define ISLOWER(c) \
@@ -3073,341 +3817,117 @@
 {
   int i;
   for (i = 0; i < 256; i++)
     if (XOR (islower (i), ISLOWER (i))
 	|| toupper (i) != TOUPPER (i))
-      exit(2);
-  exit (0);
+      return 2;
+  return 0;
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_header_stdc=no
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6
+if ac_fn_c_try_run "$LINENO"; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
 
 fi
 
 # On IRIX 5.3, sys/types and inttypes.h are conflicting.
-
-
-
-
-
-
-
-
-
 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
 		  inttypes.h stdint.h unistd.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_Header=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_Header=no"
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 
 done
 
 
-if test "${ac_cv_header_stdlib_h+set}" = set; then
-  echo "$as_me:$LINENO: checking for stdlib.h" >&5
-echo $ECHO_N "checking for stdlib.h... $ECHO_C" >&6
-if test "${ac_cv_header_stdlib_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_stdlib_h" >&5
-echo "${ECHO_T}$ac_cv_header_stdlib_h" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking stdlib.h usability" >&5
-echo $ECHO_N "checking stdlib.h usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <stdlib.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking stdlib.h presence" >&5
-echo $ECHO_N "checking stdlib.h presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: stdlib.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: stdlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: stdlib.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: stdlib.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: stdlib.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: stdlib.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: stdlib.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: stdlib.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: stdlib.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: stdlib.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: stdlib.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: stdlib.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: stdlib.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: stdlib.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: stdlib.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: stdlib.h: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ----------------------------- ##
-## Report this to the tk lists.  ##
-## ----------------------------- ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for stdlib.h" >&5
-echo $ECHO_N "checking for stdlib.h... $ECHO_C" >&6
-if test "${ac_cv_header_stdlib_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_header_stdlib_h=$ac_header_preproc
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_stdlib_h" >&5
-echo "${ECHO_T}$ac_cv_header_stdlib_h" >&6
-
-fi
-if test $ac_cv_header_stdlib_h = yes; then
+ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
+if test "x$ac_cv_header_stdlib_h" = xyes; then :
   tk_ok=1
 else
   tk_ok=0
 fi
 
 
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "strtol" >/dev/null 2>&1; then
-  :
-else
-  tk_ok=0
-fi
-rm -f conftest*
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "strtoul" >/dev/null 2>&1; then
-  :
-else
-  tk_ok=0
-fi
-rm -f conftest*
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "strtod" >/dev/null 2>&1; then
-  :
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "strtol" >/dev/null 2>&1; then :
+
+else
+  tk_ok=0
+fi
+rm -f conftest*
+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "strtoul" >/dev/null 2>&1; then :
+
+else
+  tk_ok=0
+fi
+rm -f conftest*
+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "strtod" >/dev/null 2>&1; then :
+
 else
   tk_ok=0
 fi
 rm -f conftest*
 
 if test $tk_ok = 0; then
 
-cat >>confdefs.h <<\_ACEOF
-#define NO_STDLIB_H 1
-_ACEOF
+$as_echo "#define NO_STDLIB_H 1" >>confdefs.h
 
 fi
 
 #------------------------------------------------------------------------
 # If we're using GCC, see if the compiler understands -pipe.  If so, use it.
 # It makes compiling go faster.  (This is only a performance feature.)
 #------------------------------------------------------------------------
 
 if test -z "$no_pipe" && test -n "$GCC"; then
-    echo "$as_me:$LINENO: checking if the compiler understands -pipe" >&5
-echo $ECHO_N "checking if the compiler understands -pipe... $ECHO_C" >&6
-if test "${tcl_cv_cc_pipe+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the compiler understands -pipe" >&5
+$as_echo_n "checking if the compiler understands -pipe... " >&6; }
+if ${tcl_cv_cc_pipe+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
 
 	hold_cflags=$CFLAGS; CFLAGS="$CFLAGS -pipe"
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
@@ -3414,642 +3934,56 @@
 
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   tcl_cv_cc_pipe=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-tcl_cv_cc_pipe=no
+  tcl_cv_cc_pipe=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 	CFLAGS=$hold_cflags
 fi
-echo "$as_me:$LINENO: result: $tcl_cv_cc_pipe" >&5
-echo "${ECHO_T}$tcl_cv_cc_pipe" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_cc_pipe" >&5
+$as_echo "$tcl_cv_cc_pipe" >&6; }
     if test $tcl_cv_cc_pipe = yes; then
 	CFLAGS="$CFLAGS -pipe"
     fi
 fi
 
-#------------------------------------------------------------------------
-# Threads support - this auto-enables if Tcl was compiled threaded
-#------------------------------------------------------------------------
-
-
-    # Check whether --enable-threads or --disable-threads was given.
-if test "${enable_threads+set}" = set; then
-  enableval="$enable_threads"
-  tcl_ok=$enableval
-else
-  tcl_ok=yes
-fi;
-
-    if test "${TCL_THREADS}" = 1; then
-	tcl_threaded_core=1;
-    fi
-
-    if test "$tcl_ok" = "yes" -o "${TCL_THREADS}" = 1; then
-	TCL_THREADS=1
-	# USE_THREAD_ALLOC tells us to try the special thread-based
-	# allocator that significantly reduces lock contention
-
-cat >>confdefs.h <<\_ACEOF
-#define USE_THREAD_ALLOC 1
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define _REENTRANT 1
-_ACEOF
-
-	if test "`uname -s`" = "SunOS" ; then
-
-cat >>confdefs.h <<\_ACEOF
-#define _POSIX_PTHREAD_SEMANTICS 1
-_ACEOF
-
-	fi
-
-cat >>confdefs.h <<\_ACEOF
-#define _THREAD_SAFE 1
-_ACEOF
-
-	echo "$as_me:$LINENO: checking for pthread_mutex_init in -lpthread" >&5
-echo $ECHO_N "checking for pthread_mutex_init in -lpthread... $ECHO_C" >&6
-if test "${ac_cv_lib_pthread_pthread_mutex_init+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char pthread_mutex_init ();
-int
-main ()
-{
-pthread_mutex_init ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_pthread_pthread_mutex_init=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_pthread_pthread_mutex_init=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_mutex_init" >&5
-echo "${ECHO_T}$ac_cv_lib_pthread_pthread_mutex_init" >&6
-if test $ac_cv_lib_pthread_pthread_mutex_init = yes; then
-  tcl_ok=yes
-else
-  tcl_ok=no
-fi
-
-	if test "$tcl_ok" = "no"; then
-	    # Check a little harder for __pthread_mutex_init in the same
-	    # library, as some systems hide it there until pthread.h is
-	    # defined.  We could alternatively do an AC_TRY_COMPILE with
-	    # pthread.h, but that will work with libpthread really doesn't
-	    # exist, like AIX 4.2.  [Bug: 4359]
-	    echo "$as_me:$LINENO: checking for __pthread_mutex_init in -lpthread" >&5
-echo $ECHO_N "checking for __pthread_mutex_init in -lpthread... $ECHO_C" >&6
-if test "${ac_cv_lib_pthread___pthread_mutex_init+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char __pthread_mutex_init ();
-int
-main ()
-{
-__pthread_mutex_init ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_pthread___pthread_mutex_init=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_pthread___pthread_mutex_init=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_pthread___pthread_mutex_init" >&5
-echo "${ECHO_T}$ac_cv_lib_pthread___pthread_mutex_init" >&6
-if test $ac_cv_lib_pthread___pthread_mutex_init = yes; then
-  tcl_ok=yes
-else
-  tcl_ok=no
-fi
-
-	fi
-
-	if test "$tcl_ok" = "yes"; then
-	    # The space is needed
-	    THREADS_LIBS=" -lpthread"
-	else
-	    echo "$as_me:$LINENO: checking for pthread_mutex_init in -lpthreads" >&5
-echo $ECHO_N "checking for pthread_mutex_init in -lpthreads... $ECHO_C" >&6
-if test "${ac_cv_lib_pthreads_pthread_mutex_init+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthreads  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char pthread_mutex_init ();
-int
-main ()
-{
-pthread_mutex_init ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_pthreads_pthread_mutex_init=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_pthreads_pthread_mutex_init=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_pthreads_pthread_mutex_init" >&5
-echo "${ECHO_T}$ac_cv_lib_pthreads_pthread_mutex_init" >&6
-if test $ac_cv_lib_pthreads_pthread_mutex_init = yes; then
-  tcl_ok=yes
-else
-  tcl_ok=no
-fi
-
-	    if test "$tcl_ok" = "yes"; then
-		# The space is needed
-		THREADS_LIBS=" -lpthreads"
-	    else
-		echo "$as_me:$LINENO: checking for pthread_mutex_init in -lc" >&5
-echo $ECHO_N "checking for pthread_mutex_init in -lc... $ECHO_C" >&6
-if test "${ac_cv_lib_c_pthread_mutex_init+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lc  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char pthread_mutex_init ();
-int
-main ()
-{
-pthread_mutex_init ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_c_pthread_mutex_init=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_c_pthread_mutex_init=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_c_pthread_mutex_init" >&5
-echo "${ECHO_T}$ac_cv_lib_c_pthread_mutex_init" >&6
-if test $ac_cv_lib_c_pthread_mutex_init = yes; then
-  tcl_ok=yes
-else
-  tcl_ok=no
-fi
-
-		if test "$tcl_ok" = "no"; then
-		    echo "$as_me:$LINENO: checking for pthread_mutex_init in -lc_r" >&5
-echo $ECHO_N "checking for pthread_mutex_init in -lc_r... $ECHO_C" >&6
-if test "${ac_cv_lib_c_r_pthread_mutex_init+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lc_r  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char pthread_mutex_init ();
-int
-main ()
-{
-pthread_mutex_init ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_c_r_pthread_mutex_init=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_c_r_pthread_mutex_init=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_c_r_pthread_mutex_init" >&5
-echo "${ECHO_T}$ac_cv_lib_c_r_pthread_mutex_init" >&6
-if test $ac_cv_lib_c_r_pthread_mutex_init = yes; then
-  tcl_ok=yes
-else
-  tcl_ok=no
-fi
-
-		    if test "$tcl_ok" = "yes"; then
-			# The space is needed
-			THREADS_LIBS=" -pthread"
-		    else
-			TCL_THREADS=0
-			{ echo "$as_me:$LINENO: WARNING: Don't know how to find pthread lib on your system - you must disable thread support or edit the LIBS in the Makefile..." >&5
-echo "$as_me: WARNING: Don't know how to find pthread lib on your system - you must disable thread support or edit the LIBS in the Makefile..." >&2;}
-		    fi
-		fi
-	    fi
-	fi
-
-	# Does the pthread-implementation provide
-	# 'pthread_attr_setstacksize' ?
-
-	ac_saved_libs=$LIBS
-	LIBS="$LIBS $THREADS_LIBS"
-
-
-for ac_func in pthread_attr_setstacksize pthread_atfork
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != $ac_func;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-	LIBS=$ac_saved_libs
-    else
-	TCL_THREADS=0
-    fi
-    # Do checking message here to not mess up interleaved configure output
-    echo "$as_me:$LINENO: checking for building with threads" >&5
-echo $ECHO_N "checking for building with threads... $ECHO_C" >&6
-    if test "${TCL_THREADS}" = 1; then
-
-cat >>confdefs.h <<\_ACEOF
-#define TCL_THREADS 1
-_ACEOF
-
-	if test "${tcl_threaded_core}" = 1; then
-	    echo "$as_me:$LINENO: result: yes (threaded core)" >&5
-echo "${ECHO_T}yes (threaded core)" >&6
-	else
-	    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-	fi
-    else
-	echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-    fi
-
-
-
-
-# Add the threads support libraries
-LIBS="$LIBS$THREADS_LIBS"
-
-
-    echo "$as_me:$LINENO: checking how to build libraries" >&5
-echo $ECHO_N "checking how to build libraries... $ECHO_C" >&6
-    # Check whether --enable-shared or --disable-shared was given.
-if test "${enable_shared+set}" = set; then
-  enableval="$enable_shared"
-  tcl_ok=$enableval
-else
-  tcl_ok=yes
-fi;
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to build libraries" >&5
+$as_echo_n "checking how to build libraries... " >&6; }
+    # Check whether --enable-shared was given.
+if test "${enable_shared+set}" = set; then :
+  enableval=$enable_shared; tcl_ok=$enableval
+else
+  tcl_ok=yes
+fi
+
 
     if test "${enable_shared+set}" = set; then
 	enableval="$enable_shared"
 	tcl_ok=$enableval
     else
 	tcl_ok=yes
     fi
 
     if test "$tcl_ok" = "yes" ; then
-	echo "$as_me:$LINENO: result: shared" >&5
-echo "${ECHO_T}shared" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: shared" >&5
+$as_echo "shared" >&6; }
 	SHARED_BUILD=1
     else
-	echo "$as_me:$LINENO: result: static" >&5
-echo "${ECHO_T}static" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+$as_echo "static" >&6; }
 	SHARED_BUILD=0
 
-cat >>confdefs.h <<\_ACEOF
-#define STATIC_BUILD 1
-_ACEOF
+$as_echo "#define STATIC_BUILD 1" >>confdefs.h
 
     fi
+
 
 
 #--------------------------------------------------------------------
 # The statements below define a collection of compile flags.  This
 # macro depends on the value of SHARED_BUILD, and should be called
@@ -4057,137 +3991,144 @@
 #--------------------------------------------------------------------
 
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_RANLIB+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
+
 
 fi
 if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_RANLIB"; then
   ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
-  test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
 fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-  RANLIB=$ac_ct_RANLIB
+  if test "x$ac_ct_RANLIB" = x; then
+    RANLIB=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    RANLIB=$ac_ct_RANLIB
+  fi
 else
   RANLIB="$ac_cv_prog_RANLIB"
 fi
 
 
 
     # Step 0.a: Enable 64 bit support?
 
-    echo "$as_me:$LINENO: checking if 64bit support is requested" >&5
-echo $ECHO_N "checking if 64bit support is requested... $ECHO_C" >&6
-    # Check whether --enable-64bit or --disable-64bit was given.
-if test "${enable_64bit+set}" = set; then
-  enableval="$enable_64bit"
-  do64bit=$enableval
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if 64bit support is requested" >&5
+$as_echo_n "checking if 64bit support is requested... " >&6; }
+    # Check whether --enable-64bit was given.
+if test "${enable_64bit+set}" = set; then :
+  enableval=$enable_64bit; do64bit=$enableval
 else
   do64bit=no
-fi;
-    echo "$as_me:$LINENO: result: $do64bit" >&5
-echo "${ECHO_T}$do64bit" >&6
+fi
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $do64bit" >&5
+$as_echo "$do64bit" >&6; }
 
     # Step 0.b: Enable Solaris 64 bit VIS support?
 
-    echo "$as_me:$LINENO: checking if 64bit Sparc VIS support is requested" >&5
-echo $ECHO_N "checking if 64bit Sparc VIS support is requested... $ECHO_C" >&6
-    # Check whether --enable-64bit-vis or --disable-64bit-vis was given.
-if test "${enable_64bit_vis+set}" = set; then
-  enableval="$enable_64bit_vis"
-  do64bitVIS=$enableval
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if 64bit Sparc VIS support is requested" >&5
+$as_echo_n "checking if 64bit Sparc VIS support is requested... " >&6; }
+    # Check whether --enable-64bit-vis was given.
+if test "${enable_64bit_vis+set}" = set; then :
+  enableval=$enable_64bit_vis; do64bitVIS=$enableval
 else
   do64bitVIS=no
-fi;
-    echo "$as_me:$LINENO: result: $do64bitVIS" >&5
-echo "${ECHO_T}$do64bitVIS" >&6
+fi
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $do64bitVIS" >&5
+$as_echo "$do64bitVIS" >&6; }
     # Force 64bit on with VIS
-    if test "$do64bitVIS" = "yes"; then
+    if test "$do64bitVIS" = "yes"; then :
   do64bit=yes
 fi
-
 
     # Step 0.c: Check if visibility support is available. Do this here so
     # that platform specific alternatives can be used below if this fails.
 
-    echo "$as_me:$LINENO: checking if compiler supports visibility \"hidden\"" >&5
-echo $ECHO_N "checking if compiler supports visibility \"hidden\"... $ECHO_C" >&6
-if test "${tcl_cv_cc_visibility_hidden+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler supports visibility \"hidden\"" >&5
+$as_echo_n "checking if compiler supports visibility \"hidden\"... " >&6; }
+if ${tcl_cv_cc_visibility_hidden+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
 
 	hold_cflags=$CFLAGS; CFLAGS="$CFLAGS -Werror"
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 	    extern __attribute__((__visibility__("hidden"))) void f(void);
 	    void f(void) {}
 int
@@ -4196,180 +4137,117 @@
 f();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   tcl_cv_cc_visibility_hidden=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-tcl_cv_cc_visibility_hidden=no
+  tcl_cv_cc_visibility_hidden=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 	CFLAGS=$hold_cflags
 fi
-echo "$as_me:$LINENO: result: $tcl_cv_cc_visibility_hidden" >&5
-echo "${ECHO_T}$tcl_cv_cc_visibility_hidden" >&6
-    if test $tcl_cv_cc_visibility_hidden = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_cc_visibility_hidden" >&5
+$as_echo "$tcl_cv_cc_visibility_hidden" >&6; }
+    if test $tcl_cv_cc_visibility_hidden = yes; then :
 
 
-cat >>confdefs.h <<\_ACEOF
-#define MODULE_SCOPE extern __attribute__((__visibility__("hidden")))
-_ACEOF
+$as_echo "#define MODULE_SCOPE extern __attribute__((__visibility__(\"hidden\")))" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_HIDDEN 1
-_ACEOF
+$as_echo "#define HAVE_HIDDEN 1" >>confdefs.h
 
 
 fi
-
 
     # Step 0.d: Disable -rpath support?
 
-    echo "$as_me:$LINENO: checking if rpath support is requested" >&5
-echo $ECHO_N "checking if rpath support is requested... $ECHO_C" >&6
-    # Check whether --enable-rpath or --disable-rpath was given.
-if test "${enable_rpath+set}" = set; then
-  enableval="$enable_rpath"
-  doRpath=$enableval
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if rpath support is requested" >&5
+$as_echo_n "checking if rpath support is requested... " >&6; }
+    # Check whether --enable-rpath was given.
+if test "${enable_rpath+set}" = set; then :
+  enableval=$enable_rpath; doRpath=$enableval
 else
   doRpath=yes
-fi;
-    echo "$as_me:$LINENO: result: $doRpath" >&5
-echo "${ECHO_T}$doRpath" >&6
+fi
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $doRpath" >&5
+$as_echo "$doRpath" >&6; }
 
     # Step 1: set the variable "system" to hold the name and version number
     # for the system.
 
 
-    echo "$as_me:$LINENO: checking system version" >&5
-echo $ECHO_N "checking system version... $ECHO_C" >&6
-if test "${tcl_cv_sys_version+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking system version" >&5
+$as_echo_n "checking system version... " >&6; }
+if ${tcl_cv_sys_version+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
 
-	if test -f /usr/lib/NextStep/software_version; then
-	    tcl_cv_sys_version=NEXTSTEP-`awk '/3/,/3/' /usr/lib/NextStep/software_version`
+	if test "${TEA_PLATFORM}" = "windows" ; then
+	    tcl_cv_sys_version=windows
 	else
 	    tcl_cv_sys_version=`uname -s`-`uname -r`
 	    if test "$?" -ne 0 ; then
-		{ echo "$as_me:$LINENO: WARNING: can't find uname command" >&5
-echo "$as_me: WARNING: can't find uname command" >&2;}
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: can't find uname command" >&5
+$as_echo "$as_me: WARNING: can't find uname command" >&2;}
 		tcl_cv_sys_version=unknown
 	    else
-		# Special check for weird MP-RAS system (uname returns weird
-		# results, and the version is kept in special file).
-
-		if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
-		    tcl_cv_sys_version=MP-RAS-`awk '{print $3}' /etc/.relid`
-		fi
 		if test "`uname -s`" = "AIX" ; then
 		    tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
 		fi
 	    fi
 	fi
 
 fi
-echo "$as_me:$LINENO: result: $tcl_cv_sys_version" >&5
-echo "${ECHO_T}$tcl_cv_sys_version" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_sys_version" >&5
+$as_echo "$tcl_cv_sys_version" >&6; }
     system=$tcl_cv_sys_version
 
 
     # Step 2: check for existence of -ldl library.  This is needed because
     # Linux can use either -ldl or -ldld for dynamic loading.
 
-    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if ${ac_cv_lib_dl_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char dlopen ();
 int
 main ()
 {
-dlopen ();
+return dlopen ();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dl_dlopen=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dl_dlopen=no
+  ac_cv_lib_dl_dlopen=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-if test $ac_cv_lib_dl_dlopen = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
   have_dl=yes
 else
   have_dl=no
 fi
 
@@ -4391,113 +4269,124 @@
     UNSHARED_LIB_SUFFIX=""
     TCL_TRIM_DOTS='`echo ${VERSION} | tr -d .`'
     ECHO_VERSION='`echo ${VERSION}`'
     TCL_LIB_VERSIONS_OK=ok
     CFLAGS_DEBUG=-g
-    if test "$GCC" = yes; then
+    if test "$GCC" = yes; then :
 
 	CFLAGS_OPTIMIZE=-O2
-	CFLAGS_WARNING="-Wall"
+	CFLAGS_WARNING="-Wall -Wwrite-strings -Wsign-compare -Wdeclaration-after-statement -Wpointer-arith"
 
 else
 
 	CFLAGS_OPTIMIZE=-O
 	CFLAGS_WARNING=""
 
 fi
-
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_AR+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AR+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$AR"; then
   ac_cv_prog_AR="$AR" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_AR="${ac_tool_prefix}ar"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  echo "$as_me:$LINENO: result: $AR" >&5
-echo "${ECHO_T}$AR" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+$as_echo "$AR" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
+
 
 fi
 if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_AR+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_AR"; then
   ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_AR="ar"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
-echo "${ECHO_T}$ac_ct_AR" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-  AR=$ac_ct_AR
+  if test "x$ac_ct_AR" = x; then
+    AR=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    AR=$ac_ct_AR
+  fi
 else
   AR="$ac_cv_prog_AR"
 fi
 
     STLIB_LD='${AR} cr'
     LD_LIBRARY_PATH_VAR="LD_LIBRARY_PATH"
     PLAT_OBJS=""
     PLAT_SRCS=""
     LDAIX_SRC=""
-    if test x"${SHLIB_VERSION}" = x; then
+    if test "x${SHLIB_VERSION}" = x; then :
   SHLIB_VERSION="1.0"
 fi
-
     case $system in
 	AIX-*)
-	    if test "${TCL_THREADS}" = "1" -a "$GCC" != "yes"; then
+	    if test "$GCC" != "yes"; then :
 
 		# AIX requires the _r compiler when gcc isn't being used
 		case "${CC}" in
 		    *_r|*_r\ *)
 			# ok ...
@@ -4505,15 +4394,14 @@
 		    *)
 			# Make sure only first arg gets _r
 		    	CC=`echo "$CC" | sed -e 's/^\([^ ]*\)/\1_r/'`
 			;;
 		esac
-		echo "$as_me:$LINENO: result: Using $CC for compiling with threads" >&5
-echo "${ECHO_T}Using $CC for compiling with threads" >&6
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Using $CC for compiling with threads" >&5
+$as_echo "Using $CC for compiling with threads" >&6; }
 
 fi
-
 	    LIBS="$LIBS -lc"
 	    SHLIB_CFLAGS=""
 	    SHLIB_SUFFIX=".so"
 
 	    DL_OBJS="tclLoadDl.o"
@@ -4522,16 +4410,16 @@
 	    # ldAix No longer needed with use of -bexpall/-brtl
 	    # but some extensions may still reference it
 	    LDAIX_SRC='$(UNIX_DIR)/ldAix'
 
 	    # Check to enable 64-bit flags for compiler/linker
-	    if test "$do64bit" = yes; then
+	    if test "$do64bit" = yes; then :
 
-		if test "$GCC" = yes; then
+		if test "$GCC" = yes; then :
 
-		    { echo "$as_me:$LINENO: WARNING: 64bit mode not supported with GCC on $system" >&5
-echo "$as_me: WARNING: 64bit mode not supported with GCC on $system" >&2;}
+		    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 64bit mode not supported with GCC on $system" >&5
+$as_echo "$as_me: WARNING: 64bit mode not supported with GCC on $system" >&2;}
 
 else
 
 		    do64bit_ok=yes
 		    CFLAGS="$CFLAGS -q64"
@@ -4540,52 +4428,47 @@
 		    AR="${AR} -X64"
 		    SHLIB_LD_FLAGS="-b64"
 
 fi
 
-
 fi
 
-
-	    if test "`uname -m`" = ia64; then
+	    if test "`uname -m`" = ia64; then :
 
 		# AIX-5 uses ELF style dynamic libraries on IA-64, but not PPC
 		SHLIB_LD="/usr/ccs/bin/ld -G -z text"
 		# AIX-5 has dl* in libc.so
 		DL_LIBS=""
-		if test "$GCC" = yes; then
+		if test "$GCC" = yes; then :
 
 		    CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
 
 else
 
 		    CC_SEARCH_FLAGS='-R${LIB_RUNTIME_DIR}'
 
 fi
-
 		LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
 
 else
 
-		if test "$GCC" = yes; then
+		if test "$GCC" = yes; then :
 
 		    SHLIB_LD='${CC} -shared -Wl,-bexpall'
 
 else
 
 		    SHLIB_LD="/bin/ld -bhalt:4 -bM:SRE -bexpall -H512 -T512 -bnoentry"
 		    LDFLAGS="$LDFLAGS -brtl"
 
 fi
-
 		SHLIB_LD="${SHLIB_LD} ${SHLIB_LD_FLAGS}"
 		DL_LIBS="-ldl"
 		CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
 		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
 
 fi
-
 	    ;;
 	BeOS*)
 	    SHLIB_CFLAGS="-fPIC"
 	    SHLIB_LD='${CC} -nostart'
 	    SHLIB_SUFFIX=".so"
@@ -4595,75 +4478,47 @@
 	    #-----------------------------------------------------------
 	    # Check for inet_ntoa in -lbind, for BeOS (which also needs
 	    # -lsocket, even if the network functions are in -lnet which
 	    # is always linked to, for compatibility.
 	    #-----------------------------------------------------------
-	    echo "$as_me:$LINENO: checking for inet_ntoa in -lbind" >&5
-echo $ECHO_N "checking for inet_ntoa in -lbind... $ECHO_C" >&6
-if test "${ac_cv_lib_bind_inet_ntoa+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_ntoa in -lbind" >&5
+$as_echo_n "checking for inet_ntoa in -lbind... " >&6; }
+if ${ac_cv_lib_bind_inet_ntoa+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbind  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char inet_ntoa ();
 int
 main ()
 {
-inet_ntoa ();
+return inet_ntoa ();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_bind_inet_ntoa=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_bind_inet_ntoa=no
+  ac_cv_lib_bind_inet_ntoa=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_bind_inet_ntoa" >&5
-echo "${ECHO_T}$ac_cv_lib_bind_inet_ntoa" >&6
-if test $ac_cv_lib_bind_inet_ntoa = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_inet_ntoa" >&5
+$as_echo "$ac_cv_lib_bind_inet_ntoa" >&6; }
+if test "x$ac_cv_lib_bind_inet_ntoa" = xyes; then :
   LIBS="$LIBS -lbind -lsocket"
 fi
 
 	    ;;
 	BSD/OS-2.1*|BSD/OS-3*)
@@ -4683,11 +4538,11 @@
 	    DL_LIBS="-ldl"
 	    LDFLAGS="$LDFLAGS -export-dynamic"
 	    CC_SEARCH_FLAGS=""
 	    LD_SEARCH_FLAGS=""
 	    ;;
-	CYGWIN_*|MINGW32*)
+	CYGWIN_*)
 	    SHLIB_CFLAGS=""
 	    SHLIB_LD='${CC} -shared'
 	    SHLIB_SUFFIX=".dll"
 	    DL_OBJS="tclLoadDl.o"
 	    PLAT_OBJS='${CYGWIN_OBJS}'
@@ -4696,20 +4551,16 @@
 	    CC_SEARCH_FLAGS=""
 	    LD_SEARCH_FLAGS=""
 	    TCL_NEEDS_EXP_FILE=1
 	    TCL_EXPORT_FILE_SUFFIX='${VERSION}\$\{DBGX\}.dll.a'
 	    SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -Wl,--out-implib,\$@.a"
-	    echo "$as_me:$LINENO: checking for Cygwin version of gcc" >&5
-echo $ECHO_N "checking for Cygwin version of gcc... $ECHO_C" >&6
-if test "${ac_cv_cygwin+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Cygwin version of gcc" >&5
+$as_echo_n "checking for Cygwin version of gcc... " >&6; }
+if ${ac_cv_cygwin+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 		#ifdef __CYGWIN__
 		    #error cygwin
 		#endif
@@ -4720,53 +4571,22 @@
 
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_cygwin=no
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_cygwin=yes
+  ac_cv_cygwin=yes
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_cygwin" >&5
-echo "${ECHO_T}$ac_cv_cygwin" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cygwin" >&5
+$as_echo "$ac_cv_cygwin" >&6; }
 	    if test "$ac_cv_cygwin" = "no"; then
-		{ { echo "$as_me:$LINENO: error: ${CC} is not a cygwin compiler." >&5
-echo "$as_me: error: ${CC} is not a cygwin compiler." >&2;}
-   { (exit 1); exit 1; }; }
-	    fi
-	    if test "x${TCL_THREADS}" = "x0"; then
-		{ { echo "$as_me:$LINENO: error: CYGWIN compile is only supported with --enable-threads" >&5
-echo "$as_me: error: CYGWIN compile is only supported with --enable-threads" >&2;}
-   { (exit 1); exit 1; }; }
+		as_fn_error $? "${CC} is not a cygwin compiler." "$LINENO" 5
 	    fi
 	    do64bit_ok=yes
 	    if test "x${SHARED_BUILD}" = "x1"; then
 		echo "running cd ../win; ${CONFIG_SHELL-/bin/sh} ./configure $ac_configure_args"
 		# The eval makes quoting arguments work.
@@ -4789,177 +4609,116 @@
 	    ;;
 	Haiku*)
 	    LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
 	    SHLIB_CFLAGS="-fPIC"
 	    SHLIB_SUFFIX=".so"
-	    SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
+	    SHLIB_LD='${CC} ${CFLAGS} ${LDFLAGS} -shared'
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS="-lroot"
-	    echo "$as_me:$LINENO: checking for inet_ntoa in -lnetwork" >&5
-echo $ECHO_N "checking for inet_ntoa in -lnetwork... $ECHO_C" >&6
-if test "${ac_cv_lib_network_inet_ntoa+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_ntoa in -lnetwork" >&5
+$as_echo_n "checking for inet_ntoa in -lnetwork... " >&6; }
+if ${ac_cv_lib_network_inet_ntoa+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnetwork  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char inet_ntoa ();
 int
 main ()
 {
-inet_ntoa ();
+return inet_ntoa ();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_network_inet_ntoa=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_network_inet_ntoa=no
+  ac_cv_lib_network_inet_ntoa=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_network_inet_ntoa" >&5
-echo "${ECHO_T}$ac_cv_lib_network_inet_ntoa" >&6
-if test $ac_cv_lib_network_inet_ntoa = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network_inet_ntoa" >&5
+$as_echo "$ac_cv_lib_network_inet_ntoa" >&6; }
+if test "x$ac_cv_lib_network_inet_ntoa" = xyes; then :
   LIBS="$LIBS -lnetwork"
 fi
 
 	    ;;
 	HP-UX-*.11.*)
 	    # Use updated header definitions where possible
 
-cat >>confdefs.h <<\_ACEOF
-#define _XOPEN_SOURCE_EXTENDED 1
-_ACEOF
+$as_echo "#define _XOPEN_SOURCE_EXTENDED 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define _XOPEN_SOURCE 1
-_ACEOF
+$as_echo "#define _XOPEN_SOURCE 1" >>confdefs.h
 
 	    LIBS="$LIBS -lxnet"               # Use the XOPEN network library
 
-	    if test "`uname -m`" = ia64; then
+	    if test "`uname -m`" = ia64; then :
 
 		SHLIB_SUFFIX=".so"
 
 else
 
 		SHLIB_SUFFIX=".sl"
 
 fi
-
-	    echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
+$as_echo_n "checking for shl_load in -ldld... " >&6; }
+if ${ac_cv_lib_dld_shl_load+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char shl_load ();
 int
 main ()
 {
-shl_load ();
+return shl_load ();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dld_shl_load=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dld_shl_load=no
+  ac_cv_lib_dld_shl_load=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
-if test $ac_cv_lib_dld_shl_load = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
+$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
+if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
   tcl_ok=yes
 else
   tcl_ok=no
 fi
 
-	    if test "$tcl_ok" = yes; then
+	    if test "$tcl_ok" = yes; then :
 
 		SHLIB_CFLAGS="+z"
 		SHLIB_LD="ld -b"
 		DL_OBJS="tclLoadShl.o"
 		DL_LIBS="-ldld"
@@ -4967,12 +4726,11 @@
 		CC_SEARCH_FLAGS='-Wl,+s,+b,${LIB_RUNTIME_DIR}:.'
 		LD_SEARCH_FLAGS='+s +b ${LIB_RUNTIME_DIR}:.'
 		LD_LIBRARY_PATH_VAR="SHLIB_PATH"
 
 fi
-
-	    if test "$GCC" = yes; then
+	    if test "$GCC" = yes; then :
 
 		SHLIB_LD='${CC} -shared'
 		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
 
 else
@@ -4979,34 +4737,32 @@
 
 		CFLAGS="$CFLAGS -z"
 
 fi
 
-
 	    # Users may want PA-RISC 1.1/2.0 portable code - needs HP cc
 	    #CFLAGS="$CFLAGS +DAportable"
 
 	    # Check to enable 64-bit flags for compiler/linker
-	    if test "$do64bit" = "yes"; then
+	    if test "$do64bit" = "yes"; then :
 
-		if test "$GCC" = yes; then
+		if test "$GCC" = yes; then :
 
 		    case `${CC} -dumpmachine` in
 			hppa64*)
 			    # 64-bit gcc in use.  Fix flags for GNU ld.
 			    do64bit_ok=yes
 			    SHLIB_LD='${CC} -shared'
-			    if test $doRpath = yes; then
+			    if test $doRpath = yes; then :
 
 				CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
 fi
-
 			    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
 			    ;;
 			*)
-			    { echo "$as_me:$LINENO: WARNING: 64bit mode not supported with GCC on $system" >&5
-echo "$as_me: WARNING: 64bit mode not supported with GCC on $system" >&2;}
+			    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 64bit mode not supported with GCC on $system" >&5
+$as_echo "$as_me: WARNING: 64bit mode not supported with GCC on $system" >&2;}
 			    ;;
 		    esac
 
 else
 
@@ -5014,86 +4770,56 @@
 		    CFLAGS="$CFLAGS +DD64"
 		    LDFLAGS_ARCH="+DD64"
 
 fi
 
-
-fi
- ;;
+fi ;;
 	HP-UX-*.08.*|HP-UX-*.09.*|HP-UX-*.10.*)
 	    SHLIB_SUFFIX=".sl"
-	    echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
+$as_echo_n "checking for shl_load in -ldld... " >&6; }
+if ${ac_cv_lib_dld_shl_load+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char shl_load ();
 int
 main ()
 {
-shl_load ();
+return shl_load ();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dld_shl_load=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dld_shl_load=no
+  ac_cv_lib_dld_shl_load=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
-if test $ac_cv_lib_dld_shl_load = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
+$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
+if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
   tcl_ok=yes
 else
   tcl_ok=no
 fi
 
-	    if test "$tcl_ok" = yes; then
+	    if test "$tcl_ok" = yes; then :
 
 		SHLIB_CFLAGS="+z"
 		SHLIB_LD="ld -b"
 		SHLIB_LD_LIBS=""
 		DL_OBJS="tclLoadShl.o"
@@ -5101,54 +4827,47 @@
 		LDFLAGS="$LDFLAGS -Wl,-E"
 		CC_SEARCH_FLAGS='-Wl,+s,+b,${LIB_RUNTIME_DIR}:.'
 		LD_SEARCH_FLAGS='+s +b ${LIB_RUNTIME_DIR}:.'
 		LD_LIBRARY_PATH_VAR="SHLIB_PATH"
 
-fi
- ;;
+fi ;;
 	IRIX-5.*)
 	    SHLIB_CFLAGS=""
 	    SHLIB_LD="ld -shared -rdata_shared"
 	    SHLIB_SUFFIX=".so"
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS=""
-	    case $LIBOBJS in
-    "mkstemp.$ac_objext"   | \
-  *" mkstemp.$ac_objext"   | \
-    "mkstemp.$ac_objext "* | \
+	    case " $LIBOBJS " in
   *" mkstemp.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS mkstemp.$ac_objext" ;;
+  *) LIBOBJS="$LIBOBJS mkstemp.$ac_objext"
+ ;;
 esac
 
-	    if test $doRpath = yes; then
+	    if test $doRpath = yes; then :
 
 		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
 		LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
 fi
-
 	    ;;
 	IRIX-6.*)
 	    SHLIB_CFLAGS=""
 	    SHLIB_LD="ld -n32 -shared -rdata_shared"
 	    SHLIB_SUFFIX=".so"
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS=""
-	    case $LIBOBJS in
-    "mkstemp.$ac_objext"   | \
-  *" mkstemp.$ac_objext"   | \
-    "mkstemp.$ac_objext "* | \
+	    case " $LIBOBJS " in
   *" mkstemp.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS mkstemp.$ac_objext" ;;
+  *) LIBOBJS="$LIBOBJS mkstemp.$ac_objext"
+ ;;
 esac
 
-	    if test $doRpath = yes; then
+	    if test $doRpath = yes; then :
 
 		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
 		LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
 fi
-
-	    if test "$GCC" = yes; then
+	    if test "$GCC" = yes; then :
 
 		CFLAGS="$CFLAGS -mabi=n32"
 		LDFLAGS="$LDFLAGS -mabi=n32"
 
 else
@@ -5163,41 +4882,37 @@
 			;;
 		esac
 		LDFLAGS="$LDFLAGS -n32"
 
 fi
-
 	    ;;
 	IRIX64-6.*)
 	    SHLIB_CFLAGS=""
 	    SHLIB_LD="ld -n32 -shared -rdata_shared"
 	    SHLIB_SUFFIX=".so"
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS=""
-	    case $LIBOBJS in
-    "mkstemp.$ac_objext"   | \
-  *" mkstemp.$ac_objext"   | \
-    "mkstemp.$ac_objext "* | \
+	    case " $LIBOBJS " in
   *" mkstemp.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS mkstemp.$ac_objext" ;;
+  *) LIBOBJS="$LIBOBJS mkstemp.$ac_objext"
+ ;;
 esac
 
-	    if test $doRpath = yes; then
+	    if test $doRpath = yes; then :
 
 		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
 		LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
 fi
 
-
 	    # Check to enable 64-bit flags for compiler/linker
 
-	    if test "$do64bit" = yes; then
+	    if test "$do64bit" = yes; then :
 
-	        if test "$GCC" = yes; then
+	        if test "$GCC" = yes; then :
 
-	            { echo "$as_me:$LINENO: WARNING: 64bit mode not supported by gcc" >&5
-echo "$as_me: WARNING: 64bit mode not supported by gcc" >&2;}
+	            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 64bit mode not supported by gcc" >&5
+$as_echo "$as_me: WARNING: 64bit mode not supported by gcc" >&2;}
 
 else
 
 	            do64bit_ok=yes
 	            SHLIB_LD="ld -64 -shared -rdata_shared"
@@ -5204,13 +4919,11 @@
 	            CFLAGS="$CFLAGS -64"
 	            LDFLAGS_ARCH="-64"
 
 fi
 
-
 fi
-
 	    ;;
 	Linux*|GNU*|NetBSD-Debian)
 	    SHLIB_CFLAGS="-fPIC"
 	    SHLIB_SUFFIX=".so"
 
@@ -5218,39 +4931,33 @@
 	    # egcs-2.91.66 on Redhat Linux 6.0 generates lots of warnings
 	    # when you inline the string and math operations.  Turn this off to
 	    # get rid of the warnings.
 	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
 
-	    SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
+	    SHLIB_LD='${CC} ${CFLAGS} ${LDFLAGS} -shared'
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS="-ldl"
 	    LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
-	    if test $doRpath = yes; then
+	    if test $doRpath = yes; then :
 
 		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
 fi
-
 	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
-	    if test "`uname -m`" = "alpha"; then
+	    if test "`uname -m`" = "alpha"; then :
   CFLAGS="$CFLAGS -mieee"
 fi
+	    if test $do64bit = yes; then :
 
-	    if test $do64bit = yes; then
-
-		echo "$as_me:$LINENO: checking if compiler accepts -m64 flag" >&5
-echo $ECHO_N "checking if compiler accepts -m64 flag... $ECHO_C" >&6
-if test "${tcl_cv_cc_m64+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts -m64 flag" >&5
+$as_echo_n "checking if compiler accepts -m64 flag... " >&6; }
+if ${tcl_cv_cc_m64+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
 
 		    hold_cflags=$CFLAGS
 		    CFLAGS="$CFLAGS -m64"
-		    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+		    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
@@ -5257,183 +4964,101 @@
 
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   tcl_cv_cc_m64=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-tcl_cv_cc_m64=no
+  tcl_cv_cc_m64=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 		    CFLAGS=$hold_cflags
 fi
-echo "$as_me:$LINENO: result: $tcl_cv_cc_m64" >&5
-echo "${ECHO_T}$tcl_cv_cc_m64" >&6
-		if test $tcl_cv_cc_m64 = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_cc_m64" >&5
+$as_echo "$tcl_cv_cc_m64" >&6; }
+		if test $tcl_cv_cc_m64 = yes; then :
 
 		    CFLAGS="$CFLAGS -m64"
 		    do64bit_ok=yes
 
 fi
 
-
 fi
-
 
 	    # The combo of gcc + glibc has a bug related to inlining of
 	    # functions like strtod(). The -fno-builtin flag should address
 	    # this problem but it does not work. The -fno-inline flag is kind
 	    # of overkill but it works. Disable inlining only when one of the
 	    # files in compat/*.c is being linked in.
 
-	    if test x"${USE_COMPAT}" != x; then
+	    if test x"${USE_COMPAT}" != x; then :
   CFLAGS="$CFLAGS -fno-inline"
 fi
-
 	    ;;
 	Lynx*)
 	    SHLIB_CFLAGS="-fPIC"
 	    SHLIB_SUFFIX=".so"
 	    CFLAGS_OPTIMIZE=-02
 	    SHLIB_LD='${CC} -shared'
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS="-mshared -ldl"
 	    LD_FLAGS="-Wl,--export-dynamic"
-	    if test $doRpath = yes; then
+	    if test $doRpath = yes; then :
 
 		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
 		LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
 fi
-
-	    ;;
-	MP-RAS-02*)
-	    SHLIB_CFLAGS="-K PIC"
-	    SHLIB_LD='${CC} -G'
-	    SHLIB_LD_LIBS=""
-	    SHLIB_SUFFIX=".so"
-	    DL_OBJS="tclLoadDl.o"
-	    DL_LIBS="-ldl"
-	    CC_SEARCH_FLAGS=""
-	    LD_SEARCH_FLAGS=""
-	    ;;
-	MP-RAS-*)
-	    SHLIB_CFLAGS="-K PIC"
-	    SHLIB_LD='${CC} -G'
-	    SHLIB_LD_LIBS=""
-	    SHLIB_SUFFIX=".so"
-	    DL_OBJS="tclLoadDl.o"
-	    DL_LIBS="-ldl"
-	    LDFLAGS="$LDFLAGS -Wl,-Bexport"
-	    CC_SEARCH_FLAGS=""
-	    LD_SEARCH_FLAGS=""
 	    ;;
 	OpenBSD-*)
 	    arch=`arch -s`
 	    case "$arch" in
-	    vax)
-		# Equivalent using configure option --disable-load
-		# Step 4 will set the necessary variables
-		DL_OBJS=""
-		SHLIB_LD_LIBS=""
-		LDFLAGS=""
-		;;
-	    *)
-		case "$arch" in
-		alpha|sparc|sparc64)
-		    SHLIB_CFLAGS="-fPIC"
-		    ;;
-		*)
-		    SHLIB_CFLAGS="-fpic"
-		    ;;
-		esac
-		SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}'
-		SHLIB_SUFFIX=".so"
-		DL_OBJS="tclLoadDl.o"
-		DL_LIBS=""
-		if test $doRpath = yes; then
-
-		    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
-fi
-
-		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
-		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}'
-		LDFLAGS="-Wl,-export-dynamic"
-		;;
-	    esac
-	    case "$arch" in
-	    vax)
-		CFLAGS_OPTIMIZE="-O1"
-		;;
-	    sh)
-		CFLAGS_OPTIMIZE="-O0"
-		;;
-	    *)
-		CFLAGS_OPTIMIZE="-O2"
-		;;
-	    esac
-	    if test "${TCL_THREADS}" = "1"; then
-
-		# On OpenBSD:	Compile with -pthread
-		#		Don't link with -lpthread
-		LIBS=`echo $LIBS | sed s/-lpthread//`
-		CFLAGS="$CFLAGS -pthread"
-
-fi
-
+	    alpha|sparc64)
+		SHLIB_CFLAGS="-fPIC"
+		;;
+	    *)
+		SHLIB_CFLAGS="-fpic"
+		;;
+	    esac
+	    SHLIB_LD='${CC} ${SHLIB_CFLAGS} -shared'
+	    SHLIB_SUFFIX=".so"
+	    DL_OBJS="tclLoadDl.o"
+	    DL_LIBS=""
+	    if test $doRpath = yes; then :
+
+		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+fi
+	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}'
+	    LDFLAGS="-Wl,-export-dynamic"
+	    CFLAGS_OPTIMIZE="-O2"
+	    # On OpenBSD:	Compile with -pthread
+	    #		Don't link with -lpthread
+	    LIBS=`echo $LIBS | sed s/-lpthread//`
+	    CFLAGS="$CFLAGS -pthread"
 	    # OpenBSD doesn't do version numbers with dots.
 	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
 	    TCL_LIB_VERSIONS_OK=nodots
 	    ;;
 	NetBSD-*)
 	    # NetBSD has ELF and can use 'cc -shared' to build shared libs
 	    SHLIB_CFLAGS="-fPIC"
-	    SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}'
+	    SHLIB_LD='${CC} ${SHLIB_CFLAGS} -shared'
 	    SHLIB_SUFFIX=".so"
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS=""
 	    LDFLAGS="$LDFLAGS -export-dynamic"
-	    if test $doRpath = yes; then
+	    if test $doRpath = yes; then :
 
 		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
 fi
-
 	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
-	    if test "${TCL_THREADS}" = "1"; then
-
-		# The -pthread needs to go in the CFLAGS, not LIBS
-		LIBS=`echo $LIBS | sed s/-pthread//`
-		CFLAGS="$CFLAGS -pthread"
-	    	LDFLAGS="$LDFLAGS -pthread"
-
-fi
-
+	    # The -pthread needs to go in the CFLAGS, not LIBS
+	    LIBS=`echo $LIBS | sed s/-pthread//`
+	    CFLAGS="$CFLAGS -pthread"
+	    LDFLAGS="$LDFLAGS -pthread"
 	    ;;
 	FreeBSD-*)
 	    # This configuration from FreeBSD Ports.
 	    SHLIB_CFLAGS="-fPIC"
 	    SHLIB_LD="${CC} -shared"
@@ -5440,24 +5065,19 @@
 	    SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -Wl,-soname,\$@"
 	    SHLIB_SUFFIX=".so"
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS=""
 	    LDFLAGS=""
-	    if test $doRpath = yes; then
+	    if test $doRpath = yes; then :
 
 		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
 		LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
 fi
-
-	    if test "${TCL_THREADS}" = "1"; then
-
-		# The -pthread needs to go in the LDFLAGS, not LIBS
-		LIBS=`echo $LIBS | sed s/-pthread//`
-		CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-		LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
-fi
-
+	    # The -pthread needs to go in the LDFLAGS, not LIBS
+	    LIBS=`echo $LIBS | sed s/-pthread//`
+	    CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+	    LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
 	    case $system in
 	    FreeBSD-3.*)
 		# Version numbers are dot-stripped by system policy.
 		TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
 		UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
@@ -5476,176 +5096,157 @@
 		awk 'BEGIN {FS=" +-";ORS=" "}; {for (i=2;i<=NF;i++) \
 		if ($i~/^(isysroot|mmacosx-version-min)/) print "-"$i}'`"
 	    CFLAGS="`echo " ${CFLAGS}" | \
 		awk 'BEGIN {FS=" +-";ORS=" "}; {for (i=2;i<=NF;i++) \
 		if (!($i~/^(isysroot|mmacosx-version-min)/)) print "-"$i}'`"
-	    if test $do64bit = yes; then
-
-		case `arch` in
-		    ppc)
-			echo "$as_me:$LINENO: checking if compiler accepts -arch ppc64 flag" >&5
-echo $ECHO_N "checking if compiler accepts -arch ppc64 flag... $ECHO_C" >&6
-if test "${tcl_cv_cc_arch_ppc64+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-			    hold_cflags=$CFLAGS
-			    CFLAGS="$CFLAGS -arch ppc64 -mpowerpc64 -mcpu=G5"
-			    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  tcl_cv_cc_arch_ppc64=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-tcl_cv_cc_arch_ppc64=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-			    CFLAGS=$hold_cflags
-fi
-echo "$as_me:$LINENO: result: $tcl_cv_cc_arch_ppc64" >&5
-echo "${ECHO_T}$tcl_cv_cc_arch_ppc64" >&6
-			if test $tcl_cv_cc_arch_ppc64 = yes; then
-
-			    CFLAGS="$CFLAGS -arch ppc64 -mpowerpc64 -mcpu=G5"
-			    do64bit_ok=yes
-
-fi
-;;
-		    i386)
-			echo "$as_me:$LINENO: checking if compiler accepts -arch x86_64 flag" >&5
-echo $ECHO_N "checking if compiler accepts -arch x86_64 flag... $ECHO_C" >&6
-if test "${tcl_cv_cc_arch_x86_64+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-			    hold_cflags=$CFLAGS
-			    CFLAGS="$CFLAGS -arch x86_64"
-			    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  tcl_cv_cc_arch_x86_64=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-tcl_cv_cc_arch_x86_64=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-			    CFLAGS=$hold_cflags
-fi
-echo "$as_me:$LINENO: result: $tcl_cv_cc_arch_x86_64" >&5
-echo "${ECHO_T}$tcl_cv_cc_arch_x86_64" >&6
-			if test $tcl_cv_cc_arch_x86_64 = yes; then
-
-			    CFLAGS="$CFLAGS -arch x86_64"
-			    do64bit_ok=yes
-
-fi
-;;
-		    *)
-			{ echo "$as_me:$LINENO: WARNING: Don't know how enable 64-bit on architecture \`arch\`" >&5
-echo "$as_me: WARNING: Don't know how enable 64-bit on architecture \`arch\`" >&2;};;
+	    if test $do64bit = yes; then :
+
+		case `arch` in
+		    ppc)
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts -arch ppc64 flag" >&5
+$as_echo_n "checking if compiler accepts -arch ppc64 flag... " >&6; }
+if ${tcl_cv_cc_arch_ppc64+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+			    hold_cflags=$CFLAGS
+			    CFLAGS="$CFLAGS -arch ppc64 -mpowerpc64 -mcpu=G5"
+			    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  tcl_cv_cc_arch_ppc64=yes
+else
+  tcl_cv_cc_arch_ppc64=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+			    CFLAGS=$hold_cflags
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_cc_arch_ppc64" >&5
+$as_echo "$tcl_cv_cc_arch_ppc64" >&6; }
+			if test $tcl_cv_cc_arch_ppc64 = yes; then :
+
+			    CFLAGS="$CFLAGS -arch ppc64 -mpowerpc64 -mcpu=G5"
+			    do64bit_ok=yes
+
+fi;;
+		    i386)
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts -arch x86_64 flag" >&5
+$as_echo_n "checking if compiler accepts -arch x86_64 flag... " >&6; }
+if ${tcl_cv_cc_arch_x86_64+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+			    hold_cflags=$CFLAGS
+			    CFLAGS="$CFLAGS -arch x86_64"
+			    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  tcl_cv_cc_arch_x86_64=yes
+else
+  tcl_cv_cc_arch_x86_64=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+			    CFLAGS=$hold_cflags
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_cc_arch_x86_64" >&5
+$as_echo "$tcl_cv_cc_arch_x86_64" >&6; }
+			if test $tcl_cv_cc_arch_x86_64 = yes; then :
+
+			    CFLAGS="$CFLAGS -arch x86_64"
+			    do64bit_ok=yes
+
+fi;;
+		    *)
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Don't know how enable 64-bit on architecture \`arch\`" >&5
+$as_echo "$as_me: WARNING: Don't know how enable 64-bit on architecture \`arch\`" >&2;};;
 		esac
 
 else
 
 		# Check for combined 32-bit and 64-bit fat build
 		if echo "$CFLAGS " |grep -E -q -- '-arch (ppc64|x86_64) ' \
-		    && echo "$CFLAGS " |grep -E -q -- '-arch (ppc|i386) '; then
+		    && echo "$CFLAGS " |grep -E -q -- '-arch (ppc|i386) '; then :
 
 		    fat_32_64=yes
 fi
 
-
 fi
-
 	    SHLIB_LD='${CC} -dynamiclib ${CFLAGS} ${LDFLAGS}'
-	    echo "$as_me:$LINENO: checking if ld accepts -single_module flag" >&5
-echo $ECHO_N "checking if ld accepts -single_module flag... $ECHO_C" >&6
-if test "${tcl_cv_ld_single_module+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ld accepts -single_module flag" >&5
+$as_echo_n "checking if ld accepts -single_module flag... " >&6; }
+if ${tcl_cv_ld_single_module+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
 
 		hold_ldflags=$LDFLAGS
 		LDFLAGS="$LDFLAGS -dynamiclib -Wl,-single_module"
-		cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
+		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+int i;
+  ;
+  return 0;
+}
 _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  tcl_cv_ld_single_module=yes
+else
+  tcl_cv_ld_single_module=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+		LDFLAGS=$hold_ldflags
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_ld_single_module" >&5
+$as_echo "$tcl_cv_ld_single_module" >&6; }
+	    if test $tcl_cv_ld_single_module = yes; then :
+
+		SHLIB_LD="${SHLIB_LD} -Wl,-single_module"
+
+fi
+	    SHLIB_SUFFIX=".dylib"
+	    DL_OBJS="tclLoadDyld.o"
+	    DL_LIBS=""
+	    # Don't use -prebind when building for Mac OS X 10.4 or later only:
+	    if test "`echo "${MACOSX_DEPLOYMENT_TARGET}" | awk -F '10\\.' '{print int($2)}'`" -lt 4 -a \
+		"`echo "${CPPFLAGS}" | awk -F '-mmacosx-version-min=10\\.' '{print int($2)}'`" -lt 4; then :
+
+		LDFLAGS="$LDFLAGS -prebind"
+fi
+	    LDFLAGS="$LDFLAGS -headerpad_max_install_names"
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ld accepts -search_paths_first flag" >&5
+$as_echo_n "checking if ld accepts -search_paths_first flag... " >&6; }
+if ${tcl_cv_ld_search_paths_first+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+		hold_ldflags=$LDFLAGS
+		LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
+		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
@@ -5652,183 +5253,122 @@
 int i;
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  tcl_cv_ld_single_module=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-tcl_cv_ld_single_module=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-		LDFLAGS=$hold_ldflags
-fi
-echo "$as_me:$LINENO: result: $tcl_cv_ld_single_module" >&5
-echo "${ECHO_T}$tcl_cv_ld_single_module" >&6
-	    if test $tcl_cv_ld_single_module = yes; then
-
-		SHLIB_LD="${SHLIB_LD} -Wl,-single_module"
-
-fi
-
-	    SHLIB_SUFFIX=".dylib"
-	    DL_OBJS="tclLoadDyld.o"
-	    DL_LIBS=""
-	    # Don't use -prebind when building for Mac OS X 10.4 or later only:
-	    if test "`echo "${MACOSX_DEPLOYMENT_TARGET}" | awk -F '10\\.' '{print int($2)}'`" -lt 4 -a \
-		"`echo "${CPPFLAGS}" | awk -F '-mmacosx-version-min=10\\.' '{print int($2)}'`" -lt 4; then
-
-		LDFLAGS="$LDFLAGS -prebind"
-fi
-
-	    LDFLAGS="$LDFLAGS -headerpad_max_install_names"
-	    echo "$as_me:$LINENO: checking if ld accepts -search_paths_first flag" >&5
-echo $ECHO_N "checking if ld accepts -search_paths_first flag... $ECHO_C" >&6
-if test "${tcl_cv_ld_search_paths_first+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-		hold_ldflags=$LDFLAGS
-		LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
-		cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-int i;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  tcl_cv_ld_search_paths_first=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-tcl_cv_ld_search_paths_first=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-		LDFLAGS=$hold_ldflags
-fi
-echo "$as_me:$LINENO: result: $tcl_cv_ld_search_paths_first" >&5
-echo "${ECHO_T}$tcl_cv_ld_search_paths_first" >&6
-	    if test $tcl_cv_ld_search_paths_first = yes; then
-
-		LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
-
-fi
-
-	    if test "$tcl_cv_cc_visibility_hidden" != yes; then
-
-
-cat >>confdefs.h <<\_ACEOF
-#define MODULE_SCOPE __private_extern__
-_ACEOF
-
-
-fi
-
-	    CC_SEARCH_FLAGS=""
-	    LD_SEARCH_FLAGS=""
-	    LD_LIBRARY_PATH_VAR="DYLD_LIBRARY_PATH"
-
-cat >>confdefs.h <<\_ACEOF
-#define MAC_OSX_TCL 1
-_ACEOF
-
-	    PLAT_OBJS='${MAC_OSX_OBJS}'
-	    PLAT_SRCS='${MAC_OSX_SRCS}'
-	    echo "$as_me:$LINENO: checking whether to use CoreFoundation" >&5
-echo $ECHO_N "checking whether to use CoreFoundation... $ECHO_C" >&6
-	    # Check whether --enable-corefoundation or --disable-corefoundation was given.
-if test "${enable_corefoundation+set}" = set; then
-  enableval="$enable_corefoundation"
-  tcl_corefoundation=$enableval
-else
-  tcl_corefoundation=yes
-fi;
-	    echo "$as_me:$LINENO: result: $tcl_corefoundation" >&5
-echo "${ECHO_T}$tcl_corefoundation" >&6
-	    if test $tcl_corefoundation = yes; then
-
-		echo "$as_me:$LINENO: checking for CoreFoundation.framework" >&5
-echo $ECHO_N "checking for CoreFoundation.framework... $ECHO_C" >&6
-if test "${tcl_cv_lib_corefoundation+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-		    hold_libs=$LIBS
-		    if test "$fat_32_64" = yes; then
+if ac_fn_c_try_link "$LINENO"; then :
+  tcl_cv_ld_search_paths_first=yes
+else
+  tcl_cv_ld_search_paths_first=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+		LDFLAGS=$hold_ldflags
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_ld_search_paths_first" >&5
+$as_echo "$tcl_cv_ld_search_paths_first" >&6; }
+	    if test $tcl_cv_ld_search_paths_first = yes; then :
+
+		LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
+
+fi
+	    if test "$tcl_cv_cc_visibility_hidden" != yes; then :
+
+
+$as_echo "#define MODULE_SCOPE __private_extern__" >>confdefs.h
+
+
+fi
+	    CC_SEARCH_FLAGS=""
+	    LD_SEARCH_FLAGS=""
+	    LD_LIBRARY_PATH_VAR="DYLD_LIBRARY_PATH"
+
+$as_echo "#define MAC_OSX_TCL 1" >>confdefs.h
+
+	    PLAT_OBJS='${MAC_OSX_OBJS}'
+	    PLAT_SRCS='${MAC_OSX_SRCS}'
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use CoreFoundation" >&5
+$as_echo_n "checking whether to use CoreFoundation... " >&6; }
+	    # Check whether --enable-corefoundation was given.
+if test "${enable_corefoundation+set}" = set; then :
+  enableval=$enable_corefoundation; tcl_corefoundation=$enableval
+else
+  tcl_corefoundation=yes
+fi
+
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_corefoundation" >&5
+$as_echo "$tcl_corefoundation" >&6; }
+	    if test $tcl_corefoundation = yes; then :
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CoreFoundation.framework" >&5
+$as_echo_n "checking for CoreFoundation.framework... " >&6; }
+if ${tcl_cv_lib_corefoundation+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+		    hold_libs=$LIBS
+		    if test "$fat_32_64" = yes; then :
 
 			for v in CFLAGS CPPFLAGS LDFLAGS; do
 			    # On Tiger there is no 64-bit CF, so remove 64-bit
 			    # archs from CFLAGS et al. while testing for
 			    # presence of CF. 64-bit CF is disabled in
 			    # tclUnixPort.h if necessary.
 			    eval 'hold_'$v'="$'$v'";'$v'="`echo "$'$v' "|sed -e "s/-arch ppc64 / /g" -e "s/-arch x86_64 / /g"`"'
 			done
 fi
+		    LIBS="$LIBS -framework CoreFoundation"
+		    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <CoreFoundation/CoreFoundation.h>
+int
+main ()
+{
+CFBundleRef b = CFBundleGetMainBundle();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  tcl_cv_lib_corefoundation=yes
+else
+  tcl_cv_lib_corefoundation=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+		    if test "$fat_32_64" = yes; then :
+
+			for v in CFLAGS CPPFLAGS LDFLAGS; do
+			    eval $v'="$hold_'$v'"'
+		        done
+fi
+		    LIBS=$hold_libs
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_lib_corefoundation" >&5
+$as_echo "$tcl_cv_lib_corefoundation" >&6; }
+		if test $tcl_cv_lib_corefoundation = yes; then :
 
 		    LIBS="$LIBS -framework CoreFoundation"
-		    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+
+$as_echo "#define HAVE_COREFOUNDATION 1" >>confdefs.h
+
+
+else
+  tcl_corefoundation=no
+fi
+		if test "$fat_32_64" = yes -a $tcl_corefoundation = yes; then :
+
+		    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit CoreFoundation" >&5
+$as_echo_n "checking for 64-bit CoreFoundation... " >&6; }
+if ${tcl_cv_lib_corefoundation_64+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+			for v in CFLAGS CPPFLAGS LDFLAGS; do
+			    eval 'hold_'$v'="$'$v'";'$v'="`echo "$'$v' "|sed -e "s/-arch ppc / /g" -e "s/-arch i386 / /g"`"'
+			done
+			cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <CoreFoundation/CoreFoundation.h>
 int
 main ()
 {
@@ -5835,244 +5375,83 @@
 CFBundleRef b = CFBundleGetMainBundle();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  tcl_cv_lib_corefoundation=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-tcl_cv_lib_corefoundation=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-		    if test "$fat_32_64" = yes; then
-
-			for v in CFLAGS CPPFLAGS LDFLAGS; do
-			    eval $v'="$hold_'$v'"'
-		        done
-fi
-
-		    LIBS=$hold_libs
-fi
-echo "$as_me:$LINENO: result: $tcl_cv_lib_corefoundation" >&5
-echo "${ECHO_T}$tcl_cv_lib_corefoundation" >&6
-		if test $tcl_cv_lib_corefoundation = yes; then
-
-		    LIBS="$LIBS -framework CoreFoundation"
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_COREFOUNDATION 1
-_ACEOF
-
-
-else
-  tcl_corefoundation=no
-fi
-
-		if test "$fat_32_64" = yes -a $tcl_corefoundation = yes; then
-
-		    echo "$as_me:$LINENO: checking for 64-bit CoreFoundation" >&5
-echo $ECHO_N "checking for 64-bit CoreFoundation... $ECHO_C" >&6
-if test "${tcl_cv_lib_corefoundation_64+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-			for v in CFLAGS CPPFLAGS LDFLAGS; do
-			    eval 'hold_'$v'="$'$v'";'$v'="`echo "$'$v' "|sed -e "s/-arch ppc / /g" -e "s/-arch i386 / /g"`"'
-			done
-			cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <CoreFoundation/CoreFoundation.h>
-int
-main ()
-{
-CFBundleRef b = CFBundleGetMainBundle();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  tcl_cv_lib_corefoundation_64=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-tcl_cv_lib_corefoundation_64=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-			for v in CFLAGS CPPFLAGS LDFLAGS; do
-			    eval $v'="$hold_'$v'"'
-			done
-fi
-echo "$as_me:$LINENO: result: $tcl_cv_lib_corefoundation_64" >&5
-echo "${ECHO_T}$tcl_cv_lib_corefoundation_64" >&6
-		    if test $tcl_cv_lib_corefoundation_64 = no; then
-
-
-cat >>confdefs.h <<\_ACEOF
-#define NO_COREFOUNDATION_64 1
-_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  tcl_cv_lib_corefoundation_64=yes
+else
+  tcl_cv_lib_corefoundation_64=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+			for v in CFLAGS CPPFLAGS LDFLAGS; do
+			    eval $v'="$hold_'$v'"'
+			done
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_lib_corefoundation_64" >&5
+$as_echo "$tcl_cv_lib_corefoundation_64" >&6; }
+		    if test $tcl_cv_lib_corefoundation_64 = no; then :
+
+
+$as_echo "#define NO_COREFOUNDATION_64 1" >>confdefs.h
 
                         LDFLAGS="$LDFLAGS -Wl,-no_arch_warnings"
 
 fi
 
-
-fi
-
-
-fi
-
-	    ;;
-	NEXTSTEP-*)
-	    SHLIB_CFLAGS=""
-	    SHLIB_LD='${CC} -nostdlib -r'
-	    SHLIB_LD_LIBS=""
-	    SHLIB_SUFFIX=".so"
-	    DL_OBJS="tclLoadNext.o"
-	    DL_LIBS=""
-	    CC_SEARCH_FLAGS=""
-	    LD_SEARCH_FLAGS=""
+fi
+
+fi
 	    ;;
 	OS/390-*)
 	    SHLIB_LD_LIBS=""
 	    CFLAGS_OPTIMIZE=""		# Optimizer is buggy
 
-cat >>confdefs.h <<\_ACEOF
-#define _OE_SOCKETS 1
-_ACEOF
-
-	    ;;
-	OSF1-1.0|OSF1-1.1|OSF1-1.2)
-	    # OSF/1 1.[012] from OSF, and derivatives, including Paragon OSF/1
-	    SHLIB_CFLAGS=""
-	    # Hack: make package name same as library name
-	    SHLIB_LD='ld -R -export :'
-	    SHLIB_LD_LIBS=""
-	    SHLIB_SUFFIX=".so"
-	    DL_OBJS="tclLoadOSF.o"
-	    DL_LIBS=""
-	    CC_SEARCH_FLAGS=""
-	    LD_SEARCH_FLAGS=""
-	    ;;
-	OSF1-1.*)
-	    # OSF/1 1.3 from OSF using ELF, and derivatives, including AD2
-	    SHLIB_CFLAGS="-fPIC"
-	    if test "$SHARED_BUILD" = 1; then
-  SHLIB_LD="ld -shared"
-else
-
-	        SHLIB_LD="ld -non_shared"
-
-fi
-
-	    SHLIB_LD_LIBS=""
-	    SHLIB_SUFFIX=".so"
-	    DL_OBJS="tclLoadDl.o"
-	    DL_LIBS=""
-	    CC_SEARCH_FLAGS=""
-	    LD_SEARCH_FLAGS=""
+$as_echo "#define _OE_SOCKETS 1" >>confdefs.h
+
 	    ;;
 	OSF1-V*)
 	    # Digital OSF/1
 	    SHLIB_CFLAGS=""
-	    if test "$SHARED_BUILD" = 1; then
+	    if test "$SHARED_BUILD" = 1; then :
 
 	        SHLIB_LD='ld -shared -expect_unresolved "*"'
 
 else
 
 	        SHLIB_LD='ld -non_shared -expect_unresolved "*"'
 
 fi
-
 	    SHLIB_SUFFIX=".so"
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS=""
-	    if test $doRpath = yes; then
+	    if test $doRpath = yes; then :
 
 		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
 		LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
 fi
-
-	    if test "$GCC" = yes; then
+	    if test "$GCC" = yes; then :
   CFLAGS="$CFLAGS -mieee"
 else
 
 		CFLAGS="$CFLAGS -DHAVE_TZSET -std1 -ieee"
 fi
-
 	    # see pthread_intro(3) for pthread support on osf1, k.furukawa
-	    if test "${TCL_THREADS}" = 1; then
-
-		CFLAGS="$CFLAGS -DHAVE_PTHREAD_ATTR_SETSTACKSIZE"
-		CFLAGS="$CFLAGS -DTCL_THREAD_STACK_MIN=PTHREAD_STACK_MIN*64"
-		LIBS=`echo $LIBS | sed s/-lpthreads//`
-		if test "$GCC" = yes; then
-
-		    LIBS="$LIBS -lpthread -lmach -lexc"
+	    CFLAGS="$CFLAGS -DHAVE_PTHREAD_ATTR_SETSTACKSIZE"
+	    CFLAGS="$CFLAGS -DTCL_THREAD_STACK_MIN=PTHREAD_STACK_MIN*64"
+	    LIBS=`echo $LIBS | sed s/-lpthreads//`
+	    if test "$GCC" = yes; then :
+
+		LIBS="$LIBS -lpthread -lmach -lexc"
 
 else
 
-		    CFLAGS="$CFLAGS -pthread"
-		    LDFLAGS="$LDFLAGS -pthread"
+		CFLAGS="$CFLAGS -pthread"
+		LDFLAGS="$LDFLAGS -pthread"
 
 fi
-
-
-fi
-
 	    ;;
 	QNX-6*)
 	    # QNX RTP
 	    # This may work for all QNX, but it was only reported for v6.
 	    SHLIB_CFLAGS="-fPIC"
@@ -6087,11 +5466,11 @@
 	    ;;
 	SCO_SV-3.2*)
 	    # Note, dlopen is available only on SCO 3.2.5 and greater. However,
 	    # this test works, since "uname -s" was non-standard in 3.2.4 and
 	    # below.
-	    if test "$GCC" = yes; then
+	    if test "$GCC" = yes; then :
 
 	    	SHLIB_CFLAGS="-fPIC -melf"
 	    	LDFLAGS="$LDFLAGS -melf -Wl,-Bexport"
 
 else
@@ -6098,70 +5477,36 @@
 
 	    	SHLIB_CFLAGS="-Kpic -belf"
 	    	LDFLAGS="$LDFLAGS -belf -Wl,-Bexport"
 
 fi
-
 	    SHLIB_LD="ld -G"
 	    SHLIB_LD_LIBS=""
 	    SHLIB_SUFFIX=".so"
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS=""
 	    CC_SEARCH_FLAGS=""
 	    LD_SEARCH_FLAGS=""
 	    ;;
-	SINIX*5.4*)
-	    SHLIB_CFLAGS="-K PIC"
-	    SHLIB_LD='${CC} -G'
-	    SHLIB_LD_LIBS=""
-	    SHLIB_SUFFIX=".so"
-	    DL_OBJS="tclLoadDl.o"
-	    DL_LIBS="-ldl"
-	    CC_SEARCH_FLAGS=""
-	    LD_SEARCH_FLAGS=""
-	    ;;
-	SunOS-4*)
-	    SHLIB_CFLAGS="-PIC"
-	    SHLIB_LD="ld"
-	    SHLIB_LD_LIBS=""
-	    SHLIB_SUFFIX=".so"
-	    DL_OBJS="tclLoadDl.o"
-	    DL_LIBS="-ldl"
-	    CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
-	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
-
-	    # SunOS can't handle version numbers with dots in them in library
-	    # specs, like -ltcl7.5, so use -ltcl75 instead.  Also, it
-	    # requires an extra version number at the end of .so file names.
-	    # So, the library has to have a name like libtcl75.so.1.0
-
-	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}'
-	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
-	    TCL_LIB_VERSIONS_OK=nodots
-	    ;;
 	SunOS-5.[0-6])
 	    # Careful to not let 5.10+ fall into this case
 
 	    # Note: If _REENTRANT isn't defined, then Solaris
 	    # won't define thread-safe library routines.
 
 
-cat >>confdefs.h <<\_ACEOF
-#define _REENTRANT 1
-_ACEOF
+$as_echo "#define _REENTRANT 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define _POSIX_PTHREAD_SEMANTICS 1
-_ACEOF
+$as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
 
 
 	    SHLIB_CFLAGS="-KPIC"
 	    SHLIB_SUFFIX=".so"
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS="-ldl"
-	    if test "$GCC" = yes; then
+	    if test "$GCC" = yes; then :
 
 		SHLIB_LD='${CC} -shared'
 		CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
 		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
 
@@ -6170,41 +5515,36 @@
 		SHLIB_LD="/usr/ccs/bin/ld -G -z text"
 		CC_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
 		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
 
 fi
-
 	    ;;
 	SunOS-5*)
 	    # Note: If _REENTRANT isn't defined, then Solaris
 	    # won't define thread-safe library routines.
 
 
-cat >>confdefs.h <<\_ACEOF
-#define _REENTRANT 1
-_ACEOF
+$as_echo "#define _REENTRANT 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define _POSIX_PTHREAD_SEMANTICS 1
-_ACEOF
+$as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
 
 
 	    SHLIB_CFLAGS="-KPIC"
 
 	    # Check to enable 64-bit flags for compiler/linker
-	    if test "$do64bit" = yes; then
+	    if test "$do64bit" = yes; then :
 
 		arch=`isainfo`
-		if test "$arch" = "sparcv9 sparc"; then
-
-		    if test "$GCC" = yes; then
-
-			if test "`${CC} -dumpversion | awk -F. '{print $1}'`" -lt 3; then
-
-			    { echo "$as_me:$LINENO: WARNING: 64bit mode not supported with GCC < 3.2 on $system" >&5
-echo "$as_me: WARNING: 64bit mode not supported with GCC < 3.2 on $system" >&2;}
+		if test "$arch" = "sparcv9 sparc"; then :
+
+		    if test "$GCC" = yes; then :
+
+			if test "`${CC} -dumpversion | awk -F. '{print $1}'`" -lt 3; then :
+
+			    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 64bit mode not supported with GCC < 3.2 on $system" >&5
+$as_echo "$as_me: WARNING: 64bit mode not supported with GCC < 3.2 on $system" >&2;}
 
 else
 
 			    do64bit_ok=yes
 			    CFLAGS="$CFLAGS -m64 -mcpu=v9"
@@ -6211,15 +5551,14 @@
 			    LDFLAGS="$LDFLAGS -m64 -mcpu=v9"
 			    SHLIB_CFLAGS="-fPIC"
 
 fi
 
-
 else
 
 			do64bit_ok=yes
-			if test "$do64bitVIS" = yes; then
+			if test "$do64bitVIS" = yes; then :
 
 			    CFLAGS="$CFLAGS -xarch=v9a"
 			    LDFLAGS_ARCH="-xarch=v9a"
 
 else
@@ -6226,30 +5565,28 @@
 
 			    CFLAGS="$CFLAGS -xarch=v9"
 			    LDFLAGS_ARCH="-xarch=v9"
 
 fi
-
 			# Solaris 64 uses this as well
 			#LD_LIBRARY_PATH_VAR="LD_LIBRARY_PATH_64"
 
 fi
 
+else
+  if test "$arch" = "amd64 i386"; then :
 
-else
-  if test "$arch" = "amd64 i386"; then
-
-		    if test "$GCC" = yes; then
+		    if test "$GCC" = yes; then :
 
 			case $system in
 			    SunOS-5.1[1-9]*|SunOS-5.[2-9][0-9]*)
 				do64bit_ok=yes
 				CFLAGS="$CFLAGS -m64"
 				LDFLAGS="$LDFLAGS -m64";;
 			    *)
-				{ echo "$as_me:$LINENO: WARNING: 64bit mode not supported with GCC on $system" >&5
-echo "$as_me: WARNING: 64bit mode not supported with GCC on $system" >&2;};;
+				{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 64bit mode not supported with GCC on $system" >&5
+$as_echo "$as_me: WARNING: 64bit mode not supported with GCC on $system" >&2;};;
 			esac
 
 else
 
 			do64bit_ok=yes
@@ -6262,201 +5599,62 @@
 				LDFLAGS="$LDFLAGS -xarch=amd64";;
 			esac
 
 fi
 
-
 else
-  { echo "$as_me:$LINENO: WARNING: 64bit mode not supported for $arch" >&5
-echo "$as_me: WARNING: 64bit mode not supported for $arch" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 64bit mode not supported for $arch" >&5
+$as_echo "$as_me: WARNING: 64bit mode not supported for $arch" >&2;}
+fi
 fi
 
 fi
-
-
-fi
-
 
 	    #--------------------------------------------------------------------
 	    # On Solaris 5.x i386 with the sunpro compiler we need to link
 	    # with sunmath to get floating point rounding control
 	    #--------------------------------------------------------------------
-	    if test "$GCC" = yes; then
+	    if test "$GCC" = yes; then :
   use_sunmath=no
 else
 
 		arch=`isainfo`
-		echo "$as_me:$LINENO: checking whether to use -lsunmath for fp rounding control" >&5
-echo $ECHO_N "checking whether to use -lsunmath for fp rounding control... $ECHO_C" >&6
-		if test "$arch" = "amd64 i386" -o "$arch" = "i386"; then
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use -lsunmath for fp rounding control" >&5
+$as_echo_n "checking whether to use -lsunmath for fp rounding control... " >&6; }
+		if test "$arch" = "amd64 i386" -o "$arch" = "i386"; then :
 
-			echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 			MATH_LIBS="-lsunmath $MATH_LIBS"
-			if test "${ac_cv_header_sunmath_h+set}" = set; then
-  echo "$as_me:$LINENO: checking for sunmath.h" >&5
-echo $ECHO_N "checking for sunmath.h... $ECHO_C" >&6
-if test "${ac_cv_header_sunmath_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_sunmath_h" >&5
-echo "${ECHO_T}$ac_cv_header_sunmath_h" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking sunmath.h usability" >&5
-echo $ECHO_N "checking sunmath.h usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <sunmath.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking sunmath.h presence" >&5
-echo $ECHO_N "checking sunmath.h presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sunmath.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: sunmath.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: sunmath.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sunmath.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: sunmath.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: sunmath.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: sunmath.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sunmath.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: sunmath.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sunmath.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: sunmath.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sunmath.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: sunmath.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sunmath.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: sunmath.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: sunmath.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: sunmath.h: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ----------------------------- ##
-## Report this to the tk lists.  ##
-## ----------------------------- ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for sunmath.h" >&5
-echo $ECHO_N "checking for sunmath.h... $ECHO_C" >&6
-if test "${ac_cv_header_sunmath_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_header_sunmath_h=$ac_header_preproc
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_sunmath_h" >&5
-echo "${ECHO_T}$ac_cv_header_sunmath_h" >&6
+			ac_fn_c_check_header_mongrel "$LINENO" "sunmath.h" "ac_cv_header_sunmath_h" "$ac_includes_default"
+if test "x$ac_cv_header_sunmath_h" = xyes; then :
 
 fi
 
 
 			use_sunmath=yes
 
 else
 
-			echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 			use_sunmath=no
 
 fi
 
-
 fi
-
 	    SHLIB_SUFFIX=".so"
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS="-ldl"
-	    if test "$GCC" = yes; then
+	    if test "$GCC" = yes; then :
 
 		SHLIB_LD='${CC} -shared'
 		CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
 		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
-		if test "$do64bit_ok" = yes; then
+		if test "$do64bit_ok" = yes; then :
 
-		    if test "$arch" = "sparcv9 sparc"; then
+		    if test "$arch" = "sparcv9 sparc"; then :
 
 			# We need to specify -static-libgcc or we need to
 			# add the path to the sparv9 libgcc.
 			SHLIB_LD="$SHLIB_LD -m64 -mcpu=v9 -static-libgcc"
 			# for finding sparcv9 libgcc, get the regular libgcc
@@ -6463,30 +5661,26 @@
 			# path, remove so name and append 'sparcv9'
 			#v9gcclibdir="`gcc -print-file-name=libgcc_s.so` | ..."
 			#CC_SEARCH_FLAGS="${CC_SEARCH_FLAGS},-R,$v9gcclibdir"
 
 else
-  if test "$arch" = "amd64 i386"; then
+  if test "$arch" = "amd64 i386"; then :
 
 			SHLIB_LD="$SHLIB_LD -m64 -static-libgcc"
 
 fi
+fi
 
 fi
 
-
-fi
-
-
 else
 
-		if test "$use_sunmath" = yes; then
+		if test "$use_sunmath" = yes; then :
   textmode=textoff
 else
   textmode=text
 fi
-
 		case $system in
 		    SunOS-5.[1-9][0-9]*|SunOS-5.[7-9])
 			SHLIB_LD="\${CC} -G -z $textmode \${LDFLAGS}";;
 		    *)
 			SHLIB_LD="/usr/ccs/bin/ld -G -z $textmode";;
@@ -6493,11 +5687,10 @@
 		esac
 		CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
 		LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
 
 fi
-
 	    ;;
 	UNIX_SV* | UnixWare-5*)
 	    SHLIB_CFLAGS="-KPIC"
 	    SHLIB_LD='${CC} -G'
 	    SHLIB_LD_LIBS=""
@@ -6504,23 +5697,19 @@
 	    SHLIB_SUFFIX=".so"
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS="-ldl"
 	    # Some UNIX_SV* systems (unixware 1.1.2 for example) have linkers
 	    # that don't grok the -Bexport option.  Test that it does.
-	    echo "$as_me:$LINENO: checking for ld accepts -Bexport flag" >&5
-echo $ECHO_N "checking for ld accepts -Bexport flag... $ECHO_C" >&6
-if test "${tcl_cv_ld_Bexport+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld accepts -Bexport flag" >&5
+$as_echo_n "checking for ld accepts -Bexport flag... " >&6; }
+if ${tcl_cv_ld_Bexport+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
 
 		hold_ldflags=$LDFLAGS
 		LDFLAGS="$LDFLAGS -Wl,-Bexport"
-		cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
@@ -6527,97 +5716,67 @@
 int i;
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   tcl_cv_ld_Bexport=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-tcl_cv_ld_Bexport=no
+  tcl_cv_ld_Bexport=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 	        LDFLAGS=$hold_ldflags
 fi
-echo "$as_me:$LINENO: result: $tcl_cv_ld_Bexport" >&5
-echo "${ECHO_T}$tcl_cv_ld_Bexport" >&6
-	    if test $tcl_cv_ld_Bexport = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_ld_Bexport" >&5
+$as_echo "$tcl_cv_ld_Bexport" >&6; }
+	    if test $tcl_cv_ld_Bexport = yes; then :
 
 		LDFLAGS="$LDFLAGS -Wl,-Bexport"
 
 fi
-
 	    CC_SEARCH_FLAGS=""
 	    LD_SEARCH_FLAGS=""
 	    ;;
     esac
 
-    if test "$do64bit" = yes -a "$do64bit_ok" = no; then
+    if test "$do64bit" = yes -a "$do64bit_ok" = no; then :
 
-	{ echo "$as_me:$LINENO: WARNING: 64bit support being disabled -- don't know magic for this platform" >&5
-echo "$as_me: WARNING: 64bit support being disabled -- don't know magic for this platform" >&2;}
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 64bit support being disabled -- don't know magic for this platform" >&5
+$as_echo "$as_me: WARNING: 64bit support being disabled -- don't know magic for this platform" >&2;}
 
 fi
 
-
-    if test "$do64bit" = yes -a "$do64bit_ok" = yes; then
+    if test "$do64bit" = yes -a "$do64bit_ok" = yes; then :
 
 
-cat >>confdefs.h <<\_ACEOF
-#define TCL_CFG_DO64BIT 1
-_ACEOF
+$as_echo "#define TCL_CFG_DO64BIT 1" >>confdefs.h
 
 
 fi
-
 
 
 
     # Step 4: disable dynamic loading if requested via a command-line switch.
 
-    # Check whether --enable-load or --disable-load was given.
-if test "${enable_load+set}" = set; then
-  enableval="$enable_load"
-  tcl_ok=$enableval
+    # Check whether --enable-load was given.
+if test "${enable_load+set}" = set; then :
+  enableval=$enable_load; tcl_ok=$enableval
 else
   tcl_ok=yes
-fi;
-    if test "$tcl_ok" = no; then
+fi
+
+    if test "$tcl_ok" = no; then :
   DL_OBJS=""
 fi
 
-
-    if test "x$DL_OBJS" != x; then
+    if test "x$DL_OBJS" != x; then :
   BUILD_DLTEST="\$(DLTEST_TARGETS)"
 else
 
-	{ echo "$as_me:$LINENO: WARNING: Can't figure out how to do dynamic loading or shared libraries on this system." >&5
-echo "$as_me: WARNING: Can't figure out how to do dynamic loading or shared libraries on this system." >&2;}
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Can't figure out how to do dynamic loading or shared libraries on this system." >&5
+$as_echo "$as_me: WARNING: Can't figure out how to do dynamic loading or shared libraries on this system." >&2;}
 	SHLIB_CFLAGS=""
 	SHLIB_LD=""
 	SHLIB_SUFFIX=""
 	DL_OBJS="tclLoadNone.o"
 	DL_LIBS=""
@@ -6625,60 +5784,53 @@
 	CC_SEARCH_FLAGS=""
 	LD_SEARCH_FLAGS=""
 	BUILD_DLTEST=""
 
 fi
-
     LDFLAGS="$LDFLAGS $LDFLAGS_ARCH"
 
     # If we're running gcc, then change the C flags for compiling shared
     # libraries to the right flags for gcc, instead of those for the
     # standard manufacturer compiler.
 
-    if test "$DL_OBJS" != "tclLoadNone.o" -a "$GCC" = yes; then
+    if test "$DL_OBJS" != "tclLoadNone.o" -a "$GCC" = yes; then :
 
 	case $system in
 	    AIX-*) ;;
 	    BSD/OS*) ;;
-	    CYGWIN_*|MINGW32_*) ;;
+	    CYGWIN_*) ;;
 	    IRIX*) ;;
 	    NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
 	    Darwin-*) ;;
 	    SCO_SV-3.2*) ;;
 	    *) SHLIB_CFLAGS="-fPIC" ;;
 	esac
 fi
 
-
-    if test "$tcl_cv_cc_visibility_hidden" != yes; then
+    if test "$tcl_cv_cc_visibility_hidden" != yes; then :
 
 
-cat >>confdefs.h <<\_ACEOF
-#define MODULE_SCOPE extern
-_ACEOF
+$as_echo "#define MODULE_SCOPE extern" >>confdefs.h
 
 
 fi
 
-
-    if test "$SHARED_LIB_SUFFIX" = ""; then
+    if test "$SHARED_LIB_SUFFIX" = ""; then :
 
 	SHARED_LIB_SUFFIX='${VERSION}${SHLIB_SUFFIX}'
 fi
-
-    if test "$UNSHARED_LIB_SUFFIX" = ""; then
+    if test "$UNSHARED_LIB_SUFFIX" = ""; then :
 
 	UNSHARED_LIB_SUFFIX='${VERSION}.a'
 fi
-
     DLL_INSTALL_DIR="\$(LIB_INSTALL_DIR)"
 
-    if test "${SHARED_BUILD}" = 1 -a "${SHLIB_SUFFIX}" != ""; then
+    if test "${SHARED_BUILD}" = 1 -a "${SHLIB_SUFFIX}" != ""; then :
 
         LIB_SUFFIX=${SHARED_LIB_SUFFIX}
         MAKE_LIB='${SHLIB_LD} -o $@ ${OBJS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}'
-        if test "${SHLIB_SUFFIX}" = ".dll"; then
+        if test "${SHLIB_SUFFIX}" = ".dll"; then :
 
             INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(BIN_INSTALL_DIR)/$(LIB_FILE)";if test -f $(LIB_FILE).a; then $(INSTALL_DATA) $(LIB_FILE).a "$(LIB_INSTALL_DIR)"; fi;'
             DLL_INSTALL_DIR="\$(BIN_INSTALL_DIR)"
 
 else
@@ -6685,67 +5837,58 @@
 
             INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE)"'
 
 fi
 
-
 else
 
         LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
 
-        if test "$RANLIB" = ""; then
+        if test "$RANLIB" = ""; then :
 
             MAKE_LIB='$(STLIB_LD) $@ ${OBJS}'
 
 else
 
             MAKE_LIB='${STLIB_LD} $@ ${OBJS} ; ${RANLIB} $@'
 
 fi
-
         INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE)"'
 
 fi
 
-
     # Stub lib does not depend on shared/static configuration
-    if test "$RANLIB" = ""; then
+    if test "$RANLIB" = ""; then :
 
         MAKE_STUB_LIB='${STLIB_LD} $@ ${STUB_LIB_OBJS}'
 
 else
 
         MAKE_STUB_LIB='${STLIB_LD} $@ ${STUB_LIB_OBJS} ; ${RANLIB} $@'
 
 fi
-
     INSTALL_STUB_LIB='$(INSTALL_LIBRARY) $(STUB_LIB_FILE) "$(LIB_INSTALL_DIR)/$(STUB_LIB_FILE)"'
 
     # Define TCL_LIBS now that we know what DL_LIBS is.
     # The trick here is that we don't want to change the value of TCL_LIBS if
     # it is already set when tclConfig.sh had been loaded by Tk.
-    if test "x${TCL_LIBS}" = x; then
+    if test "x${TCL_LIBS}" = x; then :
 
         TCL_LIBS="${DL_LIBS} ${LIBS} ${MATH_LIBS}"
 fi
-
 
 
 	# See if the compiler supports casting to a union type.
 	# This is used to stop gcc from printing a compiler
 	# warning when initializing a union member.
 
-	echo "$as_me:$LINENO: checking for cast to union support" >&5
-echo $ECHO_N "checking for cast to union support... $ECHO_C" >&6
-if test "${tcl_cv_cast_to_union+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cast to union support" >&5
+$as_echo_n "checking for cast to union support... " >&6; }
+if ${tcl_cv_cast_to_union+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
@@ -6755,49 +5898,23 @@
 
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   tcl_cv_cast_to_union=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-tcl_cv_cast_to_union=no
+  tcl_cv_cast_to_union=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:$LINENO: result: $tcl_cv_cast_to_union" >&5
-echo "${ECHO_T}$tcl_cv_cast_to_union" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_cast_to_union" >&5
+$as_echo "$tcl_cv_cast_to_union" >&6; }
 	if test "$tcl_cv_cast_to_union" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_CAST_TO_UNION 1
-_ACEOF
+$as_echo "#define HAVE_CAST_TO_UNION 1" >>confdefs.h
 
 	fi
 
     # FIXME: This subst was left in only because the TCL_DL_LIBS
     # entry in tclConfig.sh uses it. It is not clear why someone
@@ -6839,85 +5956,75 @@
 
 
 
 
 
-    echo "$as_me:$LINENO: checking for build with symbols" >&5
-echo $ECHO_N "checking for build with symbols... $ECHO_C" >&6
-    # Check whether --enable-symbols or --disable-symbols was given.
-if test "${enable_symbols+set}" = set; then
-  enableval="$enable_symbols"
-  tcl_ok=$enableval
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for build with symbols" >&5
+$as_echo_n "checking for build with symbols... " >&6; }
+    # Check whether --enable-symbols was given.
+if test "${enable_symbols+set}" = set; then :
+  enableval=$enable_symbols; tcl_ok=$enableval
 else
   tcl_ok=no
-fi;
+fi
+
 # FIXME: Currently, LDFLAGS_DEFAULT is not used, it should work like CFLAGS_DEFAULT.
     DBGX=""
     if test "$tcl_ok" = "no"; then
 	CFLAGS_DEFAULT='$(CFLAGS_OPTIMIZE)'
 	LDFLAGS_DEFAULT='$(LDFLAGS_OPTIMIZE)'
 
-cat >>confdefs.h <<\_ACEOF
-#define NDEBUG 1
-_ACEOF
-
-	echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-
-cat >>confdefs.h <<\_ACEOF
-#define TCL_CFG_OPTIMIZED 1
-_ACEOF
+$as_echo "#define NDEBUG 1" >>confdefs.h
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+$as_echo "#define TCL_CFG_OPTIMIZED 1" >>confdefs.h
 
     else
 	CFLAGS_DEFAULT='$(CFLAGS_DEBUG)'
 	LDFLAGS_DEFAULT='$(LDFLAGS_DEBUG)'
 	if test "$tcl_ok" = "yes"; then
-	    echo "$as_me:$LINENO: result: yes (standard debugging)" >&5
-echo "${ECHO_T}yes (standard debugging)" >&6
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (standard debugging)" >&5
+$as_echo "yes (standard debugging)" >&6; }
 	fi
     fi
 
 
 
     if test "$tcl_ok" = "mem" -o "$tcl_ok" = "all"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define TCL_MEM_DEBUG 1
-_ACEOF
+$as_echo "#define TCL_MEM_DEBUG 1" >>confdefs.h
 
     fi
 
 
 
     if test "$tcl_ok" != "yes" -a "$tcl_ok" != "no"; then
 	if test "$tcl_ok" = "all"; then
-	    echo "$as_me:$LINENO: result: enabled symbols mem debugging" >&5
-echo "${ECHO_T}enabled symbols mem debugging" >&6
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: enabled symbols mem debugging" >&5
+$as_echo "enabled symbols mem debugging" >&6; }
 	else
-	    echo "$as_me:$LINENO: result: enabled $tcl_ok debugging" >&5
-echo "${ECHO_T}enabled $tcl_ok debugging" >&6
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: enabled $tcl_ok debugging" >&5
+$as_echo "enabled $tcl_ok debugging" >&6; }
 	fi
     fi
 
 
 #--------------------------------------------------------------------
 #	Detect what compiler flags to set for 64-bit support.
 #--------------------------------------------------------------------
 
 
-    echo "$as_me:$LINENO: checking for required early compiler flags" >&5
-echo $ECHO_N "checking for required early compiler flags... $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for required early compiler flags" >&5
+$as_echo_n "checking for required early compiler flags... " >&6; }
     tcl_flags=""
 
-    if test "${tcl_cv_flag__isoc99_source+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    if ${tcl_cv_flag__isoc99_source+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 int
 main ()
 {
@@ -6924,42 +6031,14 @@
 char *p = (char *)strtoll; char *q = (char *)strtoull;
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   tcl_cv_flag__isoc99_source=no
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #define _ISOC99_SOURCE 1
 #include <stdlib.h>
 int
 main ()
@@ -6967,62 +6046,32 @@
 char *p = (char *)strtoll; char *q = (char *)strtoull;
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   tcl_cv_flag__isoc99_source=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-tcl_cv_flag__isoc99_source=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+  tcl_cv_flag__isoc99_source=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
     if test "x${tcl_cv_flag__isoc99_source}" = "xyes" ; then
 
-cat >>confdefs.h <<\_ACEOF
-#define _ISOC99_SOURCE 1
-_ACEOF
+$as_echo "#define _ISOC99_SOURCE 1" >>confdefs.h
 
 	tcl_flags="$tcl_flags _ISOC99_SOURCE"
     fi
 
 
-    if test "${tcl_cv_flag__largefile64_source+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    if ${tcl_cv_flag__largefile64_source+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/stat.h>
 int
 main ()
 {
@@ -7029,42 +6078,14 @@
 struct stat64 buf; int i = stat64("/", &buf);
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   tcl_cv_flag__largefile64_source=no
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #define _LARGEFILE64_SOURCE 1
 #include <sys/stat.h>
 int
 main ()
@@ -7072,62 +6093,32 @@
 struct stat64 buf; int i = stat64("/", &buf);
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   tcl_cv_flag__largefile64_source=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-tcl_cv_flag__largefile64_source=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+  tcl_cv_flag__largefile64_source=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
     if test "x${tcl_cv_flag__largefile64_source}" = "xyes" ; then
 
-cat >>confdefs.h <<\_ACEOF
-#define _LARGEFILE64_SOURCE 1
-_ACEOF
+$as_echo "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
 
 	tcl_flags="$tcl_flags _LARGEFILE64_SOURCE"
     fi
 
 
-    if test "${tcl_cv_flag__largefile_source64+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    if ${tcl_cv_flag__largefile_source64+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/stat.h>
 int
 main ()
 {
@@ -7134,42 +6125,14 @@
 char *p = (char *)open64;
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   tcl_cv_flag__largefile_source64=no
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #define _LARGEFILE_SOURCE64 1
 #include <sys/stat.h>
 int
 main ()
@@ -7177,76 +6140,46 @@
 char *p = (char *)open64;
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   tcl_cv_flag__largefile_source64=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-tcl_cv_flag__largefile_source64=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+  tcl_cv_flag__largefile_source64=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
     if test "x${tcl_cv_flag__largefile_source64}" = "xyes" ; then
 
-cat >>confdefs.h <<\_ACEOF
-#define _LARGEFILE_SOURCE64 1
-_ACEOF
+$as_echo "#define _LARGEFILE_SOURCE64 1" >>confdefs.h
 
 	tcl_flags="$tcl_flags _LARGEFILE_SOURCE64"
     fi
 
     if test "x${tcl_flags}" = "x" ; then
-	echo "$as_me:$LINENO: result: none" >&5
-echo "${ECHO_T}none" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
+$as_echo "none" >&6; }
     else
-	echo "$as_me:$LINENO: result: ${tcl_flags}" >&5
-echo "${ECHO_T}${tcl_flags}" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${tcl_flags}" >&5
+$as_echo "${tcl_flags}" >&6; }
     fi
 
 
 
-    echo "$as_me:$LINENO: checking for 64-bit integer type" >&5
-echo $ECHO_N "checking for 64-bit integer type... $ECHO_C" >&6
-    if test "${tcl_cv_type_64bit+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit integer type" >&5
+$as_echo_n "checking for 64-bit integer type... " >&6; }
+    if ${tcl_cv_type_64bit+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
 
 	tcl_cv_type_64bit=none
 	# See if the compiler knows natively about __int64
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
@@ -7253,48 +6186,20 @@
 __int64 value = (__int64) 0;
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   tcl_type_64bit=__int64
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-tcl_type_64bit="long long"
+  tcl_type_64bit="long long"
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-	# See if we should use long anyway  Note that we substitute in the
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+	# See if we could use long anyway  Note that we substitute in the
 	# type that is our current guess for a 64-bit type inside this check
 	# program, so it should be modified only carefully...
-        cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
@@ -7303,70 +6208,39 @@
         }
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   tcl_cv_type_64bit=${tcl_type_64bit}
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
     if test "${tcl_cv_type_64bit}" = none ; then
 
-cat >>confdefs.h <<\_ACEOF
-#define TCL_WIDE_INT_IS_LONG 1
-_ACEOF
+$as_echo "#define TCL_WIDE_INT_IS_LONG 1" >>confdefs.h
 
-	echo "$as_me:$LINENO: result: using long" >&5
-echo "${ECHO_T}using long" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
     else
 
 cat >>confdefs.h <<_ACEOF
 #define TCL_WIDE_INT_TYPE ${tcl_cv_type_64bit}
 _ACEOF
 
-	echo "$as_me:$LINENO: result: ${tcl_cv_type_64bit}" >&5
-echo "${ECHO_T}${tcl_cv_type_64bit}" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${tcl_cv_type_64bit}" >&5
+$as_echo "${tcl_cv_type_64bit}" >&6; }
 
 	# Now check for auxiliary declarations
-	echo "$as_me:$LINENO: checking for struct dirent64" >&5
-echo $ECHO_N "checking for struct dirent64... $ECHO_C" >&6
-if test "${tcl_cv_struct_dirent64+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct dirent64" >&5
+$as_echo_n "checking for struct dirent64... " >&6; }
+if ${tcl_cv_struct_dirent64+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
 
-	    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <dirent.h>
 int
 main ()
@@ -7374,62 +6248,66 @@
 struct dirent64 p;
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   tcl_cv_struct_dirent64=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-tcl_cv_struct_dirent64=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $tcl_cv_struct_dirent64" >&5
-echo "${ECHO_T}$tcl_cv_struct_dirent64" >&6
+  tcl_cv_struct_dirent64=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_struct_dirent64" >&5
+$as_echo "$tcl_cv_struct_dirent64" >&6; }
 	if test "x${tcl_cv_struct_dirent64}" = "xyes" ; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRUCT_DIRENT64 1
+$as_echo "#define HAVE_STRUCT_DIRENT64 1" >>confdefs.h
+
+	fi
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DIR64" >&5
+$as_echo_n "checking for DIR64... " >&6; }
+if ${tcl_cv_DIR64+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+#include <dirent.h>
+int
+main ()
+{
+struct dirent64 *p; DIR64 d = opendir64(".");
+            p = readdir64(d); rewinddir64(d); closedir64(d);
+  ;
+  return 0;
+}
 _ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  tcl_cv_DIR64=yes
+else
+  tcl_cv_DIR64=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_DIR64" >&5
+$as_echo "$tcl_cv_DIR64" >&6; }
+	if test "x${tcl_cv_DIR64}" = "xyes" ; then
+
+$as_echo "#define HAVE_DIR64 1" >>confdefs.h
 
 	fi
 
-	echo "$as_me:$LINENO: checking for struct stat64" >&5
-echo $ECHO_N "checking for struct stat64... $ECHO_C" >&6
-if test "${tcl_cv_struct_stat64+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct stat64" >&5
+$as_echo_n "checking for struct stat64... " >&6; }
+if ${tcl_cv_struct_stat64+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
 
-	    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/stat.h>
 int
 main ()
 {
@@ -7437,165 +6315,44 @@
 
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   tcl_cv_struct_stat64=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-tcl_cv_struct_stat64=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $tcl_cv_struct_stat64" >&5
-echo "${ECHO_T}$tcl_cv_struct_stat64" >&6
+  tcl_cv_struct_stat64=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_struct_stat64" >&5
+$as_echo "$tcl_cv_struct_stat64" >&6; }
 	if test "x${tcl_cv_struct_stat64}" = "xyes" ; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_STRUCT_STAT64 1
-_ACEOF
-
-	fi
-
-
-
-for ac_func in open64 lseek64
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-if eval "test \"\${$as_ac_var+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != $ac_func;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-if test `eval echo '${'$as_ac_var'}'` = yes; then
+$as_echo "#define HAVE_STRUCT_STAT64 1" >>confdefs.h
+
+	fi
+
+	for ac_func in open64 lseek64
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 done
 
-	echo "$as_me:$LINENO: checking for off64_t" >&5
-echo $ECHO_N "checking for off64_t... $ECHO_C" >&6
-	if test "${tcl_cv_type_off64_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for off64_t" >&5
+$as_echo_n "checking for off64_t... " >&6; }
+	if ${tcl_cv_type_off64_t+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
 
-	    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 int
 main ()
 {
@@ -7603,292 +6360,260 @@
 
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   tcl_cv_type_off64_t=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-tcl_cv_type_off64_t=no
+  tcl_cv_type_off64_t=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
 			if test "x${tcl_cv_type_off64_t}" = "xyes" && \
 	        test "x${ac_cv_func_lseek64}" = "xyes" && \
 	        test "x${ac_cv_func_open64}" = "xyes" ; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_TYPE_OFF64_T 1
-_ACEOF
+$as_echo "#define HAVE_TYPE_OFF64_T 1" >>confdefs.h
 
-	    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 	else
-	    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 	fi
     fi
 
 
 #--------------------------------------------------------------------
 #	Check endianness because we can optimize some operations
 #--------------------------------------------------------------------
 
-echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
-echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
-if test "${ac_cv_c_bigendian+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # See if sys/param.h defines the BYTE_ORDER macro.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <sys/param.h>
-
-int
-main ()
-{
-#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
- bogus endian macros
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  # It does; now see whether it defined to BIG_ENDIAN or not.
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <sys/param.h>
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
+$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
+if ${ac_cv_c_bigendian+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_c_bigendian=unknown
+    # See if we're dealing with a universal compiler.
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifndef __APPLE_CC__
+	       not a universal capable compiler
+	     #endif
+	     typedef int dummy;
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+	# Check for potential -arch flags.  It is not universal unless
+	# there are at least two -arch flags with different values.
+	ac_arch=
+	ac_prev=
+	for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
+	 if test -n "$ac_prev"; then
+	   case $ac_word in
+	     i?86 | x86_64 | ppc | ppc64)
+	       if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
+		 ac_arch=$ac_word
+	       else
+		 ac_cv_c_bigendian=universal
+		 break
+	       fi
+	       ;;
+	   esac
+	   ac_prev=
+	 elif test "x$ac_word" = "x-arch"; then
+	   ac_prev=arch
+	 fi
+       done
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    if test $ac_cv_c_bigendian = unknown; then
+      # See if sys/param.h defines the BYTE_ORDER macro.
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+	     #include <sys/param.h>
+
+int
+main ()
+{
+#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
+		     && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
+		     && LITTLE_ENDIAN)
+	      bogus endian macros
+	     #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  # It does; now see whether it defined to BIG_ENDIAN or not.
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+		#include <sys/param.h>
 
 int
 main ()
 {
 #if BYTE_ORDER != BIG_ENDIAN
- not big endian
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_c_bigendian=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_c_bigendian=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-# It does not; compile a test program.
-if test "$cross_compiling" = yes; then
-  # try to guess the endianness by grepping values into an object file
-  ac_cv_c_bigendian=unknown
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
-void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
-short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
-void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
-int
-main ()
-{
- _ascii (); _ebcdic ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
-  ac_cv_c_bigendian=yes
-fi
-if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
-  if test "$ac_cv_c_bigendian" = unknown; then
-    ac_cv_c_bigendian=no
-  else
-    # finding both strings is unlikely to happen, but who knows?
-    ac_cv_c_bigendian=unknown
-  fi
-fi
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-int
-main ()
-{
-  /* Are we little or big endian?  From Harbison&Steele.  */
-  union
-  {
-    long l;
-    char c[sizeof (long)];
-  } u;
-  u.l = 1;
-  exit (u.c[sizeof (long) - 1] == 1);
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_c_bigendian=no
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_c_bigendian=yes
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
-echo "${ECHO_T}$ac_cv_c_bigendian" >&6
-case $ac_cv_c_bigendian in
-  yes)
-
-cat >>confdefs.h <<\_ACEOF
-#define WORDS_BIGENDIAN 1
-_ACEOF
- ;;
-  no)
-     ;;
-  *)
-    { { echo "$as_me:$LINENO: error: unknown endianness
-presetting ac_cv_c_bigendian=no (or yes) will help" >&5
-echo "$as_me: error: unknown endianness
-presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
-   { (exit 1); exit 1; }; } ;;
-esac
+		 not big endian
+		#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_c_bigendian=yes
+else
+  ac_cv_c_bigendian=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    fi
+    if test $ac_cv_c_bigendian = unknown; then
+      # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <limits.h>
+
+int
+main ()
+{
+#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
+	      bogus endian macros
+	     #endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  # It does; now see whether it defined to _BIG_ENDIAN or not.
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <limits.h>
+
+int
+main ()
+{
+#ifndef _BIG_ENDIAN
+		 not big endian
+		#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_c_bigendian=yes
+else
+  ac_cv_c_bigendian=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    fi
+    if test $ac_cv_c_bigendian = unknown; then
+      # Compile a test program.
+      if test "$cross_compiling" = yes; then :
+  # Try to guess by grepping values from an object file.
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+short int ascii_mm[] =
+		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+		short int ascii_ii[] =
+		  { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+		int use_ascii (int i) {
+		  return ascii_mm[i] + ascii_ii[i];
+		}
+		short int ebcdic_ii[] =
+		  { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
+		short int ebcdic_mm[] =
+		  { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
+		int use_ebcdic (int i) {
+		  return ebcdic_mm[i] + ebcdic_ii[i];
+		}
+		extern int foo;
+
+int
+main ()
+{
+return use_ascii (foo) == use_ebcdic (foo);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
+	      ac_cv_c_bigendian=yes
+	    fi
+	    if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
+	      if test "$ac_cv_c_bigendian" = unknown; then
+		ac_cv_c_bigendian=no
+	      else
+		# finding both strings is unlikely to happen, but who knows?
+		ac_cv_c_bigendian=unknown
+	      fi
+	    fi
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+int
+main ()
+{
+
+	     /* Are we little or big endian?  From Harbison&Steele.  */
+	     union
+	     {
+	       long int l;
+	       char c[sizeof (long int)];
+	     } u;
+	     u.l = 1;
+	     return u.c[sizeof (long int) - 1] == 1;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  ac_cv_c_bigendian=no
+else
+  ac_cv_c_bigendian=yes
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+    fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
+$as_echo "$ac_cv_c_bigendian" >&6; }
+ case $ac_cv_c_bigendian in #(
+   yes)
+     $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
+;; #(
+   no)
+      ;; #(
+   universal)
+
+$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
+
+     ;; #(
+   *)
+     as_fn_error $? "unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
+ esac
 
 
 #------------------------------------------------------------------------
 # If Tcl and Tk are installed in different places, adjust the library
 # search path to reflect this.
@@ -7899,14 +6624,14 @@
 if test "$TCL_EXEC_PREFIX" != "$exec_prefix"; then
     LIB_RUNTIME_DIR="${LIB_RUNTIME_DIR}:${TCL_EXEC_PREFIX}/lib"
 fi
 
 if test "$TCL_PREFIX" != "$prefix"; then
-    { echo "$as_me:$LINENO: WARNING:
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
         Different --prefix selected for Tk and Tcl!
         [package require Tk] may not work correctly in tclsh." >&5
-echo "$as_me: WARNING:
+$as_echo "$as_me: WARNING:
         Different --prefix selected for Tk and Tcl!
         [package require Tk] may not work correctly in tclsh." >&2;}
 fi
 
 #--------------------------------------------------------------------
@@ -7917,21 +6642,17 @@
 #	other systems like SCO UNIX have a sys/select.h that's
 #	pernicious.  If "fd_set" isn't defined anywhere then set a
 #	special flag.
 #--------------------------------------------------------------------
 
-echo "$as_me:$LINENO: checking for fd_set in sys/types" >&5
-echo $ECHO_N "checking for fd_set in sys/types... $ECHO_C" >&6
-if test "${tcl_cv_type_fd_set+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fd_set in sys/types" >&5
+$as_echo_n "checking for fd_set in sys/types... " >&6; }
+if ${tcl_cv_type_fd_set+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
 
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 int
 main ()
 {
@@ -7938,252 +6659,78 @@
 fd_set readMask, writeMask;
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   tcl_cv_type_fd_set=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-tcl_cv_type_fd_set=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $tcl_cv_type_fd_set" >&5
-echo "${ECHO_T}$tcl_cv_type_fd_set" >&6
+  tcl_cv_type_fd_set=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_type_fd_set" >&5
+$as_echo "$tcl_cv_type_fd_set" >&6; }
 tk_ok=$tcl_cv_type_fd_set
 if test $tk_ok = no; then
-    echo "$as_me:$LINENO: checking for fd_mask in sys/select" >&5
-echo $ECHO_N "checking for fd_mask in sys/select... $ECHO_C" >&6
-if test "${tcl_cv_grep_fd_mask+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fd_mask in sys/select" >&5
+$as_echo_n "checking for fd_mask in sys/select... " >&6; }
+if ${tcl_cv_grep_fd_mask+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
 
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/select.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "fd_mask" >/dev/null 2>&1; then
+  $EGREP "fd_mask" >/dev/null 2>&1; then :
   tcl_cv_grep_fd_mask=present
 else
   tcl_cv_grep_fd_mask=missing
 fi
 rm -f conftest*
 
 fi
-echo "$as_me:$LINENO: result: $tcl_cv_grep_fd_mask" >&5
-echo "${ECHO_T}$tcl_cv_grep_fd_mask" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_grep_fd_mask" >&5
+$as_echo "$tcl_cv_grep_fd_mask" >&6; }
     if test $tcl_cv_grep_fd_mask = present; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SYS_SELECT_H 1
-_ACEOF
+$as_echo "#define HAVE_SYS_SELECT_H 1" >>confdefs.h
 
 	tk_ok=yes
     fi
 fi
 if test $tk_ok = no; then
 
-cat >>confdefs.h <<\_ACEOF
-#define NO_FD_SET 1
-_ACEOF
+$as_echo "#define NO_FD_SET 1" >>confdefs.h
 
 fi
 
 #------------------------------------------------------------------------------
 #       Find out all about time handling differences.
 #------------------------------------------------------------------------------
 
-
 for ac_header in sys/time.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ----------------------------- ##
-## Report this to the tk lists.  ##
-## ----------------------------- ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "sys/time.h" "ac_cv_header_sys_time_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_time_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_SYS_TIME_H 1
 _ACEOF
 
 fi
 
 done
 
-echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
-echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
-if test "${ac_cv_header_time+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
+$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
+if ${ac_cv_header_time+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <sys/time.h>
 #include <time.h>
 
@@ -8194,48 +6741,22 @@
 return 0;
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_header_time=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_header_time=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
-echo "${ECHO_T}$ac_cv_header_time" >&6
+  ac_cv_header_time=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5
+$as_echo "$ac_cv_header_time" >&6; }
 if test $ac_cv_header_time = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define TIME_WITH_SYS_TIME 1
-_ACEOF
+$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
 
 fi
 
 
 #--------------------------------------------------------------------
@@ -8244,121 +6765,28 @@
 #	and if the problem exists use a substitute procedure
 #	"fixstrtod" (provided by Tcl) that corrects the error.
 #--------------------------------------------------------------------
 
 
-    echo "$as_me:$LINENO: checking for strtod" >&5
-echo $ECHO_N "checking for strtod... $ECHO_C" >&6
-if test "${ac_cv_func_strtod+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define strtod to an innocuous variant, in case <limits.h> declares strtod.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define strtod innocuous_strtod
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char strtod (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef strtod
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char strtod ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_strtod) || defined (__stub___strtod)
-choke me
-#else
-char (*f) () = strtod;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != strtod;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_strtod=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_strtod=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_strtod" >&5
-echo "${ECHO_T}$ac_cv_func_strtod" >&6
-if test $ac_cv_func_strtod = yes; then
+    ac_fn_c_check_func "$LINENO" "strtod" "ac_cv_func_strtod"
+if test "x$ac_cv_func_strtod" = xyes; then :
   tcl_strtod=1
 else
   tcl_strtod=0
 fi
 
     if test "$tcl_strtod" = 1; then
-	echo "$as_me:$LINENO: checking for Solaris2.4/Tru64 strtod bugs" >&5
-echo $ECHO_N "checking for Solaris2.4/Tru64 strtod bugs... $ECHO_C" >&6
-if test "${tcl_cv_strtod_buggy+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Solaris2.4/Tru64 strtod bugs" >&5
+$as_echo_n "checking for Solaris2.4/Tru64 strtod bugs... " >&6; }
+if ${tcl_cv_strtod_buggy+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
 
-	    if test "$cross_compiling" = yes; then
+	    if test "$cross_compiling" = yes; then :
   tcl_cv_strtod_buggy=buggy
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 		extern double strtod();
 		int main() {
 		    char *infString="Inf", *nanString="NaN", *spaceString=" ";
@@ -8377,49 +6805,32 @@
 			exit(1);
 		    }
 		    exit(0);
 		}
 _ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   tcl_cv_strtod_buggy=ok
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-tcl_cv_strtod_buggy=buggy
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-echo "$as_me:$LINENO: result: $tcl_cv_strtod_buggy" >&5
-echo "${ECHO_T}$tcl_cv_strtod_buggy" >&6
+  tcl_cv_strtod_buggy=buggy
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_strtod_buggy" >&5
+$as_echo "$tcl_cv_strtod_buggy" >&6; }
 	if test "$tcl_cv_strtod_buggy" = buggy; then
-	    case $LIBOBJS in
-    "fixstrtod.$ac_objext"   | \
-  *" fixstrtod.$ac_objext"   | \
-    "fixstrtod.$ac_objext "* | \
+	    case " $LIBOBJS " in
   *" fixstrtod.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS fixstrtod.$ac_objext" ;;
+  *) LIBOBJS="$LIBOBJS fixstrtod.$ac_objext"
+ ;;
 esac
 
 	    USE_COMPAT=1
 
-cat >>confdefs.h <<\_ACEOF
-#define strtod fixstrtod
-_ACEOF
+$as_echo "#define strtod fixstrtod" >>confdefs.h
 
 	fi
     fi
 
 
@@ -8426,372 +6837,115 @@
 #--------------------------------------------------------------------
 #	Check for various typedefs and provide substitutes if
 #	they don't exist.
 #--------------------------------------------------------------------
 
-echo "$as_me:$LINENO: checking for mode_t" >&5
-echo $ECHO_N "checking for mode_t... $ECHO_C" >&6
-if test "${ac_cv_type_mode_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((mode_t *) 0)
-  return 0;
-if (sizeof (mode_t))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_mode_t=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_mode_t=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5
-echo "${ECHO_T}$ac_cv_type_mode_t" >&6
-if test $ac_cv_type_mode_t = yes; then
-  :
+ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default"
+if test "x$ac_cv_type_mode_t" = xyes; then :
+
 else
 
 cat >>confdefs.h <<_ACEOF
 #define mode_t int
 _ACEOF
 
 fi
 
-echo "$as_me:$LINENO: checking for pid_t" >&5
-echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
-if test "${ac_cv_type_pid_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((pid_t *) 0)
-  return 0;
-if (sizeof (pid_t))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_pid_t=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_pid_t=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
-echo "${ECHO_T}$ac_cv_type_pid_t" >&6
-if test $ac_cv_type_pid_t = yes; then
-  :
+ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
+if test "x$ac_cv_type_pid_t" = xyes; then :
+
 else
 
 cat >>confdefs.h <<_ACEOF
 #define pid_t int
 _ACEOF
 
 fi
 
-echo "$as_me:$LINENO: checking for size_t" >&5
-echo $ECHO_N "checking for size_t... $ECHO_C" >&6
-if test "${ac_cv_type_size_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((size_t *) 0)
-  return 0;
-if (sizeof (size_t))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_size_t=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_size_t=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-echo "${ECHO_T}$ac_cv_type_size_t" >&6
-if test $ac_cv_type_size_t = yes; then
-  :
+ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
+if test "x$ac_cv_type_size_t" = xyes; then :
+
 else
 
 cat >>confdefs.h <<_ACEOF
-#define size_t unsigned
+#define size_t unsigned int
 _ACEOF
 
 fi
 
-echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5
-echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6
-if test "${ac_cv_type_uid_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5
+$as_echo_n "checking for uid_t in sys/types.h... " >&6; }
+if ${ac_cv_type_uid_t+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "uid_t" >/dev/null 2>&1; then
+  $EGREP "uid_t" >/dev/null 2>&1; then :
   ac_cv_type_uid_t=yes
 else
   ac_cv_type_uid_t=no
 fi
 rm -f conftest*
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
-echo "${ECHO_T}$ac_cv_type_uid_t" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_uid_t" >&5
+$as_echo "$ac_cv_type_uid_t" >&6; }
 if test $ac_cv_type_uid_t = no; then
 
-cat >>confdefs.h <<\_ACEOF
-#define uid_t int
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define gid_t int
-_ACEOF
-
-fi
-
-
-echo "$as_me:$LINENO: checking for intptr_t" >&5
-echo $ECHO_N "checking for intptr_t... $ECHO_C" >&6
-if test "${ac_cv_type_intptr_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((intptr_t *) 0)
-  return 0;
-if (sizeof (intptr_t))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_intptr_t=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_intptr_t=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_intptr_t" >&5
-echo "${ECHO_T}$ac_cv_type_intptr_t" >&6
-if test $ac_cv_type_intptr_t = yes; then
-
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_INTPTR_T 1
-_ACEOF
-
-else
-
-    echo "$as_me:$LINENO: checking for pointer-size signed integer type" >&5
-echo $ECHO_N "checking for pointer-size signed integer type... $ECHO_C" >&6
-if test "${tcl_cv_intptr_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+$as_echo "#define uid_t int" >>confdefs.h
+
+
+$as_echo "#define gid_t int" >>confdefs.h
+
+fi
+
+
+ac_fn_c_check_type "$LINENO" "intptr_t" "ac_cv_type_intptr_t" "$ac_includes_default"
+if test "x$ac_cv_type_intptr_t" = xyes; then :
+
+
+$as_echo "#define HAVE_INTPTR_T 1" >>confdefs.h
+
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pointer-size signed integer type" >&5
+$as_echo_n "checking for pointer-size signed integer type... " >&6; }
+if ${tcl_cv_intptr_t+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
 
     for tcl_cv_intptr_t in "int" "long" "long long" none; do
 	if test "$tcl_cv_intptr_t" != none; then
-	    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
 int
 main ()
 {
 static int test_array [1 - 2 * !(sizeof (void *) <= sizeof ($tcl_cv_intptr_t))];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   tcl_ok=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-tcl_ok=no
+  tcl_ok=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 	    test "$tcl_ok" = yes && break; fi
     done
 fi
-echo "$as_me:$LINENO: result: $tcl_cv_intptr_t" >&5
-echo "${ECHO_T}$tcl_cv_intptr_t" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_intptr_t" >&5
+$as_echo "$tcl_cv_intptr_t" >&6; }
     if test "$tcl_cv_intptr_t" != none; then
 
 cat >>confdefs.h <<_ACEOF
 #define intptr_t $tcl_cv_intptr_t
 _ACEOF
@@ -8798,136 +6952,52 @@
 
     fi
 
 fi
 
-echo "$as_me:$LINENO: checking for uintptr_t" >&5
-echo $ECHO_N "checking for uintptr_t... $ECHO_C" >&6
-if test "${ac_cv_type_uintptr_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((uintptr_t *) 0)
-  return 0;
-if (sizeof (uintptr_t))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_uintptr_t=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_uintptr_t=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_uintptr_t" >&5
-echo "${ECHO_T}$ac_cv_type_uintptr_t" >&6
-if test $ac_cv_type_uintptr_t = yes; then
-
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_UINTPTR_T 1
-_ACEOF
-
-else
-
-    echo "$as_me:$LINENO: checking for pointer-size unsigned integer type" >&5
-echo $ECHO_N "checking for pointer-size unsigned integer type... $ECHO_C" >&6
-if test "${tcl_cv_uintptr_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+ac_fn_c_check_type "$LINENO" "uintptr_t" "ac_cv_type_uintptr_t" "$ac_includes_default"
+if test "x$ac_cv_type_uintptr_t" = xyes; then :
+
+
+$as_echo "#define HAVE_UINTPTR_T 1" >>confdefs.h
+
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pointer-size unsigned integer type" >&5
+$as_echo_n "checking for pointer-size unsigned integer type... " >&6; }
+if ${tcl_cv_uintptr_t+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
 
     for tcl_cv_uintptr_t in "unsigned int" "unsigned long" "unsigned long long" \
 	    none; do
 	if test "$tcl_cv_uintptr_t" != none; then
-	    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
 int
 main ()
 {
 static int test_array [1 - 2 * !(sizeof (void *) <= sizeof ($tcl_cv_uintptr_t))];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   tcl_ok=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-tcl_ok=no
+  tcl_ok=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 	    test "$tcl_ok" = yes && break; fi
     done
 fi
-echo "$as_me:$LINENO: result: $tcl_cv_uintptr_t" >&5
-echo "${ECHO_T}$tcl_cv_uintptr_t" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_uintptr_t" >&5
+$as_echo "$tcl_cv_uintptr_t" >&6; }
     if test "$tcl_cv_uintptr_t" != none; then
 
 cat >>confdefs.h <<_ACEOF
 #define uintptr_t $tcl_cv_uintptr_t
 _ACEOF
@@ -8939,21 +7009,17 @@
 
 #-------------------------------------------
 #     In OS/390 struct pwd has no pw_gecos field
 #-------------------------------------------
 
-echo "$as_me:$LINENO: checking pw_gecos in struct pwd" >&5
-echo $ECHO_N "checking pw_gecos in struct pwd... $ECHO_C" >&6
-if test "${tcl_cv_pwd_pw_gecos+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pw_gecos in struct pwd" >&5
+$as_echo_n "checking pw_gecos in struct pwd... " >&6; }
+if ${tcl_cv_pwd_pw_gecos+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
 
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <pwd.h>
 int
 main ()
 {
@@ -8960,103 +7026,73 @@
 struct passwd pwd; pwd.pw_gecos;
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   tcl_cv_pwd_pw_gecos=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-tcl_cv_pwd_pw_gecos=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $tcl_cv_pwd_pw_gecos" >&5
-echo "${ECHO_T}$tcl_cv_pwd_pw_gecos" >&6
+  tcl_cv_pwd_pw_gecos=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_pwd_pw_gecos" >&5
+$as_echo "$tcl_cv_pwd_pw_gecos" >&6; }
 if test $tcl_cv_pwd_pw_gecos = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PW_GECOS 1
-_ACEOF
+$as_echo "#define HAVE_PW_GECOS 1" >>confdefs.h
 
 fi
 
 #--------------------------------------------------------------------
 #	On Mac OS X, we can build either with X11 or with Aqua
 #--------------------------------------------------------------------
 
 if test "`uname -s`" = "Darwin" ; then
-    echo "$as_me:$LINENO: checking whether to use Aqua" >&5
-echo $ECHO_N "checking whether to use Aqua... $ECHO_C" >&6
-    # Check whether --enable-aqua or --disable-aqua was given.
-if test "${enable_aqua+set}" = set; then
-  enableval="$enable_aqua"
-  tk_aqua=$enableval
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use Aqua" >&5
+$as_echo_n "checking whether to use Aqua... " >&6; }
+    # Check whether --enable-aqua was given.
+if test "${enable_aqua+set}" = set; then :
+  enableval=$enable_aqua; tk_aqua=$enableval
 else
   tk_aqua=no
-fi;
+fi
+
     if test $tk_aqua = yes -o $tk_aqua = cocoa; then
 	tk_aqua=yes
 	if test $tcl_corefoundation = no; then
-	    { echo "$as_me:$LINENO: WARNING: Aqua can only be used when CoreFoundation is available" >&5
-echo "$as_me: WARNING: Aqua can only be used when CoreFoundation is available" >&2;}
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Aqua can only be used when CoreFoundation is available" >&5
+$as_echo "$as_me: WARNING: Aqua can only be used when CoreFoundation is available" >&2;}
 	    tk_aqua=no
 	fi
 	if test ! -d /System/Library/Frameworks/Cocoa.framework; then
-	    { echo "$as_me:$LINENO: WARNING: Aqua can only be used when Cocoa is available" >&5
-echo "$as_me: WARNING: Aqua can only be used when Cocoa is available" >&2;}
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Aqua can only be used when Cocoa is available" >&5
+$as_echo "$as_me: WARNING: Aqua can only be used when Cocoa is available" >&2;}
 	    tk_aqua=no
 	fi
 	if test "`uname -r | awk -F. '{print $1}'`" -lt 9; then
-	    { echo "$as_me:$LINENO: WARNING: Aqua requires Mac OS X 10.5 or later" >&5
-echo "$as_me: WARNING: Aqua requires Mac OS X 10.5 or later" >&2;}
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Aqua requires Mac OS X 10.5 or later" >&5
+$as_echo "$as_me: WARNING: Aqua requires Mac OS X 10.5 or later" >&2;}
 	    tk_aqua=no
 	fi
     fi
-    echo "$as_me:$LINENO: result: $tk_aqua" >&5
-echo "${ECHO_T}$tk_aqua" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tk_aqua" >&5
+$as_echo "$tk_aqua" >&6; }
     if test "$fat_32_64" = yes; then
 	if test $tk_aqua = no; then
-	    echo "$as_me:$LINENO: checking for 64-bit X11" >&5
-echo $ECHO_N "checking for 64-bit X11... $ECHO_C" >&6
-if test "${tcl_cv_lib_x11_64+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit X11" >&5
+$as_echo_n "checking for 64-bit X11... " >&6; }
+if ${tcl_cv_lib_x11_64+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
 
 		for v in CFLAGS CPPFLAGS LDFLAGS; do
 		    eval 'hold_'$v'="$'$v'";'$v'="`echo "$'$v' "|sed -e "s/-arch ppc / /g" -e "s/-arch i386 / /g"`"'
 		done
 		CPPFLAGS="$CPPFLAGS -I/usr/X11R6/include"
 		LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -lX11"
-		cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <X11/Xlib.h>
 int
 main ()
 {
@@ -9063,73 +7099,45 @@
 XrmInitialize();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   tcl_cv_lib_x11_64=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-tcl_cv_lib_x11_64=no
+  tcl_cv_lib_x11_64=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 		for v in CFLAGS CPPFLAGS LDFLAGS; do
 		    eval $v'="$hold_'$v'"'
 		done
 fi
-echo "$as_me:$LINENO: result: $tcl_cv_lib_x11_64" >&5
-echo "${ECHO_T}$tcl_cv_lib_x11_64" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_lib_x11_64" >&5
+$as_echo "$tcl_cv_lib_x11_64" >&6; }
 	fi
 	# remove 64-bit arch flags from CFLAGS et al. for combined 32 & 64 bit
 	# fat builds if configuration does not support 64-bit.
 	if test "$tcl_cv_lib_x11_64" = no; then
-	    { echo "$as_me:$LINENO: Removing 64-bit architectures from compiler & linker flags" >&5
-echo "$as_me: Removing 64-bit architectures from compiler & linker flags" >&6;}
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: Removing 64-bit architectures from compiler & linker flags" >&5
+$as_echo "$as_me: Removing 64-bit architectures from compiler & linker flags" >&6;}
 	    for v in CFLAGS CPPFLAGS LDFLAGS; do
 		eval $v'="`echo "$'$v' "|sed -e "s/-arch ppc64 / /g" -e "s/-arch x86_64 / /g"`"'
 	    done
 	fi
     fi
     if test $tk_aqua = no; then
 	# check if weak linking whole libraries is possible.
-	echo "$as_me:$LINENO: checking if ld accepts -weak-l flag" >&5
-echo $ECHO_N "checking if ld accepts -weak-l flag... $ECHO_C" >&6
-if test "${tcl_cv_ld_weak_l+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if ld accepts -weak-l flag" >&5
+$as_echo_n "checking if ld accepts -weak-l flag... " >&6; }
+if ${tcl_cv_ld_weak_l+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
 
 	    hold_ldflags=$LDFLAGS
 	    LDFLAGS="$LDFLAGS -Wl,-weak-lm"
-	    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <math.h>
 int
 main ()
 {
@@ -9136,209 +7144,43 @@
 double f = sin(1.0);
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   tcl_cv_ld_weak_l=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-tcl_cv_ld_weak_l=no
+  tcl_cv_ld_weak_l=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 	    LDFLAGS=$hold_ldflags
 fi
-echo "$as_me:$LINENO: result: $tcl_cv_ld_weak_l" >&5
-echo "${ECHO_T}$tcl_cv_ld_weak_l" >&6
-    fi
-
-for ac_header in AvailabilityMacros.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ----------------------------- ##
-## Report this to the tk lists.  ##
-## ----------------------------- ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_ld_weak_l" >&5
+$as_echo "$tcl_cv_ld_weak_l" >&6; }
+    fi
+    for ac_header in AvailabilityMacros.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "AvailabilityMacros.h" "ac_cv_header_AvailabilityMacros_h" "$ac_includes_default"
+if test "x$ac_cv_header_AvailabilityMacros_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define HAVE_AVAILABILITYMACROS_H 1
 _ACEOF
 
 fi
 
 done
 
     if test "$ac_cv_header_AvailabilityMacros_h" = yes; then
-	echo "$as_me:$LINENO: checking if weak import is available" >&5
-echo $ECHO_N "checking if weak import is available... $ECHO_C" >&6
-if test "${tcl_cv_cc_weak_import+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if weak import is available" >&5
+$as_echo_n "checking if weak import is available... " >&6; }
+if ${tcl_cv_cc_weak_import+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
 
 	    hold_cflags=$CFLAGS; CFLAGS="$CFLAGS -Werror"
-	    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 		    #ifdef __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__
 		    #if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1020
 		    #error __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1020
@@ -9354,64 +7196,34 @@
 rand();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   tcl_cv_cc_weak_import=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-tcl_cv_cc_weak_import=no
+  tcl_cv_cc_weak_import=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 	    CFLAGS=$hold_cflags
 fi
-echo "$as_me:$LINENO: result: $tcl_cv_cc_weak_import" >&5
-echo "${ECHO_T}$tcl_cv_cc_weak_import" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_cc_weak_import" >&5
+$as_echo "$tcl_cv_cc_weak_import" >&6; }
 	if test $tcl_cv_cc_weak_import = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_WEAK_IMPORT 1
-_ACEOF
+$as_echo "#define HAVE_WEAK_IMPORT 1" >>confdefs.h
 
 	fi
-	echo "$as_me:$LINENO: checking if Darwin SUSv3 extensions are available" >&5
-echo $ECHO_N "checking if Darwin SUSv3 extensions are available... $ECHO_C" >&6
-if test "${tcl_cv_cc_darwin_c_source+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if Darwin SUSv3 extensions are available" >&5
+$as_echo_n "checking if Darwin SUSv3 extensions are available... " >&6; }
+if ${tcl_cv_cc_darwin_c_source+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
 
 	    hold_cflags=$CFLAGS; CFLAGS="$CFLAGS -Werror"
-	    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 		    #ifdef __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__
 		    #if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1050
 		    #error __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1050
@@ -9428,70 +7240,40 @@
 
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   tcl_cv_cc_darwin_c_source=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-tcl_cv_cc_darwin_c_source=no
+  tcl_cv_cc_darwin_c_source=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 	    CFLAGS=$hold_cflags
 fi
-echo "$as_me:$LINENO: result: $tcl_cv_cc_darwin_c_source" >&5
-echo "${ECHO_T}$tcl_cv_cc_darwin_c_source" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_cc_darwin_c_source" >&5
+$as_echo "$tcl_cv_cc_darwin_c_source" >&6; }
 	if test $tcl_cv_cc_darwin_c_source = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define _DARWIN_C_SOURCE 1
-_ACEOF
+$as_echo "#define _DARWIN_C_SOURCE 1" >>confdefs.h
 
 	fi
     fi
 else
     tk_aqua=no
 fi
 
 if test $tk_aqua = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define MAC_OSX_TK 1
-_ACEOF
+$as_echo "#define MAC_OSX_TK 1" >>confdefs.h
 
     LIBS="$LIBS -framework Cocoa -framework Carbon -framework IOKit"
     EXTRA_CC_SWITCHES='-std=gnu99 -x objective-c'
     TK_WINDOWINGSYSTEM=AQUA
     if test -n "${enable_symbols}" -a "${enable_symbols}" != no; then
 
-cat >>confdefs.h <<\_ACEOF
-#define TK_MAC_DEBUG 1
-_ACEOF
+$as_echo "#define TK_MAC_DEBUG 1" >>confdefs.h
 
     fi
 else
     #--------------------------------------------------------------------
     #	Locate the X11 header files and the X11 library archive.  Try
@@ -9501,86 +7283,93 @@
     #	autoconf macro will return an include directory that contains
     #	no include files, so double-check its result just to be safe.
     #--------------------------------------------------------------------
 
 
-    echo "$as_me:$LINENO: checking for X" >&5
-echo $ECHO_N "checking for X... $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5
+$as_echo_n "checking for X... " >&6; }
 
 
-# Check whether --with-x or --without-x was given.
-if test "${with_x+set}" = set; then
-  withval="$with_x"
+# Check whether --with-x was given.
+if test "${with_x+set}" = set; then :
+  withval=$with_x;
+fi
 
-fi;
 # $have_x is `yes', `no', `disabled', or empty when we do not yet know.
 if test "x$with_x" = xno; then
   # The user explicitly disabled X.
   have_x=disabled
 else
-  if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then
-    # Both variables are already set.
-    have_x=yes
-  else
-    if test "${ac_cv_have_x+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  case $x_includes,$x_libraries in #(
+    *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #(
+    *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   # One or both of the vars are not set, and there is no cached value.
 ac_x_includes=no ac_x_libraries=no
-rm -fr conftest.dir
+rm -f -r conftest.dir
 if mkdir conftest.dir; then
   cd conftest.dir
-  # Make sure to not put "make" in the Imakefile rules, since we grep it out.
   cat >Imakefile <<'_ACEOF'
-acfindx:
-	@echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
+incroot:
+	@echo incroot='${INCROOT}'
+usrlibdir:
+	@echo usrlibdir='${USRLIBDIR}'
+libdir:
+	@echo libdir='${LIBDIR}'
 _ACEOF
-  if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
-    # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-    eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
+  if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
+    # GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+    for ac_var in incroot usrlibdir libdir; do
+      eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
+    done
     # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
-    for ac_extension in a so sl; do
-      if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
-	 test -f $ac_im_libdir/libX11.$ac_extension; then
+    for ac_extension in a so sl dylib la dll; do
+      if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
+	 test -f "$ac_im_libdir/libX11.$ac_extension"; then
 	ac_im_usrlibdir=$ac_im_libdir; break
       fi
     done
     # Screen out bogus values from the imake configuration.  They are
     # bogus both because they are the default anyway, and because
     # using them would break gcc on systems where it needs fixed includes.
     case $ac_im_incroot in
-	/usr/include) ;;
+	/usr/include) ac_x_includes= ;;
 	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
     esac
     case $ac_im_usrlibdir in
-	/usr/lib | /lib) ;;
+	/usr/lib | /usr/lib64 | /lib | /lib64) ;;
 	*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
     esac
   fi
   cd ..
-  rm -fr conftest.dir
+  rm -f -r conftest.dir
 fi
 
 # Standard set of common directories for X headers.
 # Check X11 before X11Rn because it is often a symlink to the current release.
 ac_x_header_dirs='
 /usr/X11/include
+/usr/X11R7/include
 /usr/X11R6/include
 /usr/X11R5/include
 /usr/X11R4/include
 
 /usr/include/X11
+/usr/include/X11R7
 /usr/include/X11R6
 /usr/include/X11R5
 /usr/include/X11R4
 
 /usr/local/X11/include
+/usr/local/X11R7/include
 /usr/local/X11R6/include
 /usr/local/X11R5/include
 /usr/local/X11R4/include
 
 /usr/local/include/X11
+/usr/local/include/X11R7
 /usr/local/include/X11R6
 /usr/local/include/X11R5
 /usr/local/include/X11R4
 
 /usr/X386/include
@@ -9598,63 +7387,35 @@
 /usr/openwin/share/include'
 
 if test "$ac_x_includes" = no; then
   # 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.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+if ac_fn_c_try_cpp "$LINENO"; then :
   # We can compile using X headers with no special include directory.
 ac_x_includes=
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
   for ac_dir in $ac_x_header_dirs; do
   if test -r "$ac_dir/X11/Xlib.h"; then
     ac_x_includes=$ac_dir
     break
   fi
 done
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 fi # $ac_x_includes = no
 
 if test "$ac_x_libraries" = no; then
   # Check for the libraries.
   # See if we find them without any special options.
   # Don't add to $LIBS permanently.
   ac_save_LIBS=$LIBS
   LIBS="-lX11 $LIBS"
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <X11/Xlib.h>
 int
 main ()
 {
@@ -9661,171 +7422,103 @@
 XrmInitialize ()
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
 ac_x_libraries=
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-LIBS=$ac_save_LIBS
-for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
+  LIBS=$ac_save_LIBS
+for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
 do
   # Don't even attempt the hair of trying to link an X program!
-  for ac_extension in a so sl; do
-    if test -r $ac_dir/libXt.$ac_extension; then
+  for ac_extension in a so sl dylib la dll; do
+    if test -r "$ac_dir/libX11.$ac_extension"; then
       ac_x_libraries=$ac_dir
       break 2
     fi
   done
 done
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi # $ac_x_libraries = no
 
-if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then
-  # Didn't find X anywhere.  Cache the known absence of X.
-  ac_cv_have_x="have_x=no"
-else
-  # Record where we found X for the cache.
-  ac_cv_have_x="have_x=yes \
-		ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries"
-fi
-fi
-
-  fi
+case $ac_x_includes,$ac_x_libraries in #(
+  no,* | *,no | *\'*)
+    # Didn't find X, or a directory has "'" in its name.
+    ac_cv_have_x="have_x=no";; #(
+  *)
+    # Record where we found X for the cache.
+    ac_cv_have_x="have_x=yes\
+	ac_x_includes='$ac_x_includes'\
+	ac_x_libraries='$ac_x_libraries'"
+esac
+fi
+;; #(
+    *) have_x=yes;;
+  esac
   eval "$ac_cv_have_x"
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:$LINENO: result: $have_x" >&5
-echo "${ECHO_T}$have_x" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_x" >&5
+$as_echo "$have_x" >&6; }
   no_x=yes
 else
   # If each of the values was on the command line, it overrides each guess.
   test "x$x_includes" = xNONE && x_includes=$ac_x_includes
   test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
   # Update the cache value to reflect the command line values.
-  ac_cv_have_x="have_x=yes \
-		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
-  echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
-echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
+  ac_cv_have_x="have_x=yes\
+	ac_x_includes='$x_includes'\
+	ac_x_libraries='$x_libraries'"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: libraries $x_libraries, headers $x_includes" >&5
+$as_echo "libraries $x_libraries, headers $x_includes" >&6; }
 fi
 
     not_really_there=""
     if test "$no_x" = ""; then
 	if test "$x_includes" = ""; then
-	    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
   not_really_there="yes"
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 	else
 	    if test ! -r $x_includes/X11/Xlib.h; then
 		not_really_there="yes"
 	    fi
 	fi
     fi
     if test "$no_x" = "yes" -o "$not_really_there" = "yes"; then
-	echo "$as_me:$LINENO: checking for X11 header files" >&5
-echo $ECHO_N "checking for X11 header files... $ECHO_C" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X11 header files" >&5
+$as_echo_n "checking for X11 header files... " >&6; }
 	found_xincludes="no"
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.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
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+if ac_fn_c_try_cpp "$LINENO"; then :
   found_xincludes="yes"
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
   found_xincludes="no"
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 	if test "$found_xincludes" = "no"; then
 	    dirs="/usr/unsupported/include /usr/local/include /usr/X386/include /usr/X11R6/include /usr/X11R5/include /usr/include/X11R5 /usr/include/X11R4 /usr/openwin/include /usr/X11/include /usr/sww/include"
 	    for i in $dirs ; do
 		if test -r $i/X11/Xlib.h; then
-		    echo "$as_me:$LINENO: result: $i" >&5
-echo "${ECHO_T}$i" >&6
+		    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $i" >&5
+$as_echo "$i" >&6; }
 		    XINCLUDES=" -I$i"
 		    found_xincludes="yes"
 		    break
 		fi
 	    done
@@ -9835,23 +7528,23 @@
 	    XINCLUDES="-I$x_includes"
 	    found_xincludes="yes"
 	fi
     fi
     if test "$found_xincludes" = "no"; then
-	echo "$as_me:$LINENO: result: couldn't find any!" >&5
-echo "${ECHO_T}couldn't find any!" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: couldn't find any!" >&5
+$as_echo "couldn't find any!" >&6; }
     fi
 
     if test "$no_x" = yes; then
-	echo "$as_me:$LINENO: checking for X11 libraries" >&5
-echo $ECHO_N "checking for X11 libraries... $ECHO_C" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X11 libraries" >&5
+$as_echo_n "checking for X11 libraries... " >&6; }
 	XLIBSW=nope
 	dirs="/usr/unsupported/lib /usr/local/lib /usr/X386/lib /usr/X11R6/lib /usr/X11R5/lib /usr/lib/X11R5 /usr/lib/X11R4 /usr/openwin/lib /usr/X11/lib /usr/sww/X11/lib"
 	for i in $dirs ; do
 	    if test -r $i/libX11.a -o -r $i/libX11.so -o -r $i/libX11.sl -o -r $i/libX11.dylib; then
-		echo "$as_me:$LINENO: result: $i" >&5
-echo "${ECHO_T}$i" >&6
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $i" >&5
+$as_echo "$i" >&6; }
 		XLIBSW="-L$i -lX11"
 		x_libraries="$i"
 		break
 	    fi
 	done
@@ -9861,82 +7554,54 @@
 	else
 	    XLIBSW="-L$x_libraries -lX11"
 	fi
     fi
     if test "$XLIBSW" = nope ; then
-	echo "$as_me:$LINENO: checking for XCreateWindow in -lXwindow" >&5
-echo $ECHO_N "checking for XCreateWindow in -lXwindow... $ECHO_C" >&6
-if test "${ac_cv_lib_Xwindow_XCreateWindow+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCreateWindow in -lXwindow" >&5
+$as_echo_n "checking for XCreateWindow in -lXwindow... " >&6; }
+if ${ac_cv_lib_Xwindow_XCreateWindow+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXwindow  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char XCreateWindow ();
 int
 main ()
 {
-XCreateWindow ();
+return XCreateWindow ();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_Xwindow_XCreateWindow=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_Xwindow_XCreateWindow=no
+  ac_cv_lib_Xwindow_XCreateWindow=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_Xwindow_XCreateWindow" >&5
-echo "${ECHO_T}$ac_cv_lib_Xwindow_XCreateWindow" >&6
-if test $ac_cv_lib_Xwindow_XCreateWindow = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xwindow_XCreateWindow" >&5
+$as_echo "$ac_cv_lib_Xwindow_XCreateWindow" >&6; }
+if test "x$ac_cv_lib_Xwindow_XCreateWindow" = xyes; then :
   XLIBSW=-lXwindow
 fi
 
     fi
     if test "$XLIBSW" = nope ; then
-	echo "$as_me:$LINENO: result: could not find any!  Using -lX11." >&5
-echo "${ECHO_T}could not find any!  Using -lX11." >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: could not find any!  Using -lX11." >&5
+$as_echo "could not find any!  Using -lX11." >&6; }
 	XLIBSW=-lX11
     fi
 
     TK_WINDOWINGSYSTEM=X11
 fi
@@ -9981,69 +7646,41 @@
 #	   To get around this problem, check for both libraries together
 #	   if -lsocket doesn't work by itself.
 #--------------------------------------------------------------------
 
 if test $tk_aqua = no; then
-    echo "$as_me:$LINENO: checking for main in -lXbsd" >&5
-echo $ECHO_N "checking for main in -lXbsd... $ECHO_C" >&6
-if test "${ac_cv_lib_Xbsd_main+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lXbsd" >&5
+$as_echo_n "checking for main in -lXbsd... " >&6; }
+if ${ac_cv_lib_Xbsd_main+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXbsd  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
 int
 main ()
 {
-main ();
+return main ();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_Xbsd_main=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_Xbsd_main=no
+  ac_cv_lib_Xbsd_main=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_Xbsd_main" >&5
-echo "${ECHO_T}$ac_cv_lib_Xbsd_main" >&6
-if test $ac_cv_lib_Xbsd_main = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xbsd_main" >&5
+$as_echo "$ac_cv_lib_Xbsd_main" >&6; }
+if test "x$ac_cv_lib_Xbsd_main" = xyes; then :
   LIBS="$LIBS -lXbsd"
 fi
 
 fi
 
@@ -10057,21 +7694,17 @@
 # Note: can't use ac_check_lib macro (at least, not in Autoconf 2.1)
 # because it can't deal with the "-" in the library name.
 #--------------------------------------------------------------------
 
 if test -d /usr/include/mit -a $tk_aqua = no; then
-    echo "$as_me:$LINENO: checking MIT X libraries" >&5
-echo $ECHO_N "checking MIT X libraries... $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking MIT X libraries" >&5
+$as_echo_n "checking MIT X libraries... " >&6; }
     tk_oldCFlags=$CFLAGS
     CFLAGS="$CFLAGS -I/usr/include/mit"
     tk_oldLibs=$LIBS
     LIBS="$LIBS -lX11-mit"
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 	#include <X11/Xlib.h>
 
 int
@@ -10082,136 +7715,66 @@
 
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-	echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+if ac_fn_c_try_link "$LINENO"; then :
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 	XLIBSW="-lX11-mit"
 	XINCLUDES="-I/usr/include/mit"
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
     CFLAGS=$tk_oldCFlags
     LIBS=$tk_oldLibs
 fi
 
 #--------------------------------------------------------------------
 #	Check for freetype / fontconfig / Xft support.
 #--------------------------------------------------------------------
 
 if test $tk_aqua = no; then
-    echo "$as_me:$LINENO: checking whether to use xft" >&5
-echo $ECHO_N "checking whether to use xft... $ECHO_C" >&6
-    # Check whether --enable-xft or --disable-xft was given.
-if test "${enable_xft+set}" = set; then
-  enableval="$enable_xft"
-  enable_xft=$enableval
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use xft" >&5
+$as_echo_n "checking whether to use xft... " >&6; }
+    # Check whether --enable-xft was given.
+if test "${enable_xft+set}" = set; then :
+  enableval=$enable_xft; enable_xft=$enableval
 else
   enable_xft="default"
-fi;
+fi
+
     XFT_CFLAGS=""
     XFT_LIBS=""
     if test "$enable_xft" = "no" ; then
-	echo "$as_me:$LINENO: result: $enable_xft" >&5
-echo "${ECHO_T}$enable_xft" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_xft" >&5
+$as_echo "$enable_xft" >&6; }
     else
 	found_xft="yes"
 			XFT_CFLAGS=`xft-config --cflags 2>/dev/null` || found_xft="no"
 	XFT_LIBS=`xft-config --libs 2>/dev/null` || found_xft="no"
 	if test "$found_xft" = "no" ; then
 	    found_xft=yes
 	    XFT_CFLAGS=`pkg-config --cflags xft 2>/dev/null` || found_xft="no"
 	    XFT_LIBS=`pkg-config --libs xft 2>/dev/null` || found_xft="no"
 	fi
-	echo "$as_me:$LINENO: result: $found_xft" >&5
-echo "${ECHO_T}$found_xft" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $found_xft" >&5
+$as_echo "$found_xft" >&6; }
 		if test "$found_xft" = "yes" ; then
 	    tk_oldCFlags=$CFLAGS
 	    CFLAGS="$CFLAGS $XINCLUDES $XFT_CFLAGS"
 	    tk_oldLibs=$LIBS
 	    LIBS="$tk_oldLIBS $XFT_LIBS $XLIBSW"
-	    echo "$as_me:$LINENO: checking for X11/Xft/Xft.h" >&5
-echo $ECHO_N "checking for X11/Xft/Xft.h... $ECHO_C" >&6
-if test "${ac_cv_header_X11_Xft_Xft_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <X11/Xlib.h>
-
-#include <X11/Xft/Xft.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_header_X11_Xft_Xft_h=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_header_X11_Xft_Xft_h=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xft_Xft_h" >&5
-echo "${ECHO_T}$ac_cv_header_X11_Xft_Xft_h" >&6
-if test $ac_cv_header_X11_Xft_Xft_h = yes; then
-  :
+	    ac_fn_c_check_header_compile "$LINENO" "X11/Xft/Xft.h" "ac_cv_header_X11_Xft_Xft_h" "#include <X11/Xlib.h>
+"
+if test "x$ac_cv_header_X11_Xft_Xft_h" = xyes; then :
+
 else
 
 		found_xft=no
 
 fi
@@ -10223,76 +7786,47 @@
 		if test "$found_xft" = "yes" ; then
 	    tk_oldCFlags=$CFLAGS
 	    CFLAGS="$CFLAGS $XINCLUDES $XFT_CFLAGS"
 	    tk_oldLibs=$LIBS
 	    LIBS="$tk_oldLIBS $XFT_LIBS $XLIBSW"
-
-echo "$as_me:$LINENO: checking for XftFontOpen in -lXft" >&5
-echo $ECHO_N "checking for XftFontOpen in -lXft... $ECHO_C" >&6
-if test "${ac_cv_lib_Xft_XftFontOpen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XftFontOpen in -lXft" >&5
+$as_echo_n "checking for XftFontOpen in -lXft... " >&6; }
+if ${ac_cv_lib_Xft_XftFontOpen+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXft  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char XftFontOpen ();
 int
 main ()
 {
-XftFontOpen ();
+return XftFontOpen ();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_Xft_XftFontOpen=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_Xft_XftFontOpen=no
+  ac_cv_lib_Xft_XftFontOpen=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_Xft_XftFontOpen" >&5
-echo "${ECHO_T}$ac_cv_lib_Xft_XftFontOpen" >&6
-if test $ac_cv_lib_Xft_XftFontOpen = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xft_XftFontOpen" >&5
+$as_echo "$ac_cv_lib_Xft_XftFontOpen" >&6; }
+if test "x$ac_cv_lib_Xft_XftFontOpen" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBXFT 1
 _ACEOF
 
   LIBS="-lXft $LIBS"
@@ -10309,75 +7843,47 @@
 		if test "$found_xft" = "yes" ; then
 	    tk_oldCFlags=$CFLAGS
 	    CFLAGS="$CFLAGS $XINCLUDES $XFT_CFLAGS"
 	    tk_oldLibs=$LIBS
 	    LIBS="$tk_oldLIBS $XFT_LIBS $XLIBSW -lfontconfig"
-	    echo "$as_me:$LINENO: checking for FcFontSort in -lfontconfig" >&5
-echo $ECHO_N "checking for FcFontSort in -lfontconfig... $ECHO_C" >&6
-if test "${ac_cv_lib_fontconfig_FcFontSort+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FcFontSort in -lfontconfig" >&5
+$as_echo_n "checking for FcFontSort in -lfontconfig... " >&6; }
+if ${ac_cv_lib_fontconfig_FcFontSort+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lfontconfig  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char FcFontSort ();
 int
 main ()
 {
-FcFontSort ();
+return FcFontSort ();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_fontconfig_FcFontSort=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_fontconfig_FcFontSort=no
+  ac_cv_lib_fontconfig_FcFontSort=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_fontconfig_FcFontSort" >&5
-echo "${ECHO_T}$ac_cv_lib_fontconfig_FcFontSort" >&6
-if test $ac_cv_lib_fontconfig_FcFontSort = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fontconfig_FcFontSort" >&5
+$as_echo "$ac_cv_lib_fontconfig_FcFontSort" >&6; }
+if test "x$ac_cv_lib_fontconfig_FcFontSort" = xyes; then :
 
 		XFT_LIBS="$XFT_LIBS -lfontconfig"
 
 fi
 
@@ -10384,12 +7890,12 @@
 	    CFLAGS=$tk_oldCFlags
 	    LIBS=$tk_oldLibs
 	fi
 		if test "$found_xft" = "no" ; then
 	    if test "$enable_xft" = "yes" ; then
-		{ echo "$as_me:$LINENO: WARNING: Can't find xft configuration, or xft is unusable" >&5
-echo "$as_me: WARNING: Can't find xft configuration, or xft is unusable" >&2;}
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Can't find xft configuration, or xft is unusable" >&5
+$as_echo "$as_me: WARNING: Can't find xft configuration, or xft is unusable" >&2;}
 	    fi
 	    enable_xft=no
 	    XFT_CFLAGS=""
 	    XFT_LIBS=""
 	else
@@ -10397,13 +7903,11 @@
 	fi
     fi
     if test $enable_xft = "yes" ; then
 	UNIX_FONT_OBJS=tkUnixRFont.o
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_XFT 1
-_ACEOF
+$as_echo "#define HAVE_XFT 1" >>confdefs.h
 
     else
 	UNIX_FONT_OBJS=tkUnixFont.o
     fi
 
@@ -10418,59 +7922,13 @@
 if test $tk_aqua = no; then
     tk_oldCFlags=$CFLAGS
     tk_oldLibs=$LIBS
     CFLAGS="$CFLAGS $XINCLUDES"
     LIBS="$LIBS $XLIBSW"
-    echo "$as_me:$LINENO: checking for X11/XKBlib.h" >&5
-echo $ECHO_N "checking for X11/XKBlib.h... $ECHO_C" >&6
-if test "${ac_cv_header_X11_XKBlib_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <X11/Xlib.h>
-
-#include <X11/XKBlib.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_header_X11_XKBlib_h=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_header_X11_XKBlib_h=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_X11_XKBlib_h" >&5
-echo "${ECHO_T}$ac_cv_header_X11_XKBlib_h" >&6
-if test $ac_cv_header_X11_XKBlib_h = yes; then
+    ac_fn_c_check_header_compile "$LINENO" "X11/XKBlib.h" "ac_cv_header_X11_XKBlib_h" "#include <X11/Xlib.h>
+"
+if test "x$ac_cv_header_X11_XKBlib_h" = xyes; then :
 
 	xkblib_header_found=yes
 
 else
 
@@ -10478,75 +7936,47 @@
 
 fi
 
 
     if test $xkblib_header_found = "yes" ; then
-	echo "$as_me:$LINENO: checking for XkbKeycodeToKeysym in -lX11" >&5
-echo $ECHO_N "checking for XkbKeycodeToKeysym in -lX11... $ECHO_C" >&6
-if test "${ac_cv_lib_X11_XkbKeycodeToKeysym+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XkbKeycodeToKeysym in -lX11" >&5
+$as_echo_n "checking for XkbKeycodeToKeysym in -lX11... " >&6; }
+if ${ac_cv_lib_X11_XkbKeycodeToKeysym+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char XkbKeycodeToKeysym ();
 int
 main ()
 {
-XkbKeycodeToKeysym ();
+return XkbKeycodeToKeysym ();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_X11_XkbKeycodeToKeysym=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_X11_XkbKeycodeToKeysym=no
+  ac_cv_lib_X11_XkbKeycodeToKeysym=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_X11_XkbKeycodeToKeysym" >&5
-echo "${ECHO_T}$ac_cv_lib_X11_XkbKeycodeToKeysym" >&6
-if test $ac_cv_lib_X11_XkbKeycodeToKeysym = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_X11_XkbKeycodeToKeysym" >&5
+$as_echo "$ac_cv_lib_X11_XkbKeycodeToKeysym" >&6; }
+if test "x$ac_cv_lib_X11_XkbKeycodeToKeysym" = xyes; then :
 
 	    xkbkeycodetokeysym_found=yes
 
 else
 
@@ -10557,13 +7987,11 @@
     else
 	xkbkeycodetokeysym_found=no
     fi
     if test $xkbkeycodetokeysym_found = "yes" ; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_XKBKEYCODETOKEYSYM 1
-_ACEOF
+$as_echo "#define HAVE_XKBKEYCODETOKEYSYM 1" >>confdefs.h
 
     fi
     CFLAGS=$tk_oldCFlags
     LIBS=$tk_oldLibs
 fi
@@ -10571,19 +7999,15 @@
 #--------------------------------------------------------------------
 # Check whether XKeycodeToKeysym is deprecated in X11 headers.
 #--------------------------------------------------------------------
 
 if test $tk_aqua = no && test "$GCC" = yes; then
-    echo "$as_me:$LINENO: checking whether XKeycodeToKeysym is deprecated" >&5
-echo $ECHO_N "checking whether XKeycodeToKeysym is deprecated... $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether XKeycodeToKeysym is deprecated" >&5
+$as_echo_n "checking whether XKeycodeToKeysym is deprecated... " >&6; }
     tk_oldCFlags=$CFLAGS
     CFLAGS="$CFLAGS -Werror"
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 	#include <X11/Xlib.h>
 
 int
@@ -10594,52 +8018,26 @@
 
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-	echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+if ac_fn_c_try_link "$LINENO"; then :
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
-cat >>confdefs.h <<\_ACEOF
-#define XKEYCODETOKEYSYM_IS_DEPRECATED 1
-_ACEOF
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define XKEYCODETOKEYSYM_IS_DEPRECATED 1" >>confdefs.h
 
 
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
     CFLAGS=$tk_oldCFlags
 fi
 
 #--------------------------------------------------------------------
 # XXX Do this last.
@@ -10655,310 +8053,119 @@
     CFLAGS="$CFLAGS $XINCLUDES"
     tk_oldLibs=$LIBS
     LIBS="$tk_oldLibs $XLIBSW"
     xss_header_found=no
     xss_lib_found=no
-    echo "$as_me:$LINENO: checking whether to try to use XScreenSaver" >&5
-echo $ECHO_N "checking whether to try to use XScreenSaver... $ECHO_C" >&6
-    # Check whether --enable-xss or --disable-xss was given.
-if test "${enable_xss+set}" = set; then
-  enableval="$enable_xss"
-  enable_xss=$enableval
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to try to use XScreenSaver" >&5
+$as_echo_n "checking whether to try to use XScreenSaver... " >&6; }
+    # Check whether --enable-xss was given.
+if test "${enable_xss+set}" = set; then :
+  enableval=$enable_xss; enable_xss=$enableval
 else
   enable_xss=yes
-fi;
-    if test "$enable_xss" = "no" ; then
-	echo "$as_me:$LINENO: result: $enable_xss" >&5
-echo "${ECHO_T}$enable_xss" >&6
-    else
-	echo "$as_me:$LINENO: result: $enable_xss" >&5
-echo "${ECHO_T}$enable_xss" >&6
-	echo "$as_me:$LINENO: checking for X11/extensions/scrnsaver.h" >&5
-echo $ECHO_N "checking for X11/extensions/scrnsaver.h... $ECHO_C" >&6
-if test "${ac_cv_header_X11_extensions_scrnsaver_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <X11/Xlib.h>
-
-#include <X11/extensions/scrnsaver.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_header_X11_extensions_scrnsaver_h=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_header_X11_extensions_scrnsaver_h=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_scrnsaver_h" >&5
-echo "${ECHO_T}$ac_cv_header_X11_extensions_scrnsaver_h" >&6
-if test $ac_cv_header_X11_extensions_scrnsaver_h = yes; then
+fi
+
+    if test "$enable_xss" = "no" ; then
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_xss" >&5
+$as_echo "$enable_xss" >&6; }
+    else
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_xss" >&5
+$as_echo "$enable_xss" >&6; }
+	ac_fn_c_check_header_compile "$LINENO" "X11/extensions/scrnsaver.h" "ac_cv_header_X11_extensions_scrnsaver_h" "#include <X11/Xlib.h>
+"
+if test "x$ac_cv_header_X11_extensions_scrnsaver_h" = xyes; then :
 
 	    xss_header_found=yes
 
 fi
 
 
-	echo "$as_me:$LINENO: checking for XScreenSaverQueryInfo" >&5
-echo $ECHO_N "checking for XScreenSaverQueryInfo... $ECHO_C" >&6
-if test "${ac_cv_func_XScreenSaverQueryInfo+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define XScreenSaverQueryInfo to an innocuous variant, in case <limits.h> declares XScreenSaverQueryInfo.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define XScreenSaverQueryInfo innocuous_XScreenSaverQueryInfo
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char XScreenSaverQueryInfo (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef XScreenSaverQueryInfo
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char XScreenSaverQueryInfo ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_XScreenSaverQueryInfo) || defined (__stub___XScreenSaverQueryInfo)
-choke me
-#else
-char (*f) () = XScreenSaverQueryInfo;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != XScreenSaverQueryInfo;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_XScreenSaverQueryInfo=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_XScreenSaverQueryInfo=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_XScreenSaverQueryInfo" >&5
-echo "${ECHO_T}$ac_cv_func_XScreenSaverQueryInfo" >&6
-if test $ac_cv_func_XScreenSaverQueryInfo = yes; then
-  :
-else
-
-	    echo "$as_me:$LINENO: checking for XScreenSaverQueryInfo in -lXext" >&5
-echo $ECHO_N "checking for XScreenSaverQueryInfo in -lXext... $ECHO_C" >&6
-if test "${ac_cv_lib_Xext_XScreenSaverQueryInfo+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lXext  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char XScreenSaverQueryInfo ();
-int
-main ()
-{
-XScreenSaverQueryInfo ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_Xext_XScreenSaverQueryInfo=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_Xext_XScreenSaverQueryInfo=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XScreenSaverQueryInfo" >&5
-echo "${ECHO_T}$ac_cv_lib_Xext_XScreenSaverQueryInfo" >&6
-if test $ac_cv_lib_Xext_XScreenSaverQueryInfo = yes; then
+	ac_fn_c_check_func "$LINENO" "XScreenSaverQueryInfo" "ac_cv_func_XScreenSaverQueryInfo"
+if test "x$ac_cv_func_XScreenSaverQueryInfo" = xyes; then :
+
+else
+
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XScreenSaverQueryInfo in -lXext" >&5
+$as_echo_n "checking for XScreenSaverQueryInfo in -lXext... " >&6; }
+if ${ac_cv_lib_Xext_XScreenSaverQueryInfo+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lXext  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char XScreenSaverQueryInfo ();
+int
+main ()
+{
+return XScreenSaverQueryInfo ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_Xext_XScreenSaverQueryInfo=yes
+else
+  ac_cv_lib_Xext_XScreenSaverQueryInfo=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xext_XScreenSaverQueryInfo" >&5
+$as_echo "$ac_cv_lib_Xext_XScreenSaverQueryInfo" >&6; }
+if test "x$ac_cv_lib_Xext_XScreenSaverQueryInfo" = xyes; then :
 
 		XLIBSW="$XLIBSW -lXext"
 		xss_lib_found=yes
 
 else
 
-		echo "$as_me:$LINENO: checking for XScreenSaverQueryInfo in -lXss" >&5
-echo $ECHO_N "checking for XScreenSaverQueryInfo in -lXss... $ECHO_C" >&6
-if test "${ac_cv_lib_Xss_XScreenSaverQueryInfo+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XScreenSaverQueryInfo in -lXss" >&5
+$as_echo_n "checking for XScreenSaverQueryInfo in -lXss... " >&6; }
+if ${ac_cv_lib_Xss_XScreenSaverQueryInfo+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXss -lXext $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-/* Override any gcc2 internal prototype to avoid an error.  */
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
 char XScreenSaverQueryInfo ();
 int
 main ()
 {
-XScreenSaverQueryInfo ();
+return XScreenSaverQueryInfo ();
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_Xss_XScreenSaverQueryInfo=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_Xss_XScreenSaverQueryInfo=no
+  ac_cv_lib_Xss_XScreenSaverQueryInfo=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_Xss_XScreenSaverQueryInfo" >&5
-echo "${ECHO_T}$ac_cv_lib_Xss_XScreenSaverQueryInfo" >&6
-if test $ac_cv_lib_Xss_XScreenSaverQueryInfo = yes; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xss_XScreenSaverQueryInfo" >&5
+$as_echo "$ac_cv_lib_Xss_XScreenSaverQueryInfo" >&6; }
+if test "x$ac_cv_lib_Xss_XScreenSaverQueryInfo" = xyes; then :
 
 		    if test "$tcl_cv_ld_weak_l" = yes; then
 			# On Darwin, weak link libXss if possible,
 			# as it is only available on Tiger or later.
 			XLIBSW="$XLIBSW -Wl,-weak-lXss -lXext"
@@ -10976,13 +8183,11 @@
 fi
 
     fi
     if test $enable_xss = yes -a $xss_lib_found = yes -a $xss_header_found = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_XSS 1
-_ACEOF
+$as_echo "#define HAVE_XSS 1" >>confdefs.h
 
     fi
     CFLAGS=$tk_oldCFlags
     LIBS=$tk_oldLibs
 fi
@@ -10990,70 +8195,40 @@
 #--------------------------------------------------------------------
 #	Figure out whether "char" is unsigned.  If so, set a
 #	#define for __CHAR_UNSIGNED__.
 #--------------------------------------------------------------------
 
-
-echo "$as_me:$LINENO: checking whether char is unsigned" >&5
-echo $ECHO_N "checking whether char is unsigned... $ECHO_C" >&6
-if test "${ac_cv_c_char_unsigned+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether char is unsigned" >&5
+$as_echo_n "checking whether char is unsigned... " >&6; }
+if ${ac_cv_c_char_unsigned+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
 int
 main ()
 {
 static int test_array [1 - 2 * !(((char) -1) < 0)];
-test_array [0] = 0
+test_array [0] = 0;
+return test_array [0];
 
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_c_char_unsigned=no
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_c_char_unsigned=yes
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_c_char_unsigned" >&5
-echo "${ECHO_T}$ac_cv_c_char_unsigned" >&6
+  ac_cv_c_char_unsigned=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_char_unsigned" >&5
+$as_echo "$ac_cv_c_char_unsigned" >&6; }
 if test $ac_cv_c_char_unsigned = yes && test "$GCC" != yes; then
-  cat >>confdefs.h <<\_ACEOF
-#define __CHAR_UNSIGNED__ 1
-_ACEOF
+  $as_echo "#define __CHAR_UNSIGNED__ 1" >>confdefs.h
 
 fi
 
 
 #--------------------------------------------------------------------
@@ -11088,42 +8263,42 @@
 # up the Tcl library.
 
 if test "`uname -s`" = "Darwin" ; then
 
     if test "`uname -s`" = "Darwin" ; then
-	echo "$as_me:$LINENO: checking how to package libraries" >&5
-echo $ECHO_N "checking how to package libraries... $ECHO_C" >&6
-	# Check whether --enable-framework or --disable-framework was given.
-if test "${enable_framework+set}" = set; then
-  enableval="$enable_framework"
-  enable_framework=$enableval
-else
-  enable_framework=no
-fi;
-	if test $enable_framework = yes; then
-	    if test $SHARED_BUILD = 0; then
-		{ echo "$as_me:$LINENO: WARNING: Frameworks can only be built if --enable-shared is yes" >&5
-echo "$as_me: WARNING: Frameworks can only be built if --enable-shared is yes" >&2;}
-		enable_framework=no
-	    fi
-	    if test $tcl_corefoundation = no; then
-		{ echo "$as_me:$LINENO: WARNING: Frameworks can only be used when CoreFoundation is available" >&5
-echo "$as_me: WARNING: Frameworks can only be used when CoreFoundation is available" >&2;}
-		enable_framework=no
-	    fi
-	fi
-	if test $enable_framework = yes; then
-	    echo "$as_me:$LINENO: result: framework" >&5
-echo "${ECHO_T}framework" >&6
-	    FRAMEWORK_BUILD=1
-	else
-	    if test $SHARED_BUILD = 1; then
-		echo "$as_me:$LINENO: result: shared library" >&5
-echo "${ECHO_T}shared library" >&6
-	    else
-		echo "$as_me:$LINENO: result: static library" >&5
-echo "${ECHO_T}static library" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to package libraries" >&5
+$as_echo_n "checking how to package libraries... " >&6; }
+	# Check whether --enable-framework was given.
+if test "${enable_framework+set}" = set; then :
+  enableval=$enable_framework; enable_framework=$enableval
+else
+  enable_framework=no
+fi
+
+	if test $enable_framework = yes; then
+	    if test $SHARED_BUILD = 0; then
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Frameworks can only be built if --enable-shared is yes" >&5
+$as_echo "$as_me: WARNING: Frameworks can only be built if --enable-shared is yes" >&2;}
+		enable_framework=no
+	    fi
+	    if test $tcl_corefoundation = no; then
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Frameworks can only be used when CoreFoundation is available" >&5
+$as_echo "$as_me: WARNING: Frameworks can only be used when CoreFoundation is available" >&2;}
+		enable_framework=no
+	    fi
+	fi
+	if test $enable_framework = yes; then
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: framework" >&5
+$as_echo "framework" >&6; }
+	    FRAMEWORK_BUILD=1
+	else
+	    if test $SHARED_BUILD = 1; then
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: shared library" >&5
+$as_echo "shared library" >&6; }
+	    else
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static library" >&5
+$as_echo "static library" >&6; }
 	    fi
 	    FRAMEWORK_BUILD=0
 	fi
     fi
 
@@ -11131,25 +8306,23 @@
     TK_SHLIB_LD_EXTRAS="${TK_SHLIB_LD_EXTRAS}"' -install_name "${DYLIB_INSTALL_DIR}/${TK_LIB_FILE}" -unexported_symbols_list $$(f=$(TK_LIB_FILE).E && nm -gp tkMacOSX*.o 2>/dev/null | awk "/^[0-9a-f]+ . \.objc/ {print \$$3}" > $$f && nm -gjp "$(TCL_BIN_DIR)"/$(TCL_STUB_LIB_FILE) | grep ^_[^_] >> $$f && echo $$f)'
     echo "$LDFLAGS " | grep -q -- '-prebind ' && TK_SHLIB_LD_EXTRAS="${TK_SHLIB_LD_EXTRAS}"' -seg1addr 0xb000000'
     TK_SHLIB_LD_EXTRAS="${TK_SHLIB_LD_EXTRAS}"' -sectcreate __TEXT __info_plist Tk-Info.plist'
     EXTRA_WISH_LIBS='-sectcreate __TEXT __info_plist Wish-Info.plist'
     EXTRA_APP_CC_SWITCHES="${EXTRA_APP_CC_SWITCHES}"' -mdynamic-no-pic'
-                        ac_config_files="$ac_config_files Tk-Info.plist:../macosx/Tk-Info.plist.in Wish-Info.plist:../macosx/Wish-Info.plist.in"
+    ac_config_files="$ac_config_files Tk-Info.plist:../macosx/Tk-Info.plist.in Wish-Info.plist:../macosx/Wish-Info.plist.in"
 
     for l in ${LOCALES}; do CFBUNDLELOCALIZATIONS="${CFBUNDLELOCALIZATIONS}<string>$l</string>"; done
     TK_YEAR="`date +%Y`"
 fi
 
 if test "$FRAMEWORK_BUILD" = "1" ; then
 
-cat >>confdefs.h <<\_ACEOF
-#define TK_FRAMEWORK 1
-_ACEOF
+$as_echo "#define TK_FRAMEWORK 1" >>confdefs.h
 
     # Construct a fake local framework structure to make linking with
     # '-framework Tk' and running of tktest work
-              ac_config_commands="$ac_config_commands Tk.framework"
+    ac_config_commands="$ac_config_commands Tk.framework"
 
     LD_LIBRARY_PATH_VAR="DYLD_FRAMEWORK_PATH"
     if test "${libdir}" = '${exec_prefix}/lib'; then
         # override libdir default
         libdir="/Library/Frameworks"
@@ -11283,11 +8456,11 @@
 
 
 
 
 
-                              ac_config_files="$ac_config_files Makefile:../unix/Makefile.in tkConfig.sh:../unix/tkConfig.sh.in tk.pc:../unix/tk.pc.in"
+ac_config_files="$ac_config_files Makefile:../unix/Makefile.in tkConfig.sh:../unix/tkConfig.sh.in tk.pc:../unix/tk.pc.in"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
 # scripts and configure runs, see configure's option --config-cache.
@@ -11303,516 +8476,659 @@
 
 _ACEOF
 
 # The following way of writing the cache mishandles newlines in values,
 # but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
+# So, we kill variables containing newlines.
 # Ultrix sh set writes to stderr and can't be redirected directly,
 # and sets the high bit in the cache file unless we assign to the vars.
-{
+(
+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
+      esac ;;
+    esac
+  done
+
   (set) 2>&1 |
-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      # `set' does not quote correctly, so add quotes: double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \.
       sed -n \
 	"s/'/'\\\\''/g;
 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;;
+      ;; #(
     *)
       # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
       ;;
-    esac;
-} |
+    esac |
+    sort
+) |
   sed '
+     /^ac_cv_env_/b end
      t clear
-     : clear
+     :clear
      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
      t end
-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
-  if test -w $cache_file; then
-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-    cat confcache >$cache_file
+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     :end' >>confcache
+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+  if test -w "$cache_file"; then
+    if test "x$cache_file" != "x/dev/null"; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
+      if test ! -f "$cache_file" || test -h "$cache_file"; then
+	cat confcache >"$cache_file"
+      else
+        case $cache_file in #(
+        */* | ?:*)
+	  mv -f confcache "$cache_file"$$ &&
+	  mv -f "$cache_file"$$ "$cache_file" ;; #(
+        *)
+	  mv -f confcache "$cache_file" ;;
+	esac
+      fi
+    fi
   else
-    echo "not updating unwritable cache $cache_file"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
 
 test "x$prefix" = xNONE && prefix=$ac_default_prefix
 # Let make expand exec_prefix.
 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
 
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/;
-s/:*\${srcdir}:*/:/;
-s/:*@srcdir@:*/:/;
-s/^\([^=]*=[	 ]*\):*/\1/;
-s/:*$//;
-s/^[^=]*=[	 ]*$//;
-}'
-fi
-
 # Transform confdefs.h into DEFS.
 # Protect against shell expansion while executing Makefile rules.
 # Protect against Makefile macro expansion.
 #
 # If the first sed substitution is executed (which looks for macros that
-# take arguments), then we branch to the quote section.  Otherwise,
-# look for a macro that doesn't take arguments.
-cat >confdef2opt.sed <<\_ACEOF
-t clear
-: clear
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*([^)]*)\)[	 ]*\(.*\),-D\1=\2,g
-t quote
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\),-D\1=\2,g
-t quote
-d
-: quote
-s,[	 `~#$^&*(){}\\|;'"<>?],\\&,g
-s,\[,\\&,g
-s,\],\\&,g
-s,\$,$$,g
-p
-_ACEOF
-# We use echo to avoid assuming a particular line-breaking character.
-# The extra dot is to prevent the shell from consuming trailing
-# line-breaks from the sub-command output.  A line-break within
-# single-quotes doesn't work because, if this script is created in a
-# platform that uses two characters for line-breaks (e.g., DOS), tr
-# would break.
-ac_LF_and_DOT=`echo; echo .`
-DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
-rm -f confdef2opt.sed
+# take arguments), then branch to the quote section.  Otherwise,
+# look for a macro that doesn't take arguments.
+ac_script='
+:mline
+/\\$/{
+ N
+ s,\\\n,,
+ b mline
+}
+t clear
+:clear
+s/^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*([^)]*)\)[	 ]*\(.*\)/-D\1=\2/g
+t quote
+s/^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\)/-D\1=\2/g
+t quote
+b any
+:quote
+s/[	 `~#$^&*(){}\\|;'\''"<>?]/\\&/g
+s/\[/\\&/g
+s/\]/\\&/g
+s/\$/$$/g
+H
+:any
+${
+	g
+	s/^\n//
+	s/\n/ /g
+	p
+}
+'
+DEFS=`sed -n "$ac_script" confdefs.h`
 
 
 ac_libobjs=
 ac_ltlibobjs=
+U=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
-  ac_i=`echo "$ac_i" |
-	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
-  # 2. Add them.
-  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
+  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
+  #    will be set to the directory where LIBOBJS objects are built.
+  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
 done
 LIBOBJS=$ac_libobjs
 
 LTLIBOBJS=$ac_ltlibobjs
 
 
 CFLAGS="${CFLAGS} ${CPPFLAGS}"; CPPFLAGS=""
 
-: ${CONFIG_STATUS=./config.status}
+
+: "${CONFIG_STATUS=./config.status}"
+ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+as_write_fail=0
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
 # Compiler output produced by configure, useful for debugging
 # configure, is in config.log if it exists.
 
 debug=false
 ac_cs_recheck=false
 ac_cs_silent=false
+
 SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+export SHELL
+_ASEOF
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
+case $0 in #((
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
+fi
+
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
 PS1='$ '
 PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-done
+  $as_echo "$as_me: error: $2" >&2
+  as_fn_exit $as_status
+} # as_fn_error
 
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
 else
   as_expr=false
 fi
 
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
   as_basename=basename
 else
   as_basename=false
 fi
 
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
 
-# Name of the executable.
-as_me=`$as_basename "$0" ||
+as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
 # Avoid depending upon Character Ranges.
 as_cr_letters='abcdefghijklmnopqrstuvwxyz'
 as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
 as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in #(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -pR'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -pR'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -pR'
+  fi
+else
+  as_ln_s='cp -pR'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p='mkdir -p "$as_dir"'
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
 fi
 
-as_executable_p="test -f"
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
 
 # Sed expression to map a string onto a valid variable name.
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
 exec 6>&1
+## ----------------------------------- ##
+## Main body of $CONFIG_STATUS script. ##
+## ----------------------------------- ##
+_ASEOF
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
 
-# Open the log real soon, to keep \$[0] and so on meaningful, and to
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# Save the log message, to keep $0 and so on meaningful, and to
 # report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.  Logging --version etc. is OK.
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-} >&5
-cat >&5 <<_CSEOF
-
-This file was extended by tk $as_me 8.6, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
+# values after options handling.
+ac_log="
+This file was extended by tk $as_me 8.7, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
   CONFIG_LINKS    = $CONFIG_LINKS
   CONFIG_COMMANDS = $CONFIG_COMMANDS
   $ $0 $@
 
-_CSEOF
-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
-echo >&5
+on `(hostname || uname -n) 2>/dev/null | sed 1q`
+"
+
 _ACEOF
 
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
+
+
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 # Files that config.status was made for.
-if test -n "$ac_config_files"; then
-  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_headers"; then
-  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_links"; then
-  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_commands"; then
-  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
+config_files="$ac_config_files"
+config_commands="$ac_config_commands"
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
+\`$as_me' instantiates files and other configuration actions
+from templates according to the current configuration.  Unless the files
+and actions are specified as TAGs, all are instantiated by default.
 
-Usage: $0 [OPTIONS] [FILE]...
+Usage: $0 [OPTION]... [TAG]...
 
   -h, --help       print this help, then exit
-  -V, --version    print version number, then exit
-  -q, --quiet      do not print progress messages
+  -V, --version    print version number and configuration settings, then exit
+      --config     print configuration, then exit
+  -q, --quiet, --silent
+                   do not print progress messages
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
+      --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
 
 Configuration files:
 $config_files
 
 Configuration commands:
 $config_commands
 
-Report bugs to <bug-autoconf@gnu.org>."
+Report bugs to the package provider."
+
 _ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-tk config.status 8.6
-configured by $0, generated by GNU Autoconf 2.59,
-  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
+tk config.status 8.7
+configured by $0, generated by GNU Autoconf 2.69,
+  with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2003 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
-srcdir=$srcdir
+
+ac_pwd='$ac_pwd'
+srcdir='$srcdir'
+test -n "\$AWK" || AWK=awk
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
 ac_need_defaults=:
 while test $# != 0
 do
   case $1 in
-  --*=*)
-    ac_option=`expr "x$1" : 'x\([^=]*\)='`
-    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
+  --*=?*)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+    ac_shift=:
+    ;;
+  --*=)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=
     ac_shift=:
     ;;
-  -*)
+  *)
     ac_option=$1
     ac_optarg=$2
     ac_shift=shift
     ;;
-  *) # This is not an option, so the user has probably given explicit
-     # arguments.
-     ac_option=$1
-     ac_need_defaults=false;;
   esac
 
   case $ac_option in
   # Handling of the options.
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
-  --version | --vers* | -V )
-    echo "$ac_cs_version"; exit 0 ;;
-  --he | --h)
-    # Conflict between --help and --header
-    { { echo "$as_me:$LINENO: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; };;
-  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit 0 ;;
-  --debug | --d* | -d )
+  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+    $as_echo "$ac_cs_version"; exit ;;
+  --config | --confi | --conf | --con | --co | --c )
+    $as_echo "$ac_cs_config"; exit ;;
+  --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    '') as_fn_error $? "missing file argument" ;;
+    esac
+    as_fn_append CONFIG_FILES " '$ac_optarg'"
     ac_need_defaults=false;;
+  --he | --h |  --help | --hel | -h )
+    $as_echo "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; } ;;
+  -*) as_fn_error $? "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
 
-  *) ac_config_targets="$ac_config_targets $1" ;;
+  *) as_fn_append ac_config_targets " $1"
+     ac_need_defaults=false ;;
 
   esac
   shift
 done
 
@@ -11822,45 +9138,57 @@
   exec 6>/dev/null
   ac_configure_extra_args="$ac_configure_extra_args --silent"
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-fi
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-#
-# INIT-COMMANDS section.
-#
-
+  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  shift
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  CONFIG_SHELL='$SHELL'
+  export CONFIG_SHELL
+  exec "\$@"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+exec 5>>config.log
+{
+  echo
+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## Running $as_me. ##
+_ASBOX
+  $as_echo "$ac_log"
+} >&5
+
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+#
+# INIT-COMMANDS
+#
 VERSION=${TK_VERSION} && tk_aqua=${tk_aqua}
 
 _ACEOF
 
-
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 
-cat >>$CONFIG_STATUS <<\_ACEOF
+# Handling of arguments.
 for ac_config_target in $ac_config_targets
 do
-  case "$ac_config_target" in
-  # Handling of arguments.
-  "Tk-Info.plist" ) CONFIG_FILES="$CONFIG_FILES Tk-Info.plist:../macosx/Tk-Info.plist.in" ;;
-  "Wish-Info.plist" ) CONFIG_FILES="$CONFIG_FILES Wish-Info.plist:../macosx/Wish-Info.plist.in" ;;
-  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile:../unix/Makefile.in" ;;
-  "tkConfig.sh" ) CONFIG_FILES="$CONFIG_FILES tkConfig.sh:../unix/tkConfig.sh.in" ;;
-  "tk.pc" ) CONFIG_FILES="$CONFIG_FILES tk.pc:../unix/tk.pc.in" ;;
-  "Tk.framework" ) CONFIG_COMMANDS="$CONFIG_COMMANDS Tk.framework" ;;
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
+  case $ac_config_target in
+    "Tk-Info.plist") CONFIG_FILES="$CONFIG_FILES Tk-Info.plist:../macosx/Tk-Info.plist.in" ;;
+    "Wish-Info.plist") CONFIG_FILES="$CONFIG_FILES Wish-Info.plist:../macosx/Wish-Info.plist.in" ;;
+    "Tk.framework") CONFIG_COMMANDS="$CONFIG_COMMANDS Tk.framework" ;;
+    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile:../unix/Makefile.in" ;;
+    "tkConfig.sh") CONFIG_FILES="$CONFIG_FILES tkConfig.sh:../unix/tkConfig.sh.in" ;;
+    "tk.pc") CONFIG_FILES="$CONFIG_FILES tk.pc:../unix/tk.pc.in" ;;
+
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
 done
+
 
 # If the user did not use the arguments to specify the items to instantiate,
 # then the envvar interface is used.  Set only those that are not.
 # We use the long form for the default assignment because of an extremely
 # bizarre bug on SunOS 4.1.3.
@@ -11868,544 +9196,431 @@
   test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
   test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
 fi
 
 # Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason to put it here, and in addition,
+# simply because there is no reason against having it here, and in addition,
 # creating and moving files from /tmp can sometimes cause problems.
-# Create a temporary directory, and hook for its removal unless debugging.
+# Hook for its removal unless debugging.
+# Note that there is a small window in which the directory will not be cleaned:
+# after its creation but before its name has been assigned to `$tmp'.
 $debug ||
 {
-  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
+  tmp= ac_tmp=
+  trap 'exit_status=$?
+  : "${ac_tmp:=$tmp}"
+  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
+' 0
+  trap 'as_fn_exit 1' 1 2 13 15
 }
-
 # Create a (secure) tmp directory for tmp files.
 
 {
-  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./confstat$$-$RANDOM
-  (umask 077 && mkdir $tmp)
-} ||
-{
-   echo "$me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-
-#
-# CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
-if test -n "\$CONFIG_FILES"; then
-  # Protect against being on the right side of a sed subst in config.status.
-  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
-   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
-s,@SHELL@,$SHELL,;t t
-s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
-s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
-s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
-s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
-s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
-s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
-s,@exec_prefix@,$exec_prefix,;t t
-s,@prefix@,$prefix,;t t
-s,@program_transform_name@,$program_transform_name,;t t
-s,@bindir@,$bindir,;t t
-s,@sbindir@,$sbindir,;t t
-s,@libexecdir@,$libexecdir,;t t
-s,@datadir@,$datadir,;t t
-s,@sysconfdir@,$sysconfdir,;t t
-s,@sharedstatedir@,$sharedstatedir,;t t
-s,@localstatedir@,$localstatedir,;t t
-s,@libdir@,$libdir,;t t
-s,@includedir@,$includedir,;t t
-s,@oldincludedir@,$oldincludedir,;t t
-s,@infodir@,$infodir,;t t
-s,@mandir@,$mandir,;t t
-s,@build_alias@,$build_alias,;t t
-s,@host_alias@,$host_alias,;t t
-s,@target_alias@,$target_alias,;t t
-s,@DEFS@,$DEFS,;t t
-s,@ECHO_C@,$ECHO_C,;t t
-s,@ECHO_N@,$ECHO_N,;t t
-s,@ECHO_T@,$ECHO_T,;t t
-s,@LIBS@,$LIBS,;t t
-s,@TCL_VERSION@,$TCL_VERSION,;t t
-s,@TCL_PATCH_LEVEL@,$TCL_PATCH_LEVEL,;t t
-s,@TCL_BIN_DIR@,$TCL_BIN_DIR,;t t
-s,@TCL_SRC_DIR@,$TCL_SRC_DIR,;t t
-s,@TCL_LIB_FILE@,$TCL_LIB_FILE,;t t
-s,@TCL_LIB_FLAG@,$TCL_LIB_FLAG,;t t
-s,@TCL_LIB_SPEC@,$TCL_LIB_SPEC,;t t
-s,@TCL_STUB_LIB_FILE@,$TCL_STUB_LIB_FILE,;t t
-s,@TCL_STUB_LIB_FLAG@,$TCL_STUB_LIB_FLAG,;t t
-s,@TCL_STUB_LIB_SPEC@,$TCL_STUB_LIB_SPEC,;t t
-s,@TCLSH_PROG@,$TCLSH_PROG,;t t
-s,@BUILD_TCLSH@,$BUILD_TCLSH,;t t
-s,@MAN_FLAGS@,$MAN_FLAGS,;t t
-s,@CC@,$CC,;t t
-s,@CFLAGS@,$CFLAGS,;t t
-s,@LDFLAGS@,$LDFLAGS,;t t
-s,@CPPFLAGS@,$CPPFLAGS,;t t
-s,@ac_ct_CC@,$ac_ct_CC,;t t
-s,@EXEEXT@,$EXEEXT,;t t
-s,@OBJEXT@,$OBJEXT,;t t
-s,@CPP@,$CPP,;t t
-s,@EGREP@,$EGREP,;t t
-s,@TCL_THREADS@,$TCL_THREADS,;t t
-s,@RANLIB@,$RANLIB,;t t
-s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
-s,@AR@,$AR,;t t
-s,@ac_ct_AR@,$ac_ct_AR,;t t
-s,@LIBOBJS@,$LIBOBJS,;t t
-s,@TCL_LIBS@,$TCL_LIBS,;t t
-s,@DL_LIBS@,$DL_LIBS,;t t
-s,@DL_OBJS@,$DL_OBJS,;t t
-s,@PLAT_OBJS@,$PLAT_OBJS,;t t
-s,@PLAT_SRCS@,$PLAT_SRCS,;t t
-s,@LDAIX_SRC@,$LDAIX_SRC,;t t
-s,@CFLAGS_DEBUG@,$CFLAGS_DEBUG,;t t
-s,@CFLAGS_OPTIMIZE@,$CFLAGS_OPTIMIZE,;t t
-s,@CFLAGS_WARNING@,$CFLAGS_WARNING,;t t
-s,@LDFLAGS_DEBUG@,$LDFLAGS_DEBUG,;t t
-s,@LDFLAGS_OPTIMIZE@,$LDFLAGS_OPTIMIZE,;t t
-s,@CC_SEARCH_FLAGS@,$CC_SEARCH_FLAGS,;t t
-s,@LD_SEARCH_FLAGS@,$LD_SEARCH_FLAGS,;t t
-s,@STLIB_LD@,$STLIB_LD,;t t
-s,@SHLIB_LD@,$SHLIB_LD,;t t
-s,@TCL_SHLIB_LD_EXTRAS@,$TCL_SHLIB_LD_EXTRAS,;t t
-s,@TK_SHLIB_LD_EXTRAS@,$TK_SHLIB_LD_EXTRAS,;t t
-s,@SHLIB_LD_LIBS@,$SHLIB_LD_LIBS,;t t
-s,@SHLIB_CFLAGS@,$SHLIB_CFLAGS,;t t
-s,@SHLIB_SUFFIX@,$SHLIB_SUFFIX,;t t
-s,@MAKE_LIB@,$MAKE_LIB,;t t
-s,@MAKE_STUB_LIB@,$MAKE_STUB_LIB,;t t
-s,@INSTALL_LIB@,$INSTALL_LIB,;t t
-s,@DLL_INSTALL_DIR@,$DLL_INSTALL_DIR,;t t
-s,@INSTALL_STUB_LIB@,$INSTALL_STUB_LIB,;t t
-s,@CFLAGS_DEFAULT@,$CFLAGS_DEFAULT,;t t
-s,@LDFLAGS_DEFAULT@,$LDFLAGS_DEFAULT,;t t
-s,@XFT_CFLAGS@,$XFT_CFLAGS,;t t
-s,@XFT_LIBS@,$XFT_LIBS,;t t
-s,@UNIX_FONT_OBJS@,$UNIX_FONT_OBJS,;t t
-s,@TK_VERSION@,$TK_VERSION,;t t
-s,@TK_MAJOR_VERSION@,$TK_MAJOR_VERSION,;t t
-s,@TK_MINOR_VERSION@,$TK_MINOR_VERSION,;t t
-s,@TK_PATCH_LEVEL@,$TK_PATCH_LEVEL,;t t
-s,@TK_YEAR@,$TK_YEAR,;t t
-s,@TK_LIB_FILE@,$TK_LIB_FILE,;t t
-s,@TK_LIB_FLAG@,$TK_LIB_FLAG,;t t
-s,@TK_LIB_SPEC@,$TK_LIB_SPEC,;t t
-s,@TK_STUB_LIB_FILE@,$TK_STUB_LIB_FILE,;t t
-s,@TK_STUB_LIB_FLAG@,$TK_STUB_LIB_FLAG,;t t
-s,@TK_STUB_LIB_SPEC@,$TK_STUB_LIB_SPEC,;t t
-s,@TK_STUB_LIB_PATH@,$TK_STUB_LIB_PATH,;t t
-s,@TK_INCLUDE_SPEC@,$TK_INCLUDE_SPEC,;t t
-s,@TK_BUILD_STUB_LIB_SPEC@,$TK_BUILD_STUB_LIB_SPEC,;t t
-s,@TK_BUILD_STUB_LIB_PATH@,$TK_BUILD_STUB_LIB_PATH,;t t
-s,@TK_SRC_DIR@,$TK_SRC_DIR,;t t
-s,@TK_SHARED_BUILD@,$TK_SHARED_BUILD,;t t
-s,@LD_LIBRARY_PATH_VAR@,$LD_LIBRARY_PATH_VAR,;t t
-s,@TK_BUILD_LIB_SPEC@,$TK_BUILD_LIB_SPEC,;t t
-s,@TCL_STUB_FLAGS@,$TCL_STUB_FLAGS,;t t
-s,@XINCLUDES@,$XINCLUDES,;t t
-s,@XLIBSW@,$XLIBSW,;t t
-s,@LOCALES@,$LOCALES,;t t
-s,@TK_WINDOWINGSYSTEM@,$TK_WINDOWINGSYSTEM,;t t
-s,@TK_PKG_DIR@,$TK_PKG_DIR,;t t
-s,@TK_LIBRARY@,$TK_LIBRARY,;t t
-s,@LIB_RUNTIME_DIR@,$LIB_RUNTIME_DIR,;t t
-s,@PRIVATE_INCLUDE_DIR@,$PRIVATE_INCLUDE_DIR,;t t
-s,@HTML_DIR@,$HTML_DIR,;t t
-s,@EXTRA_CC_SWITCHES@,$EXTRA_CC_SWITCHES,;t t
-s,@EXTRA_APP_CC_SWITCHES@,$EXTRA_APP_CC_SWITCHES,;t t
-s,@EXTRA_INSTALL@,$EXTRA_INSTALL,;t t
-s,@EXTRA_INSTALL_BINARIES@,$EXTRA_INSTALL_BINARIES,;t t
-s,@EXTRA_BUILD_HTML@,$EXTRA_BUILD_HTML,;t t
-s,@EXTRA_WISH_LIBS@,$EXTRA_WISH_LIBS,;t t
-s,@CFBUNDLELOCALIZATIONS@,$CFBUNDLELOCALIZATIONS,;t t
-s,@TK_RSRC_FILE@,$TK_RSRC_FILE,;t t
-s,@WISH_RSRC_FILE@,$WISH_RSRC_FILE,;t t
-s,@LIB_RSRC_FILE@,$LIB_RSRC_FILE,;t t
-s,@APP_RSRC_FILE@,$APP_RSRC_FILE,;t t
-s,@REZ@,$REZ,;t t
-s,@REZ_FLAGS@,$REZ_FLAGS,;t t
-s,@LTLIBOBJS@,$LTLIBOBJS,;t t
-CEOF
-
-_ACEOF
-
-  cat >>$CONFIG_STATUS <<\_ACEOF
-  # Split the substitutions into bite-sized pieces for seds with
-  # small command number limits, like on Digital OSF/1 and HP-UX.
-  ac_max_sed_lines=48
-  ac_sed_frag=1 # Number of current file.
-  ac_beg=1 # First line for current file.
-  ac_end=$ac_max_sed_lines # Line after last line for current file.
-  ac_more_lines=:
-  ac_sed_cmds=
-  while $ac_more_lines; do
-    if test $ac_beg -gt 1; then
-      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    else
-      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    fi
-    if test ! -s $tmp/subs.frag; then
-      ac_more_lines=false
-    else
-      # The purpose of the label and of the branching condition is to
-      # speed up the sed processing (if there are no `@' at all, there
-      # is no need to browse any of the substitutions).
-      # These are the two extra sed commands mentioned above.
-      (echo ':t
-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-      if test -z "$ac_sed_cmds"; then
-	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-      else
-	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-      fi
-      ac_sed_frag=`expr $ac_sed_frag + 1`
-      ac_beg=$ac_end
-      ac_end=`expr $ac_end + $ac_max_sed_lines`
-    fi
-  done
-  if test -z "$ac_sed_cmds"; then
-    ac_sed_cmds=cat
-  fi
-fi # test -n "$CONFIG_FILES"
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-	cat >$tmp/stdin
-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
-  esac
-
-  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
+  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+  test -d "$tmp"
+}  ||
+{
+  tmp=./conf$$-$RANDOM
+  (umask 077 && mkdir "$tmp")
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
+
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
+if test -n "$CONFIG_FILES"; then
+
+
+ac_cr=`echo X | tr X '\015'`
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
+# But we know of no other shell where ac_cr would be empty at this
+# point, so we can use a bashism as a fallback.
+if test "x$ac_cr" = x; then
+  eval ac_cr=\$\'\\r\'
+fi
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\\r'
+else
+  ac_cs_awk_cr=$ac_cr
+fi
+
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
+_ACEOF
+
+
+{
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+  echo "_ACEOF"
+} >conf$$subs.sh ||
+  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+  . ./conf$$subs.sh ||
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+
+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+  if test $ac_delim_n = $ac_delim_num; then
+    break
+  elif $ac_last_try; then
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+rm -f conf$$subs.sh
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\)..*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\)..*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+  N
+  s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = ""
+
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
+
+  print line
+}
+
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
+  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+_ACEOF
+
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
+if test "x$srcdir" = x.; then
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
+h
+s///
+s/^/:/
+s/[	 ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
+s/:*$//
+x
+s/\(=[	 ]*\).*/\1/
+G
+s/\n//
+s/^[^=]*=[	 ]*$//
+}'
+fi
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+fi # test -n "$CONFIG_FILES"
+
+
+eval set X "  :F $CONFIG_FILES      :C $CONFIG_COMMANDS"
+shift
+for ac_tag
+do
+  case $ac_tag in
+  :[FHLC]) ac_mode=$ac_tag; continue;;
+  esac
+  case $ac_mode$ac_tag in
+  :[FHL]*:*);;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
+  :[FH]-) ac_tag=-:-;;
+  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+  esac
+  ac_save_IFS=$IFS
+  IFS=:
+  set x $ac_tag
+  IFS=$ac_save_IFS
+  shift
+  ac_file=$1
+  shift
+
+  case $ac_mode in
+  :L) ac_source=$1;;
+  :[FH])
+    ac_file_inputs=
+    for ac_f
+    do
+      case $ac_f in
+      -) ac_f="$ac_tmp/stdin";;
+      *) # Look for the file first in the build tree, then in the source tree
+	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
+	 # because $ac_f cannot contain `:'.
+	 test -f "$ac_f" ||
+	   case $ac_f in
+	   [\\/$]*) false;;
+	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+	   esac ||
+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+      esac
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      as_fn_append ac_file_inputs " '$ac_f'"
+    done
+
+    # Let's still pretend it is `configure' which instantiates (i.e., don't
+    # use $as_me), people would be surprised to read:
+    #    /* config.h.  Generated by config.status.  */
+    configure_input='Generated from '`
+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	`' by configure.'
+    if test x"$ac_file" != x-; then
+      configure_input="$ac_file.  $configure_input"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
+    fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
+
+    case $ac_tag in
+    *:-:* | *:-) cat >"$ac_tmp/stdin" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+    esac
+    ;;
+  esac
+
+  ac_dir=`$as_dirname -- "$ac_file" ||
 $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
+	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$ac_file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  as_dir="$ac_dir"; as_fn_mkdir_p
   ac_builddir=.
 
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
 
 case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-
-
-  if test x"$ac_file" != x-; then
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    rm -f "$ac_file"
-  fi
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    configure_input=
-  else
-    configure_input="$ac_file.  "
-  fi
-  configure_input=$configure_input"Generated from `echo $ac_file_in |
-				     sed 's,.*/,,'` by configure."
-
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-	 # Absolute (can't be DOS-style, as IFS=:)
-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 echo "$f";;
-      *) # Relative
-	 if test -f "$f"; then
-	   # Build tree
-	   echo "$f"
-	 elif test -f "$srcdir/$f"; then
-	   # Source tree
-	   echo "$srcdir/$f"
-	 else
-	   # /dev/null tree
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 fi;;
-      esac
-    done` || { (exit 1); exit 1; }
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+
+  case $ac_mode in
+  :F)
+  #
+  # CONFIG_FILE
+  #
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# If the template does not know about datarootdir, expand it.
+# FIXME: This hack should be removed a few years after 2.60.
+ac_datarootdir_hack=; ac_datarootdir_seen=
+ac_sed_dataroot='
+/datarootdir/ {
+  p
+  q
+}
+/@datadir@/p
+/@docdir@/p
+/@infodir@/p
+/@localedir@/p
+/@mandir@/p'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
+*datarootdir*) ac_datarootdir_seen=yes;;
+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  ac_datarootdir_hack='
+  s&@datadir@&$datadir&g
+  s&@docdir@&$docdir&g
+  s&@infodir@&$infodir&g
+  s&@localedir@&$localedir&g
+  s&@mandir@&$mandir&g
+  s&\\\${datarootdir}&$datarootdir&g' ;;
+esac
+_ACEOF
+
+# Neutralize VPATH when `$srcdir' = `.'.
+# Shell code in configure.ac might set extrasub.
+# FIXME: do we really want to maintain this feature?
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
 $extrasub
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s,@configure_input@,$configure_input,;t t
-s,@srcdir@,$ac_srcdir,;t t
-s,@abs_srcdir@,$ac_abs_srcdir,;t t
-s,@top_srcdir@,$ac_top_srcdir,;t t
-s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
-s,@builddir@,$ac_builddir,;t t
-s,@abs_builddir@,$ac_abs_builddir,;t t
-s,@top_builddir@,$ac_top_builddir,;t t
-s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
-  rm -f $tmp/stdin
-  if test x"$ac_file" != x-; then
-    mv $tmp/out $ac_file
-  else
-    cat $tmp/out
-    rm -f $tmp/out
-  fi
-
-done
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-#
-# CONFIG_COMMANDS section.
-#
-for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
-  ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
-  ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
-  ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
-$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_dest" : 'X\(//\)[^/]' \| \
-	 X"$ac_dest" : 'X\(//\)$' \| \
-	 X"$ac_dest" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_dest" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-  ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-
-  { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
-echo "$as_me: executing $ac_dest commands" >&6;}
-  case $ac_dest in
-    Tk.framework ) n=Tk &&
+s|@configure_input@|$ac_sed_conf_input|;t t
+s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
+s&@srcdir@&$ac_srcdir&;t t
+s&@abs_srcdir@&$ac_abs_srcdir&;t t
+s&@top_srcdir@&$ac_top_srcdir&;t t
+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
+s&@builddir@&$ac_builddir&;t t
+s&@abs_builddir@&$ac_abs_builddir&;t t
+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+$ac_datarootdir_hack
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+
+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
+      "$ac_tmp/out"`; test -z "$ac_out"; } &&
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined" >&5
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined" >&2;}
+
+  rm -f "$ac_tmp/stdin"
+  case $ac_file in
+  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
+  esac \
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ ;;
+
+
+  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
+$as_echo "$as_me: executing $ac_file commands" >&6;}
+ ;;
+  esac
+
+
+  case $ac_file$ac_mode in
+    "Tk.framework":C) n=Tk &&
         f=$n.framework && v=Versions/$VERSION &&
         rm -rf $f && mkdir -p $f/$v/Resources &&
         ln -s $v/$n $v/Resources $f && ln -s ../../../$n $f/$v &&
         ln -s ../../../../$n-Info.plist $f/$v/Resources/Info.plist &&
         if test $tk_aqua = yes; then ln -s ../../../../$n.rsrc $f/$v/Resources; fi &&
         unset n f v
      ;;
-  esac
-done
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-{ (exit 0); exit 0; }
-_ACEOF
-chmod +x $CONFIG_STATUS
-ac_clean_files=$ac_clean_files_save
+
+  esac
+done # for ac_tag
+
+
+as_fn_exit 0
+_ACEOF
+ac_clean_files=$ac_clean_files_save
+
+test $ac_write_fail = 0 ||
+  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
 
 
 # configure is writing to config.log, and then calls config.status.
 # config.status does its own redirection, appending to config.log.
 # Unfortunately, on DOS this fails, as config.log is still kept open
@@ -12422,9 +9637,13 @@
   exec 5>/dev/null
   $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
+  $ac_cs_success || as_fn_exit 1
+fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
 

ADDED   unix/configure.ac
Index: unix/configure.ac
==================================================================
--- /dev/null
+++ unix/configure.ac
@@ -0,0 +1,850 @@
+#! /bin/bash -norc
+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.
+
+AC_INIT([tk],[8.7])
+AC_PREREQ(2.69)
+
+dnl This is only used when included from macosx/configure.ac
+m4_ifdef([SC_USE_CONFIG_HEADERS], [
+    AC_CONFIG_HEADERS([tkConfig.h:../unix/tkConfig.h.in])
+    AC_CONFIG_COMMANDS_PRE([DEFS="-DHAVE_TK_CONFIG_H  -imacros tkConfig.h"])
+    AH_TOP([
+    #ifndef _TKCONFIG
+    #define _TKCONFIG])
+    AH_BOTTOM([
+    /* Undef unused package specific autoheader defines so that we can
+     * include both tclConfig.h and tkConfig.h at the same time: */
+    /* override */ #undef PACKAGE_NAME
+    /* override */ #undef PACKAGE_STRING
+    /* override */ #undef PACKAGE_TARNAME
+    #endif /* _TKCONFIG */])
+])
+
+TK_VERSION=8.7
+TK_MAJOR_VERSION=8
+TK_MINOR_VERSION=7
+TK_PATCH_LEVEL="a2"
+VERSION=${TK_VERSION}
+LOCALES="cs da de el en en_gb eo es fr hu it nl pl pt ru sv"
+
+#--------------------------------------------------------------------
+# Find and load the tclConfig.sh file
+#--------------------------------------------------------------------
+
+SC_PATH_TCLCONFIG
+SC_LOAD_TCLCONFIG
+
+if test "${TCL_MAJOR_VERSION}" -lt 9 ; then
+if test "${TCL_MAJOR_VERSION}" -ne 8 ; then
+    AC_MSG_ERROR([${PACKAGE_NAME} ${PACKAGE_VERSION} requires Tcl 8.6+
+Found config for Tcl ${TCL_VERSION}])
+fi
+if test "${TCL_MINOR_VERSION}" -lt 6 ; then
+    AC_MSG_ERROR([${PACKAGE_NAME} ${PACKAGE_VERSION} requires Tcl 8.6+
+Found config for Tcl ${TCL_VERSION}])
+fi
+fi
+
+SC_PROG_TCLSH
+SC_BUILD_TCLSH
+
+#------------------------------------------------------------------------
+# Handle the --prefix=... option
+#------------------------------------------------------------------------
+
+if test "${prefix}" = "NONE"; then
+    prefix="$TCL_PREFIX"
+fi
+if test "${exec_prefix}" = "NONE"; then
+    exec_prefix=$prefix
+fi
+# Make sure srcdir is fully qualified!
+srcdir="`cd "$srcdir" ; pwd`"
+TK_SRC_DIR="`cd "$srcdir"/..; pwd`"
+
+#------------------------------------------------------------------------
+# Compress and/or soft link the manpages?
+#------------------------------------------------------------------------
+
+SC_CONFIG_MANPAGES
+
+#------------------------------------------------------------------------
+# Standard compiler checks
+#------------------------------------------------------------------------
+
+# If the user did not set CFLAGS, set it now to keep
+# the AC_PROG_CC macro from adding "-g -O2".
+if test "${CFLAGS+set}" != "set" ; then
+    CFLAGS=""
+fi
+
+AC_PROG_CC
+AC_C_INLINE
+
+#--------------------------------------------------------------------
+# Supply a substitute for stdlib.h if it doesn't define strtol,
+# strtoul, or strtod (which it doesn't in some versions of SunOS).
+#--------------------------------------------------------------------
+
+AC_CHECK_HEADER(stdlib.h, tk_ok=1, tk_ok=0)
+AC_EGREP_HEADER(strtol, stdlib.h, , tk_ok=0)
+AC_EGREP_HEADER(strtoul, stdlib.h, , tk_ok=0)
+AC_EGREP_HEADER(strtod, stdlib.h, , tk_ok=0)
+if test $tk_ok = 0; then
+    AC_DEFINE(NO_STDLIB_H, 1, [Do we have <stdlib.h>?])
+fi
+
+#------------------------------------------------------------------------
+# If we're using GCC, see if the compiler understands -pipe.  If so, use it.
+# It makes compiling go faster.  (This is only a performance feature.)
+#------------------------------------------------------------------------
+
+if test -z "$no_pipe" && test -n "$GCC"; then
+    AC_CACHE_CHECK([if the compiler understands -pipe],
+	tcl_cv_cc_pipe, [
+	hold_cflags=$CFLAGS; CFLAGS="$CFLAGS -pipe"
+	AC_TRY_COMPILE(,, tcl_cv_cc_pipe=yes, tcl_cv_cc_pipe=no)
+	CFLAGS=$hold_cflags])
+    if test $tcl_cv_cc_pipe = yes; then
+	CFLAGS="$CFLAGS -pipe"
+    fi
+fi
+
+SC_ENABLE_SHARED
+
+#--------------------------------------------------------------------
+# The statements below define a collection of compile flags.  This
+# macro depends on the value of SHARED_BUILD, and should be called
+# after SC_ENABLE_SHARED checks the configure switches.
+#--------------------------------------------------------------------
+
+SC_CONFIG_CFLAGS
+
+SC_ENABLE_SYMBOLS
+
+#--------------------------------------------------------------------
+#	Detect what compiler flags to set for 64-bit support.
+#--------------------------------------------------------------------
+
+SC_TCL_EARLY_FLAGS
+
+SC_TCL_64BIT_FLAGS
+
+#--------------------------------------------------------------------
+#	Check endianness because we can optimize some operations
+#--------------------------------------------------------------------
+
+AC_C_BIGENDIAN
+
+#------------------------------------------------------------------------
+# If Tcl and Tk are installed in different places, adjust the library
+# search path to reflect this.
+#------------------------------------------------------------------------
+
+LIB_RUNTIME_DIR='$(libdir)'
+
+if test "$TCL_EXEC_PREFIX" != "$exec_prefix"; then
+    LIB_RUNTIME_DIR="${LIB_RUNTIME_DIR}:${TCL_EXEC_PREFIX}/lib"
+fi
+
+if test "$TCL_PREFIX" != "$prefix"; then
+    AC_MSG_WARN([
+        Different --prefix selected for Tk and Tcl!
+        [[package require Tk]] may not work correctly in tclsh.])
+fi
+
+#--------------------------------------------------------------------
+#	Include sys/select.h if it exists and if it supplies things
+#	that appear to be useful and aren't already in sys/types.h.
+#	This appears to be true only on the RS/6000 under AIX.  Some
+#	systems like OSF/1 have a sys/select.h that's of no use, and
+#	other systems like SCO UNIX have a sys/select.h that's
+#	pernicious.  If "fd_set" isn't defined anywhere then set a
+#	special flag.
+#--------------------------------------------------------------------
+
+AC_CACHE_CHECK([for fd_set in sys/types], tcl_cv_type_fd_set, [
+    AC_TRY_COMPILE([#include <sys/types.h>],[fd_set readMask, writeMask;],
+	tcl_cv_type_fd_set=yes, tcl_cv_type_fd_set=no)])
+tk_ok=$tcl_cv_type_fd_set
+if test $tk_ok = no; then
+    AC_CACHE_CHECK([for fd_mask in sys/select], tcl_cv_grep_fd_mask, [
+	AC_EGREP_HEADER(fd_mask, sys/select.h,
+	     tcl_cv_grep_fd_mask=present, tcl_cv_grep_fd_mask=missing)])
+    if test $tcl_cv_grep_fd_mask = present; then
+	AC_DEFINE(HAVE_SYS_SELECT_H, 1, [Should we include <sys/select.h>?])
+	tk_ok=yes
+    fi
+fi
+if test $tk_ok = no; then
+    AC_DEFINE(NO_FD_SET, 1, [Do we have fd_set?])
+fi
+
+#------------------------------------------------------------------------------
+#       Find out all about time handling differences.
+#------------------------------------------------------------------------------
+
+AC_CHECK_HEADERS(sys/time.h)
+AC_HEADER_TIME
+
+#--------------------------------------------------------------------
+#	Under Solaris 2.4, strtod returns the wrong value for the
+#	terminating character under some conditions.  Check for this
+#	and if the problem exists use a substitute procedure
+#	"fixstrtod" (provided by Tcl) that corrects the error.
+#--------------------------------------------------------------------
+
+SC_BUGGY_STRTOD
+
+#--------------------------------------------------------------------
+#	Check for various typedefs and provide substitutes if
+#	they don't exist.
+#--------------------------------------------------------------------
+
+AC_TYPE_MODE_T
+AC_TYPE_PID_T
+AC_TYPE_SIZE_T
+AC_TYPE_UID_T
+
+AC_CHECK_TYPE([intptr_t], [
+    AC_DEFINE([HAVE_INTPTR_T], 1, [Do we have the intptr_t type?])], [
+    AC_CACHE_CHECK([for pointer-size signed integer type], tcl_cv_intptr_t, [
+    for tcl_cv_intptr_t in "int" "long" "long long" none; do
+	if test "$tcl_cv_intptr_t" != none; then
+	    AC_COMPILE_IFELSE([AC_LANG_BOOL_COMPILE_TRY([AC_INCLUDES_DEFAULT],
+		    [[sizeof (void *) <= sizeof ($tcl_cv_intptr_t)]])],
+		[tcl_ok=yes], [tcl_ok=no])
+	    test "$tcl_ok" = yes && break; fi
+    done])
+    if test "$tcl_cv_intptr_t" != none; then
+	AC_DEFINE_UNQUOTED([intptr_t], [$tcl_cv_intptr_t], [Signed integer
+	   type wide enough to hold a pointer.])
+    fi
+])
+AC_CHECK_TYPE([uintptr_t], [
+    AC_DEFINE([HAVE_UINTPTR_T], 1, [Do we have the uintptr_t type?])], [
+    AC_CACHE_CHECK([for pointer-size unsigned integer type], tcl_cv_uintptr_t, [
+    for tcl_cv_uintptr_t in "unsigned int" "unsigned long" "unsigned long long" \
+	    none; do
+	if test "$tcl_cv_uintptr_t" != none; then
+	    AC_COMPILE_IFELSE([AC_LANG_BOOL_COMPILE_TRY([AC_INCLUDES_DEFAULT],
+		    [[sizeof (void *) <= sizeof ($tcl_cv_uintptr_t)]])],
+		[tcl_ok=yes], [tcl_ok=no])
+	    test "$tcl_ok" = yes && break; fi
+    done])
+    if test "$tcl_cv_uintptr_t" != none; then
+	AC_DEFINE_UNQUOTED([uintptr_t], [$tcl_cv_uintptr_t], [Unsigned integer
+	   type wide enough to hold a pointer.])
+    fi
+])
+
+#-------------------------------------------
+#     In OS/390 struct pwd has no pw_gecos field
+#-------------------------------------------
+
+AC_CACHE_CHECK([pw_gecos in struct pwd], tcl_cv_pwd_pw_gecos, [
+    AC_TRY_COMPILE([#include <pwd.h>],
+	    [struct passwd pwd; pwd.pw_gecos;],
+	    tcl_cv_pwd_pw_gecos=yes, tcl_cv_pwd_pw_gecos=no)])
+if test $tcl_cv_pwd_pw_gecos = yes; then
+    AC_DEFINE(HAVE_PW_GECOS, 1, [Does struct password have a pw_gecos field?])
+fi
+
+#--------------------------------------------------------------------
+#	On Mac OS X, we can build either with X11 or with Aqua
+#--------------------------------------------------------------------
+
+if test "`uname -s`" = "Darwin" ; then
+    AC_MSG_CHECKING([whether to use Aqua])
+    AC_ARG_ENABLE(aqua,
+	AC_HELP_STRING([--enable-aqua=yes|no],
+	    [use Aqua windowingsystem on Mac OS X (default: no)]),
+	[tk_aqua=$enableval], [tk_aqua=no])
+    if test $tk_aqua = yes -o $tk_aqua = cocoa; then
+	tk_aqua=yes
+	if test $tcl_corefoundation = no; then
+	    AC_MSG_WARN([Aqua can only be used when CoreFoundation is available])
+	    tk_aqua=no
+	fi
+	if test ! -d /System/Library/Frameworks/Cocoa.framework; then
+	    AC_MSG_WARN([Aqua can only be used when Cocoa is available])
+	    tk_aqua=no
+	fi
+	if test "`uname -r | awk -F. '{print [$]1}'`" -lt 9; then
+	    AC_MSG_WARN([Aqua requires Mac OS X 10.5 or later])
+	    tk_aqua=no
+	fi
+    fi
+    AC_MSG_RESULT([$tk_aqua])
+    if test "$fat_32_64" = yes; then
+	if test $tk_aqua = no; then
+	    AC_CACHE_CHECK([for 64-bit X11], tcl_cv_lib_x11_64, [
+		for v in CFLAGS CPPFLAGS LDFLAGS; do
+		    eval 'hold_'$v'="$'$v'";'$v'="`echo "$'$v' "|sed -e "s/-arch ppc / /g" -e "s/-arch i386 / /g"`"'
+		done
+		CPPFLAGS="$CPPFLAGS -I/usr/X11R6/include"
+		LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -lX11"
+		AC_TRY_LINK([#include <X11/Xlib.h>], [XrmInitialize();],
+		    tcl_cv_lib_x11_64=yes, tcl_cv_lib_x11_64=no)
+		for v in CFLAGS CPPFLAGS LDFLAGS; do
+		    eval $v'="$hold_'$v'"'
+		done])
+	fi
+	# remove 64-bit arch flags from CFLAGS et al. for combined 32 & 64 bit
+	# fat builds if configuration does not support 64-bit.
+	if test "$tcl_cv_lib_x11_64" = no; then
+	    AC_MSG_NOTICE([Removing 64-bit architectures from compiler & linker flags])
+	    for v in CFLAGS CPPFLAGS LDFLAGS; do
+		eval $v'="`echo "$'$v' "|sed -e "s/-arch ppc64 / /g" -e "s/-arch x86_64 / /g"`"'
+	    done
+	fi
+    fi
+    if test $tk_aqua = no; then
+	# check if weak linking whole libraries is possible.
+	AC_CACHE_CHECK([if ld accepts -weak-l flag], tcl_cv_ld_weak_l, [
+	    hold_ldflags=$LDFLAGS
+	    LDFLAGS="$LDFLAGS -Wl,-weak-lm"
+	    AC_TRY_LINK([#include <math.h>], [double f = sin(1.0);],
+		tcl_cv_ld_weak_l=yes, tcl_cv_ld_weak_l=no)
+	    LDFLAGS=$hold_ldflags])
+    fi
+    AC_CHECK_HEADERS(AvailabilityMacros.h)
+    if test "$ac_cv_header_AvailabilityMacros_h" = yes; then
+	AC_CACHE_CHECK([if weak import is available], tcl_cv_cc_weak_import, [
+	    hold_cflags=$CFLAGS; CFLAGS="$CFLAGS -Werror"
+	    AC_TRY_LINK([
+		    #ifdef __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__
+		    #if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1020
+		    #error __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1020
+		    #endif
+		    #elif MAC_OS_X_VERSION_MIN_REQUIRED < 1020
+		    #error MAC_OS_X_VERSION_MIN_REQUIRED < 1020
+		    #endif
+		    int rand(void) __attribute__((weak_import));
+		], [rand();],
+		tcl_cv_cc_weak_import=yes, tcl_cv_cc_weak_import=no)
+	    CFLAGS=$hold_cflags])
+	if test $tcl_cv_cc_weak_import = yes; then
+	    AC_DEFINE(HAVE_WEAK_IMPORT, 1, [Is weak import available?])
+	fi
+	AC_CACHE_CHECK([if Darwin SUSv3 extensions are available],
+	    tcl_cv_cc_darwin_c_source, [
+	    hold_cflags=$CFLAGS; CFLAGS="$CFLAGS -Werror"
+	    AC_TRY_COMPILE([
+		    #ifdef __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__
+		    #if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1050
+		    #error __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1050
+		    #endif
+		    #elif MAC_OS_X_VERSION_MIN_REQUIRED < 1050
+		    #error MAC_OS_X_VERSION_MIN_REQUIRED < 1050
+		    #endif
+		    #define _DARWIN_C_SOURCE 1
+		    #include <sys/cdefs.h>
+		],,tcl_cv_cc_darwin_c_source=yes, tcl_cv_cc_darwin_c_source=no)
+	    CFLAGS=$hold_cflags])
+	if test $tcl_cv_cc_darwin_c_source = yes; then
+	    AC_DEFINE(_DARWIN_C_SOURCE, 1,
+		    [Are Darwin SUSv3 extensions available?])
+	fi
+    fi
+else
+    tk_aqua=no
+fi
+
+if test $tk_aqua = yes; then
+    AC_DEFINE(MAC_OSX_TK, 1, [Are we building TkAqua?])
+    LIBS="$LIBS -framework Cocoa -framework Carbon -framework IOKit"
+    EXTRA_CC_SWITCHES='-std=gnu99 -x objective-c'
+    TK_WINDOWINGSYSTEM=AQUA
+    if test -n "${enable_symbols}" -a "${enable_symbols}" != no; then
+        AC_DEFINE(TK_MAC_DEBUG, 1, [Are TkAqua debug messages enabled?])
+    fi
+else
+    #--------------------------------------------------------------------
+    #	Locate the X11 header files and the X11 library archive.  Try
+    #	the ac_path_x macro first, but if it doesn't find the X stuff
+    #	(e.g. because there's no xmkmf program) then check through
+    #	a list of possible directories.  Under some conditions the
+    #	autoconf macro will return an include directory that contains
+    #	no include files, so double-check its result just to be safe.
+    #--------------------------------------------------------------------
+
+    SC_PATH_X
+    TK_WINDOWINGSYSTEM=X11
+fi
+
+#--------------------------------------------------------------------
+#	Various manipulations on the search path used at runtime to
+#	find shared libraries:
+#	1. If the X library binaries are in a non-standard directory,
+#	   add the X library location into that search path.
+#	2. On systems such as AIX and Ultrix that use "-L" as the
+#	   search path option, colons cannot be used to separate
+#	   directories from each other. Change colons to " -L".
+#	3. Create two sets of search flags, one for use in cc lines
+#	   and the other for when the linker is invoked directly.  In
+#	   the second case, '-Wl,' must be stripped off and commas must
+#	   be replaced by spaces.
+#--------------------------------------------------------------------
+
+if test "x${x_libraries}" != "x"; then
+  if test "x${x_libraries}" != "xNONE"; then
+    LIB_RUNTIME_DIR="${LIB_RUNTIME_DIR}:${x_libraries}"
+  fi
+fi
+if test "${TCL_LD_SEARCH_FLAGS}" = '-L${LIB_RUNTIME_DIR}'; then
+    LIB_RUNTIME_DIR=`echo ${LIB_RUNTIME_DIR} |sed -e 's/:/ -L/g'`
+fi
+
+#--------------------------------------------------------------------
+#	Check for the existence of various libraries.  The order here
+#	is important, so that then end up in the right order in the
+#	command line generated by make.  The -lsocket and -lnsl libraries
+#	require a couple of special tricks:
+#	1. Use "connect" and "accept" to check for -lsocket, and
+#	   "gethostbyname" to check for -lnsl.
+#	2. Use each function name only once:  can't redo a check because
+#	   autoconf caches the results of the last check and won't redo it.
+#	3. Use -lnsl and -lsocket only if they supply procedures that
+#	   aren't already present in the normal libraries.  This is because
+#	   IRIX 5.2 has libraries, but they aren't needed and they're
+#	   bogus:  they goof up name resolution if used.
+#	4. On some SVR4 systems, can't use -lsocket without -lnsl too.
+#	   To get around this problem, check for both libraries together
+#	   if -lsocket doesn't work by itself.
+#--------------------------------------------------------------------
+
+if test $tk_aqua = no; then
+    AC_CHECK_LIB(Xbsd, main, [LIBS="$LIBS -lXbsd"])
+fi
+
+#--------------------------------------------------------------------
+# One more check related to the X libraries.  The standard releases
+# of Ultrix don't support the "xauth" mechanism, so send won't work
+# unless TK_NO_SECURITY is defined.  However, there are usually copies
+# of the MIT X server available as well, which do support xauth.
+# Check for the MIT stuff and use it if it exists.
+#
+# Note: can't use ac_check_lib macro (at least, not in Autoconf 2.1)
+# because it can't deal with the "-" in the library name.
+#--------------------------------------------------------------------
+
+if test -d /usr/include/mit -a $tk_aqua = no; then
+    AC_MSG_CHECKING([MIT X libraries])
+    tk_oldCFlags=$CFLAGS
+    CFLAGS="$CFLAGS -I/usr/include/mit"
+    tk_oldLibs=$LIBS
+    LIBS="$LIBS -lX11-mit"
+    AC_TRY_LINK([
+	#include <X11/Xlib.h>
+    ], [
+	XOpenDisplay(0);
+    ], [
+	AC_MSG_RESULT([yes])
+	XLIBSW="-lX11-mit"
+	XINCLUDES="-I/usr/include/mit"
+    ], AC_MSG_RESULT([no]))
+    CFLAGS=$tk_oldCFlags
+    LIBS=$tk_oldLibs
+fi
+
+#--------------------------------------------------------------------
+#	Check for freetype / fontconfig / Xft support.
+#--------------------------------------------------------------------
+
+if test $tk_aqua = no; then
+    AC_MSG_CHECKING([whether to use xft])
+    AC_ARG_ENABLE(xft,
+	AC_HELP_STRING([--enable-xft],
+	    [use freetype/fontconfig/xft (default: on)]),
+	[enable_xft=$enableval], [enable_xft="default"])
+    XFT_CFLAGS=""
+    XFT_LIBS=""
+    if test "$enable_xft" = "no" ; then
+	AC_MSG_RESULT([$enable_xft])
+    else
+	found_xft="yes"
+	dnl make sure package configurator (xft-config or pkg-config
+	dnl says that xft is present.
+	XFT_CFLAGS=`xft-config --cflags 2>/dev/null` || found_xft="no"
+	XFT_LIBS=`xft-config --libs 2>/dev/null` || found_xft="no"
+	if test "$found_xft" = "no" ; then
+	    found_xft=yes
+	    XFT_CFLAGS=`pkg-config --cflags xft 2>/dev/null` || found_xft="no"
+	    XFT_LIBS=`pkg-config --libs xft 2>/dev/null` || found_xft="no"
+	fi
+	AC_MSG_RESULT([$found_xft])
+	dnl make sure that compiling against Xft header file doesn't bomb
+	if test "$found_xft" = "yes" ; then
+	    tk_oldCFlags=$CFLAGS
+	    CFLAGS="$CFLAGS $XINCLUDES $XFT_CFLAGS"
+	    tk_oldLibs=$LIBS
+	    LIBS="$tk_oldLIBS $XFT_LIBS $XLIBSW"
+	    AC_CHECK_HEADER(X11/Xft/Xft.h, [], [
+		found_xft=no
+	    ],[#include <X11/Xlib.h>])
+	    CFLAGS=$tk_oldCFlags
+	    LIBS=$tk_oldLibs
+	fi
+	dnl make sure that linking against Xft libraries finds freetype
+	if test "$found_xft" = "yes" ; then
+	    tk_oldCFlags=$CFLAGS
+	    CFLAGS="$CFLAGS $XINCLUDES $XFT_CFLAGS"
+	    tk_oldLibs=$LIBS
+	    LIBS="$tk_oldLIBS $XFT_LIBS $XLIBSW"
+	    AC_CHECK_LIB(Xft, XftFontOpen, [], [
+		found_xft=no
+	    ])
+	    CFLAGS=$tk_oldCFlags
+	    LIBS=$tk_oldLibs
+	fi
+	dnl make sure that linking against fontconfig libraries finds Fc* symbols
+	if test "$found_xft" = "yes" ; then
+	    tk_oldCFlags=$CFLAGS
+	    CFLAGS="$CFLAGS $XINCLUDES $XFT_CFLAGS"
+	    tk_oldLibs=$LIBS
+	    LIBS="$tk_oldLIBS $XFT_LIBS $XLIBSW -lfontconfig"
+	    AC_CHECK_LIB(fontconfig, FcFontSort, [
+		XFT_LIBS="$XFT_LIBS -lfontconfig"
+	    ], [])
+	    CFLAGS=$tk_oldCFlags
+	    LIBS=$tk_oldLibs
+	fi
+	dnl print a warning if xft is unusable and was specifically requested
+	if test "$found_xft" = "no" ; then
+	    if test "$enable_xft" = "yes" ; then
+		AC_MSG_WARN([Can't find xft configuration, or xft is unusable])
+	    fi
+	    enable_xft=no
+	    XFT_CFLAGS=""
+	    XFT_LIBS=""
+	else
+            enable_xft=yes
+	fi
+    fi
+    if test $enable_xft = "yes" ; then
+	UNIX_FONT_OBJS=tkUnixRFont.o
+	AC_DEFINE(HAVE_XFT, 1, [Have we turned on XFT (antialiased fonts)?])
+    else
+	UNIX_FONT_OBJS=tkUnixFont.o
+    fi
+    AC_SUBST(XFT_CFLAGS)
+    AC_SUBST(XFT_LIBS)
+    AC_SUBST(UNIX_FONT_OBJS)
+fi
+
+#--------------------------------------------------------------------
+#	Check for XkbKeycodeToKeysym.
+#--------------------------------------------------------------------
+
+if test $tk_aqua = no; then
+    tk_oldCFlags=$CFLAGS
+    tk_oldLibs=$LIBS
+    CFLAGS="$CFLAGS $XINCLUDES"
+    LIBS="$LIBS $XLIBSW"
+    AC_CHECK_HEADER(X11/XKBlib.h, [
+	xkblib_header_found=yes
+    ], [
+	xkblib_header_found=no
+    ], [#include <X11/Xlib.h>])
+    if test $xkblib_header_found = "yes" ; then
+	AC_CHECK_LIB(X11, XkbKeycodeToKeysym, [
+	    xkbkeycodetokeysym_found=yes
+	], [
+	    xkbkeycodetokeysym_found=no
+	])
+    else
+	xkbkeycodetokeysym_found=no
+    fi
+    if test $xkbkeycodetokeysym_found = "yes" ; then
+	AC_DEFINE(HAVE_XKBKEYCODETOKEYSYM, 1, [Do we have XkbKeycodeToKeysym?])
+    fi
+    CFLAGS=$tk_oldCFlags
+    LIBS=$tk_oldLibs
+fi
+
+#--------------------------------------------------------------------
+# Check whether XKeycodeToKeysym is deprecated in X11 headers.
+#--------------------------------------------------------------------
+
+if test $tk_aqua = no && test "$GCC" = yes; then
+    AC_MSG_CHECKING([whether XKeycodeToKeysym is deprecated])
+    tk_oldCFlags=$CFLAGS
+    CFLAGS="$CFLAGS -Werror"
+    AC_TRY_LINK([
+	#include <X11/Xlib.h>
+    ], [
+	XKeycodeToKeysym(0,0,0);
+    ], [
+	AC_MSG_RESULT([no])
+    ], [
+    AC_MSG_RESULT([yes])
+	AC_DEFINE(XKEYCODETOKEYSYM_IS_DEPRECATED, 1, [Is XKeycodeToKeysym deprecated?])
+	])
+    CFLAGS=$tk_oldCFlags
+fi
+
+#--------------------------------------------------------------------
+# XXX Do this last.
+# It might modify XLIBSW which could affect other tests.
+#
+# Check whether the header and library for the XScreenSaver
+# extension are available, and set HAVE_XSS if so.
+# XScreenSaver is needed for Tk_GetUserInactiveTime().
+#--------------------------------------------------------------------
+
+if test $tk_aqua = no; then
+    tk_oldCFlags=$CFLAGS
+    CFLAGS="$CFLAGS $XINCLUDES"
+    tk_oldLibs=$LIBS
+    LIBS="$tk_oldLibs $XLIBSW"
+    xss_header_found=no
+    xss_lib_found=no
+    AC_MSG_CHECKING([whether to try to use XScreenSaver])
+    AC_ARG_ENABLE(xss,
+	AC_HELP_STRING([--enable-xss],
+	    [use XScreenSaver for activity timer (default: on)]),
+	[enable_xss=$enableval], [enable_xss=yes])
+    if test "$enable_xss" = "no" ; then
+	AC_MSG_RESULT([$enable_xss])
+    else
+	AC_MSG_RESULT([$enable_xss])
+	AC_CHECK_HEADER(X11/extensions/scrnsaver.h, [
+	    xss_header_found=yes
+	],,[#include <X11/Xlib.h>])
+	AC_CHECK_FUNC(XScreenSaverQueryInfo,,[
+	    AC_CHECK_LIB(Xext, XScreenSaverQueryInfo, [
+		XLIBSW="$XLIBSW -lXext"
+		xss_lib_found=yes
+	    ], [
+		AC_CHECK_LIB(Xss, XScreenSaverQueryInfo, [
+		    if test "$tcl_cv_ld_weak_l" = yes; then
+			# On Darwin, weak link libXss if possible,
+			# as it is only available on Tiger or later.
+			XLIBSW="$XLIBSW -Wl,-weak-lXss -lXext"
+		    else
+			XLIBSW="$XLIBSW -lXss -lXext"
+		    fi
+		    xss_lib_found=yes
+		],, -lXext)
+	    ])
+	])
+    fi
+    if test $enable_xss = yes -a $xss_lib_found = yes -a $xss_header_found = yes; then
+	AC_DEFINE(HAVE_XSS, 1, [Is XScreenSaver available?])
+    fi
+    CFLAGS=$tk_oldCFlags
+    LIBS=$tk_oldLibs
+fi
+
+#--------------------------------------------------------------------
+#	Figure out whether "char" is unsigned.  If so, set a
+#	#define for __CHAR_UNSIGNED__.
+#--------------------------------------------------------------------
+
+AC_C_CHAR_UNSIGNED
+
+#--------------------------------------------------------------------
+#	The statements below define a collection of symbols related to
+#	building libtk as a shared library instead of a static library.
+#--------------------------------------------------------------------
+
+eval eval "TK_UNSHARED_LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}"
+eval eval "TK_SHARED_LIB_SUFFIX=${SHARED_LIB_SUFFIX}"
+eval "TK_LIB_FILE=libtk${LIB_SUFFIX}"
+
+# tkConfig.sh needs a version of the _LIB_SUFFIX that has been eval'ed
+# since on some platforms TK_LIB_FILE contains shell escapes.
+
+eval "TK_LIB_FILE=${TK_LIB_FILE}"
+
+if test "${SHARED_BUILD}" = "1" -a "${SHLIB_SUFFIX}" != ""; then
+    SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \${TCL_STUB_LIB_SPEC}"
+    TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
+fi
+
+TK_LIBRARY='$(prefix)/lib/tk$(VERSION)'
+PRIVATE_INCLUDE_DIR='$(includedir)'
+HTML_DIR='$(DISTDIR)/html'
+TK_PKG_DIR='tk$(VERSION)'
+TK_RSRC_FILE='tk$(VERSION).rsrc'
+WISH_RSRC_FILE='wish$(VERSION).rsrc'
+
+# Note:  in the following variable, it's important to use the absolute
+# path name of the Tcl directory rather than "..":  this is because
+# AIX remembers this path and will attempt to use it at run-time to look
+# up the Tcl library.
+
+if test "`uname -s`" = "Darwin" ; then
+    SC_ENABLE_FRAMEWORK
+    TK_SHLIB_LD_EXTRAS="-compatibility_version ${TK_VERSION} -current_version ${TK_VERSION}`echo ${TK_PATCH_LEVEL} | awk ['{match($0, "\\\.[0-9]+"); print substr($0,RSTART,RLENGTH)}']`"
+    TK_SHLIB_LD_EXTRAS="${TK_SHLIB_LD_EXTRAS}"' -install_name "${DYLIB_INSTALL_DIR}/${TK_LIB_FILE}" -unexported_symbols_list $$(f=$(TK_LIB_FILE).E && nm -gp tkMacOSX*.o 2>/dev/null | awk "/^[[0-9a-f]]+ . \.objc/ {print \$$3}" > $$f && nm -gjp "$(TCL_BIN_DIR)"/$(TCL_STUB_LIB_FILE) | grep ^_[[^_]] >> $$f && echo $$f)'
+    echo "$LDFLAGS " | grep -q -- '-prebind ' && TK_SHLIB_LD_EXTRAS="${TK_SHLIB_LD_EXTRAS}"' -seg1addr 0xb000000'
+    TK_SHLIB_LD_EXTRAS="${TK_SHLIB_LD_EXTRAS}"' -sectcreate __TEXT __info_plist Tk-Info.plist'
+    EXTRA_WISH_LIBS='-sectcreate __TEXT __info_plist Wish-Info.plist'
+    EXTRA_APP_CC_SWITCHES="${EXTRA_APP_CC_SWITCHES}"' -mdynamic-no-pic'
+    AC_CONFIG_FILES([Tk-Info.plist:../macosx/Tk-Info.plist.in Wish-Info.plist:../macosx/Wish-Info.plist.in])
+    for l in ${LOCALES}; do CFBUNDLELOCALIZATIONS="${CFBUNDLELOCALIZATIONS}<string>$l</string>"; done
+    TK_YEAR="`date +%Y`"
+fi
+
+if test "$FRAMEWORK_BUILD" = "1" ; then
+    AC_DEFINE(TK_FRAMEWORK, 1, [Is Tk built as a framework?])
+    # Construct a fake local framework structure to make linking with
+    # '-framework Tk' and running of tktest work
+    AC_CONFIG_COMMANDS([Tk.framework], [n=Tk &&
+        f=$n.framework && v=Versions/$VERSION &&
+        rm -rf $f && mkdir -p $f/$v/Resources &&
+        ln -s $v/$n $v/Resources $f && ln -s ../../../$n $f/$v &&
+        ln -s ../../../../$n-Info.plist $f/$v/Resources/Info.plist &&
+        if test $tk_aqua = yes; then ln -s ../../../../$n.rsrc $f/$v/Resources; fi &&
+        unset n f v
+    ], VERSION=${TK_VERSION} && tk_aqua=${tk_aqua})
+    LD_LIBRARY_PATH_VAR="DYLD_FRAMEWORK_PATH"
+    if test "${libdir}" = '${exec_prefix}/lib'; then
+        # override libdir default
+        libdir="/Library/Frameworks"
+    fi
+    TK_LIB_FILE="Tk"
+    TK_LIB_FLAG="-framework Tk"
+    TK_BUILD_LIB_SPEC="-F`pwd | sed -e 's/ /\\\\ /g'` -framework Tk"
+    TK_LIB_SPEC="-F${libdir} -framework Tk"
+    libdir="${libdir}/Tk.framework/Versions/\${VERSION}"
+    TK_LIBRARY="${libdir}/Resources/Scripts"
+    TK_PKG_DIR="Resources/Scripts"
+    TK_RSRC_FILE="Tk.rsrc"
+    WISH_RSRC_FILE="Wish.rsrc"
+    includedir="${libdir}/Headers"
+    PRIVATE_INCLUDE_DIR="${libdir}/PrivateHeaders"
+    HTML_DIR="${libdir}/Resources/Documentation/Reference/Tk"
+    EXTRA_INSTALL="install-private-headers html-tk"
+    EXTRA_BUILD_HTML='@ln -fs contents.htm "$(HTML_INSTALL_DIR)"/TkTOC.html'
+    EXTRA_INSTALL_BINARIES='@echo "Installing Info.plist to $(LIB_INSTALL_DIR)/Resources/" && $(INSTALL_DATA_DIR) "$(LIB_INSTALL_DIR)/Resources" && $(INSTALL_DATA) Tk-Info.plist "$(LIB_INSTALL_DIR)/Resources/Info.plist"'
+    EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Installing license.terms to $(LIB_INSTALL_DIR)/Resources/" && $(INSTALL_DATA) "$(TOP_DIR)/license.terms" "$(LIB_INSTALL_DIR)/Resources"'
+    if test $tk_aqua = yes; then
+	EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Installing Images to $(LIB_INSTALL_DIR)/Resources/" && $(INSTALL_DATA_DIR) "$(LIB_INSTALL_DIR)/Resources" && for i in Tk.tiff Tk.icns; do $(INSTALL_DATA) "$(MAC_OSX_DIR)/$$i" "$(LIB_INSTALL_DIR)/Resources"; done'
+	EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Installing wish$(VERSION) script to $(INSTALL_ROOT)/'"${bindir}"'/" && $(INSTALL_DATA_DIR) "$(INSTALL_ROOT)/'"${bindir}"'" && printf > "$(INSTALL_ROOT)/'"${bindir}"'/wish$(VERSION)" "#!/bin/sh\n\"\$$(dirname \$$0)'"`eval d="${bindir}"; echo "$d" | sed -e 's#/[^/][^/]*#/..#g'`"'$(bindir)/Wish\" \"\$$@\"" && chmod +x "$(INSTALL_ROOT)/'"${bindir}"'/wish$(VERSION)"'
+	bindir="${libdir}/Resources/Wish.app/Contents/MacOS"
+	EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Installing Info.plist to $(BIN_INSTALL_DIR)/.." && $(INSTALL_DATA) Wish-Info.plist "$(BIN_INSTALL_DIR)/../Info.plist" && mv -f "$(BIN_INSTALL_DIR)/wish$(VERSION)" "$(BIN_INSTALL_DIR)/Wish"'
+	EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Installing Wish.icns to $(BIN_INSTALL_DIR)/../Resources" && $(INSTALL_DATA_DIR) "$(BIN_INSTALL_DIR)/../Resources"'
+	EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && $(INSTALL_DATA) "$(MAC_OSX_DIR)/Tk.icns" "$(BIN_INSTALL_DIR)/../Resources/Wish.icns"'
+	EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Installing Wish.sdef to $(BIN_INSTALL_DIR)/../Resources" && $(INSTALL_DATA) "$(MAC_OSX_DIR)/Wish.sdef" "$(BIN_INSTALL_DIR)/../Resources"'
+    fi
+    EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Finalizing Tk.framework" && rm -f "$(LIB_INSTALL_DIR)/../Current" && ln -s "$(VERSION)" "$(LIB_INSTALL_DIR)/../Current" && for f in "$(LIB_FILE)" tkConfig.sh Resources Headers PrivateHeaders; do rm -f "$(LIB_INSTALL_DIR)/../../$$f" && ln -s "Versions/Current/$$f" "$(LIB_INSTALL_DIR)/../.."; done && f="$(STUB_LIB_FILE)" && rm -f "$(LIB_INSTALL_DIR)/../../$$f" && ln -s "Versions/$(VERSION)/$$f" "$(LIB_INSTALL_DIR)/../.."'
+    # Don't use AC_DEFINE for the following as the framework version define
+    # needs to go into the Makefile even when using autoheader, so that we
+    # can pick up a potential make override of VERSION. Also, don't put this
+    # into CFLAGS as it should not go into tkConfig.sh
+    EXTRA_CC_SWITCHES="$EXTRA_CC_SWITCHES"' -DTK_FRAMEWORK_VERSION=\"$(VERSION)\"'
+else
+    if test $tk_aqua = yes; then
+        EXTRA_INSTALL_BINARIES='@echo "Installing Images to $(LIB_INSTALL_DIR)/" && $(INSTALL_DATA_DIR) "$(LIB_INSTALL_DIR)" && for i in Tk.tiff Tk.icns; do $(INSTALL_DATA) "$(MAC_OSX_DIR)/$$i" "$(LIB_INSTALL_DIR)"; done'
+    fi
+    # libdir must be a fully qualified path and not ${exec_prefix}/lib
+    eval libdir="$libdir"
+    if test "${ac_cv_cygwin}" = "yes" -a "$SHARED_BUILD" = "1"; then
+	TK_LIB_FLAG="-ltk`echo ${TK_VERSION} | tr -d .`"
+	TK_BUILD_LIB_SPEC="-L\$(TOP_DIR)/win ${TK_LIB_FLAG}"
+    else
+	if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
+	    TK_LIB_FLAG="-ltk${TK_VERSION}"
+	else
+	    TK_LIB_FLAG="-ltk`echo ${TK_VERSION} | tr -d .`"
+	fi
+	TK_BUILD_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TK_LIB_FLAG}"
+    fi
+    TK_LIB_SPEC="-L${libdir} ${TK_LIB_FLAG}"
+fi
+
+#--------------------------------------------------------------------
+#       The statements below define various symbols relating to Tk
+#       stub support.
+#--------------------------------------------------------------------
+
+# Replace ${VERSION} with contents of ${TK_VERSION}
+eval "TK_STUB_LIB_FILE=libtkstub${TK_UNSHARED_LIB_SUFFIX}"
+eval "TK_STUB_LIB_DIR=${libdir}"
+
+if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
+    TK_STUB_LIB_FLAG="-ltkstub${TK_VERSION}"
+else
+    TK_STUB_LIB_FLAG="-ltkstub`echo ${TK_VERSION} | tr -d .`"
+fi
+
+TK_BUILD_STUB_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TK_STUB_LIB_FLAG}"
+TK_STUB_LIB_SPEC="-L${TK_STUB_LIB_DIR} ${TK_STUB_LIB_FLAG}"
+TK_BUILD_STUB_LIB_PATH="`pwd`/${TK_STUB_LIB_FILE}"
+TK_STUB_LIB_PATH="${TK_STUB_LIB_DIR}/${TK_STUB_LIB_FILE}"
+
+# Install time header dir can be set via --includedir
+eval "TK_INCLUDE_SPEC=\"-I${includedir}\""
+
+#------------------------------------------------------------------------
+# tkConfig.sh refers to this by a different name
+#------------------------------------------------------------------------
+
+TK_SHARED_BUILD=${SHARED_BUILD}
+
+AC_SUBST(TK_VERSION)
+AC_SUBST(TK_MAJOR_VERSION)
+AC_SUBST(TK_MINOR_VERSION)
+AC_SUBST(TK_PATCH_LEVEL)
+AC_SUBST(TK_YEAR)
+
+AC_SUBST(TK_LIB_FILE)
+AC_SUBST(TK_LIB_FLAG)
+AC_SUBST(TK_LIB_SPEC)
+AC_SUBST(TK_STUB_LIB_FILE)
+AC_SUBST(TK_STUB_LIB_FLAG)
+AC_SUBST(TK_STUB_LIB_SPEC)
+AC_SUBST(TK_STUB_LIB_PATH)
+AC_SUBST(TK_INCLUDE_SPEC)
+AC_SUBST(TK_BUILD_STUB_LIB_SPEC)
+AC_SUBST(TK_BUILD_STUB_LIB_PATH)
+
+AC_SUBST(TK_SRC_DIR)
+
+AC_SUBST(TK_SHARED_BUILD)
+AC_SUBST(LD_LIBRARY_PATH_VAR)
+
+AC_SUBST(TK_BUILD_LIB_SPEC)
+
+AC_SUBST(TCL_STUB_FLAGS)
+AC_SUBST(XINCLUDES)
+AC_SUBST(XLIBSW)
+AC_SUBST(LOCALES)
+
+AC_SUBST(TK_WINDOWINGSYSTEM)
+AC_SUBST(TK_PKG_DIR)
+AC_SUBST(TK_LIBRARY)
+AC_SUBST(LIB_RUNTIME_DIR)
+AC_SUBST(PRIVATE_INCLUDE_DIR)
+AC_SUBST(HTML_DIR)
+
+AC_SUBST(EXTRA_CC_SWITCHES)
+AC_SUBST(EXTRA_APP_CC_SWITCHES)
+AC_SUBST(EXTRA_INSTALL)
+AC_SUBST(EXTRA_INSTALL_BINARIES)
+AC_SUBST(EXTRA_BUILD_HTML)
+AC_SUBST(EXTRA_WISH_LIBS)
+AC_SUBST(CFBUNDLELOCALIZATIONS)
+
+AC_SUBST(TK_RSRC_FILE)
+AC_SUBST(WISH_RSRC_FILE)
+AC_SUBST(LIB_RSRC_FILE)
+AC_SUBST(APP_RSRC_FILE)
+AC_SUBST(REZ)
+AC_SUBST(REZ_FLAGS)
+
+AC_CONFIG_FILES([
+    Makefile:../unix/Makefile.in
+    tkConfig.sh:../unix/tkConfig.sh.in
+    tk.pc:../unix/tk.pc.in
+])
+AC_OUTPUT
+
+dnl Local Variables:
+dnl mode: autoconf
+dnl End:

DELETED unix/configure.in
Index: unix/configure.in
==================================================================
--- unix/configure.in
+++ /dev/null
@@ -1,857 +0,0 @@
-#! /bin/bash -norc
-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.
-
-AC_INIT([tk],[8.6])
-AC_PREREQ(2.59)
-
-dnl This is only used when included from macosx/configure.ac
-m4_ifdef([SC_USE_CONFIG_HEADERS], [
-    AC_CONFIG_HEADERS([tkConfig.h:../unix/tkConfig.h.in])
-    AC_CONFIG_COMMANDS_PRE([DEFS="-DHAVE_TK_CONFIG_H  -imacros tkConfig.h"])
-    AH_TOP([
-    #ifndef _TKCONFIG
-    #define _TKCONFIG])
-    AH_BOTTOM([
-    /* Undef unused package specific autoheader defines so that we can
-     * include both tclConfig.h and tkConfig.h at the same time: */
-    /* override */ #undef PACKAGE_NAME
-    /* override */ #undef PACKAGE_STRING
-    /* override */ #undef PACKAGE_TARNAME
-    #endif /* _TKCONFIG */])
-])
-
-TK_VERSION=8.6
-TK_MAJOR_VERSION=8
-TK_MINOR_VERSION=6
-TK_PATCH_LEVEL=".6"
-VERSION=${TK_VERSION}
-LOCALES="cs da de el en en_gb eo es fr hu it nl pl pt ru sv"
-
-#--------------------------------------------------------------------
-# Find and load the tclConfig.sh file
-#--------------------------------------------------------------------
-
-SC_PATH_TCLCONFIG
-SC_LOAD_TCLCONFIG
-
-if test "${TCL_MAJOR_VERSION}" -ne 8 ; then
-    AC_MSG_ERROR([${PACKAGE_NAME} ${PACKAGE_VERSION} requires Tcl 8.6+
-Found config for Tcl ${TCL_VERSION}])
-fi
-if test "${TCL_MINOR_VERSION}" -lt 6 ; then
-    AC_MSG_ERROR([${PACKAGE_NAME} ${PACKAGE_VERSION} requires Tcl 8.6+
-Found config for Tcl ${TCL_VERSION}])
-fi
-
-SC_PROG_TCLSH
-SC_BUILD_TCLSH
-
-#------------------------------------------------------------------------
-# Handle the --prefix=... option
-#------------------------------------------------------------------------
-
-if test "${prefix}" = "NONE"; then
-    prefix="$TCL_PREFIX"
-fi
-if test "${exec_prefix}" = "NONE"; then
-    exec_prefix=$prefix
-fi
-# Make sure srcdir is fully qualified!
-srcdir="`cd "$srcdir" ; pwd`"
-TK_SRC_DIR="`cd "$srcdir"/..; pwd`"
-
-#------------------------------------------------------------------------
-# Compress and/or soft link the manpages?
-#------------------------------------------------------------------------
-
-SC_CONFIG_MANPAGES
-
-#------------------------------------------------------------------------
-# Standard compiler checks
-#------------------------------------------------------------------------
-
-# If the user did not set CFLAGS, set it now to keep
-# the AC_PROG_CC macro from adding "-g -O2".
-if test "${CFLAGS+set}" != "set" ; then
-    CFLAGS=""
-fi
-
-AC_PROG_CC
-AC_C_INLINE
-
-#--------------------------------------------------------------------
-# Supply a substitute for stdlib.h if it doesn't define strtol,
-# strtoul, or strtod (which it doesn't in some versions of SunOS).
-#--------------------------------------------------------------------
-
-AC_CHECK_HEADER(stdlib.h, tk_ok=1, tk_ok=0)
-AC_EGREP_HEADER(strtol, stdlib.h, , tk_ok=0)
-AC_EGREP_HEADER(strtoul, stdlib.h, , tk_ok=0)
-AC_EGREP_HEADER(strtod, stdlib.h, , tk_ok=0)
-if test $tk_ok = 0; then
-    AC_DEFINE(NO_STDLIB_H, 1, [Do we have <stdlib.h>?])
-fi
-
-#------------------------------------------------------------------------
-# If we're using GCC, see if the compiler understands -pipe.  If so, use it.
-# It makes compiling go faster.  (This is only a performance feature.)
-#------------------------------------------------------------------------
-
-if test -z "$no_pipe" && test -n "$GCC"; then
-    AC_CACHE_CHECK([if the compiler understands -pipe],
-	tcl_cv_cc_pipe, [
-	hold_cflags=$CFLAGS; CFLAGS="$CFLAGS -pipe"
-	AC_TRY_COMPILE(,, tcl_cv_cc_pipe=yes, tcl_cv_cc_pipe=no)
-	CFLAGS=$hold_cflags])
-    if test $tcl_cv_cc_pipe = yes; then
-	CFLAGS="$CFLAGS -pipe"
-    fi
-fi
-
-#------------------------------------------------------------------------
-# Threads support - this auto-enables if Tcl was compiled threaded
-#------------------------------------------------------------------------
-
-SC_ENABLE_THREADS
-
-# Add the threads support libraries
-LIBS="$LIBS$THREADS_LIBS"
-
-SC_ENABLE_SHARED
-
-#--------------------------------------------------------------------
-# The statements below define a collection of compile flags.  This
-# macro depends on the value of SHARED_BUILD, and should be called
-# after SC_ENABLE_SHARED checks the configure switches.
-#--------------------------------------------------------------------
-
-SC_CONFIG_CFLAGS
-
-SC_ENABLE_SYMBOLS
-
-#--------------------------------------------------------------------
-#	Detect what compiler flags to set for 64-bit support.
-#--------------------------------------------------------------------
-
-SC_TCL_EARLY_FLAGS
-
-SC_TCL_64BIT_FLAGS
-
-#--------------------------------------------------------------------
-#	Check endianness because we can optimize some operations
-#--------------------------------------------------------------------
-
-AC_C_BIGENDIAN
-
-#------------------------------------------------------------------------
-# If Tcl and Tk are installed in different places, adjust the library
-# search path to reflect this.
-#------------------------------------------------------------------------
-
-LIB_RUNTIME_DIR='$(libdir)'
-
-if test "$TCL_EXEC_PREFIX" != "$exec_prefix"; then
-    LIB_RUNTIME_DIR="${LIB_RUNTIME_DIR}:${TCL_EXEC_PREFIX}/lib"
-fi
-
-if test "$TCL_PREFIX" != "$prefix"; then
-    AC_MSG_WARN([
-        Different --prefix selected for Tk and Tcl!
-        [[package require Tk]] may not work correctly in tclsh.])
-fi
-
-#--------------------------------------------------------------------
-#	Include sys/select.h if it exists and if it supplies things
-#	that appear to be useful and aren't already in sys/types.h.
-#	This appears to be true only on the RS/6000 under AIX.  Some
-#	systems like OSF/1 have a sys/select.h that's of no use, and
-#	other systems like SCO UNIX have a sys/select.h that's
-#	pernicious.  If "fd_set" isn't defined anywhere then set a
-#	special flag.
-#--------------------------------------------------------------------
-
-AC_CACHE_CHECK([for fd_set in sys/types], tcl_cv_type_fd_set, [
-    AC_TRY_COMPILE([#include <sys/types.h>],[fd_set readMask, writeMask;],
-	tcl_cv_type_fd_set=yes, tcl_cv_type_fd_set=no)])
-tk_ok=$tcl_cv_type_fd_set
-if test $tk_ok = no; then
-    AC_CACHE_CHECK([for fd_mask in sys/select], tcl_cv_grep_fd_mask, [
-	AC_EGREP_HEADER(fd_mask, sys/select.h,
-	     tcl_cv_grep_fd_mask=present, tcl_cv_grep_fd_mask=missing)])
-    if test $tcl_cv_grep_fd_mask = present; then
-	AC_DEFINE(HAVE_SYS_SELECT_H, 1, [Should we include <sys/select.h>?])
-	tk_ok=yes
-    fi
-fi
-if test $tk_ok = no; then
-    AC_DEFINE(NO_FD_SET, 1, [Do we have fd_set?])
-fi
-
-#------------------------------------------------------------------------------
-#       Find out all about time handling differences.
-#------------------------------------------------------------------------------
-
-AC_CHECK_HEADERS(sys/time.h)
-AC_HEADER_TIME
-
-#--------------------------------------------------------------------
-#	Under Solaris 2.4, strtod returns the wrong value for the
-#	terminating character under some conditions.  Check for this
-#	and if the problem exists use a substitute procedure
-#	"fixstrtod" (provided by Tcl) that corrects the error.
-#--------------------------------------------------------------------
-
-SC_BUGGY_STRTOD
-
-#--------------------------------------------------------------------
-#	Check for various typedefs and provide substitutes if
-#	they don't exist.
-#--------------------------------------------------------------------
-
-AC_TYPE_MODE_T
-AC_TYPE_PID_T
-AC_TYPE_SIZE_T
-AC_TYPE_UID_T
-
-AC_CHECK_TYPE([intptr_t], [
-    AC_DEFINE([HAVE_INTPTR_T], 1, [Do we have the intptr_t type?])], [
-    AC_CACHE_CHECK([for pointer-size signed integer type], tcl_cv_intptr_t, [
-    for tcl_cv_intptr_t in "int" "long" "long long" none; do
-	if test "$tcl_cv_intptr_t" != none; then
-	    AC_COMPILE_IFELSE([AC_LANG_BOOL_COMPILE_TRY([AC_INCLUDES_DEFAULT],
-		    [[sizeof (void *) <= sizeof ($tcl_cv_intptr_t)]])],
-		[tcl_ok=yes], [tcl_ok=no])
-	    test "$tcl_ok" = yes && break; fi
-    done])
-    if test "$tcl_cv_intptr_t" != none; then
-	AC_DEFINE_UNQUOTED([intptr_t], [$tcl_cv_intptr_t], [Signed integer
-	   type wide enough to hold a pointer.])
-    fi
-])
-AC_CHECK_TYPE([uintptr_t], [
-    AC_DEFINE([HAVE_UINTPTR_T], 1, [Do we have the uintptr_t type?])], [
-    AC_CACHE_CHECK([for pointer-size unsigned integer type], tcl_cv_uintptr_t, [
-    for tcl_cv_uintptr_t in "unsigned int" "unsigned long" "unsigned long long" \
-	    none; do
-	if test "$tcl_cv_uintptr_t" != none; then
-	    AC_COMPILE_IFELSE([AC_LANG_BOOL_COMPILE_TRY([AC_INCLUDES_DEFAULT],
-		    [[sizeof (void *) <= sizeof ($tcl_cv_uintptr_t)]])],
-		[tcl_ok=yes], [tcl_ok=no])
-	    test "$tcl_ok" = yes && break; fi
-    done])
-    if test "$tcl_cv_uintptr_t" != none; then
-	AC_DEFINE_UNQUOTED([uintptr_t], [$tcl_cv_uintptr_t], [Unsigned integer
-	   type wide enough to hold a pointer.])
-    fi
-])
-
-#-------------------------------------------
-#     In OS/390 struct pwd has no pw_gecos field
-#-------------------------------------------
-
-AC_CACHE_CHECK([pw_gecos in struct pwd], tcl_cv_pwd_pw_gecos, [
-    AC_TRY_COMPILE([#include <pwd.h>],
-	    [struct passwd pwd; pwd.pw_gecos;],
-	    tcl_cv_pwd_pw_gecos=yes, tcl_cv_pwd_pw_gecos=no)])
-if test $tcl_cv_pwd_pw_gecos = yes; then
-    AC_DEFINE(HAVE_PW_GECOS, 1, [Does struct password have a pw_gecos field?])
-fi
-
-#--------------------------------------------------------------------
-#	On Mac OS X, we can build either with X11 or with Aqua
-#--------------------------------------------------------------------
-
-if test "`uname -s`" = "Darwin" ; then
-    AC_MSG_CHECKING([whether to use Aqua])
-    AC_ARG_ENABLE(aqua,
-	AC_HELP_STRING([--enable-aqua=yes|no],
-	    [use Aqua windowingsystem on Mac OS X (default: no)]),
-	[tk_aqua=$enableval], [tk_aqua=no])
-    if test $tk_aqua = yes -o $tk_aqua = cocoa; then
-	tk_aqua=yes
-	if test $tcl_corefoundation = no; then
-	    AC_MSG_WARN([Aqua can only be used when CoreFoundation is available])
-	    tk_aqua=no
-	fi
-	if test ! -d /System/Library/Frameworks/Cocoa.framework; then
-	    AC_MSG_WARN([Aqua can only be used when Cocoa is available])
-	    tk_aqua=no
-	fi
-	if test "`uname -r | awk -F. '{print [$]1}'`" -lt 9; then
-	    AC_MSG_WARN([Aqua requires Mac OS X 10.5 or later])
-	    tk_aqua=no
-	fi
-    fi
-    AC_MSG_RESULT([$tk_aqua])
-    if test "$fat_32_64" = yes; then
-	if test $tk_aqua = no; then
-	    AC_CACHE_CHECK([for 64-bit X11], tcl_cv_lib_x11_64, [
-		for v in CFLAGS CPPFLAGS LDFLAGS; do
-		    eval 'hold_'$v'="$'$v'";'$v'="`echo "$'$v' "|sed -e "s/-arch ppc / /g" -e "s/-arch i386 / /g"`"'
-		done
-		CPPFLAGS="$CPPFLAGS -I/usr/X11R6/include"
-		LDFLAGS="$LDFLAGS -L/usr/X11R6/lib -lX11"
-		AC_TRY_LINK([#include <X11/Xlib.h>], [XrmInitialize();],
-		    tcl_cv_lib_x11_64=yes, tcl_cv_lib_x11_64=no)
-		for v in CFLAGS CPPFLAGS LDFLAGS; do
-		    eval $v'="$hold_'$v'"'
-		done])
-	fi
-	# remove 64-bit arch flags from CFLAGS et al. for combined 32 & 64 bit
-	# fat builds if configuration does not support 64-bit.
-	if test "$tcl_cv_lib_x11_64" = no; then
-	    AC_MSG_NOTICE([Removing 64-bit architectures from compiler & linker flags])
-	    for v in CFLAGS CPPFLAGS LDFLAGS; do
-		eval $v'="`echo "$'$v' "|sed -e "s/-arch ppc64 / /g" -e "s/-arch x86_64 / /g"`"'
-	    done
-	fi
-    fi
-    if test $tk_aqua = no; then
-	# check if weak linking whole libraries is possible.
-	AC_CACHE_CHECK([if ld accepts -weak-l flag], tcl_cv_ld_weak_l, [
-	    hold_ldflags=$LDFLAGS
-	    LDFLAGS="$LDFLAGS -Wl,-weak-lm"
-	    AC_TRY_LINK([#include <math.h>], [double f = sin(1.0);],
-		tcl_cv_ld_weak_l=yes, tcl_cv_ld_weak_l=no)
-	    LDFLAGS=$hold_ldflags])
-    fi
-    AC_CHECK_HEADERS(AvailabilityMacros.h)
-    if test "$ac_cv_header_AvailabilityMacros_h" = yes; then
-	AC_CACHE_CHECK([if weak import is available], tcl_cv_cc_weak_import, [
-	    hold_cflags=$CFLAGS; CFLAGS="$CFLAGS -Werror"
-	    AC_TRY_LINK([
-		    #ifdef __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__
-		    #if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1020
-		    #error __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1020
-		    #endif
-		    #elif MAC_OS_X_VERSION_MIN_REQUIRED < 1020
-		    #error MAC_OS_X_VERSION_MIN_REQUIRED < 1020
-		    #endif
-		    int rand(void) __attribute__((weak_import));
-		], [rand();],
-		tcl_cv_cc_weak_import=yes, tcl_cv_cc_weak_import=no)
-	    CFLAGS=$hold_cflags])
-	if test $tcl_cv_cc_weak_import = yes; then
-	    AC_DEFINE(HAVE_WEAK_IMPORT, 1, [Is weak import available?])
-	fi
-	AC_CACHE_CHECK([if Darwin SUSv3 extensions are available],
-	    tcl_cv_cc_darwin_c_source, [
-	    hold_cflags=$CFLAGS; CFLAGS="$CFLAGS -Werror"
-	    AC_TRY_COMPILE([
-		    #ifdef __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__
-		    #if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1050
-		    #error __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1050
-		    #endif
-		    #elif MAC_OS_X_VERSION_MIN_REQUIRED < 1050
-		    #error MAC_OS_X_VERSION_MIN_REQUIRED < 1050
-		    #endif
-		    #define _DARWIN_C_SOURCE 1
-		    #include <sys/cdefs.h>
-		],,tcl_cv_cc_darwin_c_source=yes, tcl_cv_cc_darwin_c_source=no)
-	    CFLAGS=$hold_cflags])
-	if test $tcl_cv_cc_darwin_c_source = yes; then
-	    AC_DEFINE(_DARWIN_C_SOURCE, 1,
-		    [Are Darwin SUSv3 extensions available?])
-	fi
-    fi
-else
-    tk_aqua=no
-fi
-
-if test $tk_aqua = yes; then
-    AC_DEFINE(MAC_OSX_TK, 1, [Are we building TkAqua?])
-    LIBS="$LIBS -framework Cocoa -framework Carbon -framework IOKit"
-    EXTRA_CC_SWITCHES='-std=gnu99 -x objective-c'
-    TK_WINDOWINGSYSTEM=AQUA
-    if test -n "${enable_symbols}" -a "${enable_symbols}" != no; then
-        AC_DEFINE(TK_MAC_DEBUG, 1, [Are TkAqua debug messages enabled?])
-    fi
-else
-    #--------------------------------------------------------------------
-    #	Locate the X11 header files and the X11 library archive.  Try
-    #	the ac_path_x macro first, but if it doesn't find the X stuff
-    #	(e.g. because there's no xmkmf program) then check through
-    #	a list of possible directories.  Under some conditions the
-    #	autoconf macro will return an include directory that contains
-    #	no include files, so double-check its result just to be safe.
-    #--------------------------------------------------------------------
-
-    SC_PATH_X
-    TK_WINDOWINGSYSTEM=X11
-fi
-
-#--------------------------------------------------------------------
-#	Various manipulations on the search path used at runtime to
-#	find shared libraries:
-#	1. If the X library binaries are in a non-standard directory,
-#	   add the X library location into that search path.
-#	2. On systems such as AIX and Ultrix that use "-L" as the
-#	   search path option, colons cannot be used to separate
-#	   directories from each other. Change colons to " -L".
-#	3. Create two sets of search flags, one for use in cc lines
-#	   and the other for when the linker is invoked directly.  In
-#	   the second case, '-Wl,' must be stripped off and commas must
-#	   be replaced by spaces.
-#--------------------------------------------------------------------
-
-if test "x${x_libraries}" != "x"; then
-  if test "x${x_libraries}" != "xNONE"; then
-    LIB_RUNTIME_DIR="${LIB_RUNTIME_DIR}:${x_libraries}"
-  fi
-fi
-if test "${TCL_LD_SEARCH_FLAGS}" = '-L${LIB_RUNTIME_DIR}'; then
-    LIB_RUNTIME_DIR=`echo ${LIB_RUNTIME_DIR} |sed -e 's/:/ -L/g'`
-fi
-
-#--------------------------------------------------------------------
-#	Check for the existence of various libraries.  The order here
-#	is important, so that then end up in the right order in the
-#	command line generated by make.  The -lsocket and -lnsl libraries
-#	require a couple of special tricks:
-#	1. Use "connect" and "accept" to check for -lsocket, and
-#	   "gethostbyname" to check for -lnsl.
-#	2. Use each function name only once:  can't redo a check because
-#	   autoconf caches the results of the last check and won't redo it.
-#	3. Use -lnsl and -lsocket only if they supply procedures that
-#	   aren't already present in the normal libraries.  This is because
-#	   IRIX 5.2 has libraries, but they aren't needed and they're
-#	   bogus:  they goof up name resolution if used.
-#	4. On some SVR4 systems, can't use -lsocket without -lnsl too.
-#	   To get around this problem, check for both libraries together
-#	   if -lsocket doesn't work by itself.
-#--------------------------------------------------------------------
-
-if test $tk_aqua = no; then
-    AC_CHECK_LIB(Xbsd, main, [LIBS="$LIBS -lXbsd"])
-fi
-
-#--------------------------------------------------------------------
-# One more check related to the X libraries.  The standard releases
-# of Ultrix don't support the "xauth" mechanism, so send won't work
-# unless TK_NO_SECURITY is defined.  However, there are usually copies
-# of the MIT X server available as well, which do support xauth.
-# Check for the MIT stuff and use it if it exists.
-#
-# Note: can't use ac_check_lib macro (at least, not in Autoconf 2.1)
-# because it can't deal with the "-" in the library name.
-#--------------------------------------------------------------------
-
-if test -d /usr/include/mit -a $tk_aqua = no; then
-    AC_MSG_CHECKING([MIT X libraries])
-    tk_oldCFlags=$CFLAGS
-    CFLAGS="$CFLAGS -I/usr/include/mit"
-    tk_oldLibs=$LIBS
-    LIBS="$LIBS -lX11-mit"
-    AC_TRY_LINK([
-	#include <X11/Xlib.h>
-    ], [
-	XOpenDisplay(0);
-    ], [
-	AC_MSG_RESULT([yes])
-	XLIBSW="-lX11-mit"
-	XINCLUDES="-I/usr/include/mit"
-    ], AC_MSG_RESULT([no]))
-    CFLAGS=$tk_oldCFlags
-    LIBS=$tk_oldLibs
-fi
-
-#--------------------------------------------------------------------
-#	Check for freetype / fontconfig / Xft support.
-#--------------------------------------------------------------------
-
-if test $tk_aqua = no; then
-    AC_MSG_CHECKING([whether to use xft])
-    AC_ARG_ENABLE(xft,
-	AC_HELP_STRING([--enable-xft],
-	    [use freetype/fontconfig/xft (default: on)]),
-	[enable_xft=$enableval], [enable_xft="default"])
-    XFT_CFLAGS=""
-    XFT_LIBS=""
-    if test "$enable_xft" = "no" ; then
-	AC_MSG_RESULT([$enable_xft])
-    else
-	found_xft="yes"
-	dnl make sure package configurator (xft-config or pkg-config
-	dnl says that xft is present.
-	XFT_CFLAGS=`xft-config --cflags 2>/dev/null` || found_xft="no"
-	XFT_LIBS=`xft-config --libs 2>/dev/null` || found_xft="no"
-	if test "$found_xft" = "no" ; then
-	    found_xft=yes
-	    XFT_CFLAGS=`pkg-config --cflags xft 2>/dev/null` || found_xft="no"
-	    XFT_LIBS=`pkg-config --libs xft 2>/dev/null` || found_xft="no"
-	fi
-	AC_MSG_RESULT([$found_xft])
-	dnl make sure that compiling against Xft header file doesn't bomb
-	if test "$found_xft" = "yes" ; then
-	    tk_oldCFlags=$CFLAGS
-	    CFLAGS="$CFLAGS $XINCLUDES $XFT_CFLAGS"
-	    tk_oldLibs=$LIBS
-	    LIBS="$tk_oldLIBS $XFT_LIBS $XLIBSW"
-	    AC_CHECK_HEADER(X11/Xft/Xft.h, [], [
-		found_xft=no
-	    ],[#include <X11/Xlib.h>])
-	    CFLAGS=$tk_oldCFlags
-	    LIBS=$tk_oldLibs
-	fi
-	dnl make sure that linking against Xft libraries finds freetype
-	if test "$found_xft" = "yes" ; then
-	    tk_oldCFlags=$CFLAGS
-	    CFLAGS="$CFLAGS $XINCLUDES $XFT_CFLAGS"
-	    tk_oldLibs=$LIBS
-	    LIBS="$tk_oldLIBS $XFT_LIBS $XLIBSW"
-	    AC_CHECK_LIB(Xft, XftFontOpen, [], [
-		found_xft=no
-	    ])
-	    CFLAGS=$tk_oldCFlags
-	    LIBS=$tk_oldLibs
-	fi
-	dnl make sure that linking against fontconfig libraries finds Fc* symbols
-	if test "$found_xft" = "yes" ; then
-	    tk_oldCFlags=$CFLAGS
-	    CFLAGS="$CFLAGS $XINCLUDES $XFT_CFLAGS"
-	    tk_oldLibs=$LIBS
-	    LIBS="$tk_oldLIBS $XFT_LIBS $XLIBSW -lfontconfig"
-	    AC_CHECK_LIB(fontconfig, FcFontSort, [
-		XFT_LIBS="$XFT_LIBS -lfontconfig"
-	    ], [])
-	    CFLAGS=$tk_oldCFlags
-	    LIBS=$tk_oldLibs
-	fi
-	dnl print a warning if xft is unusable and was specifically requested
-	if test "$found_xft" = "no" ; then
-	    if test "$enable_xft" = "yes" ; then
-		AC_MSG_WARN([Can't find xft configuration, or xft is unusable])
-	    fi
-	    enable_xft=no
-	    XFT_CFLAGS=""
-	    XFT_LIBS=""
-	else
-            enable_xft=yes
-	fi
-    fi
-    if test $enable_xft = "yes" ; then
-	UNIX_FONT_OBJS=tkUnixRFont.o
-	AC_DEFINE(HAVE_XFT, 1, [Have we turned on XFT (antialiased fonts)?])
-    else
-	UNIX_FONT_OBJS=tkUnixFont.o
-    fi
-    AC_SUBST(XFT_CFLAGS)
-    AC_SUBST(XFT_LIBS)
-    AC_SUBST(UNIX_FONT_OBJS)
-fi
-
-#--------------------------------------------------------------------
-#	Check for XkbKeycodeToKeysym.
-#--------------------------------------------------------------------
-
-if test $tk_aqua = no; then
-    tk_oldCFlags=$CFLAGS
-    tk_oldLibs=$LIBS
-    CFLAGS="$CFLAGS $XINCLUDES"
-    LIBS="$LIBS $XLIBSW"
-    AC_CHECK_HEADER(X11/XKBlib.h, [
-	xkblib_header_found=yes
-    ], [
-	xkblib_header_found=no
-    ], [#include <X11/Xlib.h>])
-    if test $xkblib_header_found = "yes" ; then
-	AC_CHECK_LIB(X11, XkbKeycodeToKeysym, [
-	    xkbkeycodetokeysym_found=yes
-	], [
-	    xkbkeycodetokeysym_found=no
-	])
-    else
-	xkbkeycodetokeysym_found=no
-    fi
-    if test $xkbkeycodetokeysym_found = "yes" ; then
-	AC_DEFINE(HAVE_XKBKEYCODETOKEYSYM, 1, [Do we have XkbKeycodeToKeysym?])
-    fi
-    CFLAGS=$tk_oldCFlags
-    LIBS=$tk_oldLibs
-fi
-
-#--------------------------------------------------------------------
-# Check whether XKeycodeToKeysym is deprecated in X11 headers.
-#--------------------------------------------------------------------
-
-if test $tk_aqua = no && test "$GCC" = yes; then
-    AC_MSG_CHECKING([whether XKeycodeToKeysym is deprecated])
-    tk_oldCFlags=$CFLAGS
-    CFLAGS="$CFLAGS -Werror"
-    AC_TRY_LINK([
-	#include <X11/Xlib.h>
-    ], [
-	XKeycodeToKeysym(0,0,0);
-    ], [
-	AC_MSG_RESULT([no])
-    ], [
-    AC_MSG_RESULT([yes])
-	AC_DEFINE(XKEYCODETOKEYSYM_IS_DEPRECATED, 1, [Is XKeycodeToKeysym deprecated?])
-	])
-    CFLAGS=$tk_oldCFlags
-fi
-
-#--------------------------------------------------------------------
-# XXX Do this last.
-# It might modify XLIBSW which could affect other tests.
-#
-# Check whether the header and library for the XScreenSaver
-# extension are available, and set HAVE_XSS if so.
-# XScreenSaver is needed for Tk_GetUserInactiveTime().
-#--------------------------------------------------------------------
-
-if test $tk_aqua = no; then
-    tk_oldCFlags=$CFLAGS
-    CFLAGS="$CFLAGS $XINCLUDES"
-    tk_oldLibs=$LIBS
-    LIBS="$tk_oldLibs $XLIBSW"
-    xss_header_found=no
-    xss_lib_found=no
-    AC_MSG_CHECKING([whether to try to use XScreenSaver])
-    AC_ARG_ENABLE(xss,
-	AC_HELP_STRING([--enable-xss],
-	    [use XScreenSaver for activity timer (default: on)]),
-	[enable_xss=$enableval], [enable_xss=yes])
-    if test "$enable_xss" = "no" ; then
-	AC_MSG_RESULT([$enable_xss])
-    else
-	AC_MSG_RESULT([$enable_xss])
-	AC_CHECK_HEADER(X11/extensions/scrnsaver.h, [
-	    xss_header_found=yes
-	],,[#include <X11/Xlib.h>])
-	AC_CHECK_FUNC(XScreenSaverQueryInfo,,[
-	    AC_CHECK_LIB(Xext, XScreenSaverQueryInfo, [
-		XLIBSW="$XLIBSW -lXext"
-		xss_lib_found=yes
-	    ], [
-		AC_CHECK_LIB(Xss, XScreenSaverQueryInfo, [
-		    if test "$tcl_cv_ld_weak_l" = yes; then
-			# On Darwin, weak link libXss if possible,
-			# as it is only available on Tiger or later.
-			XLIBSW="$XLIBSW -Wl,-weak-lXss -lXext"
-		    else
-			XLIBSW="$XLIBSW -lXss -lXext"
-		    fi
-		    xss_lib_found=yes
-		],, -lXext)
-	    ])
-	])
-    fi
-    if test $enable_xss = yes -a $xss_lib_found = yes -a $xss_header_found = yes; then
-	AC_DEFINE(HAVE_XSS, 1, [Is XScreenSaver available?])
-    fi
-    CFLAGS=$tk_oldCFlags
-    LIBS=$tk_oldLibs
-fi
-
-#--------------------------------------------------------------------
-#	Figure out whether "char" is unsigned.  If so, set a
-#	#define for __CHAR_UNSIGNED__.
-#--------------------------------------------------------------------
-
-AC_C_CHAR_UNSIGNED
-
-#--------------------------------------------------------------------
-#	The statements below define a collection of symbols related to
-#	building libtk as a shared library instead of a static library.
-#--------------------------------------------------------------------
-
-eval eval "TK_UNSHARED_LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}"
-eval eval "TK_SHARED_LIB_SUFFIX=${SHARED_LIB_SUFFIX}"
-eval "TK_LIB_FILE=libtk${LIB_SUFFIX}"
-
-# tkConfig.sh needs a version of the _LIB_SUFFIX that has been eval'ed
-# since on some platforms TK_LIB_FILE contains shell escapes.
-
-eval "TK_LIB_FILE=${TK_LIB_FILE}"
-
-if test "${SHARED_BUILD}" = "1" -a "${SHLIB_SUFFIX}" != ""; then
-    SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \${TCL_STUB_LIB_SPEC}"
-    TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
-fi
-
-TK_LIBRARY='$(prefix)/lib/tk$(VERSION)'
-PRIVATE_INCLUDE_DIR='$(includedir)'
-HTML_DIR='$(DISTDIR)/html'
-TK_PKG_DIR='tk$(VERSION)'
-TK_RSRC_FILE='tk$(VERSION).rsrc'
-WISH_RSRC_FILE='wish$(VERSION).rsrc'
-
-# Note:  in the following variable, it's important to use the absolute
-# path name of the Tcl directory rather than "..":  this is because
-# AIX remembers this path and will attempt to use it at run-time to look
-# up the Tcl library.
-
-if test "`uname -s`" = "Darwin" ; then
-    SC_ENABLE_FRAMEWORK
-    TK_SHLIB_LD_EXTRAS="-compatibility_version ${TK_VERSION} -current_version ${TK_VERSION}`echo ${TK_PATCH_LEVEL} | awk ['{match($0, "\\\.[0-9]+"); print substr($0,RSTART,RLENGTH)}']`"
-    TK_SHLIB_LD_EXTRAS="${TK_SHLIB_LD_EXTRAS}"' -install_name "${DYLIB_INSTALL_DIR}/${TK_LIB_FILE}" -unexported_symbols_list $$(f=$(TK_LIB_FILE).E && nm -gp tkMacOSX*.o 2>/dev/null | awk "/^[[0-9a-f]]+ . \.objc/ {print \$$3}" > $$f && nm -gjp "$(TCL_BIN_DIR)"/$(TCL_STUB_LIB_FILE) | grep ^_[[^_]] >> $$f && echo $$f)'
-    echo "$LDFLAGS " | grep -q -- '-prebind ' && TK_SHLIB_LD_EXTRAS="${TK_SHLIB_LD_EXTRAS}"' -seg1addr 0xb000000'
-    TK_SHLIB_LD_EXTRAS="${TK_SHLIB_LD_EXTRAS}"' -sectcreate __TEXT __info_plist Tk-Info.plist'
-    EXTRA_WISH_LIBS='-sectcreate __TEXT __info_plist Wish-Info.plist'
-    EXTRA_APP_CC_SWITCHES="${EXTRA_APP_CC_SWITCHES}"' -mdynamic-no-pic'
-    AC_CONFIG_FILES([Tk-Info.plist:../macosx/Tk-Info.plist.in Wish-Info.plist:../macosx/Wish-Info.plist.in])
-    for l in ${LOCALES}; do CFBUNDLELOCALIZATIONS="${CFBUNDLELOCALIZATIONS}<string>$l</string>"; done
-    TK_YEAR="`date +%Y`"
-fi
-
-if test "$FRAMEWORK_BUILD" = "1" ; then
-    AC_DEFINE(TK_FRAMEWORK, 1, [Is Tk built as a framework?])
-    # Construct a fake local framework structure to make linking with
-    # '-framework Tk' and running of tktest work
-    AC_CONFIG_COMMANDS([Tk.framework], [n=Tk &&
-        f=$n.framework && v=Versions/$VERSION &&
-        rm -rf $f && mkdir -p $f/$v/Resources &&
-        ln -s $v/$n $v/Resources $f && ln -s ../../../$n $f/$v &&
-        ln -s ../../../../$n-Info.plist $f/$v/Resources/Info.plist &&
-        if test $tk_aqua = yes; then ln -s ../../../../$n.rsrc $f/$v/Resources; fi &&
-        unset n f v
-    ], VERSION=${TK_VERSION} && tk_aqua=${tk_aqua})
-    LD_LIBRARY_PATH_VAR="DYLD_FRAMEWORK_PATH"
-    if test "${libdir}" = '${exec_prefix}/lib'; then
-        # override libdir default
-        libdir="/Library/Frameworks"
-    fi
-    TK_LIB_FILE="Tk"
-    TK_LIB_FLAG="-framework Tk"
-    TK_BUILD_LIB_SPEC="-F`pwd | sed -e 's/ /\\\\ /g'` -framework Tk"
-    TK_LIB_SPEC="-F${libdir} -framework Tk"
-    libdir="${libdir}/Tk.framework/Versions/\${VERSION}"
-    TK_LIBRARY="${libdir}/Resources/Scripts"
-    TK_PKG_DIR="Resources/Scripts"
-    TK_RSRC_FILE="Tk.rsrc"
-    WISH_RSRC_FILE="Wish.rsrc"
-    includedir="${libdir}/Headers"
-    PRIVATE_INCLUDE_DIR="${libdir}/PrivateHeaders"
-    HTML_DIR="${libdir}/Resources/Documentation/Reference/Tk"
-    EXTRA_INSTALL="install-private-headers html-tk"
-    EXTRA_BUILD_HTML='@ln -fs contents.htm "$(HTML_INSTALL_DIR)"/TkTOC.html'
-    EXTRA_INSTALL_BINARIES='@echo "Installing Info.plist to $(LIB_INSTALL_DIR)/Resources/" && $(INSTALL_DATA_DIR) "$(LIB_INSTALL_DIR)/Resources" && $(INSTALL_DATA) Tk-Info.plist "$(LIB_INSTALL_DIR)/Resources/Info.plist"'
-    EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Installing license.terms to $(LIB_INSTALL_DIR)/Resources/" && $(INSTALL_DATA) "$(TOP_DIR)/license.terms" "$(LIB_INSTALL_DIR)/Resources"'
-    if test $tk_aqua = yes; then
-	EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Installing Images to $(LIB_INSTALL_DIR)/Resources/" && $(INSTALL_DATA_DIR) "$(LIB_INSTALL_DIR)/Resources" && for i in Tk.tiff Tk.icns; do $(INSTALL_DATA) "$(MAC_OSX_DIR)/$$i" "$(LIB_INSTALL_DIR)/Resources"; done'
-	EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Installing wish$(VERSION) script to $(INSTALL_ROOT)/'"${bindir}"'/" && $(INSTALL_DATA_DIR) "$(INSTALL_ROOT)/'"${bindir}"'" && printf > "$(INSTALL_ROOT)/'"${bindir}"'/wish$(VERSION)" "#!/bin/sh\n\"\$$(dirname \$$0)'"`eval d="${bindir}"; echo "$d" | sed -e 's#/[^/][^/]*#/..#g'`"'$(bindir)/Wish\" \"\$$@\"" && chmod +x "$(INSTALL_ROOT)/'"${bindir}"'/wish$(VERSION)"'
-	bindir="${libdir}/Resources/Wish.app/Contents/MacOS"
-	EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Installing Info.plist to $(BIN_INSTALL_DIR)/.." && $(INSTALL_DATA) Wish-Info.plist "$(BIN_INSTALL_DIR)/../Info.plist" && mv -f "$(BIN_INSTALL_DIR)/wish$(VERSION)" "$(BIN_INSTALL_DIR)/Wish"'
-	EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Installing Wish.icns to $(BIN_INSTALL_DIR)/../Resources" && $(INSTALL_DATA_DIR) "$(BIN_INSTALL_DIR)/../Resources"'
-	EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && $(INSTALL_DATA) "$(MAC_OSX_DIR)/Tk.icns" "$(BIN_INSTALL_DIR)/../Resources/Wish.icns"'
-	EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Installing Wish.sdef to $(BIN_INSTALL_DIR)/../Resources" && $(INSTALL_DATA) "$(MAC_OSX_DIR)/Wish.sdef" "$(BIN_INSTALL_DIR)/../Resources"'
-    fi
-    EXTRA_INSTALL_BINARIES="$EXTRA_INSTALL_BINARIES"' && echo "Finalizing Tk.framework" && rm -f "$(LIB_INSTALL_DIR)/../Current" && ln -s "$(VERSION)" "$(LIB_INSTALL_DIR)/../Current" && for f in "$(LIB_FILE)" tkConfig.sh Resources Headers PrivateHeaders; do rm -f "$(LIB_INSTALL_DIR)/../../$$f" && ln -s "Versions/Current/$$f" "$(LIB_INSTALL_DIR)/../.."; done && f="$(STUB_LIB_FILE)" && rm -f "$(LIB_INSTALL_DIR)/../../$$f" && ln -s "Versions/$(VERSION)/$$f" "$(LIB_INSTALL_DIR)/../.."'
-    # Don't use AC_DEFINE for the following as the framework version define
-    # needs to go into the Makefile even when using autoheader, so that we
-    # can pick up a potential make override of VERSION. Also, don't put this
-    # into CFLAGS as it should not go into tkConfig.sh
-    EXTRA_CC_SWITCHES="$EXTRA_CC_SWITCHES"' -DTK_FRAMEWORK_VERSION=\"$(VERSION)\"'
-else
-    if test $tk_aqua = yes; then
-        EXTRA_INSTALL_BINARIES='@echo "Installing Images to $(LIB_INSTALL_DIR)/" && $(INSTALL_DATA_DIR) "$(LIB_INSTALL_DIR)" && for i in Tk.tiff Tk.icns; do $(INSTALL_DATA) "$(MAC_OSX_DIR)/$$i" "$(LIB_INSTALL_DIR)"; done'
-    fi
-    # libdir must be a fully qualified path and not ${exec_prefix}/lib
-    eval libdir="$libdir"
-    if test "${ac_cv_cygwin}" = "yes" -a "$SHARED_BUILD" = "1"; then
-	TK_LIB_FLAG="-ltk`echo ${TK_VERSION} | tr -d .`"
-	TK_BUILD_LIB_SPEC="-L\$(TOP_DIR)/win ${TK_LIB_FLAG}"
-    else
-	if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
-	    TK_LIB_FLAG="-ltk${TK_VERSION}"
-	else
-	    TK_LIB_FLAG="-ltk`echo ${TK_VERSION} | tr -d .`"
-	fi
-	TK_BUILD_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TK_LIB_FLAG}"
-    fi
-    TK_LIB_SPEC="-L${libdir} ${TK_LIB_FLAG}"
-fi
-
-#--------------------------------------------------------------------
-#       The statements below define various symbols relating to Tk
-#       stub support.
-#--------------------------------------------------------------------
-
-# Replace ${VERSION} with contents of ${TK_VERSION}
-eval "TK_STUB_LIB_FILE=libtkstub${TK_UNSHARED_LIB_SUFFIX}"
-eval "TK_STUB_LIB_DIR=${libdir}"
-
-if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
-    TK_STUB_LIB_FLAG="-ltkstub${TK_VERSION}"
-else
-    TK_STUB_LIB_FLAG="-ltkstub`echo ${TK_VERSION} | tr -d .`"
-fi
-
-TK_BUILD_STUB_LIB_SPEC="-L`pwd | sed -e 's/ /\\\\ /g'` ${TK_STUB_LIB_FLAG}"
-TK_STUB_LIB_SPEC="-L${TK_STUB_LIB_DIR} ${TK_STUB_LIB_FLAG}"
-TK_BUILD_STUB_LIB_PATH="`pwd`/${TK_STUB_LIB_FILE}"
-TK_STUB_LIB_PATH="${TK_STUB_LIB_DIR}/${TK_STUB_LIB_FILE}"
-
-# Install time header dir can be set via --includedir
-eval "TK_INCLUDE_SPEC=\"-I${includedir}\""
-
-#------------------------------------------------------------------------
-# tkConfig.sh refers to this by a different name
-#------------------------------------------------------------------------
-
-TK_SHARED_BUILD=${SHARED_BUILD}
-
-AC_SUBST(TK_VERSION)
-AC_SUBST(TK_MAJOR_VERSION)
-AC_SUBST(TK_MINOR_VERSION)
-AC_SUBST(TK_PATCH_LEVEL)
-AC_SUBST(TK_YEAR)
-
-AC_SUBST(TK_LIB_FILE)
-AC_SUBST(TK_LIB_FLAG)
-AC_SUBST(TK_LIB_SPEC)
-AC_SUBST(TK_STUB_LIB_FILE)
-AC_SUBST(TK_STUB_LIB_FLAG)
-AC_SUBST(TK_STUB_LIB_SPEC)
-AC_SUBST(TK_STUB_LIB_PATH)
-AC_SUBST(TK_INCLUDE_SPEC)
-AC_SUBST(TK_BUILD_STUB_LIB_SPEC)
-AC_SUBST(TK_BUILD_STUB_LIB_PATH)
-
-AC_SUBST(TK_SRC_DIR)
-
-AC_SUBST(TK_SHARED_BUILD)
-AC_SUBST(LD_LIBRARY_PATH_VAR)
-
-AC_SUBST(TK_BUILD_LIB_SPEC)
-
-AC_SUBST(TCL_STUB_FLAGS)
-AC_SUBST(XINCLUDES)
-AC_SUBST(XLIBSW)
-AC_SUBST(LOCALES)
-
-AC_SUBST(TK_WINDOWINGSYSTEM)
-AC_SUBST(TK_PKG_DIR)
-AC_SUBST(TK_LIBRARY)
-AC_SUBST(LIB_RUNTIME_DIR)
-AC_SUBST(PRIVATE_INCLUDE_DIR)
-AC_SUBST(HTML_DIR)
-
-AC_SUBST(EXTRA_CC_SWITCHES)
-AC_SUBST(EXTRA_APP_CC_SWITCHES)
-AC_SUBST(EXTRA_INSTALL)
-AC_SUBST(EXTRA_INSTALL_BINARIES)
-AC_SUBST(EXTRA_BUILD_HTML)
-AC_SUBST(EXTRA_WISH_LIBS)
-AC_SUBST(CFBUNDLELOCALIZATIONS)
-
-AC_SUBST(TK_RSRC_FILE)
-AC_SUBST(WISH_RSRC_FILE)
-AC_SUBST(LIB_RSRC_FILE)
-AC_SUBST(APP_RSRC_FILE)
-AC_SUBST(REZ)
-AC_SUBST(REZ_FLAGS)
-
-AC_CONFIG_FILES([
-    Makefile:../unix/Makefile.in
-    tkConfig.sh:../unix/tkConfig.sh.in
-    tk.pc:../unix/tk.pc.in
-])
-AC_OUTPUT
-
-dnl Local Variables:
-dnl mode: autoconf
-dnl End:

Index: unix/tcl.m4
==================================================================
--- unix/tcl.m4
+++ unix/tcl.m4
@@ -91,12 +91,15 @@
 		for i in `ls -d ${libdir} 2>/dev/null` \
 			`ls -d ${exec_prefix}/lib 2>/dev/null` \
 			`ls -d ${prefix}/lib 2>/dev/null` \
 			`ls -d /usr/local/lib 2>/dev/null` \
 			`ls -d /usr/contrib/lib 2>/dev/null` \
+			`ls -d /usr/pkg/lib 2>/dev/null` \
 			`ls -d /usr/lib 2>/dev/null` \
 			`ls -d /usr/lib64 2>/dev/null` \
+			`ls -d /usr/local/lib/tcl8.7 2>/dev/null` \
+			`ls -d /usr/local/lib/tcl/tcl8.7 2>/dev/null` \
 			; do
 		    if test -f "$i/tclConfig.sh" ; then
 			ac_cv_c_tclconfig="`(cd $i; pwd)`"
 			break
 		    fi
@@ -221,12 +224,15 @@
 		for i in `ls -d ${libdir} 2>/dev/null` \
 			`ls -d ${exec_prefix}/lib 2>/dev/null` \
 			`ls -d ${prefix}/lib 2>/dev/null` \
 			`ls -d /usr/local/lib 2>/dev/null` \
 			`ls -d /usr/contrib/lib 2>/dev/null` \
+			`ls -d /usr/pkg/lib 2>/dev/null` \
 			`ls -d /usr/lib 2>/dev/null` \
 			`ls -d /usr/lib64 2>/dev/null` \
+			`ls -d /usr/local/lib/tk8.7 2>/dev/null` \
+			`ls -d /usr/local/lib/tcl/tk8.7 2>/dev/null` \
 			; do
 		    if test -f "$i/tkConfig.sh" ; then
 			ac_cv_c_tkconfig="`(cd $i; pwd)`"
 			break
 		    fi
@@ -539,10 +545,11 @@
     else
 	AC_MSG_RESULT([static])
 	SHARED_BUILD=0
 	AC_DEFINE(STATIC_BUILD, 1, [Is this a static build?])
     fi
+    AC_SUBST(SHARED_BUILD)
 ])
 
 #------------------------------------------------------------------------
 # SC_ENABLE_FRAMEWORK --
 #
@@ -589,118 +596,10 @@
 	    FRAMEWORK_BUILD=0
 	fi
     fi
 ])
 
-#------------------------------------------------------------------------
-# SC_ENABLE_THREADS --
-#
-#	Specify if thread support should be enabled
-#
-# Arguments:
-#	none
-#
-# Results:
-#
-#	Adds the following arguments to configure:
-#		--enable-threads
-#
-#	Sets the following vars:
-#		THREADS_LIBS	Thread library(s)
-#
-#	Defines the following vars:
-#		TCL_THREADS
-#		_REENTRANT
-#		_THREAD_SAFE
-#
-#------------------------------------------------------------------------
-
-AC_DEFUN([SC_ENABLE_THREADS], [
-    AC_ARG_ENABLE(threads,
-	AC_HELP_STRING([--enable-threads],
-	    [build with threads (default: on)]),
-	[tcl_ok=$enableval], [tcl_ok=yes])
-
-    if test "${TCL_THREADS}" = 1; then
-	tcl_threaded_core=1;
-    fi
-
-    if test "$tcl_ok" = "yes" -o "${TCL_THREADS}" = 1; then
-	TCL_THREADS=1
-	# USE_THREAD_ALLOC tells us to try the special thread-based
-	# allocator that significantly reduces lock contention
-	AC_DEFINE(USE_THREAD_ALLOC, 1,
-	    [Do we want to use the threaded memory allocator?])
-	AC_DEFINE(_REENTRANT, 1, [Do we want the reentrant OS API?])
-	if test "`uname -s`" = "SunOS" ; then
-	    AC_DEFINE(_POSIX_PTHREAD_SEMANTICS, 1,
-		    [Do we really want to follow the standard? Yes we do!])
-	fi
-	AC_DEFINE(_THREAD_SAFE, 1, [Do we want the thread-safe OS API?])
-	AC_CHECK_LIB(pthread,pthread_mutex_init,tcl_ok=yes,tcl_ok=no)
-	if test "$tcl_ok" = "no"; then
-	    # Check a little harder for __pthread_mutex_init in the same
-	    # library, as some systems hide it there until pthread.h is
-	    # defined.  We could alternatively do an AC_TRY_COMPILE with
-	    # pthread.h, but that will work with libpthread really doesn't
-	    # exist, like AIX 4.2.  [Bug: 4359]
-	    AC_CHECK_LIB(pthread, __pthread_mutex_init,
-		tcl_ok=yes, tcl_ok=no)
-	fi
-
-	if test "$tcl_ok" = "yes"; then
-	    # The space is needed
-	    THREADS_LIBS=" -lpthread"
-	else
-	    AC_CHECK_LIB(pthreads, pthread_mutex_init,
-		tcl_ok=yes, tcl_ok=no)
-	    if test "$tcl_ok" = "yes"; then
-		# The space is needed
-		THREADS_LIBS=" -lpthreads"
-	    else
-		AC_CHECK_LIB(c, pthread_mutex_init,
-		    tcl_ok=yes, tcl_ok=no)
-		if test "$tcl_ok" = "no"; then
-		    AC_CHECK_LIB(c_r, pthread_mutex_init,
-			tcl_ok=yes, tcl_ok=no)
-		    if test "$tcl_ok" = "yes"; then
-			# The space is needed
-			THREADS_LIBS=" -pthread"
-		    else
-			TCL_THREADS=0
-			AC_MSG_WARN([Don't know how to find pthread lib on your system - you must disable thread support or edit the LIBS in the Makefile...])
-		    fi
-		fi
-	    fi
-	fi
-
-	# Does the pthread-implementation provide
-	# 'pthread_attr_setstacksize' ?
-
-	ac_saved_libs=$LIBS
-	LIBS="$LIBS $THREADS_LIBS"
-	AC_CHECK_FUNCS(pthread_attr_setstacksize pthread_atfork)
-	LIBS=$ac_saved_libs
-    else
-	TCL_THREADS=0
-    fi
-    # Do checking message here to not mess up interleaved configure output
-    AC_MSG_CHECKING([for building with threads])
-    if test "${TCL_THREADS}" = 1; then
-	AC_DEFINE(TCL_THREADS, 1, [Are we building with threads enabled?])
-	if test "${tcl_threaded_core}" = 1; then
-	    AC_MSG_RESULT([yes (threaded core)])
-	else
-	    AC_MSG_RESULT([yes])
-	fi
-    else
-	AC_MSG_RESULT([no])
-    fi
-
-    AC_SUBST(TCL_THREADS)
-])
-
 #------------------------------------------------------------------------
 # SC_ENABLE_SYMBOLS --
 #
 #	Specify if debugging symbols should be used.
 #	Memory (TCL_MEM_DEBUG) and compile (TCL_COMPILE_DEBUG) debugging
@@ -725,11 +624,10 @@
 #				Sets to $(CFLAGS_OPTIMIZE) if false
 #		LDFLAGS_DEFAULT	Sets to $(LDFLAGS_DEBUG) if true
 #				Sets to $(LDFLAGS_OPTIMIZE) if false
 #		DBGX		Formerly used as debug library extension;
 #				always blank now.
-#
 #------------------------------------------------------------------------
 
 AC_DEFUN([SC_ENABLE_SYMBOLS], [
     AC_MSG_CHECKING([for build with symbols])
     AC_ARG_ENABLE(symbols,
@@ -890,39 +788,31 @@
 #--------------------------------------------------------------------
 # SC_CONFIG_SYSTEM
 #
 #	Determine what the system is (some things cannot be easily checked
 #	on a feature-driven basis, alas). This can usually be done via the
-#	"uname" command, but there are a few systems, like Next, where
-#	this doesn't work.
+#	"uname" command.
 #
 # Arguments:
 #	none
 #
 # Results:
 #	Defines the following var:
 #
 #	system -	System/platform/version identification code.
-#
 #--------------------------------------------------------------------
 
 AC_DEFUN([SC_CONFIG_SYSTEM], [
     AC_CACHE_CHECK([system version], tcl_cv_sys_version, [
-	if test -f /usr/lib/NextStep/software_version; then
-	    tcl_cv_sys_version=NEXTSTEP-`awk '/3/,/3/' /usr/lib/NextStep/software_version`
+	if test "${TEA_PLATFORM}" = "windows" ; then
+	    tcl_cv_sys_version=windows
 	else
 	    tcl_cv_sys_version=`uname -s`-`uname -r`
 	    if test "$?" -ne 0 ; then
 		AC_MSG_WARN([can't find uname command])
 		tcl_cv_sys_version=unknown
 	    else
-		# Special check for weird MP-RAS system (uname returns weird
-		# results, and the version is kept in special file).
-
-		if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
-		    tcl_cv_sys_version=MP-RAS-`awk '{print $[3]}' /etc/.relid`
-		fi
 		if test "`uname -s`" = "AIX" ; then
 		    tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
 		fi
 	    fi
 	fi
@@ -975,15 +865,15 @@
 #       SHLIB_LD -      Base command to use for combining object files
 #                       into a shared library.
 #       SHLIB_LD_LIBS - Dependent libraries for the linker to scan when
 #                       creating shared libraries.  This symbol typically
 #                       goes at the end of the "ld" commands that build
-#                       shared libraries. The value of the symbol is
+#                       shared libraries. The value of the symbol defaults to
 #                       "${LIBS}" if all of the dependent libraries should
 #                       be specified when creating a shared library.  If
-#                       dependent libraries should not be specified (as on
-#                       SunOS 4.x, where they cause the link to fail, or in
+#                       dependent libraries should not be specified (as on some
+#                       SunOS systems, where they cause the link to fail, or in
 #                       general if Tcl and Tk aren't themselves shared
 #                       libraries), then this symbol has an empty string
 #                       as its value.
 #       SHLIB_SUFFIX -  Suffix to use for the names of dynamically loadable
 #                       extensions.  An empty string means we don't know how
@@ -1094,11 +984,11 @@
     ECHO_VERSION='`echo ${VERSION}`'
     TCL_LIB_VERSIONS_OK=ok
     CFLAGS_DEBUG=-g
     AS_IF([test "$GCC" = yes], [
 	CFLAGS_OPTIMIZE=-O2
-	CFLAGS_WARNING="-Wall"
+	CFLAGS_WARNING="-Wall -Wwrite-strings -Wsign-compare -Wdeclaration-after-statement -Wpointer-arith"
     ], [
 	CFLAGS_OPTIMIZE=-O
 	CFLAGS_WARNING=""
     ])
     AC_CHECK_TOOL(AR, ar)
@@ -1105,14 +995,14 @@
     STLIB_LD='${AR} cr'
     LD_LIBRARY_PATH_VAR="LD_LIBRARY_PATH"
     PLAT_OBJS=""
     PLAT_SRCS=""
     LDAIX_SRC=""
-    AS_IF([test x"${SHLIB_VERSION}" = x], [SHLIB_VERSION="1.0"])
+    AS_IF([test "x${SHLIB_VERSION}" = x], [SHLIB_VERSION="1.0"])
     case $system in
 	AIX-*)
-	    AS_IF([test "${TCL_THREADS}" = "1" -a "$GCC" != "yes"], [
+	    AS_IF([test "$GCC" != "yes"], [
 		# AIX requires the _r compiler when gcc isn't being used
 		case "${CC}" in
 		    *_r|*_r\ *)
 			# ok ...
 			;;
@@ -1203,11 +1093,11 @@
 	    DL_LIBS="-ldl"
 	    LDFLAGS="$LDFLAGS -export-dynamic"
 	    CC_SEARCH_FLAGS=""
 	    LD_SEARCH_FLAGS=""
 	    ;;
-	CYGWIN_*|MINGW32*)
+	CYGWIN_*)
 	    SHLIB_CFLAGS=""
 	    SHLIB_LD='${CC} -shared'
 	    SHLIB_SUFFIX=".dll"
 	    DL_OBJS="tclLoadDl.o"
 	    PLAT_OBJS='${CYGWIN_OBJS}'
@@ -1229,13 +1119,10 @@
 		ac_cv_cygwin=yes)
 	    )
 	    if test "$ac_cv_cygwin" = "no"; then
 		AC_MSG_ERROR([${CC} is not a cygwin compiler.])
 	    fi
-	    if test "x${TCL_THREADS}" = "x0"; then
-		AC_MSG_ERROR([CYGWIN compile is only supported with --enable-threads])
-	    fi
 	    do64bit_ok=yes
 	    if test "x${SHARED_BUILD}" = "x1"; then
 		echo "running cd ../win; ${CONFIG_SHELL-/bin/sh} ./configure $ac_configure_args"
 		# The eval makes quoting arguments work.
 		if cd ../win; eval ${CONFIG_SHELL-/bin/sh} ./configure $ac_configure_args; cd ../unix
@@ -1257,11 +1144,11 @@
 	    ;;
 	Haiku*)
 	    LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
 	    SHLIB_CFLAGS="-fPIC"
 	    SHLIB_SUFFIX=".so"
-	    SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
+	    SHLIB_LD='${CC} ${CFLAGS} ${LDFLAGS} -shared'
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS="-lroot"
 	    AC_CHECK_LIB(network, inet_ntoa, [LIBS="$LIBS -lnetwork"])
 	    ;;
 	HP-UX-*.11.*)
@@ -1401,11 +1288,11 @@
 	    # egcs-2.91.66 on Redhat Linux 6.0 generates lots of warnings
 	    # when you inline the string and math operations.  Turn this off to
 	    # get rid of the warnings.
 	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
 
-	    SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
+	    SHLIB_LD='${CC} ${CFLAGS} ${LDFLAGS} -shared'
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS="-ldl"
 	    LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
 	    AS_IF([test $doRpath = yes], [
 		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'])
@@ -1441,99 +1328,53 @@
 	    LD_FLAGS="-Wl,--export-dynamic"
 	    AS_IF([test $doRpath = yes], [
 		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
 		LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'])
 	    ;;
-	MP-RAS-02*)
-	    SHLIB_CFLAGS="-K PIC"
-	    SHLIB_LD='${CC} -G'
-	    SHLIB_LD_LIBS=""
-	    SHLIB_SUFFIX=".so"
-	    DL_OBJS="tclLoadDl.o"
-	    DL_LIBS="-ldl"
-	    CC_SEARCH_FLAGS=""
-	    LD_SEARCH_FLAGS=""
-	    ;;
-	MP-RAS-*)
-	    SHLIB_CFLAGS="-K PIC"
-	    SHLIB_LD='${CC} -G'
-	    SHLIB_LD_LIBS=""
-	    SHLIB_SUFFIX=".so"
-	    DL_OBJS="tclLoadDl.o"
-	    DL_LIBS="-ldl"
-	    LDFLAGS="$LDFLAGS -Wl,-Bexport"
-	    CC_SEARCH_FLAGS=""
-	    LD_SEARCH_FLAGS=""
-	    ;;
 	OpenBSD-*)
 	    arch=`arch -s`
 	    case "$arch" in
-	    vax)
-		# Equivalent using configure option --disable-load
-		# Step 4 will set the necessary variables
-		DL_OBJS=""
-		SHLIB_LD_LIBS=""
-		LDFLAGS=""
-		;;
-	    *)
-		case "$arch" in
-		alpha|sparc|sparc64)
-		    SHLIB_CFLAGS="-fPIC"
-		    ;;
-		*)
-		    SHLIB_CFLAGS="-fpic"
-		    ;;
-		esac
-		SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}'
-		SHLIB_SUFFIX=".so"
-		DL_OBJS="tclLoadDl.o"
-		DL_LIBS=""
-		AS_IF([test $doRpath = yes], [
-		    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'])
-		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
-		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}'
-		LDFLAGS="-Wl,-export-dynamic"
-		;;
-	    esac
-	    case "$arch" in
-	    vax)
-		CFLAGS_OPTIMIZE="-O1"
-		;;
-	    sh)
-		CFLAGS_OPTIMIZE="-O0"
-		;;
-	    *)
-		CFLAGS_OPTIMIZE="-O2"
-		;;
-	    esac
-	    AS_IF([test "${TCL_THREADS}" = "1"], [
-		# On OpenBSD:	Compile with -pthread
-		#		Don't link with -lpthread
-		LIBS=`echo $LIBS | sed s/-lpthread//`
-		CFLAGS="$CFLAGS -pthread"
-	    ])
+	    alpha|sparc64)
+		SHLIB_CFLAGS="-fPIC"
+		;;
+	    *)
+		SHLIB_CFLAGS="-fpic"
+		;;
+	    esac
+	    SHLIB_LD='${CC} ${SHLIB_CFLAGS} -shared'
+	    SHLIB_SUFFIX=".so"
+	    DL_OBJS="tclLoadDl.o"
+	    DL_LIBS=""
+	    AS_IF([test $doRpath = yes], [
+		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'])
+	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}'
+	    LDFLAGS="-Wl,-export-dynamic"
+	    CFLAGS_OPTIMIZE="-O2"
+	    # On OpenBSD:	Compile with -pthread
+	    #		Don't link with -lpthread
+	    LIBS=`echo $LIBS | sed s/-lpthread//`
+	    CFLAGS="$CFLAGS -pthread"
 	    # OpenBSD doesn't do version numbers with dots.
 	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
 	    TCL_LIB_VERSIONS_OK=nodots
 	    ;;
 	NetBSD-*)
 	    # NetBSD has ELF and can use 'cc -shared' to build shared libs
 	    SHLIB_CFLAGS="-fPIC"
-	    SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}'
+	    SHLIB_LD='${CC} ${SHLIB_CFLAGS} -shared'
 	    SHLIB_SUFFIX=".so"
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS=""
 	    LDFLAGS="$LDFLAGS -export-dynamic"
 	    AS_IF([test $doRpath = yes], [
 		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'])
 	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
-	    AS_IF([test "${TCL_THREADS}" = "1"], [
-		# The -pthread needs to go in the CFLAGS, not LIBS
-		LIBS=`echo $LIBS | sed s/-pthread//`
-		CFLAGS="$CFLAGS -pthread"
-	    	LDFLAGS="$LDFLAGS -pthread"
-	    ])
+	    # The -pthread needs to go in the CFLAGS, not LIBS
+	    LIBS=`echo $LIBS | sed s/-pthread//`
+	    CFLAGS="$CFLAGS -pthread"
+	    LDFLAGS="$LDFLAGS -pthread"
 	    ;;
 	FreeBSD-*)
 	    # This configuration from FreeBSD Ports.
 	    SHLIB_CFLAGS="-fPIC"
 	    SHLIB_LD="${CC} -shared"
@@ -1543,15 +1384,14 @@
 	    DL_LIBS=""
 	    LDFLAGS=""
 	    AS_IF([test $doRpath = yes], [
 		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
 		LD_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'])
-	    AS_IF([test "${TCL_THREADS}" = "1"], [
-		# The -pthread needs to go in the LDFLAGS, not LIBS
-		LIBS=`echo $LIBS | sed s/-pthread//`
-		CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-		LDFLAGS="$LDFLAGS $PTHREAD_LIBS"])
+	    # The -pthread needs to go in the LDFLAGS, not LIBS
+	    LIBS=`echo $LIBS | sed s/-pthread//`
+	    CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+	    LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
 	    case $system in
 	    FreeBSD-3.*)
 		# Version numbers are dot-stripped by system policy.
 		TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
 		UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
@@ -1696,51 +1536,16 @@
                         LDFLAGS="$LDFLAGS -Wl,-no_arch_warnings"
 		    ])
 		])
 	    ])
 	    ;;
-	NEXTSTEP-*)
-	    SHLIB_CFLAGS=""
-	    SHLIB_LD='${CC} -nostdlib -r'
-	    SHLIB_LD_LIBS=""
-	    SHLIB_SUFFIX=".so"
-	    DL_OBJS="tclLoadNext.o"
-	    DL_LIBS=""
-	    CC_SEARCH_FLAGS=""
-	    LD_SEARCH_FLAGS=""
-	    ;;
 	OS/390-*)
 	    SHLIB_LD_LIBS=""
 	    CFLAGS_OPTIMIZE=""		# Optimizer is buggy
 	    AC_DEFINE(_OE_SOCKETS, 1,	# needed in sys/socket.h
 		[Should OS/390 do the right thing with sockets?])
 	    ;;
-	OSF1-1.0|OSF1-1.1|OSF1-1.2)
-	    # OSF/1 1.[012] from OSF, and derivatives, including Paragon OSF/1
-	    SHLIB_CFLAGS=""
-	    # Hack: make package name same as library name
-	    SHLIB_LD='ld -R -export $@:'
-	    SHLIB_LD_LIBS=""
-	    SHLIB_SUFFIX=".so"
-	    DL_OBJS="tclLoadOSF.o"
-	    DL_LIBS=""
-	    CC_SEARCH_FLAGS=""
-	    LD_SEARCH_FLAGS=""
-	    ;;
-	OSF1-1.*)
-	    # OSF/1 1.3 from OSF using ELF, and derivatives, including AD2
-	    SHLIB_CFLAGS="-fPIC"
-	    AS_IF([test "$SHARED_BUILD" = 1], [SHLIB_LD="ld -shared"], [
-	        SHLIB_LD="ld -non_shared"
-	    ])
-	    SHLIB_LD_LIBS=""
-	    SHLIB_SUFFIX=".so"
-	    DL_OBJS="tclLoadDl.o"
-	    DL_LIBS=""
-	    CC_SEARCH_FLAGS=""
-	    LD_SEARCH_FLAGS=""
-	    ;;
 	OSF1-V*)
 	    # Digital OSF/1
 	    SHLIB_CFLAGS=""
 	    AS_IF([test "$SHARED_BUILD" = 1], [
 	        SHLIB_LD='ld -shared -expect_unresolved "*"'
@@ -1754,20 +1559,18 @@
 		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
 		LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'])
 	    AS_IF([test "$GCC" = yes], [CFLAGS="$CFLAGS -mieee"], [
 		CFLAGS="$CFLAGS -DHAVE_TZSET -std1 -ieee"])
 	    # see pthread_intro(3) for pthread support on osf1, k.furukawa
-	    AS_IF([test "${TCL_THREADS}" = 1], [
-		CFLAGS="$CFLAGS -DHAVE_PTHREAD_ATTR_SETSTACKSIZE"
-		CFLAGS="$CFLAGS -DTCL_THREAD_STACK_MIN=PTHREAD_STACK_MIN*64"
-		LIBS=`echo $LIBS | sed s/-lpthreads//`
-		AS_IF([test "$GCC" = yes], [
-		    LIBS="$LIBS -lpthread -lmach -lexc"
-		], [
-		    CFLAGS="$CFLAGS -pthread"
-		    LDFLAGS="$LDFLAGS -pthread"
-		])
+	    CFLAGS="$CFLAGS -DHAVE_PTHREAD_ATTR_SETSTACKSIZE"
+	    CFLAGS="$CFLAGS -DTCL_THREAD_STACK_MIN=PTHREAD_STACK_MIN*64"
+	    LIBS=`echo $LIBS | sed s/-lpthreads//`
+	    AS_IF([test "$GCC" = yes], [
+		LIBS="$LIBS -lpthread -lmach -lexc"
+	    ], [
+		CFLAGS="$CFLAGS -pthread"
+		LDFLAGS="$LDFLAGS -pthread"
 	    ])
 	    ;;
 	QNX-6*)
 	    # QNX RTP
 	    # This may work for all QNX, but it was only reported for v6.
@@ -1798,39 +1601,10 @@
 	    DL_OBJS="tclLoadDl.o"
 	    DL_LIBS=""
 	    CC_SEARCH_FLAGS=""
 	    LD_SEARCH_FLAGS=""
 	    ;;
-	SINIX*5.4*)
-	    SHLIB_CFLAGS="-K PIC"
-	    SHLIB_LD='${CC} -G'
-	    SHLIB_LD_LIBS=""
-	    SHLIB_SUFFIX=".so"
-	    DL_OBJS="tclLoadDl.o"
-	    DL_LIBS="-ldl"
-	    CC_SEARCH_FLAGS=""
-	    LD_SEARCH_FLAGS=""
-	    ;;
-	SunOS-4*)
-	    SHLIB_CFLAGS="-PIC"
-	    SHLIB_LD="ld"
-	    SHLIB_LD_LIBS=""
-	    SHLIB_SUFFIX=".so"
-	    DL_OBJS="tclLoadDl.o"
-	    DL_LIBS="-ldl"
-	    CC_SEARCH_FLAGS='-L${LIB_RUNTIME_DIR}'
-	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
-
-	    # SunOS can't handle version numbers with dots in them in library
-	    # specs, like -ltcl7.5, so use -ltcl75 instead.  Also, it
-	    # requires an extra version number at the end of .so file names.
-	    # So, the library has to have a name like libtcl75.so.1.0
-
-	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}'
-	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
-	    TCL_LIB_VERSIONS_OK=nodots
-	    ;;
 	SunOS-5.[[0-6]])
 	    # Careful to not let 5.10+ fall into this case
 
 	    # Note: If _REENTRANT isn't defined, then Solaris
 	    # won't define thread-safe library routines.
@@ -2025,11 +1799,11 @@
 
     AS_IF([test "$DL_OBJS" != "tclLoadNone.o" -a "$GCC" = yes], [
 	case $system in
 	    AIX-*) ;;
 	    BSD/OS*) ;;
-	    CYGWIN_*|MINGW32_*) ;;
+	    CYGWIN_*) ;;
 	    IRIX*) ;;
 	    NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
 	    Darwin-*) ;;
 	    SCO_SV-3.2*) ;;
 	    *) SHLIB_CFLAGS="-fPIC" ;;
@@ -2153,11 +1927,10 @@
 #
 # Results:
 #
 #	Defines some of the following vars:
 #		NO_DIRENT_H
-#		NO_VALUES_H
 #		NO_STDLIB_H
 #		NO_STRING_H
 #		NO_SYS_WAIT_H
 #		NO_DLFCN_H
 #		HAVE_SYS_PARAM_H
@@ -2191,12 +1964,10 @@
 
     if test $tcl_cv_dirent_h = no; then
 	AC_DEFINE(NO_DIRENT_H, 1, [Do we have <dirent.h>?])
     fi
 
-    AC_CHECK_HEADER(float.h, , [AC_DEFINE(NO_FLOAT_H, 1, [Do we have <float.h>?])])
-    AC_CHECK_HEADER(values.h, , [AC_DEFINE(NO_VALUES_H, 1, [Do we have <values.h>?])])
     AC_CHECK_HEADER(stdlib.h, tcl_ok=1, tcl_ok=0)
     AC_EGREP_HEADER(strtol, stdlib.h, , tcl_ok=0)
     AC_EGREP_HEADER(strtoul, stdlib.h, , tcl_ok=0)
     AC_EGREP_HEADER(strtod, stdlib.h, , tcl_ok=0)
     if test $tcl_ok = 0; then
@@ -2335,14 +2106,10 @@
     case $system in
 	OSF*)
 	    AC_DEFINE(USE_FIONBIO, 1, [Should we use FIONBIO?])
 	    AC_MSG_RESULT([FIONBIO])
 	    ;;
-	SunOS-4*)
-	    AC_DEFINE(USE_FIONBIO, 1, [Should we use FIONBIO?])
-	    AC_MSG_RESULT([FIONBIO])
-	    ;;
 	*)
 	    AC_MSG_RESULT([O_NONBLOCK])
 	    ;;
     esac
 ])
@@ -2470,16 +2237,23 @@
 #--------------------------------------------------------------------
 # SC_TCL_LINK_LIBS
 #
 #	Search for the libraries needed to link the Tcl shell.
 #	Things like the math library (-lm) and socket stuff (-lsocket vs.
-#	-lnsl) are dealt with here.
+#	-lnsl) or thread library (-lpthread) are dealt with here.
 #
 # Arguments:
 #	None.
 #
 # Results:
+#
+#	Sets the following vars:
+#		THREADS_LIBS	Thread library(s)
+#
+#	Defines the following vars:
+#		_REENTRANT
+#		_THREAD_SAFE
 #
 #	Might append to the following vars:
 #		LIBS
 #		MATH_LIBS
 #
@@ -2490,16 +2264,13 @@
 
 AC_DEFUN([SC_TCL_LINK_LIBS], [
     #--------------------------------------------------------------------
     # On a few very rare systems, all of the libm.a stuff is
     # already in libc.a.  Set compiler flags accordingly.
-    # Also, Linux requires the "ieee" library for math to work
-    # right (and it must appear before "-lm").
     #--------------------------------------------------------------------
 
     AC_CHECK_FUNC(sin, MATH_LIBS="", MATH_LIBS="-lm")
-    AC_CHECK_LIB(ieee, main, [MATH_LIBS="-lieee $MATH_LIBS"])
 
     #--------------------------------------------------------------------
     # Interactive UNIX requires -linet instead of -lsocket, plus it
     # needs net/errno.h to define the socket-related error codes.
     #--------------------------------------------------------------------
@@ -2537,10 +2308,59 @@
 	LIBS="$LIBS -lsocket -lnsl"
 	AC_CHECK_FUNC(accept, tcl_checkNsl=0, [LIBS=$tk_oldLibs])
     fi
     AC_CHECK_FUNC(gethostbyname, , [AC_CHECK_LIB(nsl, gethostbyname,
 	    [LIBS="$LIBS -lnsl"])])
+
+    AC_DEFINE(_REENTRANT, 1, [Do we want the reentrant OS API?])
+    AC_DEFINE(_THREAD_SAFE, 1, [Do we want the thread-safe OS API?])
+    AC_CHECK_LIB(pthread,pthread_mutex_init,tcl_ok=yes,tcl_ok=no)
+    if test "$tcl_ok" = "no"; then
+	# Check a little harder for __pthread_mutex_init in the same
+	# library, as some systems hide it there until pthread.h is
+	# defined.  We could alternatively do an AC_TRY_COMPILE with
+	# pthread.h, but that will work with libpthread really doesn't
+	# exist, like AIX 4.2.  [Bug: 4359]
+	AC_CHECK_LIB(pthread, __pthread_mutex_init,
+		tcl_ok=yes, tcl_ok=no)
+    fi
+
+    if test "$tcl_ok" = "yes"; then
+	# The space is needed
+	THREADS_LIBS=" -lpthread"
+    else
+	AC_CHECK_LIB(pthreads, pthread_mutex_init,
+	_ok=yes, tcl_ok=no)
+	if test "$tcl_ok" = "yes"; then
+	    # The space is needed
+	    THREADS_LIBS=" -lpthreads"
+	else
+	    AC_CHECK_LIB(c, pthread_mutex_init,
+		    tcl_ok=yes, tcl_ok=no)
+	    if test "$tcl_ok" = "no"; then
+		AC_CHECK_LIB(c_r, pthread_mutex_init,
+			tcl_ok=yes, tcl_ok=no)
+		if test "$tcl_ok" = "yes"; then
+		    # The space is needed
+		    THREADS_LIBS=" -pthread"
+		else
+		    AC_MSG_WARN([Don't know how to find pthread lib on your system - you must edit the LIBS in the Makefile...])
+		fi
+	    fi
+	fi
+    fi
+
+    # Does the pthread-implementation provide
+    # 'pthread_attr_setstacksize' ?
+
+    ac_saved_libs=$LIBS
+    LIBS="$LIBS $THREADS_LIBS"
+    AC_CHECK_FUNCS(pthread_attr_setstacksize pthread_atfork)
+    LIBS=$ac_saved_libs
+
+    # TIP #509
+    AC_CHECK_DECLS([PTHREAD_MUTEX_RECURSIVE],tcl_ok=yes,tcl_ok=no, [[#include <pthread.h>]])
 ])
 
 #--------------------------------------------------------------------
 # SC_TCL_EARLY_FLAGS
 #
@@ -2599,11 +2419,11 @@
 # Results:
 #
 #	Might define the following vars:
 #		TCL_WIDE_INT_IS_LONG
 #		TCL_WIDE_INT_TYPE
-#		HAVE_STRUCT_DIRENT64
+#		HAVE_STRUCT_DIRENT64, HAVE_DIR64
 #		HAVE_STRUCT_STAT64
 #		HAVE_TYPE_OFF64_T
 #
 #--------------------------------------------------------------------
 
@@ -2612,19 +2432,19 @@
     AC_CACHE_VAL(tcl_cv_type_64bit,[
 	tcl_cv_type_64bit=none
 	# See if the compiler knows natively about __int64
 	AC_TRY_COMPILE(,[__int64 value = (__int64) 0;],
 	    tcl_type_64bit=__int64, tcl_type_64bit="long long")
-	# See if we should use long anyway  Note that we substitute in the
+	# See if we could use long anyway  Note that we substitute in the
 	# type that is our current guess for a 64-bit type inside this check
 	# program, so it should be modified only carefully...
         AC_TRY_COMPILE(,[switch (0) {
             case 1: case (sizeof(]${tcl_type_64bit}[)==sizeof(long)): ;
         }],tcl_cv_type_64bit=${tcl_type_64bit})])
     if test "${tcl_cv_type_64bit}" = none ; then
-	AC_DEFINE(TCL_WIDE_INT_IS_LONG, 1, [Are wide integers to be implemented with C 'long's?])
-	AC_MSG_RESULT([using long])
+	AC_DEFINE(TCL_WIDE_INT_IS_LONG, 1, [Do 'long' and 'long long' have the same size (64-bit)?])
+	AC_MSG_RESULT([yes])
     else
 	AC_DEFINE_UNQUOTED(TCL_WIDE_INT_TYPE,${tcl_cv_type_64bit},
 	    [What type should be used to define wide integers?])
 	AC_MSG_RESULT([${tcl_cv_type_64bit}])
 
@@ -2634,10 +2454,19 @@
 #include <dirent.h>],[struct dirent64 p;],
 		tcl_cv_struct_dirent64=yes,tcl_cv_struct_dirent64=no)])
 	if test "x${tcl_cv_struct_dirent64}" = "xyes" ; then
 	    AC_DEFINE(HAVE_STRUCT_DIRENT64, 1, [Is 'struct dirent64' in <sys/types.h>?])
 	fi
+
+	AC_CACHE_CHECK([for DIR64], tcl_cv_DIR64,[
+	    AC_TRY_COMPILE([#include <sys/types.h>
+#include <dirent.h>],[struct dirent64 *p; DIR64 d = opendir64(".");
+            p = readdir64(d); rewinddir64(d); closedir64(d);],
+		tcl_cv_DIR64=yes,tcl_cv_DIR64=no)])
+	if test "x${tcl_cv_DIR64}" = "xyes" ; then
+	    AC_DEFINE(HAVE_DIR64, 1, [Is 'DIR64' in <sys/types.h>?])
+	fi
 
 	AC_CACHE_CHECK([for struct stat64], tcl_cv_struct_stat64,[
 	    AC_TRY_COMPILE([#include <sys/stat.h>],[struct stat64 p;
 ],
 		tcl_cv_struct_stat64=yes,tcl_cv_struct_stat64=no)])
@@ -2704,11 +2533,11 @@
 # Arguments:
 #	funcName - function to test for
 #	advancedTest - the advanced test to run if the function is present
 #
 # Results:
-#	Might cause compatability versions of the function to be used.
+#	Might cause compatibility versions of the function to be used.
 #	Might affect the following vars:
 #		USE_COMPAT	(implicit)
 #
 #--------------------------------------------------------------------
 
@@ -3131,8 +2960,131 @@
         [Use compat implementation of getaddrinfo() and friends])
    AC_LIBOBJ([fake-rfc2553])
    AC_CHECK_FUNC(strlcpy)
 fi
 ])
+
+#------------------------------------------------------------------------
+# SC_CC_FOR_BUILD
+#	For cross compiles, locate a C compiler that can generate native binaries.
+#
+# Arguments:
+#	none
+#
+# Results:
+#	Substitutes the following vars:
+#		CC_FOR_BUILD
+#		EXEEXT_FOR_BUILD
+#------------------------------------------------------------------------
+
+dnl Get a default for CC_FOR_BUILD to put into Makefile.
+AC_DEFUN([AX_CC_FOR_BUILD],[# Put a plausible default for CC_FOR_BUILD in Makefile.
+    if test -z "$CC_FOR_BUILD"; then
+      if test "x$cross_compiling" = "xno"; then
+        CC_FOR_BUILD='$(CC)'
+      else
+        AC_MSG_CHECKING([for gcc])
+        AC_CACHE_VAL(ac_cv_path_cc, [
+            search_path=`echo ${PATH} | sed -e 's/:/ /g'`
+            for dir in $search_path ; do
+                for j in `ls -r $dir/gcc 2> /dev/null` \
+                        `ls -r $dir/gcc 2> /dev/null` ; do
+                    if test x"$ac_cv_path_cc" = x ; then
+                        if test -f "$j" ; then
+                            ac_cv_path_cc=$j
+                            break
+                        fi
+                    fi
+                done
+            done
+        ])
+      fi
+    fi
+    AC_SUBST(CC_FOR_BUILD)
+    # Also set EXEEXT_FOR_BUILD.
+    if test "x$cross_compiling" = "xno"; then
+      EXEEXT_FOR_BUILD='$(EXEEXT)'
+      OBJEXT_FOR_BUILD='$(OBJEXT)'
+    else
+      OBJEXT_FOR_BUILD='.no'
+      AC_CACHE_CHECK([for build system executable suffix], bfd_cv_build_exeext,
+        [rm -f conftest*
+         echo 'int main () { return 0; }' > conftest.c
+         bfd_cv_build_exeext=
+         ${CC_FOR_BUILD} -o conftest conftest.c 1>&5 2>&5
+         for file in conftest.*; do
+           case $file in
+           *.c | *.o | *.obj | *.ilk | *.pdb) ;;
+           *) bfd_cv_build_exeext=`echo $file | sed -e s/conftest//` ;;
+           esac
+         done
+         rm -f conftest*
+         test x"${bfd_cv_build_exeext}" = x && bfd_cv_build_exeext=no])
+      EXEEXT_FOR_BUILD=""
+      test x"${bfd_cv_build_exeext}" != xno && EXEEXT_FOR_BUILD=${bfd_cv_build_exeext}
+    fi
+    AC_SUBST(EXEEXT_FOR_BUILD)])dnl
+    AC_SUBST(OBJEXT_FOR_BUILD)])dnl
+])
+
+
+#------------------------------------------------------------------------
+# SC_ZIPFS_SUPPORT
+#	Locate a zip encoder installed on the system path, or none.
+#
+# Arguments:
+#	none
+#
+# Results:
+#	Substitutes the following vars:
+#		ZIP_PROG
+#       ZIP_PROG_OPTIONS
+#       ZIP_PROG_VFSSEARCH
+#       ZIP_INSTALL_OBJS
+#------------------------------------------------------------------------
+
+AC_DEFUN([SC_ZIPFS_SUPPORT], [
+    ZIP_PROG=""
+    ZIP_PROG_OPTIONS=""
+    ZIP_PROG_VFSSEARCH=""
+    ZIP_INSTALL_OBJS=""
+
+    AC_MSG_CHECKING([for zip])
+    AC_CACHE_VAL(ac_cv_path_zip, [
+    search_path=`echo ${PATH} | sed -e 's/:/ /g'`
+    for dir in $search_path ; do
+        for j in `ls -r $dir/zip 2> /dev/null` \
+            `ls -r $dir/zip 2> /dev/null` ; do
+        if test x"$ac_cv_path_zip" = x ; then
+            if test -f "$j" ; then
+            ac_cv_path_zip=$j
+            break
+            fi
+        fi
+        done
+    done
+    ])
+    if test -f "$ac_cv_path_zip" ; then
+        ZIP_PROG="$ac_cv_path_zip "
+        AC_MSG_RESULT([$ZIP_PROG])
+        ZIP_PROG_OPTIONS="-rq"
+        ZIP_PROG_VFSSEARCH="."
+        AC_MSG_RESULT([Found INFO Zip in environment])
+        # Use standard arguments for zip
+    else
+        # It is not an error if an installed version of Zip can't be located.
+        # We can use the locally distributed minizip instead
+        ZIP_PROG="../minizip${EXEEXT_FOR_BUILD}"
+        ZIP_PROG_OPTIONS="-o -r"
+        ZIP_PROG_VFSSEARCH="."
+        ZIP_INSTALL_OBJS="minizip${EXEEXT_FOR_BUILD}"
+        AC_MSG_RESULT([No zip found on PATH. Building minizip])
+    fi
+    AC_SUBST(ZIP_PROG)
+    AC_SUBST(ZIP_PROG_OPTIONS)
+    AC_SUBST(ZIP_PROG_VFSSEARCH)
+    AC_SUBST(ZIP_INSTALL_OBJS)
+])
+
 # Local Variables:
 # mode: autoconf
 # End:

Index: unix/tk.spec
==================================================================
--- unix/tk.spec
+++ unix/tk.spec
@@ -2,19 +2,19 @@
 
 %{!?directory:%define directory /usr/local}
 
 Name:          tk
 Summary:       Tk graphical toolkit for the Tcl scripting language.
-Version:       8.6.6
+Version:       8.7a2
 Release:       2
 License:       BSD
 Group:         Development/Languages
 Source:        http://prdownloads.sourceforge.net/tcl/tk%{version}-src.tar.gz
 URL:           http://www.tcl.tk/
 Buildroot:     /var/tmp/%{name}%{version}
-Buildrequires: XFree86-devel tcl >= %version
-Requires:      tcl >= %version
+Buildrequires: XFree86-devel tcl >= 8.6.0
+Requires:      tcl >= 8.6.0
 
 %description
 The Tcl (Tool Command Language) provides a powerful platform for
 creating integration applications that tie together diverse
 applications, protocols, devices, and frameworks.  When paired with

Index: unix/tkAppInit.c
==================================================================
--- unix/tkAppInit.c
+++ unix/tkAppInit.c
@@ -71,10 +71,13 @@
     int argc,			/* Number of command-line arguments. */
     char **argv)		/* Values of command-line arguments. */
 {
 #ifdef TK_LOCAL_MAIN_HOOK
     TK_LOCAL_MAIN_HOOK(&argc, &argv);
+#elif (TCL_MAJOR_VERSION > 8) || (TCL_MINOR_VERSION > 6)
+    /* This doesn't work with Tcl 8.6 */
+    TclZipfs_AppHook(&argc, &argv);
 #endif
 
     Tk_Main(argc, argv, TK_LOCAL_APPINIT);
     return 0;			/* Needed only to prevent compiler warning. */
 }

Index: unix/tkConfig.h.in
==================================================================
--- unix/tkConfig.h.in
+++ unix/tkConfig.h.in
@@ -131,13 +131,10 @@
 #undef PACKAGE_VERSION
 
 /* Is this a static build? */
 #undef STATIC_BUILD
 
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
 /* Is this a 64-bit build? */
 #undef TCL_CFG_DO64BIT
 
 /* Is this an optimized build? */
 #undef TCL_CFG_OPTIMIZED
@@ -152,13 +149,10 @@
 #undef TCL_MEM_DEBUG
 
 /* What is the default extension for shared libraries? */
 #undef TCL_SHLIB_EXT
 
-/* Are we building with threads enabled? */
-#undef TCL_THREADS
-
 /* Are wide integers to be implemented with C 'long's? */
 #undef TCL_WIDE_INT_IS_LONG
 
 /* What type should be used to define wide integers? */
 #undef TCL_WIDE_INT_TYPE

Index: unix/tkUnixButton.c
==================================================================
--- unix/tkUnixButton.c
+++ unix/tkUnixButton.c
@@ -348,10 +348,51 @@
  *	Commands are output to X to display the button in its current mode.
  *	The REDRAW_PENDING flag is cleared.
  *
  *----------------------------------------------------------------------
  */
+
+static void
+ShiftByOffset(
+    TkButton *butPtr,
+    int relief,
+    int *x,		/* shift this x coordinate */
+    int *y,		/* shift this y coordinate */
+    int width,		/* width of image/text */
+    int height)		/* height of image/text */
+{
+    if (relief != TK_RELIEF_RAISED
+	    && butPtr->type == TYPE_BUTTON
+	    && !Tk_StrictMotif(butPtr->tkwin)) {
+	int shiftX;
+	int shiftY;
+
+	/*
+	 * This is an (unraised) button widget, so we offset the text to make
+	 * the button appear to move up and down as the relief changes.
+	 */
+
+	shiftX = shiftY = (relief == TK_RELIEF_SUNKEN) ? 2 : 1;
+
+	if (relief != TK_RELIEF_RIDGE) {
+	    /*
+	     * Take back one pixel if the padding is even, otherwise the
+	     * content will be displayed too far right/down.
+	     */
+
+	    if ((Tk_Width(butPtr->tkwin) - width) % 2 == 0) {
+		shiftX -= 1;
+	    }
+	    if ((Tk_Height(butPtr->tkwin) - height) % 2 == 0) {
+		shiftY -= 1;
+	    }
+	}
+
+	*x += shiftX;
+	*y += shiftY;
+    }
+}
 
 void
 TkpDisplayButton(
     ClientData clientData)	/* Information about widget. */
 {
@@ -364,14 +405,10 @@
     int y, relief;
     Tk_Window tkwin = butPtr->tkwin;
     int width = 0, height = 0, fullWidth, fullHeight;
     int textXOffset, textYOffset;
     int haveImage = 0, haveText = 0;
-    int offset;			/* 1 means this is a button widget, so we
-				 * offset the text to make the button appear
-				 * to move up and down as the relief
-				 * changes. */
     int imageWidth, imageHeight;
     int imageXOffset = 0, imageYOffset = 0;
 				/* image information that will be used to
 				 * restrict disabled pixmap as well */
 
@@ -430,12 +467,10 @@
 	} else if (butPtr->overRelief != relief) {
 	    relief = butPtr->offRelief;
 	}
     }
 
-    offset = (butPtr->type == TYPE_BUTTON) && !Tk_StrictMotif(butPtr->tkwin);
-
     /*
      * In order to avoid screen flashes, this function redraws the button in a
      * pixmap, then copies the pixmap to the screen in a single operation.
      * This means that there's no point in time where the on-screen image has
      * been cleared.
@@ -523,21 +558,11 @@
 
 	TkComputeAnchor(butPtr->anchor, tkwin, butPtr->padX, butPtr->padY,
 		butPtr->indicatorSpace + fullWidth, fullHeight, &x, &y);
 
 	x += butPtr->indicatorSpace;
-
-	x += offset;
-	y += offset;
-	if (relief == TK_RELIEF_RAISED) {
-	    x -= offset;
-	    y -= offset;
-	} else if (relief == TK_RELIEF_SUNKEN) {
-	    x += offset;
-	    y += offset;
-	}
-
+	ShiftByOffset(butPtr, relief, &x, &y, width, height);
 	imageXOffset += x;
 	imageYOffset += y;
 
 	if (butPtr->image != NULL) {
 	    /*
@@ -591,20 +616,11 @@
     } else {
 	if (haveImage) {
 	    TkComputeAnchor(butPtr->anchor, tkwin, 0, 0,
 		    butPtr->indicatorSpace + width, height, &x, &y);
 	    x += butPtr->indicatorSpace;
-
-	    x += offset;
-	    y += offset;
-	    if (relief == TK_RELIEF_RAISED) {
-		x -= offset;
-		y -= offset;
-	    } else if (relief == TK_RELIEF_SUNKEN) {
-		x += offset;
-		y += offset;
-	    }
+	    ShiftByOffset(butPtr, relief, &x, &y, width, height);
 	    imageXOffset += x;
 	    imageYOffset += y;
 	    if (butPtr->image != NULL) {
 		/*
 		 * Do boundary clipping, so that Tk_RedrawImage is passed
@@ -653,20 +669,11 @@
  	    TkComputeAnchor(butPtr->anchor, tkwin, butPtr->padX, butPtr->padY,
 		    butPtr->indicatorSpace + butPtr->textWidth,
 		    butPtr->textHeight, &x, &y);
 
 	    x += butPtr->indicatorSpace;
-
-	    x += offset;
-	    y += offset;
-	    if (relief == TK_RELIEF_RAISED) {
-		x -= offset;
-		y -= offset;
-	    } else if (relief == TK_RELIEF_SUNKEN) {
-		x += offset;
-		y += offset;
-	    }
+	    ShiftByOffset(butPtr, relief, &x, &y, width, height);
 	    Tk_DrawTextLayout(butPtr->display, pixmap, gc, butPtr->textLayout,
 		    x, y, 0, -1);
 	    Tk_UnderlineTextLayout(butPtr->display, pixmap, gc,
 		    butPtr->textLayout, x, y, butPtr->underline);
 	    y += butPtr->textHeight/2;

Index: unix/tkUnixCursor.c
==================================================================
--- unix/tkUnixCursor.c
+++ unix/tkUnixCursor.c
@@ -637,11 +637,10 @@
     TkCursor *cursorPtr)
 {
     TkUnixCursor *unixCursorPtr = (TkUnixCursor *) cursorPtr;
 
     XFreeCursor(unixCursorPtr->display, (Cursor) unixCursorPtr->info.cursor);
-    Tk_FreeXId(unixCursorPtr->display, (XID) unixCursorPtr->info.cursor);
 }
 
 /*
  * Local Variables:
  * mode: c

Index: unix/tkUnixDefault.h
==================================================================
--- unix/tkUnixDefault.h
+++ unix/tkUnixDefault.h
@@ -151,10 +151,12 @@
 #define DEF_ENTRY_INSERT_BD_MONO	"0"
 #define DEF_ENTRY_INSERT_OFF_TIME	"300"
 #define DEF_ENTRY_INSERT_ON_TIME	"600"
 #define DEF_ENTRY_INSERT_WIDTH		"2"
 #define DEF_ENTRY_JUSTIFY		"left"
+#define DEF_ENTRY_PLACEHOLDER		""
+#define DEF_ENTRY_PLACEHOLDERFG		"#b3b3b3"
 #define DEF_ENTRY_READONLY_BG_COLOR	NORMAL_BG
 #define DEF_ENTRY_READONLY_BG_MONO	WHITE
 #define DEF_ENTRY_RELIEF		"sunken"
 #define DEF_ENTRY_SCROLL_COMMAND	""
 #define DEF_ENTRY_SELECT_COLOR		SELECT_BG
@@ -272,10 +274,11 @@
 #define DEF_MENU_ACTIVE_BG_COLOR	ACTIVE_BG
 #define DEF_MENU_ACTIVE_BG_MONO		BLACK
 #define DEF_MENU_ACTIVE_BORDER_WIDTH	"1"
 #define DEF_MENU_ACTIVE_FG_COLOR	BLACK
 #define DEF_MENU_ACTIVE_FG_MONO		WHITE
+#define DEF_MENU_ACTIVE_RELIEF		"raised"
 #define DEF_MENU_BG_COLOR		NORMAL_BG
 #define DEF_MENU_BG_MONO		WHITE
 #define DEF_MENU_BORDER_WIDTH		"1"
 #define DEF_MENU_CURSOR			"arrow"
 #define DEF_MENU_DISABLED_FG_COLOR	DISABLED
@@ -285,11 +288,11 @@
 #define DEF_MENU_POST_COMMAND		""
 #define DEF_MENU_RELIEF			"raised"
 #define DEF_MENU_SELECT_COLOR		MENU_INDICATOR
 #define DEF_MENU_SELECT_MONO		BLACK
 #define DEF_MENU_TAKE_FOCUS		"0"
-#define DEF_MENU_TEAROFF		"1"
+#define DEF_MENU_TEAROFF		"0"
 #define DEF_MENU_TEAROFF_CMD		((char *) NULL)
 #define DEF_MENU_TITLE			""
 #define DEF_MENU_TYPE			"normal"
 
 /*

Index: unix/tkUnixEmbed.c
==================================================================
--- unix/tkUnixEmbed.c
+++ unix/tkUnixEmbed.c
@@ -886,11 +886,11 @@
 	    containerPtr = containerPtr->nextPtr) {
 	Tcl_DStringStartSublist(&dString);
 	if (containerPtr->parent == None) {
 	    Tcl_DStringAppendElement(&dString, "");
 	} else if (all) {
-	    sprintf(buffer, "0x%x", (int) containerPtr->parent);
+	    sprintf(buffer, "0x%" TCL_Z_MODIFIER "x", (size_t) containerPtr->parent);
 	    Tcl_DStringAppendElement(&dString, buffer);
 	} else {
 	    Tcl_DStringAppendElement(&dString, "XXX");
 	}
 	if (containerPtr->parentPtr == NULL) {
@@ -900,11 +900,11 @@
 		    containerPtr->parentPtr->pathName);
 	}
 	if (containerPtr->wrapper == None) {
 	    Tcl_DStringAppendElement(&dString, "");
 	} else if (all) {
-	    sprintf(buffer, "0x%x", (int) containerPtr->wrapper);
+	    sprintf(buffer, "0x%" TCL_Z_MODIFIER "x", (size_t) containerPtr->wrapper);
 	    Tcl_DStringAppendElement(&dString, buffer);
 	} else {
 	    Tcl_DStringAppendElement(&dString, "XXX");
 	}
 	if (containerPtr->embeddedPtr == NULL) {

Index: unix/tkUnixEvent.c
==================================================================
--- unix/tkUnixEvent.c
+++ unix/tkUnixEvent.c
@@ -36,10 +36,12 @@
 static void		DisplayExitHandler(ClientData clientData);
 static void		DisplayFileProc(ClientData clientData, int flags);
 static void		DisplaySetupProc(ClientData clientData, int flags);
 static void		TransferXEventsToTcl(Display *display);
 #ifdef TK_USE_INPUT_METHODS
+static void		InstantiateIMCallback(Display *, XPointer client_data, XPointer call_data);
+static void		DestroyIMCallback(XIM im, XPointer client_data, XPointer call_data);
 static void		OpenIM(TkDisplay *dispPtr);
 #endif
 
 /*
  *----------------------------------------------------------------------
@@ -127,11 +129,11 @@
     int major = 1;
     int minor = 0;
     int reason = 0;
     unsigned int use_xkb = 0;
     /* Disabled, until we have a better test. See [Bug 3613668] */
-#if 0 && defined(XKEYCODETOKEYSYM_IS_DEPRECATED) && defined(TCL_THREADS)
+#if 0 && defined(XKEYCODETOKEYSYM_IS_DEPRECATED)
     static int xinited = 0;
     static Tcl_Mutex xinitMutex = NULL;
 
     if (!xinited) {
 	Tcl_MutexLock(&xinitMutex);
@@ -177,10 +179,12 @@
     memset(dispPtr, 0, sizeof(TkDisplay));
     dispPtr->display = display;
     dispPtr->flags |= use_xkb;
 #ifdef TK_USE_INPUT_METHODS
     OpenIM(dispPtr);
+    XRegisterIMInstantiateCallback(dispPtr->display, NULL, NULL, NULL,
+	    InstantiateIMCallback, (XPointer) dispPtr);
 #endif
     Tcl_CreateFileHandler(ConnectionNumber(display), TCL_READABLE,
 	    DisplayFileProc, dispPtr);
     return dispPtr;
 }
@@ -661,10 +665,39 @@
      */
 
     TransferXEventsToTcl(display);
 }
 #ifdef TK_USE_INPUT_METHODS
+
+static void
+InstantiateIMCallback(
+    Display      *display,
+    XPointer     client_data,
+    XPointer     call_data)
+{
+    TkDisplay    *dispPtr;
+
+    dispPtr = (TkDisplay *) client_data;
+    OpenIM(dispPtr);
+    XUnregisterIMInstantiateCallback(dispPtr->display, NULL, NULL, NULL,
+	    InstantiateIMCallback, (XPointer) dispPtr);
+}
+
+static void
+DestroyIMCallback(
+    XIM         im,
+    XPointer    client_data,
+    XPointer    call_data)
+{
+    TkDisplay   *dispPtr;
+
+    dispPtr = (TkDisplay *) client_data;
+    dispPtr->inputMethod = NULL;
+    ++dispPtr->ximGeneration;
+    XRegisterIMInstantiateCallback(dispPtr->display, NULL, NULL, NULL,
+	    InstantiateIMCallback, (XPointer) dispPtr);
+}
 
 /*
  *--------------------------------------------------------------
  *
  * OpenIM --
@@ -691,14 +724,26 @@
 
     if (XSetLocaleModifiers("") == NULL) {
 	return;
     }
 
+    ++dispPtr->ximGeneration;
     dispPtr->inputMethod = XOpenIM(dispPtr->display, NULL, NULL, NULL);
     if (dispPtr->inputMethod == NULL) {
 	return;
     }
+
+    /* Require X11R6 */
+    {
+	XIMCallback destroy_cb;
+
+	destroy_cb.callback = DestroyIMCallback;
+	destroy_cb.client_data = (XPointer) dispPtr;
+	if (XSetIMValues(dispPtr->inputMethod, XNDestroyCallback,
+		&destroy_cb, NULL))
+	    goto error;
+    }
 
     if ((XGetIMValues(dispPtr->inputMethod, XNQueryInputStyle, &stylePtr,
 	    NULL) != NULL) || (stylePtr == NULL)) {
 	goto error;
     }
@@ -742,10 +787,11 @@
 
 error:
     if (dispPtr->inputMethod) {
 	XCloseIM(dispPtr->inputMethod);
 	dispPtr->inputMethod = NULL;
+	++dispPtr->ximGeneration;
     }
 }
 #endif /* TK_USE_INPUT_METHODS */
 
 void

Index: unix/tkUnixFont.c
==================================================================
--- unix/tkUnixFont.c
+++ unix/tkUnixFont.c
@@ -17,12 +17,12 @@
 
 /*
  * The preferred font encodings.
  */
 
-static const char *const encodingList[] = {
-    "iso8859-1", "jis0208", "jis0212", NULL
+static const char encodingList[][10] = {
+    "iso8859-1", "jis0208", "jis0212"
 };
 
 /*
  * The following structure represents a font family. It is assumed that all
  * screen fonts constructed from the same "font family" share certain
@@ -33,18 +33,18 @@
  *
  * Under Unix, there are three attributes that uniquely identify a "font
  * family": the foundry, face name, and charset.
  */
 
-#define FONTMAP_SHIFT		10
+#define FONTMAP_SHIFT		12
 
-#define FONTMAP_PAGES		(1 << (sizeof(Tcl_UniChar)*8 - FONTMAP_SHIFT))
+#define FONTMAP_PAGES		(1 << (21 - FONTMAP_SHIFT))
 #define FONTMAP_BITSPERPAGE	(1 << FONTMAP_SHIFT)
 
 typedef struct FontFamily {
     struct FontFamily *nextPtr;	/* Next in list of all known font families. */
-    int refCount;		/* How many SubFonts are referring to this
+    size_t refCount;		/* How many SubFonts are referring to this
 				 * FontFamily. When the refCount drops to
 				 * zero, this FontFamily may be freed. */
     /*
      * Key.
      */
@@ -169,11 +169,11 @@
 /*
  * The set of builtin encoding alises to convert the XLFD names for the
  * encodings into the names expected by the Tcl encoding package.
  */
 
-static EncodingAlias encodingAliases[] = {
+static const EncodingAlias encodingAliases[] = {
     {"gb2312-raw",	"gb2312*"},
     {"big5",		"big5*"},
     {"cns11643-1",	"cns11643*-1"},
     {"cns11643-1",	"cns11643*.1-0"},
     {"cns11643-2",	"cns11643*-2"},
@@ -404,14 +404,13 @@
 				 * correspond to the bytes stored in the
 				 * output buffer. */
 {
     const char *srcStart, *srcEnd;
     char *dstStart, *dstEnd;
-    Tcl_UniChar ch;
-    int result;
-    static char hexChars[] = "0123456789abcdef";
-    static char mapChars[] = {
+    int ch, result;
+    static const char hexChars[] = "0123456789abcdef";
+    static const char mapChars[] = {
 	0, 0, 0, 0, 0, 0, 0,
 	'a', 'b', 't', 'n', 'v', 'f', 'r'
     };
 
     result = TCL_OK;
@@ -425,27 +424,35 @@
     for ( ; src < srcEnd; ) {
 	if (dst > dstEnd) {
 	    result = TCL_CONVERT_NOSPACE;
 	    break;
 	}
-	src += Tcl_UtfToUniChar(src, &ch);
+	src += TkUtfToUniChar(src, &ch);
 	dst[0] = '\\';
-	if ((ch < sizeof(mapChars)) && (mapChars[ch] != 0)) {
+	if (((size_t) ch < sizeof(mapChars)) && (mapChars[ch] != 0)) {
 	    dst[1] = mapChars[ch];
 	    dst += 2;
 	} else if (ch < 256) {
 	    dst[1] = 'x';
 	    dst[2] = hexChars[(ch >> 4) & 0xf];
 	    dst[3] = hexChars[ch & 0xf];
 	    dst += 4;
-	} else {
+	} else if (ch < 0x10000) {
 	    dst[1] = 'u';
 	    dst[2] = hexChars[(ch >> 12) & 0xf];
 	    dst[3] = hexChars[(ch >> 8) & 0xf];
 	    dst[4] = hexChars[(ch >> 4) & 0xf];
 	    dst[5] = hexChars[ch & 0xf];
 	    dst += 6;
+	} else {
+	    /* TODO we can do better here */
+	    dst[1] = 'u';
+	    dst[2] = 'f';
+	    dst[3] = 'f';
+	    dst[4] = 'f';
+	    dst[5] = 'd';
+	    dst += 6;
 	}
     }
     *srcReadPtr = src - srcStart;
     *dstWrotePtr = dst - dstStart;
     *dstCharsPtr = dst - dstStart;
@@ -511,11 +518,11 @@
 
     srcStart = src;
     srcEnd = src + srcLen;
 
     dstStart = dst;
-    dstEnd = dst + dstLen - TCL_UTF_MAX;
+    dstEnd = dst + dstLen - 4;
 
     for (numChars = 0; src < srcEnd; numChars++) {
 	if (dst > dstEnd) {
 	    result = TCL_CONVERT_NOSPACE;
 	    break;
@@ -586,11 +593,11 @@
 
     srcStart = src;
     srcEnd = src + srcLen;
     srcClose = srcEnd;
     if (!(flags & TCL_ENCODING_END)) {
-	srcClose -= TCL_UTF_MAX;
+	srcClose -= 4;
     }
 
     dstStart = dst;
     dstEnd = dst + dstLen - 2 /* sizeof(UCS-2) */;
 
@@ -944,11 +951,11 @@
 
 void
 TkpGetFontAttrsForChar(
     Tk_Window tkwin,		/* Window on the font's display */
     Tk_Font tkfont,		/* Font to query */
-    Tcl_UniChar c,		/* Character of interest */
+    int c,         		/* Character of interest */
     TkFontAttributes *faPtr)	/* Output: Font attributes */
 {
     FontAttributes atts;
     UnixFont *fontPtr = (UnixFont *) tkfont;
 				/* Structure describing the logical font */
@@ -1008,11 +1015,11 @@
     int *lengthPtr)		/* Filled with x-location just after the
 				 * terminating character. */
 {
     UnixFont *fontPtr;
     SubFont *lastSubFontPtr;
-    int curX, curByte;
+    int curX, curByte, ch;
 
     /*
      * Unix does not use kerning or fractional character widths when
      * displaying text on the screen. So that means we can safely measure
      * individual characters or spans of characters and add up the widths w/o
@@ -1026,11 +1033,10 @@
     if (numBytes == 0) {
 	curX = 0;
 	curByte = 0;
     } else if (maxLength < 0) {
 	const char *p, *end, *next;
-	Tcl_UniChar ch;
 	SubFont *thisSubFontPtr;
 	FontFamily *familyPtr;
 	Tcl_DString runString;
 
 	/*
@@ -1042,11 +1048,11 @@
 	 */
 
 	curX = 0;
 	end = source + numBytes;
 	for (p = source; p < end; ) {
-	    next = p + Tcl_UtfToUniChar(p, &ch);
+	    next = p + TkUtfToUniChar(p, &ch);
 	    thisSubFontPtr = FindSubFontForChar(fontPtr, ch, &lastSubFontPtr);
 	    if (thisSubFontPtr != lastSubFontPtr) {
 		familyPtr = lastSubFontPtr->familyPtr;
 		Tcl_UtfToExternalDString(familyPtr->encoding, source,
 			p - source, &runString);
@@ -1080,21 +1086,20 @@
 	Tcl_DStringFree(&runString);
 	curByte = numBytes;
     } else {
 	const char *p, *end, *next, *term;
 	int newX, termX, sawNonSpace, dstWrote;
-	Tcl_UniChar ch;
 	FontFamily *familyPtr;
 	XChar2b buf[8];
 
 	/*
 	 * How many chars will fit in the space allotted? This first version
 	 * may be inefficient because it measures every character
 	 * individually.
 	 */
 
-	next = source + Tcl_UtfToUniChar(source, &ch);
+	next = source + TkUtfToUniChar(source, &ch);
 	newX = curX = termX = 0;
 
 	term = source;
 	end = source + numBytes;
 
@@ -1125,11 +1130,11 @@
 		term = end;
 		termX = curX;
 		break;
 	    }
 
-	    next += Tcl_UtfToUniChar(next, &ch);
+	    next += TkUtfToUniChar(next, &ch);
 	    if ((ch < 256) && isspace(ch)) {
 		if (sawNonSpace) {
 		    term = p;
 		    termX = curX;
 		    sawNonSpace = 0;
@@ -1150,17 +1155,17 @@
 	     * desired span. The width returned will include the width of that
 	     * extra character.
 	     */
 
 	    curX = newX;
-	    p += Tcl_UtfToUniChar(p, &ch);
+	    p += TkUtfToUniChar(p, &ch);
 	}
 	if ((flags & TK_AT_LEAST_ONE) && (term == source) && (p < end)) {
 	    term = p;
 	    termX = curX;
 	    if (term == source) {
-		term += Tcl_UtfToUniChar(term, &ch);
+		term += TkUtfToUniChar(term, &ch);
 		termX = newX;
 	    }
 	} else if ((p >= end) || !(flags & TK_WHOLE_WORDS)) {
 	    term = p;
 	    termX = curX;
@@ -1268,12 +1273,11 @@
 {
     UnixFont *fontPtr = (UnixFont *) tkfont;
     SubFont *thisSubFontPtr, *lastSubFontPtr;
     Tcl_DString runString;
     const char *p, *end, *next;
-    int xStart, needWidth, window_width, do_width;
-    Tcl_UniChar ch;
+    int xStart, needWidth, window_width, do_width, ch;
     FontFamily *familyPtr;
 #ifdef TK_DRAW_CHAR_XWINDOW_CHECK
     int rx, ry;
     unsigned width, height, border_width, depth;
     Drawable root;
@@ -1304,11 +1308,11 @@
 
     end = source + numBytes;
     needWidth = fontPtr->font.fa.underline + fontPtr->font.fa.overstrike;
     for (p = source; p <= end; ) {
 	if (p < end) {
-	    next = p + Tcl_UtfToUniChar(p, &ch);
+	    next = p + TkUtfToUniChar(p, &ch);
 	    thisSubFontPtr = FindSubFontForChar(fontPtr, ch, &lastSubFontPtr);
 	} else {
 	    next = p + 1;
 	    thisSubFontPtr = lastSubFontPtr;
 	}
@@ -1404,14 +1408,17 @@
     int rangeLength,		/* Length of range to draw in bytes. */
     int x, int y)		/* Coordinates at which to place origin of the
 				 * whole (not just the range) string when
 				 * drawing. */
 {
+    int widthUntilStart;
+
     (void) numBytes; /*unused*/
 
+    Tk_MeasureChars(tkfont, source, rangeStart, -1, 0, &widthUntilStart);
     Tk_DrawChars(display, drawable, gc, tkfont, source + rangeStart,
-	    rangeLength, x, y);
+	    rangeLength, x+widthUntilStart, y);
 }
 
 /*
  *-------------------------------------------------------------------------
  *
@@ -1522,11 +1529,11 @@
 
 	if (TkFontParseXLFD(nameList[nameIdx], &got.fa, &got.xa) != TCL_OK) {
 	    continue;
 	}
 	IdentifySymbolEncodings(&got);
-	scalable = (got.fa.size == 0);
+	scalable = (got.fa.size == 0.0);
 	score = RankAttributes(&want, &got);
 	if (score < bestScore[scalable]) {
 	    bestIdx[scalable] = nameIdx;
 	    bestScore[scalable] = score;
 	}
@@ -1629,11 +1636,11 @@
     fmPtr->descent = fontStructPtr->descent;
     fmPtr->maxWidth = fontStructPtr->max_bounds.width;
     fmPtr->fixed = fixed;
 
     fontPtr->display = display;
-    fontPtr->pixelSize = TkFontGetPixels(tkwin, fa.fa.size);
+    fontPtr->pixelSize = (int)(TkFontGetPixels(tkwin, fa.fa.size) + 0.5);
     fontPtr->xa = fa.xa;
 
     fontPtr->numSubFonts = 1;
     fontPtr->subFontArray = fontPtr->staticSubFonts;
     InitSubFont(display, fontStructPtr, 1, &fontPtr->subFontArray[0]);
@@ -1836,11 +1843,13 @@
     familyPtr = tsdPtr->fontFamilyList;
     for (; familyPtr != NULL; familyPtr = familyPtr->nextPtr) {
 	if ((familyPtr->faceName == fa.fa.family)
 		&& (familyPtr->foundry == fa.xa.foundry)
 		&& (familyPtr->encoding == encoding)) {
-	    Tcl_FreeEncoding(encoding);
+	    if (encoding) {
+		Tcl_FreeEncoding(encoding);
+	    }
 	    familyPtr->refCount++;
 	    return familyPtr;
 	}
     }
 
@@ -1906,15 +1915,16 @@
     int i;
 
     if (familyPtr == NULL) {
 	return;
     }
-    familyPtr->refCount--;
-    if (familyPtr->refCount > 0) {
+    if (familyPtr->refCount-- > 1) {
 	return;
     }
-    Tcl_FreeEncoding(familyPtr->encoding);
+    if (familyPtr->encoding) {
+	Tcl_FreeEncoding(familyPtr->encoding);
+    }
     for (i = 0; i < FONTMAP_PAGES; i++) {
 	if (familyPtr->fontMap[i] != NULL) {
 	    ckfree(familyPtr->fontMap[i]);
 	}
     }
@@ -2200,11 +2210,11 @@
     SubFont *subFontPtr,	/* Contains font mapping cache to be
 				 * updated. */
     int row)			/* Index of the page to be loaded into the
 				 * cache. */
 {
-    char buf[16], src[TCL_UTF_MAX];
+    char buf[16], src[6];
     int minHi, maxHi, minLo, maxLo, scale, checkLo;
     int i, end, bitOffset, isTwoByteFont, n;
     Tcl_Encoding encoding;
     XFontStruct *fontStructPtr;
     XCharStruct *widths;
@@ -2238,11 +2248,11 @@
 
     end = (row + 1) << FONTMAP_SHIFT;
     for (i = row << FONTMAP_SHIFT; i < end; i++) {
 	int hi, lo;
 
-	if (Tcl_UtfToExternal(NULL, encoding, src, Tcl_UniCharToUtf(i, src),
+	if (Tcl_UtfToExternal(NULL, encoding, src, TkUniCharToUtf(i, src),
 		TCL_ENCODING_STOPONERROR, NULL, buf, sizeof(buf), NULL,
 		NULL, NULL) != TCL_OK) {
 	    continue;
 	}
 	if (isTwoByteFont) {
@@ -2404,11 +2414,11 @@
     Tk_Uid hateFoundry;
     const char *charset, *hateCharset;
     unsigned bestScore[2];
     char **nameList;
     char **nameListOrig;
-    char src[TCL_UTF_MAX];
+    char src[6];
     FontAttributes want, got;
     Display *display;
     SubFont subFont;
     XFontStruct *fontStructPtr;
     Tcl_DString dsEncodings;
@@ -2434,17 +2444,17 @@
     if (numNames == 0) {
 	return NULL;
     }
     nameListOrig = nameList;
 
-    srcLen = Tcl_UniCharToUtf(ch, src);
+    srcLen = TkUniCharToUtf(ch, src);
 
     want.fa = fontPtr->font.fa;
     want.xa = fontPtr->xa;
 
     want.fa.family = Tk_GetUid(faceName);
-    want.fa.size = -fontPtr->pixelSize;
+    want.fa.size = (double)-fontPtr->pixelSize;
 
     hateFoundry = NULL;
     hateCharset = NULL;
     numEncodings = 0;
     Tcl_DStringInit(&dsEncodings);
@@ -2523,11 +2533,11 @@
 
 	/*
 	 * D. Rank each name and pick the best match.
 	 */
 
-	scalable = (got.fa.size == 0);
+	scalable = (got.fa.size == 0.0);
 	score = RankAttributes(&want, &got);
 	if (score < bestScore[scalable]) {
 	    bestIdx[scalable] = nameIdx;
 	    bestScore[scalable] = score;
 	}
@@ -2652,11 +2662,11 @@
     }
     if (gotPtr->xa.setwidth != wantPtr->xa.setwidth) {
 	penalty += 1000;
     }
 
-    if (gotPtr->fa.size == 0) {
+    if (gotPtr->fa.size == 0.0) {
 	/*
 	 * A scalable font is almost always acceptable, but the corresponding
 	 * bitmapped font would be better.
 	 */
 
@@ -2666,29 +2676,29 @@
 
 	/*
 	 * It's worse to be too large than to be too small.
 	 */
 
-	diff = (-gotPtr->fa.size - -wantPtr->fa.size);
+	diff = (int) (150 * (-gotPtr->fa.size - -wantPtr->fa.size));
 	if (diff > 0) {
 	    penalty += 600;
 	} else if (diff < 0) {
 	    penalty += 150;
 	    diff = -diff;
 	}
-	penalty += 150 * diff;
+	penalty += diff;
     }
     if (gotPtr->xa.charset != wantPtr->xa.charset) {
-	int i;
+	size_t i;
 	const char *gotAlias, *wantAlias;
 
 	penalty += 65000;
 	gotAlias = GetEncodingAlias(gotPtr->xa.charset);
 	wantAlias = GetEncodingAlias(wantPtr->xa.charset);
 	if (strcmp(gotAlias, wantAlias) != 0) {
 	    penalty += 30000;
-	    for (i = 0; encodingList[i] != NULL; i++) {
+	    for (i = 0; i < sizeof(encodingList)/sizeof(encodingList[0]); i++) {
 		if (strcmp(gotAlias, encodingList[i]) == 0) {
 		    penalty -= 30000;
 		    break;
 		}
 		penalty += 20000;
@@ -2760,11 +2770,11 @@
 	for (i = XLFD_PIXEL_SIZE; i < XLFD_CHARSET; i++) {
 	    rest = strchr(rest + 1, '-');
 	}
 	*str = '\0';
 	sprintf(buf, "%.200s-%d-*-*-*-*-*%s", nameList[bestIdx[1]],
-		-wantPtr->fa.size, rest);
+		(int)(-wantPtr->fa.size+0.5), rest);
 	*str = '-';
 	fontStructPtr = XLoadQueryFont(display, buf);
 	bestScore[1] = INT_MAX;
     }
     if (fontStructPtr == NULL) {
@@ -3002,11 +3012,11 @@
 
 static const char *
 GetEncodingAlias(
     const char *name)		/* The name to look up. */
 {
-    EncodingAlias *aliasPtr;
+    const EncodingAlias *aliasPtr;
 
     for (aliasPtr = encodingAliases; aliasPtr->aliasPattern != NULL; ) {
 	if (Tcl_StringMatch(name, aliasPtr->aliasPattern)) {
 	    return aliasPtr->realName;
 	}

Index: unix/tkUnixKey.c
==================================================================
--- unix/tkUnixKey.c
+++ unix/tkUnixKey.c
@@ -108,11 +108,11 @@
 TkpGetString(
     TkWindow *winPtr,		/* Window where event occurred */
     XEvent *eventPtr,		/* X keyboard event. */
     Tcl_DString *dsPtr)		/* Initialized, empty string to hold result. */
 {
-    int len;
+    size_t len;
     Tcl_DString buf;
     TkKeyEvent *kePtr = (TkKeyEvent *) eventPtr;
 
     /*
      * If we have the value cached already, use it now. [Bug 1373712]
@@ -119,13 +119,24 @@
      */
 
     if (kePtr->charValuePtr != NULL) {
 	Tcl_DStringSetLength(dsPtr, kePtr->charValueLen);
 	memcpy(Tcl_DStringValue(dsPtr), kePtr->charValuePtr,
-		(unsigned) kePtr->charValueLen+1);
+		kePtr->charValueLen+1);
 	return Tcl_DStringValue(dsPtr);
     }
+
+    /*
+     * Only do this for KeyPress events, otherwise
+     * further Xlib function behavior might be undefined.
+     */
+
+    if (eventPtr->type != KeyPress) {
+	len = 0;
+	Tcl_DStringSetLength(dsPtr, len);
+	goto done;
+    }
 
 #ifdef TK_USE_INPUT_METHODS
     if ((winPtr->dispPtr->flags & TK_DISPLAY_USE_IM)
 	    && (winPtr->inputContext != NULL)
 	    && (eventPtr->type == KeyPress)) {
@@ -215,13 +226,14 @@
      * Cache the string in the event so that if/when we return to this
      * function, we will be able to produce it without asking X. This stops us
      * from having to reenter the XIM engine. [Bug 1373712]
      */
 
+done:
     kePtr->charValuePtr = ckalloc(len + 1);
     kePtr->charValueLen = len;
-    memcpy(kePtr->charValuePtr, Tcl_DStringValue(dsPtr), (unsigned) len + 1);
+    memcpy(kePtr->charValuePtr, Tcl_DStringValue(dsPtr), len + 1);
     return Tcl_DStringValue(dsPtr);
 }
 
 /*
  * When mapping from a keysym to a keycode, need information about the
@@ -234,11 +246,11 @@
     Tk_Window tkwin,
     KeySym keySym,
     XEvent *eventPtr)
 {
     TkDisplay *dispPtr = ((TkWindow *) tkwin)->dispPtr;
-    int state;
+    int state, mincode, maxcode;
     KeyCode keycode;
 
     if (keySym == NoSymbol) {
 	keycode = 0;
     } else {
@@ -256,10 +268,25 @@
 		}
 		break;
 	    }
 	}
     }
+
+    /*
+     * Filter keycodes out of range, otherwise further Xlib function
+     * behavior might be undefined, in particular XIM could cause crashes.
+     */
+
+    mincode = 0;
+    maxcode = -1;
+    XDisplayKeycodes(dispPtr->display, &mincode, &maxcode);
+    if (keycode < mincode) {
+	keycode = mincode;
+    } else if (keycode > maxcode) {
+	keycode = maxcode;
+    }
+
     eventPtr->xkey.keycode = keycode;
 }
 
 /*
  *----------------------------------------------------------------------

Index: unix/tkUnixMenu.c
==================================================================
--- unix/tkUnixMenu.c
+++ unix/tkUnixMenu.c
@@ -7,13 +7,13 @@
  *
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
 
-#include "default.h"
 #include "tkUnixInt.h"
 #include "tkMenu.h"
+#include "default.h"
 
 /*
  * Constants used for menu drawing.
  */
 
@@ -50,12 +50,12 @@
 
 static void		SetHelpMenu(TkMenu *menuPtr);
 static void		DrawMenuEntryAccelerator(TkMenu *menuPtr,
 			    TkMenuEntry *mePtr, Drawable d, GC gc,
 			    Tk_Font tkfont, const Tk_FontMetrics *fmPtr,
-			    Tk_3DBorder activeBorder, int x, int y,
-			    int width, int height, int drawArrow);
+			    Tk_3DBorder activeBorder, Tk_3DBorder bgBorder,
+			    int x, int y, int width, int height, int drawArrow);
 static void		DrawMenuEntryBackground(TkMenu *menuPtr,
 			    TkMenuEntry *mePtr, Drawable d,
 			    Tk_3DBorder activeBorder, Tk_3DBorder bgBorder,
 			    int x, int y, int width, int heigth);
 static void		DrawMenuEntryIndicator(TkMenu *menuPtr,
@@ -441,13 +441,12 @@
 	if ((menuPtr->menuType == MENUBAR)
 		&& ((menuPtr->postedCascade == NULL)
 		|| (menuPtr->postedCascade != mePtr))) {
 	    relief = TK_RELIEF_FLAT;
 	} else {
-	    relief = TK_RELIEF_RAISED;
+	    Tk_GetReliefFromObj(NULL, menuPtr->activeReliefPtr, &relief);
 	}
-
 	Tk_GetPixelsFromObj(NULL, menuPtr->tkwin,
 		menuPtr->activeBorderWidthPtr, &activeBorderWidth);
 	Tk_Fill3DRectangle(menuPtr->tkwin, d, bgBorder, x, y, width, height,
 		activeBorderWidth, relief);
     } else {
@@ -479,10 +478,11 @@
     Drawable d,			/* The drawable we are drawing into */
     GC gc,			/* The precalculated gc to draw with */
     Tk_Font tkfont,		/* The precalculated font */
     const Tk_FontMetrics *fmPtr,/* The precalculated metrics */
     Tk_3DBorder activeBorder,	/* The border for an active item */
+    Tk_3DBorder bgBorder,	/* The background border */
     int x,			/* Left coordinate of entry rect */
     int y,			/* Top coordinate of entry rect */
     int width,			/* Width of entry */
     int height,			/* Height of entry */
     int drawArrow)		/* Whether or not to draw arrow. */
@@ -508,12 +508,13 @@
     	points[0].y = y + (height - CASCADE_ARROW_HEIGHT)/2;
     	points[1].x = points[0].x;
     	points[1].y = points[0].y + CASCADE_ARROW_HEIGHT;
     	points[2].x = points[0].x + CASCADE_ARROW_WIDTH;
     	points[2].y = points[0].y + CASCADE_ARROW_HEIGHT/2;
-    	Tk_Fill3DPolygon(menuPtr->tkwin, d, activeBorder, points, 3,
-		DECORATION_BORDER_WIDTH,
+    	Tk_Fill3DPolygon(menuPtr->tkwin, d,
+		(mePtr->state == ENTRY_ACTIVE) ? activeBorder : bgBorder,
+		points, 3, DECORATION_BORDER_WIDTH,
 	    	(menuPtr->postedCascade == mePtr)
 	    	? TK_RELIEF_SUNKEN : TK_RELIEF_RAISED);
     } else if (mePtr->accelPtr != NULL) {
 	const char *accel = Tcl_GetString(mePtr->accelPtr);
 	int left = x + mePtr->labelWidth + activeBorderWidth
@@ -636,11 +637,11 @@
 	return;
     }
 
     points[0].x = x;
     points[0].y = y + height/2;
-    points[1].x = width - 1;
+    points[1].x = x + width - 1;
     points[1].y = points[0].y;
     border = Tk_Get3DBorderFromObj(menuPtr->tkwin, menuPtr->borderPtr);
     Tk_Draw3DPolygon(menuPtr->tkwin, d, border, points, 2, 1,
 	    TK_RELIEF_RAISED);
 }
@@ -1191,11 +1192,11 @@
 
     points[0].x = x;
     points[0].y = y + height/2;
     points[1].y = points[0].y;
     segmentWidth = 6;
-    maxX = width - 1;
+    maxX = x + width - 1;
     border = Tk_Get3DBorderFromObj(menuPtr->tkwin, menuPtr->borderPtr);
 
     while (points[0].x < maxX) {
 	points[1].x = points[0].x + segmentWidth;
 	if (points[1].x > maxX) {
@@ -1324,12 +1325,11 @@
     int y,			/* Y-coordinate of topleft of entry */
     int width,			/* Width of the entry rectangle */
     int height,			/* Height of the current rectangle */
     int strictMotif,		/* Boolean flag */
     int drawArrow)		/* Whether or not to draw the cascade arrow
-				 * for cascade items. Only applies to
-				 * Windows. */
+				 * for cascade items. */
 {
     GC gc, indicatorGC;
     XColor *indicatorColor, *disableColor = NULL;
     TkMenu *menuPtr = mePtr->menuPtr;
     Tk_3DBorder bgBorder, activeBorder;
@@ -1433,11 +1433,12 @@
 		width, adjustedHeight);
     } else {
 	DrawMenuEntryLabel(menuPtr, mePtr, d, gc, tkfont, fmPtr, x, adjustedY,
 		width, adjustedHeight);
 	DrawMenuEntryAccelerator(menuPtr, mePtr, d, gc, tkfont, fmPtr,
-		activeBorder, x, adjustedY, width, adjustedHeight, drawArrow);
+		activeBorder, bgBorder, x, adjustedY, width, adjustedHeight,
+		drawArrow);
 	if (!mePtr->hideMargin) {
 	    if (mePtr->state == ENTRY_ACTIVE) {
 		bgBorder = activeBorder;
 	    }
 	    DrawMenuEntryIndicator(menuPtr, mePtr, d, bgBorder, indicatorColor,
@@ -1716,11 +1717,11 @@
 		+ accelWidth + 2 * activeBorderWidth;
 	menuPtr->entries[j]->x = x;
 	menuPtr->entries[j]->entryFlags |= ENTRY_LAST_COLUMN;
     }
     windowWidth = x + indicatorSpace + labelWidth + accelWidth
-	    + 2 * activeBorderWidth + 2 * borderWidth;
+	    + 2 * activeBorderWidth + borderWidth;
 
     windowHeight += borderWidth;
 
     /*
      * The X server doesn't like zero dimensions, so round up to at least 1 (a

Index: unix/tkUnixRFont.c
==================================================================
--- unix/tkUnixRFont.c
+++ unix/tkUnixRFont.c
@@ -67,11 +67,11 @@
 
 void
 TkpFontPkgInit(
     TkMainInfo *mainPtr)	/* The application being created. */
 {
-    static Tcl_Config cfg[] = {
+    static const Tcl_Config cfg[] = {
 	{ "fontsystem", "xft" },
 	{ 0,0 }
     };
 
     Tcl_RegisterConfig(mainPtr->interp, "tk", cfg, TCL_CFGVAL_ENCODING);
@@ -168,22 +168,25 @@
     XftFont *ftFont,
     TkFontAttributes *faPtr)
 {
     const char *family = "Unknown";
     const char *const *familyPtr = &family;
-    int weight, slant, size, pxsize;
-    double ptsize;
+    int weight, slant, pxsize;
+    double size, ptsize;
 
     (void) XftPatternGetString(ftFont->pattern, XFT_FAMILY, 0, familyPtr);
     if (XftPatternGetDouble(ftFont->pattern, XFT_SIZE, 0,
 	    &ptsize) == XftResultMatch) {
-	size = (int) ptsize;
+	size = ptsize;
+    } else if (XftPatternGetDouble(ftFont->pattern, XFT_PIXEL_SIZE, 0,
+	    &ptsize) == XftResultMatch) {
+	size = -ptsize;
     } else if (XftPatternGetInteger(ftFont->pattern, XFT_PIXEL_SIZE, 0,
 	    &pxsize) == XftResultMatch) {
-	size = -pxsize;
+	size = (double)-pxsize;
     } else {
-	size = 12;
+	size = 12.0;
     }
     if (XftPatternGetInteger(ftFont->pattern, XFT_WEIGHT, 0,
 	    &weight) != XftResultMatch) {
 	weight = XFT_WEIGHT_MEDIUM;
     }
@@ -192,11 +195,11 @@
 	slant = XFT_SLANT_ROMAN;
     }
 
 #if DEBUG_FONTSEL
     printf("family %s size %d weight %d slant %d\n",
-	    family, size, weight, slant);
+	    family, (int)size, weight, slant);
 #endif /* DEBUG_FONTSEL */
 
     faPtr->family = Tk_GetUid(family);
     faPtr->size = size;
     faPtr->weight = (weight > XFT_WEIGHT_MEDIUM) ? TK_FW_BOLD : TK_FW_NORMAL;
@@ -439,14 +442,14 @@
 #endif /* DEBUG_FONTSEL */
     pattern = XftPatternCreate();
     if (faPtr->family) {
 	XftPatternAddString(pattern, XFT_FAMILY, faPtr->family);
     }
-    if (faPtr->size > 0) {
-	XftPatternAddDouble(pattern, XFT_SIZE, (double)faPtr->size);
-    } else if (faPtr->size < 0) {
-	XftPatternAddInteger(pattern, XFT_PIXEL_SIZE, -faPtr->size);
+    if (faPtr->size > 0.0) {
+	XftPatternAddDouble(pattern, XFT_SIZE, faPtr->size);
+    } else if (faPtr->size < 0.0) {
+	XftPatternAddDouble(pattern, XFT_SIZE, TkFontGetPoints(tkwin, faPtr->size));
     } else {
 	XftPatternAddDouble(pattern, XFT_SIZE, 12.0);
     }
     switch (faPtr->weight) {
     case TK_FW_NORMAL:
@@ -613,11 +616,11 @@
 
 void
 TkpGetFontAttrsForChar(
     Tk_Window tkwin,		/* Window on the font's display */
     Tk_Font tkfont,		/* Font to query */
-    Tcl_UniChar c,		/* Character of interest */
+    int c,         		/* Character of interest */
     TkFontAttributes *faPtr)	/* Output: Font attributes */
 {
     UnixFtFont *fontPtr = (UnixFtFont *) tkfont;
 				/* Structure describing the logical font */
     FcChar32 ucs4 = (FcChar32) c;
@@ -666,13 +669,13 @@
 
     curX = 0;
     curByte = 0;
     sawNonSpace = 0;
     while (numBytes > 0) {
-	Tcl_UniChar unichar;
+	int unichar;
 
-	clen = Tcl_UtfToUniChar(source, &unichar);
+	clen = TkUtfToUniChar(source, &unichar);
 	c = (FcChar32) unichar;
 
 	if (clen <= 0) {
 	    /*
 	     * This can't happen (but see #1185640)
@@ -706,13 +709,23 @@
 	if (maxLength >= 0 && newX > maxLength) {
 	    if (flags & TK_PARTIAL_OK ||
 		    (flags & TK_AT_LEAST_ONE && curByte == 0)) {
 		curX = newX;
 		curByte = newByte;
-	    } else if (flags & TK_WHOLE_WORDS && termX != 0) {
-		curX = termX;
-		curByte = termByte;
+	    } else if (flags & TK_WHOLE_WORDS) {
+		if ((flags & TK_AT_LEAST_ONE) && (termX == 0)) {
+		    /*
+		     * No space was seen before reaching the right
+		     * of the allotted maxLength space, i.e. no word
+		     * boundary. Return the string that fills the
+		     * allotted space, without overfill.
+		     * curX and curByte are already the right ones:
+		     */
+		} else {
+		    curX = termX;
+		    curByte = termByte;
+		}
 	    }
 	    break;
 	}
 
 	curX = newX;
@@ -776,11 +789,11 @@
 
     for (i = fontPtr->firstColor;
 	 i >= 0; last2 = last, last = i, i = fontPtr->colors[i].next) {
 
 	if (pixel == fontPtr->colors[i].color.pixel) {
-	    /* 
+	    /*
 	     * Color found in cache.  Move it to the front of the list and return it.
 	     */
 	    if (last >= 0) {
 		fontPtr->colors[last].next = fontPtr->colors[i].next;
 		fontPtr->colors[i].next = fontPtr->firstColor;
@@ -800,11 +813,11 @@
     if (fontPtr->ncolors < MAX_CACHED_COLORS) {
 	last2 = -1;
 	last = fontPtr->ncolors++;
     }
 
-    /* 
+    /*
      * Translate the pixel value to a color.  Needs a server round-trip.
      */
     xcolor.pixel = pixel;
     XQueryColor(display, DefaultColormap(display, fontPtr->screen), &xcolor);
 
@@ -845,10 +858,11 @@
     int numBytes,		/* Number of bytes in string. */
     int x, int y)		/* Coordinates at which to place origin of
 				 * string when drawing. */
 {
     const int maxCoord = 0x7FFF;/* Xft coordinates are 16 bit values */
+    const int minCoord = -maxCoord-1;
     UnixFtFont *fontPtr = (UnixFtFont *) tkfont;
     XGCValues values;
     XftColor *xftcolor;
     int clen, nspec, xStart = x;
     XftGlyphFontSpec specs[NUM_SPEC];
@@ -874,11 +888,11 @@
     xftcolor = LookUpColor(display, fontPtr, values.foreground);
     if (tsdPtr->clipRegion != None) {
 	XftDrawSetClip(fontPtr->ftDraw, tsdPtr->clipRegion);
     }
     nspec = 0;
-    while (numBytes > 0 && x <= maxCoord && y <= maxCoord) {
+    while (numBytes > 0) {
 	XftFont *ftFont;
 	FcChar32 c;
 
 	clen = FcUtf8ToUcs4((FcChar8 *) source, &c, numBytes);
 	if (clen <= 0) {
@@ -891,24 +905,32 @@
 	source += clen;
 	numBytes -= clen;
 
 	ftFont = GetFont(fontPtr, c, 0.0);
 	if (ftFont) {
-	    specs[nspec].font = ftFont;
 	    specs[nspec].glyph = XftCharIndex(fontPtr->display, ftFont, c);
-	    specs[nspec].x = x;
-	    specs[nspec].y = y;
 	    XftGlyphExtents(fontPtr->display, ftFont, &specs[nspec].glyph, 1,
 		    &metrics);
+
+	    /*
+	     * Draw glyph only when it fits entirely into 16 bit coords.
+	     */
+
+	    if (x >= minCoord && y >= minCoord &&
+		x <= maxCoord - metrics.width &&
+		y <= maxCoord - metrics.height) {
+		specs[nspec].font = ftFont;
+		specs[nspec].x = x;
+		specs[nspec].y = y;
+		if (++nspec == NUM_SPEC) {
+		    XftDrawGlyphFontSpec(fontPtr->ftDraw, xftcolor,
+			    specs, nspec);
+		    nspec = 0;
+		}
+	    }
 	    x += metrics.xOff;
 	    y += metrics.yOff;
-	    nspec++;
-	    if (nspec == NUM_SPEC) {
-		XftDrawGlyphFontSpec(fontPtr->ftDraw, xftcolor,
-			specs, nspec);
-		nspec = 0;
-	    }
 	}
     }
     if (nspec) {
 	XftDrawGlyphFontSpec(fontPtr->ftDraw, xftcolor, specs, nspec);
     }
@@ -967,11 +989,11 @@
     double x, double y,		/* Coordinates at which to place origin of
 				 * string when drawing. */
     double angle)		/* What angle to put text at, in degrees. */
 {
     const int maxCoord = 0x7FFF;/* Xft coordinates are 16 bit values */
-    const int minCoord = -1000;	/* Should be good enough... */
+    const int minCoord = -maxCoord-1;
     UnixFtFont *fontPtr = (UnixFtFont *) tkfont;
     XGCValues values;
     XftColor *xftcolor;
     int xStart = x, yStart = y;
     ThreadSpecificData *tsdPtr = (ThreadSpecificData *)
@@ -1006,12 +1028,11 @@
 
     nglyph = 0;
     currentFtFont = NULL;
     originX = originY = 0;		/* lint */
 
-    while (numBytes > 0 && x <= maxCoord && x >= minCoord && y <= maxCoord
-	    && y >= minCoord) {
+    while (numBytes > 0) {
 	XftFont *ftFont;
 	FcChar32 c;
 
 	clen = FcUtf8ToUcs4((FcChar8 *) source, &c, numBytes);
 	if (clen <= 0) {
@@ -1036,29 +1057,58 @@
 		 * perform better rendering of sub-pixel inter-glyph spacing.
 		 * If only the current Xft implementation could make use of
 		 * this information... but we'll be ready when it does!
 		 */
 
-		XftDrawGlyphs(fontPtr->ftDraw, xftcolor, currentFtFont,
-			originX, originY, glyphs, nglyph);
+		XftGlyphExtents(fontPtr->display, currentFtFont, glyphs,
+			nglyph, &metrics);
+		/*
+		 * Draw glyph only when it fits entirely into 16 bit coords.
+		 */
+
+		if (x >= minCoord && y >= minCoord &&
+		    x <= maxCoord - metrics.width &&
+		    y <= maxCoord - metrics.height) {
+
+		    /*
+		     * NOTE:
+		     * The whole algorithm has a design problem, the choice of
+		     * NUM_SPEC is arbitrary, and so the inter-glyph spacing could
+		     * look arbitrary. This algorithm has to draw the whole string
+		     * at once (or whole blocks with same font), this requires a
+		     * dynamic 'glyphs' array. In case of overflow the array has to
+		     * be divided until the maximal string will fit. (GC)
+                     * Given the resolution of current displays though, this should
+                     * not be a huge issue since NUM_SPEC is 1024 and thus able to
+                     * cover about 6000 pixels for a 6 pixel wide font (which is
+                     * a very small barely readable font)
+		     */
+
+		    XftDrawGlyphs(fontPtr->ftDraw, xftcolor, currentFtFont,
+			    originX, originY, glyphs, nglyph);
+		}
 	    }
 	    originX = ROUND16(x);
 	    originY = ROUND16(y);
-	    if (nglyph) {
-		XftGlyphExtents(fontPtr->display, currentFtFont, glyphs,
-			nglyph, &metrics);
-		nglyph = 0;
-		x += metrics.xOff;
-		y += metrics.yOff;
-	    }
 	    currentFtFont = ftFont;
 	}
 	glyphs[nglyph++] = XftCharIndex(fontPtr->display, ftFont, c);
     }
     if (nglyph) {
-	XftDrawGlyphs(fontPtr->ftDraw, xftcolor, currentFtFont,
-		originX, originY, glyphs, nglyph);
+	XftGlyphExtents(fontPtr->display, currentFtFont, glyphs,
+		nglyph, &metrics);
+
+	/*
+	 * Draw glyph only when it fits entirely into 16 bit coords.
+	 */
+
+	if (x >= minCoord && y >= minCoord &&
+	    x <= maxCoord - metrics.width &&
+	    y <= maxCoord - metrics.height) {
+	    XftDrawGlyphs(fontPtr->ftDraw, xftcolor, currentFtFont,
+		    originX, originY, glyphs, nglyph);
+	}
     }
 #else /* !XFT_HAS_FIXED_ROTATED_PLACEMENT */
     int clen, nspec;
     XftGlyphFontSpec specs[NUM_SPEC];
     XGlyphInfo metrics;
@@ -1082,12 +1132,11 @@
     xftcolor = LookUpColor(display, fontPtr, values.foreground);
     if (tsdPtr->clipRegion != None) {
 	XftDrawSetClip(fontPtr->ftDraw, tsdPtr->clipRegion);
     }
     nspec = 0;
-    while (numBytes > 0 && x <= maxCoord && x >= minCoord
-	    && y <= maxCoord && y >= minCoord) {
+    while (numBytes > 0) {
 	XftFont *ftFont, *ft0Font;
 	FcChar32 c;
 
 	clen = FcUtf8ToUcs4((FcChar8 *) source, &c, numBytes);
 	if (clen <= 0) {
@@ -1101,24 +1150,32 @@
 	numBytes -= clen;
 
 	ftFont = GetFont(fontPtr, c, angle);
 	ft0Font = GetFont(fontPtr, c, 0.0);
 	if (ftFont && ft0Font) {
-	    specs[nspec].font = ftFont;
 	    specs[nspec].glyph = XftCharIndex(fontPtr->display, ftFont, c);
-	    specs[nspec].x = ROUND16(x);
-	    specs[nspec].y = ROUND16(y);
 	    XftGlyphExtents(fontPtr->display, ft0Font, &specs[nspec].glyph, 1,
 		    &metrics);
+
+	    /*
+	     * Draw glyph only when it fits entirely into 16 bit coords.
+	     */
+
+	    if (x >= minCoord && y >= minCoord &&
+		x <= maxCoord - metrics.width &&
+		y <= maxCoord - metrics.height) {
+		specs[nspec].font = ftFont;
+		specs[nspec].x = ROUND16(x);
+		specs[nspec].y = ROUND16(y);
+		if (++nspec == NUM_SPEC) {
+		    XftDrawGlyphFontSpec(fontPtr->ftDraw, xftcolor,
+			    specs, nspec);
+		    nspec = 0;
+		}
+	    }
 	    x += metrics.xOff*cosA + metrics.yOff*sinA;
 	    y += metrics.yOff*cosA - metrics.xOff*sinA;
-	    nspec++;
-	    if (nspec == NUM_SPEC) {
-		XftDrawGlyphFontSpec(fontPtr->ftDraw, xftcolor,
-			specs, nspec);
-		nspec = 0;
-	    }
 	}
     }
     if (nspec) {
 	XftDrawGlyphFontSpec(fontPtr->ftDraw, xftcolor, specs, nspec);
     }

Index: unix/tkUnixScale.c
==================================================================
--- unix/tkUnixScale.c
+++ unix/tkUnixScale.c
@@ -11,10 +11,14 @@
  */
 
 #include "tkInt.h"
 #include "tkScale.h"
 
+#if defined(_WIN32)
+#define snprintf _snprintf
+#endif
+
 /*
  * Forward declarations for functions defined later in this file:
  */
 
 static void		DisplayHorizontalScale(TkScale *scalePtr,
@@ -265,11 +269,13 @@
     char valueString[TCL_DOUBLE_SPACE];
     Tk_FontMetrics fm;
 
     Tk_GetFontMetrics(scalePtr->tkfont, &fm);
     y = TkScaleValueToPixel(scalePtr, value) + fm.ascent/2;
-    sprintf(valueString, scalePtr->format, value);
+    if (snprintf(valueString, TCL_DOUBLE_SPACE, scalePtr->format, value) < 0) {
+        valueString[TCL_DOUBLE_SPACE - 1] = '\0';
+    }
     length = (int) strlen(valueString);
     width = Tk_TextWidth(scalePtr->tkfont, valueString, length);
 
     /*
      * Adjust the y-coordinate if necessary to keep the text entirely inside
@@ -350,11 +356,14 @@
 	     * fromValue would take. Not exact, but better than no constraint.
 	     */
 
 	    ticks = fabs((scalePtr->toValue - scalePtr->fromValue)
 		    / tickInterval);
-	    sprintf(valueString, scalePtr->format, scalePtr->fromValue);
+            if (snprintf(valueString, TCL_DOUBLE_SPACE, scalePtr->format,
+                    scalePtr->fromValue) < 0) {
+                valueString[TCL_DOUBLE_SPACE - 1] = '\0';
+            }
 	    maxTicks = (double) Tk_Width(tkwin)
 		    / (double) Tk_TextWidth(scalePtr->tkfont, valueString, -1);
 	    if (ticks > maxTicks) {
 		tickInterval *= (ticks / maxTicks);
 	    }
@@ -482,11 +491,13 @@
     Tk_FontMetrics fm;
 
     x = TkScaleValueToPixel(scalePtr, value);
     Tk_GetFontMetrics(scalePtr->tkfont, &fm);
     y = top + fm.ascent;
-    sprintf(valueString, scalePtr->format, value);
+    if (snprintf(valueString, TCL_DOUBLE_SPACE, scalePtr->format, value) < 0) {
+        valueString[TCL_DOUBLE_SPACE - 1] = '\0';
+    }
     length = (int) strlen(valueString);
     width = Tk_TextWidth(scalePtr->tkfont, valueString, length);
 
     /*
      * Adjust the x-coordinate if necessary to keep the text entirely inside
@@ -549,11 +560,14 @@
      */
 
     Tcl_Preserve(scalePtr);
     if ((scalePtr->flags & INVOKE_COMMAND) && (scalePtr->command != NULL)) {
 	Tcl_Preserve(interp);
-	sprintf(string, scalePtr->format, scalePtr->value);
+        if (snprintf(string, TCL_DOUBLE_SPACE, scalePtr->format,
+                scalePtr->value) < 0) {
+            string[TCL_DOUBLE_SPACE - 1] = '\0';
+        }
 	Tcl_DStringInit(&buf);
 	Tcl_DStringAppend(&buf, scalePtr->command, -1);
 	Tcl_DStringAppend(&buf, " ", -1);
 	Tcl_DStringAppend(&buf, string, -1);
 	result = Tcl_EvalEx(interp, Tcl_DStringValue(&buf), -1, 0);

Index: unix/tkUnixScrlbr.c
==================================================================
--- unix/tkUnixScrlbr.c
+++ unix/tkUnixScrlbr.c
@@ -287,10 +287,15 @@
 	scrollPtr->highlightWidth = 0;
     }
     scrollPtr->inset = scrollPtr->highlightWidth + scrollPtr->borderWidth;
     width = (scrollPtr->vertical) ? Tk_Width(scrollPtr->tkwin)
 	    : Tk_Height(scrollPtr->tkwin);
+
+    /*
+     * Next line assumes that the arrow area is a square.
+     */
+
     scrollPtr->arrowLength = width - 2*scrollPtr->inset + 1;
     fieldLength = (scrollPtr->vertical ? Tk_Height(scrollPtr->tkwin)
 	    : Tk_Width(scrollPtr->tkwin))
 	    - 2*(scrollPtr->arrowLength + scrollPtr->inset);
     if (fieldLength < 0) {

Index: unix/tkUnixSelect.c
==================================================================
--- unix/tkUnixSelect.c
+++ unix/tkUnixSelect.c
@@ -19,11 +19,11 @@
 				 * means only the final zero-length transfer
 				 * still has to be done. Otherwise it is the
 				 * offset of the next chunk of data to
 				 * transfer. */
     Tcl_EncodingState state;	/* The encoding state needed across chunks. */
-    char buffer[TCL_UTF_MAX];	/* A buffer to hold part of a UTF character
+    char buffer[4];		/* A buffer to hold part of a UTF character
 				 * that is split across chunks.*/
 } ConvertInfo;
 
 /*
  * When handling INCR-style selection retrievals, the selection owner uses the
@@ -163,10 +163,17 @@
     retr.encFlags = TCL_ENCODING_START;
     retr.nextPtr = pendingRetrievals;
     Tcl_DStringInit(&retr.buf);
     pendingRetrievals = &retr;
 
+    /*
+     * Delete the property to indicate that no parameters are supplied for
+     * the conversion request.
+     */
+
+    XDeleteProperty(winPtr->display, retr.winPtr->window, retr.property);
+
     /*
      * Initiate the request for the selection. Note: can't use TkCurrentTime
      * for the time. If we do, and this application hasn't received any X
      * events in a long time, the current time will be way in the past and
      * could even predate the time when the selection was made; if this
@@ -437,11 +444,11 @@
 
 		/*
 		 * Preserve any left-over bytes.
 		 */
 
-		if (srcLen > TCL_UTF_MAX) {
+		if (srcLen > 4) {
 		    Tcl_Panic("selection conversion left too many bytes unconverted");
 		}
 		memcpy(incrPtr->converts[i].buffer, src, (size_t) srcLen+1);
 		Tcl_DStringFree(&ds);
 	    } else {
@@ -863,12 +870,13 @@
 	incr.multAtoms = NULL;
 	if (eventPtr->property == None) {
 	    goto refuse;
 	}
 	result = XGetWindowProperty(eventPtr->display, eventPtr->requestor,
-		eventPtr->property, 0, MAX_PROP_WORDS, False, XA_ATOM,
-		&type, &format, &incr.numConversions, &bytesAfter,
+		eventPtr->property, 0, MAX_PROP_WORDS, False,
+		winPtr->dispPtr->atomPairAtom, &type, &format,
+		&incr.numConversions, &bytesAfter,
 		(unsigned char **) multAtomsPtr);
 	if ((result != Success) || (bytesAfter != 0) || (format != 32)
 		|| (type == None)) {
 	    if (incr.multAtoms != NULL) {
 		XFree((char *) incr.multAtoms);
@@ -1026,12 +1034,12 @@
 	incr.nextPtr = tsdPtr->pendingIncrs;
 	tsdPtr->pendingIncrs = &incr;
     }
     if (multiple) {
 	XChangeProperty(reply.xsel.display, reply.xsel.requestor,
-		reply.xsel.property, XA_ATOM, 32, PropModeReplace,
-		(unsigned char *) incr.multAtoms,
+		reply.xsel.property, winPtr->dispPtr->atomPairAtom,
+		32, PropModeReplace, (unsigned char *) incr.multAtoms,
 		(int) incr.numConversions*2);
     } else {
 	/*
 	 * Not a MULTIPLE request. The first property in "multAtoms" got set
 	 * to None if there was an error in conversion.

Index: unix/tkUnixSend.c
==================================================================
--- unix/tkUnixSend.c
+++ unix/tkUnixSend.c
@@ -259,14 +259,17 @@
     NameRegistry *regPtr;
     int result, actualFormat;
     unsigned long bytesAfter;
     Atom actualType;
     char **propertyPtr;
+    Tk_ErrorHandler handler;
 
     if (dispPtr->commTkwin == NULL) {
 	SendInit(interp, dispPtr);
     }
+
+    handler = Tk_CreateErrorHandler(dispPtr->display, -1, -1, -1, NULL, NULL);
 
     regPtr = ckalloc(sizeof(NameRegistry));
     regPtr->dispPtr = dispPtr;
     regPtr->locked = 0;
     regPtr->modified = 0;
@@ -304,11 +307,14 @@
 	    regPtr->property = NULL;
 	}
 	XDeleteProperty(dispPtr->display,
 		RootWindow(dispPtr->display, 0),
 		dispPtr->registryProperty);
+        XSync(dispPtr->display, False);
     }
+
+    Tk_DeleteErrorHandler(handler);
 
     /*
      * Xlib placed an extra null byte after the end of the property, just to
      * make sure that it is always NULL-terminated. Be sure to include this
      * byte in our count if it's needed to ensure null termination (note: as
@@ -512,10 +518,15 @@
 static void
 RegClose(
     NameRegistry *regPtr)	/* Pointer to a registry opened with a
 				 * previous call to RegOpen. */
 {
+    Tk_ErrorHandler handler;
+
+    handler = Tk_CreateErrorHandler(regPtr->dispPtr->display, -1, -1, -1,
+            NULL, NULL);
+
     if (regPtr->modified) {
 	if (!regPtr->locked && !localData.sendDebug) {
 	    Tcl_Panic("The name registry was modified without being locked!");
 	}
 	XChangeProperty(regPtr->dispPtr->display,
@@ -537,10 +548,12 @@
      * ungrab command is still sitting in our output buffer, we could
      * deadlock.
      */
 
     XFlush(regPtr->dispPtr->display);
+
+    Tk_DeleteErrorHandler(handler);
 
     if (regPtr->property != NULL) {
 	if (regPtr->allocedByX) {
 	    XFree(regPtr->property);
 	} else {
@@ -1093,10 +1106,35 @@
     Tcl_DStringAppend(&request, Tcl_GetString(objv[firstArg]), -1);
     for (i = firstArg+1; i < objc; i++) {
 	Tcl_DStringAppend(&request, " ", 1);
 	Tcl_DStringAppend(&request, Tcl_GetString(objv[i]), -1);
     }
+
+    if (!async) {
+	/*
+	 * Register the fact that we're waiting for a command to complete
+	 * (this is needed by SendEventProc and by AppendErrorProc to pass
+	 * back the command's results). Set up a timeout handler so that
+	 * we can check during long sends to make sure that the destination
+	 * application is still alive.
+	 *
+	 * We prepare the pending struct here in order to catch potential
+	 * early X errors from AppendPropCarefully() due to XSync().
+	 */
+
+	pending.serial = localData.sendSerial;
+	pending.dispPtr = dispPtr;
+	pending.target = destName;
+	pending.commWindow = commWindow;
+	pending.interp = interp;
+	pending.result = NULL;
+	pending.errorInfo = NULL;
+	pending.errorCode = NULL;
+	pending.gotResponse = 0;
+	pending.nextPtr = tsdPtr->pendingCommands;
+	tsdPtr->pendingCommands = &pending;
+    }
     (void) AppendPropCarefully(dispPtr->display, commWindow,
 	    dispPtr->commProperty, Tcl_DStringValue(&request),
 	    Tcl_DStringLength(&request) + 1, (async ? NULL : &pending));
     Tcl_DStringFree(&request);
     if (async) {
@@ -1106,30 +1144,10 @@
 	 */
 
 	return TCL_OK;
     }
 
-    /*
-     * Register the fact that we're waiting for a command to complete (this is
-     * needed by SendEventProc and by AppendErrorProc to pass back the
-     * command's results). Set up a timeout handler so that we can check
-     * during long sends to make sure that the destination application is
-     * still alive.
-     */
-
-    pending.serial = localData.sendSerial;
-    pending.dispPtr = dispPtr;
-    pending.target = destName;
-    pending.commWindow = commWindow;
-    pending.interp = interp;
-    pending.result = NULL;
-    pending.errorInfo = NULL;
-    pending.errorCode = NULL;
-    pending.gotResponse = 0;
-    pending.nextPtr = tsdPtr->pendingCommands;
-    tsdPtr->pendingCommands = &pending;
-
     /*
      * Enter a loop processing X events until the result comes in or the
      * target is declared to be dead. While waiting for a result, look only at
      * send-related events so that the send is synchronous with respect to
      * other events in the application.
@@ -1949,28 +1967,32 @@
     };
     static const char *const testsendOptions[] = {
 	"bogus",   "prop",   "serial",  NULL
     };
     TkWindow *winPtr = clientData;
+    Tk_ErrorHandler handler;
     int index;
 
     if (objc < 2) {
 	Tcl_WrongNumArgs(interp, 1, objv,
 		"option ?arg ...?");
 	return TCL_ERROR;
     }
 
-	if (Tcl_GetIndexFromObjStruct(interp, objv[1], testsendOptions,
+    if (Tcl_GetIndexFromObjStruct(interp, objv[1], testsendOptions,
 		sizeof(char *), "option", 0, &index) != TCL_OK) {
-	    return TCL_ERROR;
-	}
-	if (index == TESTSEND_BOGUS) {
+	return TCL_ERROR;
+    }
+    if (index == TESTSEND_BOGUS) {
+        handler = Tk_CreateErrorHandler(winPtr->dispPtr->display, -1, -1, -1,
+                NULL, NULL);
 	XChangeProperty(winPtr->dispPtr->display,
 		RootWindow(winPtr->dispPtr->display, 0),
 		winPtr->dispPtr->registryProperty, XA_INTEGER, 32,
 		PropModeReplace,
 		(unsigned char *) "This is bogus information", 6);
+        Tk_DeleteErrorHandler(handler);
     } else if (index == TESTSEND_PROP) {
 	int result, actualFormat;
 	unsigned long length, bytesAfter;
 	Atom actualType, propName;
 	char *property, **propertyPtr = &property, *p, *end;
@@ -2005,11 +2027,14 @@
 	    }
 	    if (property != NULL) {
 		XFree(property);
 	    }
 	} else if (Tcl_GetString(objv[4])[0] == 0) {
+            handler = Tk_CreateErrorHandler(winPtr->dispPtr->display,
+                    -1, -1, -1, NULL, NULL);
 	    XDeleteProperty(winPtr->dispPtr->display, w, propName);
+            Tk_DeleteErrorHandler(handler);
 	} else {
 	    Tcl_DString tmp;
 
 	    Tcl_DStringInit(&tmp);
 	    for (p = Tcl_DStringAppend(&tmp, Tcl_GetString(objv[4]),
@@ -2016,14 +2041,16 @@
 		    (int) strlen(Tcl_GetString(objv[4]))); *p != 0; p++) {
 		if (*p == '\n') {
 		    *p = 0;
 		}
 	    }
-
+            handler = Tk_CreateErrorHandler(winPtr->dispPtr->display,
+                    -1, -1, -1, NULL, NULL);
 	    XChangeProperty(winPtr->dispPtr->display, w, propName, XA_STRING,
 		    8, PropModeReplace, (unsigned char*)Tcl_DStringValue(&tmp),
 		    p-Tcl_DStringValue(&tmp));
+            Tk_DeleteErrorHandler(handler);
 	    Tcl_DStringFree(&tmp);
 	}
     } else if (index == TESTSEND_SERIAL) {
 	Tcl_SetObjResult(interp, Tcl_NewIntObj(localData.sendSerial+1));
     }

Index: unix/tkUnixWm.c
==================================================================
--- unix/tkUnixWm.c
+++ unix/tkUnixWm.c
@@ -34,11 +34,11 @@
 				 * needs of the actual command. THIS MUST BE
 				 * THE LAST FIELD OF THE STRUCTURE. */
 } ProtocolHandler;
 
 #define HANDLER_SIZE(cmdLength) \
-    ((unsigned) ((Tk_Offset(ProtocolHandler, command) + 1) + cmdLength))
+    (Tk_Offset(ProtocolHandler, command) + 1 + cmdLength)
 
 /*
  * Data for [wm attributes] command:
  */
 
@@ -1031,11 +1031,11 @@
 	WMOPT_ICONIFY, WMOPT_ICONMASK, WMOPT_ICONNAME, WMOPT_ICONPHOTO,
 	WMOPT_ICONPOSITION, WMOPT_ICONWINDOW, WMOPT_MANAGE, WMOPT_MAXSIZE,
 	WMOPT_MINSIZE, WMOPT_OVERRIDEREDIRECT, WMOPT_POSITIONFROM,
 	WMOPT_PROTOCOL, WMOPT_RESIZABLE, WMOPT_SIZEFROM, WMOPT_STACKORDER,
 	WMOPT_STATE, WMOPT_TITLE, WMOPT_TRANSIENT, WMOPT_WITHDRAW };
-    int index, length;
+    int index;
     const char *argv1;
     TkWindow *winPtr;
     Tk_Window targetWin;
     TkDisplay *dispPtr = ((TkWindow *) tkwin)->dispPtr;
 
@@ -1043,13 +1043,13 @@
     wrongNumArgs:
 	Tcl_WrongNumArgs(interp, 1, objv, "option window ?arg ...?");
 	return TCL_ERROR;
     }
 
-    argv1 = Tcl_GetStringFromObj(objv[1], &length);
-    if ((argv1[0] == 't') && (strncmp(argv1, "tracing", (size_t) length) == 0)
-	    && (length >= 3)) {
+    argv1 = Tcl_GetString(objv[1]);
+    if ((argv1[0] == 't') && (strncmp(argv1, "tracing", objv[1]->length) == 0)
+	    && (objv[1]->length >= 3)) {
 	int wmTracing;
 
 	if ((objc != 2) && (objc != 3)) {
 	    Tcl_WrongNumArgs(interp, 2, objv, "?boolean?");
 	    return TCL_ERROR;
@@ -1455,11 +1455,10 @@
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
     register WmInfo *wmPtr = winPtr->wmInfoPtr;
     const char *argv3;
-    int length;
 
     if ((objc != 3) && (objc != 4)) {
 	Tcl_WrongNumArgs(interp, 2, objv, "window ?name?");
 	return TCL_ERROR;
     }
@@ -1468,11 +1467,11 @@
 	    Tcl_SetObjResult(interp,
 		    Tcl_NewStringObj(wmPtr->clientMachine, -1));
 	}
 	return TCL_OK;
     }
-    argv3 = Tcl_GetStringFromObj(objv[3], &length);
+    argv3 = Tcl_GetString(objv[3]);
     if (argv3[0] == 0) {
 	if (wmPtr->clientMachine != NULL) {
 	    ckfree(wmPtr->clientMachine);
 	    wmPtr->clientMachine = NULL;
 	    if (!(wmPtr->flags & WM_NEVER_MAPPED)) {
@@ -1484,11 +1483,11 @@
 	return TCL_OK;
     }
     if (wmPtr->clientMachine != NULL) {
 	ckfree(wmPtr->clientMachine);
     }
-    wmPtr->clientMachine = ckalloc(length + 1);
+    wmPtr->clientMachine = ckalloc(objv[3]->length + 1);
     strcpy(wmPtr->clientMachine, argv3);
     if (!(wmPtr->flags & WM_NEVER_MAPPED)) {
 	XTextProperty textProp;
 	Tcl_DString ds;
 
@@ -2070,11 +2069,10 @@
 {
     register WmInfo *wmPtr = winPtr->wmInfoPtr;
     Tk_Window tkwin2;
     WmInfo *wmPtr2;
     const char *argv3;
-    int length;
 
     if ((objc != 3) && (objc != 4)) {
 	Tcl_WrongNumArgs(interp, 2, objv, "window ?pathName?");
 	return TCL_ERROR;
     }
@@ -2082,11 +2080,11 @@
 	if (wmPtr->hints.flags & WindowGroupHint) {
 	    Tcl_SetObjResult(interp, Tcl_NewStringObj(wmPtr->leaderName, -1));
 	}
 	return TCL_OK;
     }
-    argv3 = Tcl_GetStringFromObj(objv[3], &length);
+    argv3 = Tcl_GetString(objv[3]);
     if (*argv3 == '\0') {
 	wmPtr->hints.flags &= ~WindowGroupHint;
 	if (wmPtr->leaderName != NULL) {
 	    ckfree(wmPtr->leaderName);
 	}
@@ -2110,11 +2108,11 @@
 	if (wmPtr->leaderName != NULL) {
 	    ckfree(wmPtr->leaderName);
 	}
 	wmPtr->hints.window_group = Tk_WindowId(wmPtr2->wrapperPtr);
 	wmPtr->hints.flags |= WindowGroupHint;
-	wmPtr->leaderName = ckalloc(length + 1);
+	wmPtr->leaderName = ckalloc(objv[3]->length + 1);
 	strcpy(wmPtr->leaderName, argv3);
     }
     UpdateHints(winPtr);
     return TCL_OK;
 }
@@ -2332,11 +2330,10 @@
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
     register WmInfo *wmPtr = winPtr->wmInfoPtr;
     const char *argv3;
-    int length;
 
     if (objc > 4) {
 	Tcl_WrongNumArgs(interp, 2, objv, "window ?newName?");
 	return TCL_ERROR;
     }
@@ -2347,12 +2344,12 @@
 	return TCL_OK;
     } else {
 	if (wmPtr->iconName != NULL) {
 	    ckfree(wmPtr->iconName);
 	}
-	argv3 = Tcl_GetStringFromObj(objv[3], &length);
-	wmPtr->iconName = ckalloc(length + 1);
+	argv3 = Tcl_GetString(objv[3]);
+	wmPtr->iconName = ckalloc(objv[3]->length + 1);
 	strcpy(wmPtr->iconName, argv3);
 	if (!(wmPtr->flags & WM_NEVER_MAPPED)) {
 	    UpdateTitle(winPtr);
 	}
     }
@@ -3006,11 +3003,11 @@
 {
     register WmInfo *wmPtr = winPtr->wmInfoPtr;
     register ProtocolHandler *protPtr, *prevPtr;
     Atom protocol;
     const char *cmd;
-    int cmdLength;
+    size_t cmdLength;
 
     if ((objc < 3) || (objc > 5)) {
 	Tcl_WrongNumArgs(interp, 2, objv, "window ?name? ?command?");
 	return TCL_ERROR;
     }
@@ -3072,11 +3069,11 @@
 	    }
 	    Tcl_EventuallyFree(protPtr, TCL_DYNAMIC);
 	    break;
 	}
     }
-    cmd = Tcl_GetStringFromObj(objv[4], &cmdLength);
+    cmd = TkGetStringFromObj(objv[4], &cmdLength);
     if (cmdLength > 0) {
 	protPtr = ckalloc(HANDLER_SIZE(cmdLength));
 	protPtr->protocol = protocol;
 	protPtr->nextPtr = wmPtr->protPtr;
 	wmPtr->protPtr = protPtr;
@@ -3469,11 +3466,10 @@
     int objc,			/* Number of arguments. */
     Tcl_Obj *const objv[])	/* Argument objects. */
 {
     register WmInfo *wmPtr = winPtr->wmInfoPtr;
     const char *argv3;
-    int length;
 
     if (objc > 4) {
 	Tcl_WrongNumArgs(interp, 2, objv, "window ?newTitle?");
 	return TCL_ERROR;
     }
@@ -3485,12 +3481,12 @@
 	}
     } else {
 	if (wmPtr->title != NULL) {
 	    ckfree(wmPtr->title);
 	}
-	argv3 = Tcl_GetStringFromObj(objv[3], &length);
-	wmPtr->title = ckalloc(length + 1);
+	argv3 = Tcl_GetString(objv[3]);
+	wmPtr->title = ckalloc(objv[3]->length + 1);
 	strcpy(wmPtr->title, argv3);
 
 	if (!(wmPtr->flags & WM_NEVER_MAPPED)) {
 	    UpdateTitle(winPtr);
 	}
@@ -5452,12 +5448,12 @@
 	atoms = ckalloc(sizeof(Atom) * objc);
     }
 
     for (n = 0; n < objc; ++n) {
 	Tcl_DString ds, dsName;
-	int len;
-	char *name = Tcl_GetStringFromObj(objv[n], &len);
+	size_t len;
+	char *name = TkGetStringFromObj(objv[n], &len);
 
 	Tcl_UtfToUpper(name);
 	Tcl_UtfToExternalDString(NULL, name, len, &dsName);
 	Tcl_DStringInit(&ds);
 	Tcl_DStringAppend(&ds, "_NET_WM_WINDOW_TYPE_", 20);

Index: unix/tkUnixXId.c
==================================================================
--- unix/tkUnixXId.c
+++ unix/tkUnixXId.c
@@ -12,43 +12,10 @@
 
 
 /*
  *----------------------------------------------------------------------
  *
- * Tk_FreeXId --
- *
- *	This function is called to indicate that an X resource identifier is
- *	now free.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	The identifier is added to the stack of free identifiers for its
- *	display, so that it can be re-used.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tk_FreeXId(
-    Display *display,		/* Display for which xid was allocated. */
-    XID xid)			/* Identifier that is no longer in use. */
-{
-    /*
-     * This does nothing, because the XC-MISC extension takes care of
-     * freeing XIDs for us.  It has been a standard X11 extension for
-     * about 15 years as of 2008.  Keith Packard and another X.org
-     * developer suggested that we remove the previous code that used:
-     * #define XLIB_ILLEGAL_ACCESS.
-     */
-}
-
-
-/*
- *----------------------------------------------------------------------
- *
  * Tk_GetPixmap --
  *
  *	Same as the XCreatePixmap function except that it manages resource
  *	identifiers better.
  *
@@ -94,11 +61,10 @@
 Tk_FreePixmap(
     Display *display,		/* Display for which pixmap was allocated. */
     Pixmap pixmap)		/* Identifier for pixmap. */
 {
     XFreePixmap(display, pixmap);
-    Tk_FreeXId(display, (XID) pixmap);
 }
 
 
 /*
  *----------------------------------------------------------------------

Index: win/Makefile.in
==================================================================
--- win/Makefile.in
+++ win/Makefile.in
@@ -25,10 +25,11 @@
 prefix			= @prefix@
 exec_prefix		= @exec_prefix@
 bindir			= @bindir@
 libdir			= @libdir@
 includedir		= @includedir@
+datarootdir		= @datarootdir@
 mandir			= @mandir@
 
 # The following definition can be set to non-null for special systems
 # like AFS with replication.  It allows the pathnames used for installation
 # to be different than those used for actually reference files at
@@ -167,11 +168,11 @@
 # To change the compiler switches, for example to change from optimization to
 # debugging symbols, change the following line:
 #CFLAGS		= $(CFLAGS_DEBUG)
 #CFLAGS		= $(CFLAGS_OPTIMIZE)
 #CFLAGS		= $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE)
-CFLAGS		= @CFLAGS@ @CFLAGS_DEFAULT@ -DUNICODE -D_UNICODE
+CFLAGS		= @CFLAGS@ @CFLAGS_DEFAULT@ -DUNICODE -D_UNICODE -D_ATL_XP_TARGETING
 
 # Special compiler flags to use when building man2tcl on Windows.
 MAN2TCLFLAGS	= @MAN2TCLFLAGS@
 
 AR		= @AR@
@@ -213,10 +214,11 @@
 # running make for the first time. Certain build targets (make genstubs)
 # need it to be available on the PATH. This executable should *NOT* be
 # required just to do a normal build although it can be required to run
 # make dist.
 TCL_EXE			= @TCLSH_PROG@
+WINE    		= @WINE@
 
 CC_SWITCHES = ${CFLAGS} ${CFLAGS_WARNING} ${SHLIB_CFLAGS} \
 -I"${GENERIC_DIR_NATIVE}" -I"${WIN_DIR_NATIVE}" \
 -I"${XLIB_DIR_NATIVE}" -I"${BITMAP_DIR_NATIVE}" \
 -I"${TCL_GENERIC_NATIVE}" -I"${TCL_PLATFORM_NATIVE}" \
@@ -314,10 +316,11 @@
 	tkGet.$(OBJEXT) \
 	tkGrab.$(OBJEXT) \
 	tkGrid.$(OBJEXT) \
 	tkImage.$(OBJEXT) \
 	tkImgBmap.$(OBJEXT) \
+	tkImgListFormat.$(OBJEXT) \
 	tkImgGIF.$(OBJEXT) \
 	tkImgPNG.$(OBJEXT) \
 	tkImgPPM.$(OBJEXT) \
 	tkImgPhoto.$(OBJEXT) \
 	tkImgPhInstance.$(OBJEXT) \
@@ -436,27 +439,27 @@
 #	% make test TESTFLAGS="-verbose bps -file fileName.test"
 
 test: test-classic test-ttk
 
 test-classic: binaries $(TKTEST) $(TEST_DLL_FILE) $(CAT32)
-	$(SHELL_ENV) ./$(TKTEST) "$(ROOT_DIR_NATIVE)/tests/all.tcl" \
-	$(TESTFLAGS) | ./$(CAT32)
+	$(SHELL_ENV) $(WINE) ./$(TKTEST) "$(ROOT_DIR_NATIVE)/tests/all.tcl" \
+	$(TESTFLAGS) | $(WINE) ./$(CAT32)
 
 test-ttk: binaries $(TKTEST) $(TEST_DLL_FILE) $(CAT32)
-	$(SHELL_ENV) ./$(TKTEST) "$(ROOT_DIR_NATIVE)/tests/ttk/all.tcl" \
-	$(TESTFLAGS) | ./$(CAT32)
+	$(SHELL_ENV) $(WINE) ./$(TKTEST) "$(ROOT_DIR_NATIVE)/tests/ttk/all.tcl" \
+	$(TESTFLAGS) | $(WINE) ./$(CAT32)
 
 runtest: binaries $(TKTEST) $(TEST_DLL_FILE)
-	$(SHELL_ENV) ./$(TKTEST) $(TESTFLAGS) $(SCRIPT)
+	$(SHELL_ENV) $(WINE) ./$(TKTEST) $(TESTFLAGS) $(SCRIPT)
 
 # This target can be used to run wish from the build directory
 # via `make shell` or `make shell SCRIPT=foo.tcl`
 shell: binaries
-	$(SHELL_ENV) ./$(WISH) $(SCRIPT)
+	$(SHELL_ENV) $(WINE) ./$(WISH) $(SCRIPT)
 
 demo: $(WISH)
-	$(SHELL_ENV) ./$(WISH) $(ROOT_DIR)/library/demos/widget
+	$(SHELL_ENV) $(WINE) ./$(WISH) $(ROOT_DIR)/library/demos/widget
 
 # This target can be used to run wish inside either gdb or insight
 gdb: binaries
 	@echo "set env TCL_LIBRARY=$(TCL_SRC_DIR_NATIVE)/library" > gdb.run
 	@echo "set env TK_LIBRARY=$(ROOT_DIR_NATIVE)/library" >> gdb.run
@@ -484,11 +487,11 @@
 	    fi; \
 	    done
 	@echo "Creating package index $(PKG_INDEX)";
 	@$(RM) $(PKG_INDEX);
 	@(\
-	echo "if {[catch {package present Tcl 8.6.0}]} return";\
+	echo "if {[catch {package present Tcl 8.6-}]} return";\
 	echo "if {(\$$::tcl_platform(platform) eq \"unix\") && ([info exists ::env(DISPLAY)]";\
 	echo "	|| ([info exists ::argv] && (\"-display\" in \$$::argv)))} {";\
 	echo "    package ifneeded Tk $(VERSION)$(PATCH_LEVEL) [list load [file normalize [file join \$$dir .. .. bin libtk$(VERSION).dll]] Tk]";\
 	echo "} else {";\
 	echo "    package ifneeded Tk $(VERSION)$(PATCH_LEVEL) [list load [file normalize [file join \$$dir .. .. bin $(TK_DLL_FILE)]] Tk]";\
@@ -727,11 +730,11 @@
 genstubs:
 	$(TCL_EXE) "$(TCL_TOOL_DIR)/genStubs.tcl" \
 	    "$(GENERIC_DIR_NATIVE)" \
 	    "$(GENERIC_DIR_NATIVE)/tk.decls" \
 	    "$(GENERIC_DIR_NATIVE)/tkInt.decls"
-	$(TCL_EXE) "$(TTK_DIR)/ttkGenStubs.tcl" \
+	$(TCL_EXE) "$(TCL_TOOL_DIR)/genStubs.tcl" \
 	    "$(TTK_DIR)" \
 	    "$(TTK_DIR)/ttk.decls"
 
 #
 # The list of all the targets that do not correspond to real files. This stops

Index: win/README
==================================================================
--- win/README
+++ win/README
@@ -1,6 +1,6 @@
-Tk 8.6 for Windows
+Tk 8.7 for Windows
 
 Originally by Scott Stanton while at Sun Microsystems Labs
 
 This is the directory where you configure and compile the Windows
 version of Tk.  This directory also contains source files for Tk

Index: win/configure
==================================================================
--- win/configure
+++ win/configure
@@ -1,322 +1,792 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59.
+# Generated by GNU Autoconf 2.69.
+#
+#
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
 #
-# Copyright (C) 2003 Free Software Foundation, Inc.
+#
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
 
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
+  setopt NO_GLOB_SUBST
 else
-  as_unset=false
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
 fi
 
 
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
+case $0 in #((
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
+fi
+
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
 PS1='$ '
 PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+# Use a proper internal environment variable to ensure we don't fall
+  # into an infinite loop, continuously re-executing ourselves.
+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+    _as_can_reexec=no; export _as_can_reexec;
+    # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+  fi
+  # We don't want this to propagate to other subprocesses.
+          { _as_can_reexec=; unset _as_can_reexec;}
+if test "x$CONFIG_SHELL" = x; then
+  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
+else
+  case \`(set -o) 2>/dev/null\` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+"
+  as_required="as_fn_return () { (exit \$1); }
+as_fn_success () { as_fn_return 0; }
+as_fn_failure () { as_fn_return 1; }
+as_fn_ret_success () { return 0; }
+as_fn_ret_failure () { return 1; }
+
+exitcode=0
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+
+else
+  exitcode=1; echo positional parameters were not saved.
+fi
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
+  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
+  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
+  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
+  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+test \$(( 1 + 1 )) = 2 || exit 1"
+  if (eval "$as_required") 2>/dev/null; then :
+  as_have_required=yes
+else
+  as_have_required=no
+fi
+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
+
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  as_found=:
+  case $as_dir in #(
+	 /*)
+	   for as_base in sh bash ksh sh5; do
+	     # Try only shells that exist, to save several forks.
+	     as_shell=$as_dir/$as_base
+	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  CONFIG_SHELL=$as_shell as_have_required=yes
+		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+  break 2
+fi
+fi
+	   done;;
+       esac
+  as_found=false
+done
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
+  CONFIG_SHELL=$SHELL as_have_required=yes
+fi; }
+IFS=$as_save_IFS
+
+
+      if test "x$CONFIG_SHELL" != x; then :
+  export CONFIG_SHELL
+             # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
+fi
+
+    if test x$as_have_required = xno; then :
+  $as_echo "$0: This script requires a shell more modern than all"
+  $as_echo "$0: the shells that I found on your system."
+  if test x${ZSH_VERSION+set} = xset ; then
+    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
   else
-    $as_unset $as_var
+    $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
+$0: including any error possibly output before this
+$0: message. Then install a modern shell, or manually run
+$0: the script under such a shell if you do have one."
+  fi
+  exit 1
+fi
+fi
+fi
+SHELL=${CONFIG_SHELL-/bin/sh}
+export SHELL
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
+
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
+
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-done
+  $as_echo "$as_me: error: $2" >&2
+  as_fn_exit $as_status
+} # as_fn_error
 
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
 else
   as_expr=false
 fi
 
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
   as_basename=basename
 else
   as_basename=false
 fi
 
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
 
-# Name of the executable.
-as_me=`$as_basename "$0" ||
+as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
 # Avoid depending upon Character Ranges.
 as_cr_letters='abcdefghijklmnopqrstuvwxyz'
 as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
 as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
+
+  as_lineno_1=$LINENO as_lineno_1a=$LINENO
+  as_lineno_2=$LINENO as_lineno_2a=$LINENO
+  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
+  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
+  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
+  sed -n '
+    p
+    /[$]LINENO/=
+  ' <$as_myself |
+    sed '
+      s/[$]LINENO.*/&-/
+      t lineno
+      b
+      :lineno
+      N
+      :loop
+      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+      t loop
+      s/-\n.*//
+    ' >$as_me.lineno &&
+  chmod +x "$as_me.lineno" ||
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+
+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+  # already done that, so ensure we don't try to do so again and fall
+  # in an infinite loop.  This has already happened in practice.
+  _as_can_reexec=no; export _as_can_reexec
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
+  # original and so on.  Autoconf is especially sensitive to this).
+  . "./$as_me.lineno"
   # Exit status is that of the last command.
   exit
 }
 
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in #(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -pR'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -pR'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -pR'
+  fi
+else
+  as_ln_s='cp -pR'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p='mkdir -p "$as_dir"'
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
 fi
 
-as_executable_p="test -f"
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
 
 # Sed expression to map a string onto a valid variable name.
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1
 
 # Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
 # so uname gets run too.
 ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
 
-exec 6>&1
-
 #
 # Initializations.
 #
 ac_default_prefix=/usr/local
+ac_clean_files=
 ac_config_libobj_dir=.
+LIBOBJS=
 cross_compiling=no
 subdirs=
 MFLAGS=
 MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-# Maximum number of lines to put in a shell here document.
-# This variable seems obsolete.  It should probably be removed, and
-# only ac_max_sed_lines should be used.
-: ${ac_max_here_lines=38}
 
 # Identity of this package.
 PACKAGE_NAME=
 PACKAGE_TARNAME=
 PACKAGE_VERSION=
 PACKAGE_STRING=
 PACKAGE_BUGREPORT=
+PACKAGE_URL=
 
 ac_unique_file="../generic/tk.h"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
-#if HAVE_SYS_TYPES_H
+#ifdef HAVE_SYS_TYPES_H
 # include <sys/types.h>
 #endif
-#if HAVE_SYS_STAT_H
+#ifdef HAVE_SYS_STAT_H
 # include <sys/stat.h>
 #endif
-#if STDC_HEADERS
+#ifdef STDC_HEADERS
 # include <stdlib.h>
 # include <stddef.h>
 #else
-# if HAVE_STDLIB_H
+# ifdef HAVE_STDLIB_H
 #  include <stdlib.h>
 # endif
 #endif
-#if HAVE_STRING_H
-# if !STDC_HEADERS && HAVE_MEMORY_H
+#ifdef HAVE_STRING_H
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
 #  include <memory.h>
 # endif
 # include <string.h>
 #endif
-#if HAVE_STRINGS_H
+#ifdef HAVE_STRINGS_H
 # include <strings.h>
 #endif
-#if HAVE_INTTYPES_H
+#ifdef HAVE_INTTYPES_H
 # include <inttypes.h>
-#else
-# if HAVE_STDINT_H
-#  include <stdint.h>
-# endif
+#endif
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
 #endif
-#if HAVE_UNISTD_H
+#ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP AR ac_ct_AR RANLIB ac_ct_RANLIB RC ac_ct_RC SET_MAKE TCL_THREADS TCL_VERSION TCL_BIN_DIR TCL_SRC_DIR TCL_LIB_FILE TCL_LIB_FLAG TCL_LIB_SPEC TCL_STUB_LIB_FILE TCL_STUB_LIB_FLAG TCL_STUB_LIB_SPEC TCL_DEFS CYGPATH CELIB_DIR DL_LIBS CFLAGS_DEBUG CFLAGS_OPTIMIZE CFLAGS_WARNING MAN2TCLFLAGS CFLAGS_DEFAULT LDFLAGS_DEFAULT VC_MANIFEST_EMBED_DLL VC_MANIFEST_EMBED_EXE BUILD_TCLSH TCLSH_PROG TK_WIN_VERSION MACHINE TK_VERSION TK_MAJOR_VERSION TK_MINOR_VERSION TK_PATCH_LEVEL TK_DBGX TK_LIB_FILE TK_DLL_FILE TK_STUB_LIB_FILE TK_STUB_LIB_FLAG TK_BUILD_STUB_LIB_SPEC TK_SRC_DIR TK_BIN_DIR TCL_MAJOR_VERSION TCL_MINOR_VERSION TCL_PATCH_LEVEL TCL_DBGX CFG_TK_SHARED_LIB_SUFFIX CFG_TK_UNSHARED_LIB_SUFFIX CFG_TK_EXPORT_FILE_SUFFIX EXTRA_CFLAGS DEPARG CC_OBJNAME CC_EXENAME LDFLAGS_DEBUG LDFLAGS_OPTIMIZE LDFLAGS_CONSOLE LDFLAGS_WINDOW TK_RES STLIB_LD SHLIB_LD SHLIB_LD_LIBS SHLIB_CFLAGS SHLIB_SUFFIX TK_SHARED_BUILD LIBS_GUI DLLSUFFIX LIBPREFIX LIBSUFFIX EXESUFFIX LIBRARIES MAKE_LIB MAKE_STUB_LIB POST_MAKE_LIB MAKE_DLL MAKE_EXE TK_LIB_FLAG TK_LIB_SPEC TK_BUILD_LIB_SPEC TK_STUB_LIB_SPEC TK_STUB_LIB_PATH TK_BUILD_STUB_LIB_PATH TK_CC_SEARCH_FLAGS TK_LD_SEARCH_FLAGS RC_OUT RC_TYPE RC_INCLUDE RC_DEFINE RC_DEFINES RES LIBOBJS LTLIBOBJS'
+ac_subst_vars='LTLIBOBJS
+LIBOBJS
+RES
+RC_DEFINES
+RC_DEFINE
+RC_INCLUDE
+RC_TYPE
+RC_OUT
+TK_LD_SEARCH_FLAGS
+TK_CC_SEARCH_FLAGS
+TK_BUILD_STUB_LIB_PATH
+TK_STUB_LIB_PATH
+TK_STUB_LIB_SPEC
+TK_BUILD_LIB_SPEC
+TK_LIB_SPEC
+TK_LIB_FLAG
+MAKE_EXE
+MAKE_DLL
+POST_MAKE_LIB
+MAKE_STUB_LIB
+MAKE_LIB
+LIBRARIES
+EXESUFFIX
+LIBSUFFIX
+LIBPREFIX
+DLLSUFFIX
+LIBS_GUI
+TK_SHARED_BUILD
+SHLIB_SUFFIX
+SHLIB_CFLAGS
+SHLIB_LD_LIBS
+SHLIB_LD
+STLIB_LD
+TK_RES
+LDFLAGS_WINDOW
+LDFLAGS_CONSOLE
+LDFLAGS_OPTIMIZE
+LDFLAGS_DEBUG
+CC_EXENAME
+CC_OBJNAME
+DEPARG
+EXTRA_CFLAGS
+CFG_TK_EXPORT_FILE_SUFFIX
+CFG_TK_UNSHARED_LIB_SUFFIX
+CFG_TK_SHARED_LIB_SUFFIX
+TCL_DBGX
+TCL_PATCH_LEVEL
+TCL_MINOR_VERSION
+TCL_MAJOR_VERSION
+TK_BIN_DIR
+TK_SRC_DIR
+TK_BUILD_STUB_LIB_SPEC
+TK_STUB_LIB_FLAG
+TK_STUB_LIB_FILE
+TK_DLL_FILE
+TK_LIB_FILE
+TK_DBGX
+TK_PATCH_LEVEL
+TK_MINOR_VERSION
+TK_MAJOR_VERSION
+TK_VERSION
+MACHINE
+TK_WIN_VERSION
+TCLSH_PROG
+BUILD_TCLSH
+VC_MANIFEST_EMBED_EXE
+VC_MANIFEST_EMBED_DLL
+LDFLAGS_DEFAULT
+CFLAGS_DEFAULT
+MAN2TCLFLAGS
+CFLAGS_WARNING
+CFLAGS_OPTIMIZE
+CFLAGS_DEBUG
+DL_LIBS
+WINE
+CYGPATH
+TCL_DEFS
+TCL_STUB_LIB_SPEC
+TCL_STUB_LIB_FLAG
+TCL_STUB_LIB_FILE
+TCL_LIB_SPEC
+TCL_LIB_FLAG
+TCL_LIB_FILE
+TCL_ZIP_FILE
+TCL_SRC_DIR
+TCL_BIN_DIR
+TCL_VERSION
+SHARED_BUILD
+SET_MAKE
+RC
+RANLIB
+AR
+EGREP
+GREP
+CPP
+OBJEXT
+EXEEXT
+ac_ct_CC
+CPPFLAGS
+LDFLAGS
+CFLAGS
+CC
+target_alias
+host_alias
+build_alias
+LIBS
+ECHO_T
+ECHO_N
+ECHO_C
+DEFS
+mandir
+localedir
+libdir
+psdir
+pdfdir
+dvidir
+htmldir
+infodir
+docdir
+oldincludedir
+includedir
+localstatedir
+sharedstatedir
+sysconfdir
+datadir
+datarootdir
+libexecdir
+sbindir
+bindir
+program_transform_name
+prefix
+exec_prefix
+PACKAGE_URL
+PACKAGE_BUGREPORT
+PACKAGE_STRING
+PACKAGE_VERSION
+PACKAGE_TARNAME
+PACKAGE_NAME
+PATH_SEPARATOR
+SHELL
+OBJEXT_FOR_BUILD'
 ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+enable_shared
+with_tcl
+enable_64bit
+enable_symbols
+enable_embedded_manifest
+'
+      ac_precious_vars='build_alias
+host_alias
+target_alias
+CC
+CFLAGS
+LDFLAGS
+LIBS
+CPPFLAGS
+CPP'
+
 
 # Initialize some variables set by options.
 ac_init_help=
 ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
 # The variables have the same names as the options, with
 # dashes changed to underlines.
 cache_file=/dev/null
 exec_prefix=NONE
 no_create=
@@ -335,38 +805,53 @@
 # Installation directory options.
 # These are left unexpanded so users can "make install exec_prefix=/foo"
 # and all the variables that are supposed to be based on exec_prefix
 # by default will actually change.
 # Use braces instead of parens because sh, perl, etc. also accept them.
+# (The list follows the same order as the GNU Coding Standards.)
 bindir='${exec_prefix}/bin'
 sbindir='${exec_prefix}/sbin'
 libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
+datarootdir='${prefix}/share'
+datadir='${datarootdir}'
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
+docdir='${datarootdir}/doc/${PACKAGE}'
+infodir='${datarootdir}/info'
+htmldir='${docdir}'
+dvidir='${docdir}'
+pdfdir='${docdir}'
+psdir='${docdir}'
+libdir='${exec_prefix}/lib'
+localedir='${datarootdir}/locale'
+mandir='${datarootdir}/man'
 
 ac_prev=
+ac_dashdash=
 for ac_option
 do
   # If the previous option needs an argument, assign it.
   if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
+    eval $ac_prev=\$ac_option
     ac_prev=
     continue
   fi
 
-  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
+  case $ac_option in
+  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+  *=)   ac_optarg= ;;
+  *)    ac_optarg=yes ;;
+  esac
 
   # Accept the important Cygnus configure options, so we can diagnose typos.
 
-  case $ac_option in
+  case $ac_dashdash$ac_option in
+  --)
+    ac_dashdash=yes ;;
 
   -bindir | --bindir | --bindi | --bind | --bin | --bi)
     ac_prev=bindir ;;
   -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
     bindir=$ac_optarg ;;
@@ -384,37 +869,63 @@
     cache_file=$ac_optarg ;;
 
   --config-cache | -C)
     cache_file=config.cache ;;
 
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
+  -datadir | --datadir | --datadi | --datad)
     ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
+  -datadir=* | --datadir=* | --datadi=* | --datad=*)
     datadir=$ac_optarg ;;
+
+  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
+  | --dataroo | --dataro | --datar)
+    ac_prev=datarootdir ;;
+  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
+  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
+    datarootdir=$ac_optarg ;;
 
   -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    eval "enable_$ac_feature=no" ;;
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid feature name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval enable_$ac_useropt=no ;;
+
+  -docdir | --docdir | --docdi | --doc | --do)
+    ac_prev=docdir ;;
+  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
+    docdir=$ac_optarg ;;
+
+  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
+    ac_prev=dvidir ;;
+  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
+    dvidir=$ac_optarg ;;
 
   -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) ac_optarg=yes ;;
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid feature name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
     esac
-    eval "enable_$ac_feature='$ac_optarg'" ;;
+    eval enable_$ac_useropt=\$ac_optarg ;;
 
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
   | --exec | --exe | --ex)
     ac_prev=exec_prefix ;;
@@ -436,10 +947,16 @@
 
   -host | --host | --hos | --ho)
     ac_prev=host_alias ;;
   -host=* | --host=* | --hos=* | --ho=*)
     host_alias=$ac_optarg ;;
+
+  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
+    ac_prev=htmldir ;;
+  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
+  | --ht=*)
+    htmldir=$ac_optarg ;;
 
   -includedir | --includedir | --includedi | --included | --include \
   | --includ | --inclu | --incl | --inc)
     ac_prev=includedir ;;
   -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
@@ -460,18 +977,21 @@
   | --libexe | --libex | --libe)
     ac_prev=libexecdir ;;
   -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
   | --libexe=* | --libex=* | --libe=*)
     libexecdir=$ac_optarg ;;
+
+  -localedir | --localedir | --localedi | --localed | --locale)
+    ac_prev=localedir ;;
+  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
+    localedir=$ac_optarg ;;
 
   -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
+  | --localstate | --localstat | --localsta | --localst | --locals)
     ac_prev=localstatedir ;;
   -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
+  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
     localstatedir=$ac_optarg ;;
 
   -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
     ac_prev=mandir ;;
   -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
@@ -531,10 +1051,20 @@
   | --program-transform=* | --program-transfor=* \
   | --program-transfo=* | --program-transf=* \
   | --program-trans=* | --program-tran=* \
   | --progr-tra=* | --program-tr=* | --program-t=*)
     program_transform_name=$ac_optarg ;;
+
+  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
+    ac_prev=pdfdir ;;
+  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
+    pdfdir=$ac_optarg ;;
+
+  -psdir | --psdir | --psdi | --psd | --ps)
+    ac_prev=psdir ;;
+  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
+    psdir=$ac_optarg ;;
 
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
@@ -582,30 +1112,40 @@
 
   -version | --version | --versio | --versi | --vers | -V)
     ac_init_version=: ;;
 
   -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) ac_optarg=yes ;;
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid package name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
     esac
-    eval "with_$ac_package='$ac_optarg'" ;;
+    eval with_$ac_useropt=\$ac_optarg ;;
 
   -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/-/_/g'`
-    eval "with_$ac_package=no" ;;
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      as_fn_error $? "invalid package name: $ac_useropt"
+    ac_useropt_orig=$ac_useropt
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+	 ac_unrecognized_sep=', ';;
+    esac
+    eval with_$ac_useropt=no ;;
 
   --x)
     # Obsolete; use --with-x.
     with_x=yes ;;
 
@@ -621,63 +1161,67 @@
     ac_prev=x_libraries ;;
   -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) { echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
+  -*) as_fn_error $? "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information"
     ;;
 
   *=*)
     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
-    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
-    eval "$ac_envvar='$ac_optarg'"
+    case $ac_envvar in #(
+      '' | [0-9]* | *[!_$as_cr_alnum]* )
+      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+    esac
+    eval $ac_envvar=\$ac_optarg
     export $ac_envvar ;;
 
   *)
     # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     ;;
 
   esac
 done
 
 if test -n "$ac_prev"; then
   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
-fi
-
-# Be sure to have absolute paths.
-for ac_var in exec_prefix prefix
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# Be sure to have absolute paths.
-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-	      localstatedir libdir includedir oldincludedir infodir mandir
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
+  as_fn_error $? "missing argument to $ac_option"
+fi
+
+if test -n "$ac_unrecognized_opts"; then
+  case $enable_option_checking in
+    no) ;;
+    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
+    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+  esac
+fi
+
+# Check all directory arguments for consistency.
+for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
+		datadir sysconfdir sharedstatedir localstatedir includedir \
+		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+		libdir localedir mandir
+do
+  eval ac_val=\$$ac_var
+  # Remove trailing slashes.
+  case $ac_val in
+    */ )
+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+      eval $ac_var=\$ac_val;;
+  esac
+  # Be sure to have absolute directory names.
+  case $ac_val in
+    [\\/$]* | ?:[\\/]* )  continue;;
+    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+  esac
+  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
 done
 
 # There might be people who depend on the old broken behavior: `$host'
 # used to hold the argument of --host etc.
 # FIXME: To remove some day.
@@ -687,12 +1231,10 @@
 
 # FIXME: To remove some day.
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
 fi
 
@@ -699,79 +1241,77 @@
 ac_tool_prefix=
 test -n "$host_alias" && ac_tool_prefix=$host_alias-
 
 test "$silent" = yes && exec 6>/dev/null
 
+
+ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ac_ls_di=`ls -di .` &&
+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+  as_fn_error $? "working directory cannot be determined"
+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+  as_fn_error $? "pwd does not report name of working directory"
+
 
 # Find the source files, if location was not specified.
 if test -z "$srcdir"; then
   ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_confdir=`(dirname "$0") 2>/dev/null ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$0" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
+  # Try the directory containing this script, then the parent directory.
+  ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_myself" : 'X\(//\)[^/]' \| \
+	 X"$as_myself" : 'X\(//\)$' \| \
+	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
   srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
+  if test ! -r "$srcdir/$ac_unique_file"; then
     srcdir=..
   fi
 else
   ac_srcdir_defaulted=no
 fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
-   { (exit 1); exit 1; }; }
-  else
-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-   { (exit 1); exit 1; }; }
-  fi
-fi
-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
-  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
-   { (exit 1); exit 1; }; }
-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
-ac_env_build_alias_set=${build_alias+set}
-ac_env_build_alias_value=$build_alias
-ac_cv_env_build_alias_set=${build_alias+set}
-ac_cv_env_build_alias_value=$build_alias
-ac_env_host_alias_set=${host_alias+set}
-ac_env_host_alias_value=$host_alias
-ac_cv_env_host_alias_set=${host_alias+set}
-ac_cv_env_host_alias_value=$host_alias
-ac_env_target_alias_set=${target_alias+set}
-ac_env_target_alias_value=$target_alias
-ac_cv_env_target_alias_set=${target_alias+set}
-ac_cv_env_target_alias_value=$target_alias
-ac_env_CC_set=${CC+set}
-ac_env_CC_value=$CC
-ac_cv_env_CC_set=${CC+set}
-ac_cv_env_CC_value=$CC
-ac_env_CFLAGS_set=${CFLAGS+set}
-ac_env_CFLAGS_value=$CFLAGS
-ac_cv_env_CFLAGS_set=${CFLAGS+set}
-ac_cv_env_CFLAGS_value=$CFLAGS
-ac_env_LDFLAGS_set=${LDFLAGS+set}
-ac_env_LDFLAGS_value=$LDFLAGS
-ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
-ac_cv_env_LDFLAGS_value=$LDFLAGS
-ac_env_CPPFLAGS_set=${CPPFLAGS+set}
-ac_env_CPPFLAGS_value=$CPPFLAGS
-ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
-ac_cv_env_CPPFLAGS_value=$CPPFLAGS
-ac_env_CPP_set=${CPP+set}
-ac_env_CPP_value=$CPP
-ac_cv_env_CPP_set=${CPP+set}
-ac_cv_env_CPP_value=$CPP
+if test ! -r "$srcdir/$ac_unique_file"; then
+  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
+fi
+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ac_abs_confdir=`(
+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
+	pwd)`
+# When building in place, set srcdir=.
+if test "$ac_abs_confdir" = "$ac_pwd"; then
+  srcdir=.
+fi
+# Remove unnecessary trailing slashes from srcdir.
+# Double slashes in file names in object file debugging info
+# mess up M-x gdb in Emacs.
+case $srcdir in
+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
+esac
+for ac_var in $ac_precious_vars; do
+  eval ac_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_env_${ac_var}_value=\$${ac_var}
+  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
+  eval ac_cv_env_${ac_var}_value=\$${ac_var}
+done
 
 #
 # Report the --help message.
 #
 if test "$ac_init_help" = "long"; then
@@ -790,45 +1330,49 @@
 Configuration:
   -h, --help              display this help and exit
       --help=short        display options specific to this package
       --help=recursive    display the short help of all the included packages
   -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
+  -q, --quiet, --silent   do not print \`checking ...' messages
       --cache-file=FILE   cache test results in FILE [disabled]
   -C, --config-cache      alias for \`--cache-file=config.cache'
   -n, --no-create         do not create output files
       --srcdir=DIR        find the sources in DIR [configure dir or \`..']
 
-_ACEOF
-
-  cat <<_ACEOF
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
+                          [$ac_default_prefix]
   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
+                          [PREFIX]
 
 By default, \`make install' will install all the files in
 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
 an installation prefix other than \`$ac_default_prefix' using \`--prefix',
 for instance \`--prefix=\$HOME'.
 
 For better control, use the options below.
 
 Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --infodir=DIR          info documentation [PREFIX/info]
-  --mandir=DIR           man documentation [PREFIX/man]
+  --bindir=DIR            user executables [EPREFIX/bin]
+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
+  --libexecdir=DIR        program executables [EPREFIX/libexec]
+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --libdir=DIR            object code libraries [EPREFIX/lib]
+  --includedir=DIR        C header files [PREFIX/include]
+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
+  --infodir=DIR           info documentation [DATAROOTDIR/info]
+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
+  --mandir=DIR            man documentation [DATAROOTDIR/man]
+  --docdir=DIR            documentation root [DATAROOTDIR/doc/PACKAGE]
+  --htmldir=DIR           html documentation [DOCDIR]
+  --dvidir=DIR            dvi documentation [DOCDIR]
+  --pdfdir=DIR            pdf documentation [DOCDIR]
+  --psdir=DIR             ps documentation [DOCDIR]
 _ACEOF
 
   cat <<\_ACEOF
 _ACEOF
 fi
@@ -836,152 +1380,406 @@
 if test -n "$ac_init_help"; then
 
   cat <<\_ACEOF
 
 Optional Features:
+  --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-threads        build with threads (default: on)
   --enable-shared         build and link with shared libraries (default: on)
   --enable-64bit          enable 64bit support (where applicable)
-  --enable-wince          enable Win/CE support (where applicable)
   --enable-symbols        build with debugging symbols (default: off)
   --enable-embedded-manifest
                           embed manifest if possible (default: yes)
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-tcl              directory containing tcl configuration
                           (tclConfig.sh)
-  --with-celib=DIR        use Windows/CE support library from DIR
 
 Some influential environment variables:
   CC          C compiler command
   CFLAGS      C compiler flags
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
               nonstandard directory <lib dir>
-  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
-              headers in a nonstandard directory <include dir>
+  LIBS        libraries to pass to the linker, e.g. -l<library>
+  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
+              you have headers in a nonstandard directory <include dir>
   CPP         C preprocessor
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
+Report bugs to the package provider.
 _ACEOF
+ac_status=$?
 fi
 
 if test "$ac_init_help" = "recursive"; then
   # If there are subdirs, report their specific --help.
-  ac_popdir=`pwd`
   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d $ac_dir || continue
+    test -d "$ac_dir" ||
+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+      continue
     ac_builddir=.
 
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
 
 case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
+  .)  # We are building in place.
     ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
     ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-    cd $ac_dir
-    # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f $ac_srcdir/configure.gnu; then
-      echo
-      $SHELL $ac_srcdir/configure.gnu  --help=recursive
-    elif test -f $ac_srcdir/configure; then
-      echo
-      $SHELL $ac_srcdir/configure  --help=recursive
-    elif test -f $ac_srcdir/configure.ac ||
-	   test -f $ac_srcdir/configure.in; then
-      echo
-      $ac_configure --help
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+    cd "$ac_dir" || { ac_status=$?; continue; }
+    # Check for guested configure.
+    if test -f "$ac_srcdir/configure.gnu"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
+    elif test -f "$ac_srcdir/configure"; then
+      echo &&
+      $SHELL "$ac_srcdir/configure" --help=recursive
     else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi
-    cd $ac_popdir
+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+    fi || ac_status=$?
+    cd "$ac_pwd" || { ac_status=$?; break; }
   done
 fi
 
-test -n "$ac_init_help" && exit 0
+test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
+configure
+generated by GNU Autoconf 2.69
 
-Copyright (C) 2003 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
-  exit 0
+  exit
 fi
-exec 5>config.log
-cat >&5 <<_ACEOF
+
+## ------------------------ ##
+## Autoconf initialization. ##
+## ------------------------ ##
+
+# ac_fn_c_try_compile LINENO
+# --------------------------
+# Try to compile conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext
+  if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_compile
+
+# ac_fn_c_try_cpp LINENO
+# ----------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_cpp ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } > conftest.i && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+    ac_retval=1
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_cpp
+
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+# that executables *can* be run.
+ac_fn_c_try_run ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+       $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_retval=$ac_status
+fi
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_run
+
+# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
+# ---------------------------------------------
+# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
+# accordingly.
+ac_fn_c_check_decl ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  as_decl_name=`echo $2|sed 's/ *(.*//'`
+  as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
+$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+int
+main ()
+{
+#ifndef $as_decl_name
+#ifdef __cplusplus
+  (void) $as_decl_use;
+#else
+  (void) $as_decl_name;
+#endif
+#endif
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_decl
+
+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists and can be compiled using the include files in
+# INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_c_check_header_compile ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  eval "$3=yes"
+else
+  eval "$3=no"
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_header_compile
+
+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
+# the include files in INCLUDES and setting the cache variable VAR
+# accordingly.
+ac_fn_c_check_header_mongrel ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if eval \${$3+:} false; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
+$as_echo_n "checking $2 usability... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_header_compiler=yes
+else
+  ac_header_compiler=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
+$as_echo_n "checking $2 presence... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <$2>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  ac_header_preproc=yes
+else
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
+  yes:no: )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+    ;;
+esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=\$ac_header_compiler"
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_header_mongrel
+cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by $as_me, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
 
 _ACEOF
+exec 5>>config.log
 {
 cat <<_ASUNAME
 ## --------- ##
 ## Platform. ##
 ## --------- ##
@@ -996,11 +1794,11 @@
 /bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
 
 /bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
 /usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
 /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
+/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
 /bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
 /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
 /bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
 
 _ASUNAME
@@ -1008,12 +1806,13 @@
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
-done
+    $as_echo "PATH: $as_dir"
+  done
+IFS=$as_save_IFS
 
 } >&5
 
 cat >&5 <<_ACEOF
 
@@ -1031,11 +1830,10 @@
 # Also quote any args containing shell meta-characters.
 # Make two passes to allow for proper duplicate-argument suppression.
 ac_configure_args=
 ac_configure_args0=
 ac_configure_args1=
-ac_sep=
 ac_must_keep_next=false
 for ac_pass in 1 2
 do
   for ac_arg
   do
@@ -1042,17 +1840,17 @@
     case $ac_arg in
     -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
     -q | -quiet | --quiet | --quie | --qui | --qu | --q \
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*)
+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
+    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
     2)
-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
+      as_fn_append ac_configure_args1 " '$ac_arg'"
       if test $ac_must_keep_next = true; then
 	ac_must_keep_next=false # Got value, back to normal.
       else
 	case $ac_arg in
 	  *=* | --config-cache | -C | -disable-* | --disable-* \
@@ -1064,221 +1862,257 @@
 	    esac
 	    ;;
 	  -* ) ac_must_keep_next=true ;;
 	esac
       fi
-      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
-      # Get rid of the leading space.
-      ac_sep=" "
+      as_fn_append ac_configure_args " '$ac_arg'"
       ;;
     esac
   done
 done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
+{ ac_configure_args0=; unset ac_configure_args0;}
+{ ac_configure_args1=; unset ac_configure_args1;}
 
 # When interrupted or exit'd, cleanup temporary files, and complete
 # config.log.  We remove comments because anyway the quotes in there
 # would cause problems or look ugly.
-# WARNING: Be sure not to use single quotes in there, as some shells,
-# such as our DU 5.0 friend, will then `close' the trap.
+# WARNING: Use '\'' to represent an apostrophe within the trap.
+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
 trap 'exit_status=$?
   # Save into config.log some information that might help in debugging.
   {
     echo
 
-    cat <<\_ASBOX
-## ---------------- ##
+    $as_echo "## ---------------- ##
 ## Cache variables. ##
-## ---------------- ##
-_ASBOX
+## ---------------- ##"
     echo
     # The following way of writing the cache mishandles newlines in values,
-{
+(
+  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
+      esac ;;
+    esac
+  done
   (set) 2>&1 |
-    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
+    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
       sed -n \
-	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
-      ;;
+	"s/'\''/'\''\\\\'\'''\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
+      ;; #(
     *)
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
       ;;
-    esac;
-}
+    esac |
+    sort
+)
     echo
 
-    cat <<\_ASBOX
-## ----------------- ##
+    $as_echo "## ----------------- ##
 ## Output variables. ##
-## ----------------- ##
-_ASBOX
+## ----------------- ##"
     echo
     for ac_var in $ac_subst_vars
     do
-      eval ac_val=$`echo $ac_var`
-      echo "$ac_var='"'"'$ac_val'"'"'"
+      eval ac_val=\$$ac_var
+      case $ac_val in
+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      esac
+      $as_echo "$ac_var='\''$ac_val'\''"
     done | sort
     echo
 
     if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------- ##
-## Output files. ##
-## ------------- ##
-_ASBOX
+      $as_echo "## ------------------- ##
+## File substitutions. ##
+## ------------------- ##"
       echo
       for ac_var in $ac_subst_files
       do
-	eval ac_val=$`echo $ac_var`
-	echo "$ac_var='"'"'$ac_val'"'"'"
+	eval ac_val=\$$ac_var
+	case $ac_val in
+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	esac
+	$as_echo "$ac_var='\''$ac_val'\''"
       done | sort
       echo
     fi
 
     if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
+      $as_echo "## ----------- ##
 ## confdefs.h. ##
-## ----------- ##
-_ASBOX
+## ----------- ##"
       echo
-      sed "/^$/d" confdefs.h | sort
+      cat confdefs.h
       echo
     fi
     test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
+      $as_echo "$as_me: caught signal $ac_signal"
+    $as_echo "$as_me: exit $exit_status"
   } >&5
-  rm -f core *.core &&
-  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
+  rm -f core *.core core.conftest.* &&
+    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
     exit $exit_status
-     ' 0
+' 0
 for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
 done
 ac_signal=0
 
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo >confdefs.h
+rm -f -r conftest* confdefs.h
+
+$as_echo "/* confdefs.h */" > confdefs.h
 
 # Predefined preprocessor variables.
 
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_NAME "$PACKAGE_NAME"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_TARNAME "$PACKAGE_TARNAME"
 _ACEOF
-
 
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_VERSION "$PACKAGE_VERSION"
 _ACEOF
 
-
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_STRING "$PACKAGE_STRING"
 _ACEOF
-
 
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
 _ACEOF
 
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_URL "$PACKAGE_URL"
+_ACEOF
+
 
 # Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
+if test -n "$CONFIG_SITE"; then
+  # We do not want a PATH search for config.site.
+  case $CONFIG_SITE in #((
+    -*)  ac_site_file1=./$CONFIG_SITE;;
+    */*) ac_site_file1=$CONFIG_SITE;;
+    *)   ac_site_file1=./$CONFIG_SITE;;
+  esac
+elif test "x$prefix" != xNONE; then
+  ac_site_file1=$prefix/share/config.site
+  ac_site_file2=$prefix/etc/config.site
+else
+  ac_site_file1=$ac_default_prefix/share/config.site
+  ac_site_file2=$ac_default_prefix/etc/config.site
+fi
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+do
+  test "x$ac_site_file" = xNONE && continue
+  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
+    . "$ac_site_file" \
+      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "failed to load site script $ac_site_file
+See \`config.log' for more details" "$LINENO" 5; }
   fi
 done
 
 if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
+  # Some versions of bash will fail to source /dev/null (special files
+  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
+  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
-      [\\/]* | ?:[\\/]* ) . $cache_file;;
-      *)                      . ./$cache_file;;
+      [\\/]* | ?:[\\/]* ) . "$cache_file";;
+      *)                      . "./$cache_file";;
     esac
   fi
 else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
 # Check that the precious variables saved in the cache have kept the same
 # value.
 ac_cache_corrupted=false
-for ac_var in `(set) 2>&1 |
-	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
+for ac_var in $ac_precious_vars; do
   eval ac_old_set=\$ac_cv_env_${ac_var}_set
   eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
-  eval ac_new_val="\$ac_env_${ac_var}_value"
+  eval ac_old_val=\$ac_cv_env_${ac_var}_value
+  eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
+	# differences in whitespace do not lead to failure.
+	ac_old_val_w=`echo x $ac_old_val`
+	ac_new_val_w=`echo x $ac_new_val`
+	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	  ac_cache_corrupted=:
+	else
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	  eval $ac_var=\$ac_old_val
+	fi
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
       fi;;
   esac
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
       *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
     esac
   fi
 done
 if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-   { (exit 1); exit 1; }; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
 fi
+## -------------------- ##
+## Main body of script. ##
+## -------------------- ##
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -1285,36 +2119,19 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 # The following define is needed when building with Cygwin since newer
 # versions of autoconf incorrectly set SHELL to /bin/bash instead of
 # /bin/sh. The bash shell seems to suffer from some strange failures.
 SHELL=/bin/sh
 
-TK_VERSION=8.6
+TK_VERSION=8.7
 TK_MAJOR_VERSION=8
-TK_MINOR_VERSION=6
-TK_PATCH_LEVEL=".6"
+TK_MINOR_VERSION=7
+TK_PATCH_LEVEL="a2"
 VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION
 
 #------------------------------------------------------------------------
 # Handle the --prefix=... option
 #------------------------------------------------------------------------
@@ -1344,174 +2161,147 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
+
 
 fi
 if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-  CC=$ac_ct_CC
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
 else
   CC="$ac_cv_prog_CC"
 fi
 
 if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+          if test -n "$ac_tool_prefix"; then
+    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  CC=$ac_ct_CC
-else
-  CC="$ac_cv_prog_CC"
-fi
-
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  fi
 fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
   ac_prog_rejected=no
@@ -1518,22 +2308,23 @@
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
      fi
     ac_cv_prog_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 if test $ac_prog_rejected = yes; then
   # We found a bogon in the path, so make sure we never use it.
   set dummy $ac_cv_prog_CC
   shift
@@ -1547,139 +2338,154 @@
 fi
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
+
 
 fi
 if test -z "$CC"; then
   if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl
+  for ac_prog in cl.exe
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
+
 
     test -n "$CC" && break
   done
 fi
 if test -z "$CC"; then
   ac_ct_CC=$CC
-  for ac_prog in cl
+  for ac_prog in cl.exe
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
+
 
   test -n "$ac_ct_CC" && break
 done
 
-  CC=$ac_ct_CC
+  if test "x$ac_ct_CC" = x; then
+    CC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    CC=$ac_ct_CC
+  fi
 fi
 
 fi
 
 
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "no acceptable C compiler found in \$PATH
+See \`config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
-echo "$as_me:$LINENO:" \
-     "checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-  (eval $ac_compiler --version </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-  (eval $ac_compiler -v </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-  (eval $ac_compiler -V </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
+for ac_option in --version -v -V -qversion; do
+  { { ac_try="$ac_compiler $ac_option >&5"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    sed '10a\
+... rest of stderr output deleted ...
+         10q' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+  fi
+  rm -f conftest.er1 conftest.err
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+done
+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
@@ -1687,155 +2493,203 @@
   ;
   return 0;
 }
 _ACEOF
 ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
-  (eval $ac_link_default) 2>&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
+ac_rmfiles=
+for ac_file in $ac_files
+do
+  case $ac_file in
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
+    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
+  esac
+done
+rm -f $ac_rmfiles
+
+if { { ac_try="$ac_link_default"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link_default") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # Find the output, starting from the most likely.  This scheme is
-# not robust to junk in `.', hence go to wildcards (a.*) only as a last
-# resort.
-
-# Be careful to initialize this variable, since it used to be cached.
-# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
-ac_cv_exeext=
-# b.out is created by i960 compilers.
-for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
+# in a Makefile.  We should not override ac_cv_exeext if it was cached,
+# so that the user can short-circuit this test for compilers unknown to
+# Autoconf.
+for ac_file in $ac_files ''
 do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
-	;;
-    conftest.$ac_ext )
-	# This is the source file.
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
 	;;
     [ab].out )
 	# We found the default executable, but exeext='' is most
 	# certainly right.
 	break;;
     *.* )
-	ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	# FIXME: I believe we export ac_cv_exeext for Libtool,
-	# but it would be cool to find out if it's true.  Does anybody
-	# maintain Libtool? --akim.
-	export ac_cv_exeext
+	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+	then :; else
+	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+	fi
+	# We set ac_cv_exeext here because the later test for it is not
+	# safe: cross compilers may not add the suffix if given an `-o'
+	# argument, so we may need to know it at that point already.
+	# Even if this section looks crufty: it has the advantage of
+	# actually working.
 	break;;
     * )
 	break;;
   esac
 done
+test "$ac_cv_exeext" = no && ac_cv_exeext=
+
 else
-  echo "$as_me: failed program was:" >&5
+  ac_file=''
+fi
+if test -z "$ac_file"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
-See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-fi
-
-ac_exeext=$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6
-
-# Check the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
-  if { ac_try='./$ac_file'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-  fi
-fi
-echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
-ac_clean_files=$ac_clean_files_save
-# Check the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6
-
-echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "C compiler cannot create executables
+See \`config.log' for more details" "$LINENO" 5; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
+ac_exeext=$ac_cv_exeext
+
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
+ac_clean_files=$ac_clean_files_save
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
+if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
 # work properly (i.e., refer to `conftest.exe'), while it won't with
 # `rm'.
 for ac_file in conftest.exe conftest conftest.*; do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	  export ac_cv_exeext
 	  break;;
     * ) break;;
   esac
 done
 else
-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+See \`config.log' for more details" "$LINENO" 5; }
 fi
-
-rm -f conftest$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6
+rm -f conftest conftest$ac_cv_exeext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
-if test "${ac_cv_objext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdio.h>
+int
+main ()
+{
+FILE *f = fopen ("conftest.out", "w");
+ return ferror (f) || fclose (f) != 0;
+
+  ;
+  return 0;
+}
 _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+ac_clean_files="$ac_clean_files conftest.out"
+# Check that the compiler produces executables we can run.  If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+if test "$cross_compiling" != yes; then
+  { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+  if { ac_try='./conftest$ac_cv_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then
+    cross_compiling=no
+  else
+    if test "$cross_compiling" = maybe; then
+	cross_compiling=yes
+    else
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details" "$LINENO" 5; }
+    fi
+  fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+ac_clean_files=$ac_clean_files_save
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
+if ${ac_cv_objext+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
@@ -1843,49 +2697,50 @@
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+if { { ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_compile") 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
+  for ac_file in conftest.o conftest.obj conftest.*; do
+  test -f "$ac_file" || continue;
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
        break;;
   esac
 done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot compute suffix of object files: cannot compile
+See \`config.log' for more details" "$LINENO" 5; }
 fi
-
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+if ${ac_cv_c_compiler_gnu+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
@@ -1895,59 +2750,69 @@
 
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_compiler_gnu=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_compiler_gnu=no
+  ac_compiler_gnu=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
-GCC=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+  GCC=yes
+else
+  GCC=
+fi
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-CFLAGS="-g"
-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if ${ac_cv_prog_cc_g+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
+  ac_save_c_werror_flag=$ac_c_werror_flag
+   ac_c_werror_flag=yes
+   ac_cv_prog_cc_g=no
+   CFLAGS="-g"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_g=yes
+else
+  CFLAGS=""
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
 _ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+else
+  ac_c_werror_flag=$ac_save_c_werror_flag
+	 CFLAGS="-g"
+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
@@ -1954,43 +2819,22 @@
 
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_prog_cc_g=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_c_werror_flag=$ac_save_c_werror_flag
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
   if test "$GCC" = yes; then
     CFLAGS="-g -O2"
@@ -2002,27 +2846,22 @@
     CFLAGS="-O2"
   else
     CFLAGS=
   fi
 fi
-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+if ${ac_cv_prog_cc_c89+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  ac_cv_prog_cc_stdc=no
+  ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
 struct buf { int x; };
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
 static char *e (p, i)
      char **p;
@@ -2041,15 +2880,20 @@
 }
 
 /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
    function prototypes and stuff, but not '\xHH' hex character constants.
    These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std1 is added to get
+   as 'x'.  The following induces an error, until -std is added to get
    proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
    array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std1.  */
+   that's true only with -std.  */
 int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
 
 int test (int i, double x);
 struct s1 {int (*f) (int a);};
 struct s2 {int (*f) (double a);};
 int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
@@ -2061,271 +2905,74 @@
 return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
   ;
   return 0;
 }
 _ACEOF
-# Don't try gcc -ansi; that turns off useful extensions and
-# breaks some systems' header files.
-# AIX			-qlanglvl=ansi
-# Ultrix and OSF/1	-std1
-# HP-UX 10.20 and later	-Ae
-# HP-UX older versions	-Aa -D_HPUX_SOURCE
-# SVR4			-Xc -D__EXTENSIONS__
-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
   CC="$ac_save_CC $ac_arg"
-  rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_prog_cc_stdc=$ac_arg
-break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+  if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_c89=$ac_arg
 fi
-rm -f conftest.err conftest.$ac_objext
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c89" != "xno" && break
 done
-rm -f conftest.$ac_ext conftest.$ac_objext
+rm -f conftest.$ac_ext
 CC=$ac_save_CC
 
 fi
-
-case "x$ac_cv_prog_cc_stdc" in
-  x|xno)
-    echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6 ;;
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+  x)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+  xno)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
   *)
-    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
-    CC="$CC $ac_cv_prog_cc_stdc" ;;
+    CC="$CC $ac_cv_prog_cc_c89"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
 esac
-
-# Some people use a C++ compiler to compile C.  Since we use `exit',
-# in C++ we need to declare it.  In case someone uses the same compiler
-# for both compiling C and C++ we need to have the C++ compiler decide
-# the declaration of exit, since it's the most demanding environment.
-cat >conftest.$ac_ext <<_ACEOF
-#ifndef __cplusplus
-  choke me
-#endif
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  for ac_declaration in \
-   '' \
-   'extern "C" void std::exit (int) throw (); using std::exit;' \
-   'extern "C" void std::exit (int); using std::exit;' \
-   'extern "C" void exit (int) throw ();' \
-   'extern "C" void exit (int);' \
-   'void exit (int);'
-do
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-#include <stdlib.h>
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-continue
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
-  echo '#ifdef __cplusplus' >>confdefs.h
-  echo $ac_declaration      >>confdefs.h
-  echo '#endif'             >>confdefs.h
-fi
-
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+if test "x$ac_cv_prog_cc_c89" != xno; then :
+
+fi
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-echo "$as_me:$LINENO: checking for inline" >&5
-echo $ECHO_N "checking for inline... $ECHO_C" >&6
-if test "${ac_cv_c_inline+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
+$as_echo_n "checking for inline... " >&6; }
+if ${ac_cv_c_inline+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifndef __cplusplus
 typedef int foo_t;
 static $ac_kw foo_t static_foo () {return 0; }
 $ac_kw foo_t foo () {return 0; }
 #endif
 
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_c_inline=$ac_kw; break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_c_inline=$ac_kw
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  test "$ac_cv_c_inline" != no && break
 done
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
-echo "${ECHO_T}$ac_cv_c_inline" >&6
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
+$as_echo "$ac_cv_c_inline" >&6; }
 
 case $ac_cv_c_inline in
   inline | yes) ;;
   *)
     case $ac_cv_c_inline in
@@ -2343,19 +2990,19 @@
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  if ${ac_cv_prog_CPP+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
     for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
     do
       ac_preproc_ok=false
@@ -2365,95 +3012,47 @@
   # with a fresh cross-compiler works.
   # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
 #else
 # include <assert.h>
 #endif
 		     Syntax error
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
-  # OK, works on sane cases.  Now check whether non-existent headers
+  # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+if ac_fn_c_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
   break
 fi
 
     done
     ac_cv_prog_CPP=$CPP
@@ -2461,147 +3060,209 @@
 fi
   CPP=$ac_cv_prog_CPP
 else
   ac_cv_prog_CPP=$CPP
 fi
-echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
   # Use a header file that comes with gcc, so configuring glibc
   # with a fresh cross-compiler works.
   # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
   # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifdef __STDC__
 # include <limits.h>
 #else
 # include <assert.h>
 #endif
 		     Syntax error
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
+if ac_fn_c_try_cpp "$LINENO"; then :
+
+else
   # Broken: fails on valid input.
 continue
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
-  # OK, works on sane cases.  Now check whether non-existent headers
+  # OK, works on sane cases.  Now check whether nonexistent headers
   # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+if ac_fn_c_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
   # Passes both tests.
 ac_preproc_ok=:
 break
 fi
-rm -f conftest.err conftest.$ac_ext
+rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+
 else
-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6
-if test "${ac_cv_prog_egrep+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
-    then ac_cv_prog_egrep='grep -E'
-    else ac_cv_prog_egrep='egrep'
-    fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
- EGREP=$ac_cv_prog_egrep
-
-
-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
-if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+if ${ac_cv_path_GREP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$GREP"; then
+  ac_path_GREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in grep ggrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_GREP" || continue
+# Check for GNU ac_path_GREP and select it if it is found.
+  # Check for GNU $ac_path_GREP
+case `"$ac_path_GREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'GREP' >> "conftest.nl"
+    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_GREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_GREP="$ac_path_GREP"
+      ac_path_GREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_GREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_GREP"; then
+    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_GREP=$GREP
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
+ GREP="$ac_cv_path_GREP"
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
+if ${ac_cv_path_EGREP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+   then ac_cv_path_EGREP="$GREP -E"
+   else
+     if test -z "$EGREP"; then
+  ac_path_EGREP_found=false
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in egrep; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+      as_fn_executable_p "$ac_path_EGREP" || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
+  # Check for GNU $ac_path_EGREP
+case `"$ac_path_EGREP" --version 2>&1` in
+*GNU*)
+  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
+*)
+  ac_count=0
+  $as_echo_n 0123456789 >"conftest.in"
+  while :
+  do
+    cat "conftest.in" "conftest.in" >"conftest.tmp"
+    mv "conftest.tmp" "conftest.in"
+    cp "conftest.in" "conftest.nl"
+    $as_echo 'EGREP' >> "conftest.nl"
+    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+    as_fn_arith $ac_count + 1 && ac_count=$as_val
+    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+      # Best one so far, save it but keep looking for a better one
+      ac_cv_path_EGREP="$ac_path_EGREP"
+      ac_path_EGREP_max=$ac_count
+    fi
+    # 10*(2^10) chars as input seems more than enough
+    test $ac_count -gt 10 && break
+  done
+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+      $ac_path_EGREP_found && break 3
+    done
+  done
+  done
+IFS=$as_save_IFS
+  if test -z "$ac_cv_path_EGREP"; then
+    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+  fi
+else
+  ac_cv_path_EGREP=$EGREP
+fi
+
+   fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
+ EGREP="$ac_cv_path_EGREP"
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if ${ac_cv_header_stdc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
 #include <float.h>
@@ -2612,95 +3273,60 @@
 
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_header_stdc=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_header_stdc=no
+  ac_cv_header_stdc=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <string.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then
-  :
+  $EGREP "memchr" >/dev/null 2>&1; then :
+
 else
   ac_cv_header_stdc=no
 fi
 rm -f conftest*
 
 fi
 
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then
-  :
+  $EGREP "free" >/dev/null 2>&1; then :
+
 else
   ac_cv_header_stdc=no
 fi
 rm -f conftest*
 
 fi
 
 if test $ac_cv_header_stdc = yes; then
   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
   :
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ctype.h>
+#include <stdlib.h>
 #if ((' ' & 0x0FF) == 0x020)
 # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
 # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
 #else
 # define ISLOWER(c) \
@@ -2716,317 +3342,343 @@
 {
   int i;
   for (i = 0; i < 256; i++)
     if (XOR (islower (i), ISLOWER (i))
 	|| toupper (i) != TOUPPER (i))
-      exit(2);
-  exit (0);
+      return 2;
+  return 0;
 }
 _ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_header_stdc=no
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6
+if ac_fn_c_try_run "$LINENO"; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
 
 fi
 
 
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_AR+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AR+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$AR"; then
   ac_cv_prog_AR="$AR" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_AR="${ac_tool_prefix}ar"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  echo "$as_me:$LINENO: result: $AR" >&5
-echo "${ECHO_T}$AR" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+$as_echo "$AR" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
+
 
 fi
 if test -z "$ac_cv_prog_AR"; then
   ac_ct_AR=$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_AR+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_AR"; then
   ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_AR="ar"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
-echo "${ECHO_T}$ac_ct_AR" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-  AR=$ac_ct_AR
+  if test "x$ac_ct_AR" = x; then
+    AR=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    AR=$ac_ct_AR
+  fi
 else
   AR="$ac_cv_prog_AR"
 fi
 
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_RANLIB+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
+
 
 fi
 if test -z "$ac_cv_prog_RANLIB"; then
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_RANLIB"; then
   ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-  RANLIB=$ac_ct_RANLIB
+  if test "x$ac_ct_RANLIB" = x; then
+    RANLIB=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    RANLIB=$ac_ct_RANLIB
+  fi
 else
   RANLIB="$ac_cv_prog_RANLIB"
 fi
 
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
 set dummy ${ac_tool_prefix}windres; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_RC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_RC+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$RC"; then
   ac_cv_prog_RC="$RC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_RC="${ac_tool_prefix}windres"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 RC=$ac_cv_prog_RC
 if test -n "$RC"; then
-  echo "$as_me:$LINENO: result: $RC" >&5
-echo "${ECHO_T}$RC" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RC" >&5
+$as_echo "$RC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
+
 
 fi
 if test -z "$ac_cv_prog_RC"; then
   ac_ct_RC=$RC
   # Extract the first word of "windres", so it can be a program name with args.
 set dummy windres; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_RC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_RC+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_RC"; then
   ac_cv_prog_ac_ct_RC="$ac_ct_RC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_RC="windres"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
 fi
 fi
 ac_ct_RC=$ac_cv_prog_ac_ct_RC
 if test -n "$ac_ct_RC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_RC" >&5
-echo "${ECHO_T}$ac_ct_RC" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RC" >&5
+$as_echo "$ac_ct_RC" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-  RC=$ac_ct_RC
+  if test "x$ac_ct_RC" = x; then
+    RC=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    RC=$ac_ct_RC
+  fi
 else
   RC="$ac_cv_prog_RC"
 fi
 
 
 #--------------------------------------------------------------------
 # Checks to see if the make program sets the $MAKE variable.
 #--------------------------------------------------------------------
 
-echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
 all:
-	@echo 'ac_maketemp="$(MAKE)"'
+	@echo '@@@%%%=$(MAKE)=@@@%%%'
 _ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
-  eval ac_cv_prog_make_${ac_make}_set=yes
-else
-  eval ac_cv_prog_make_${ac_make}_set=no
-fi
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+case `${MAKE-make} -f conftest.make 2>/dev/null` in
+  *@@@%%%=?*=@@@%%%*)
+    eval ac_cv_prog_make_${ac_make}_set=yes;;
+  *)
+    eval ac_cv_prog_make_${ac_make}_set=no;;
+esac
 rm -f conftest.make
 fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   SET_MAKE=
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
 
 #--------------------------------------------------------------------
@@ -3033,85 +3685,47 @@
 # Determines the correct binary file extension (.o, .obj, .exe etc.)
 #--------------------------------------------------------------------
 
 
 
-
-#--------------------------------------------------------------------
-# Check whether --enable-threads or --disable-threads was given.
-#--------------------------------------------------------------------
-
-
-    echo "$as_me:$LINENO: checking for building with threads" >&5
-echo $ECHO_N "checking for building with threads... $ECHO_C" >&6
-    # Check whether --enable-threads or --disable-threads was given.
-if test "${enable_threads+set}" = set; then
-  enableval="$enable_threads"
-  tcl_ok=$enableval
-else
-  tcl_ok=yes
-fi;
-
-    if test "$tcl_ok" = "yes"; then
-	echo "$as_me:$LINENO: result: yes (default)" >&5
-echo "${ECHO_T}yes (default)" >&6
-	TCL_THREADS=1
-	cat >>confdefs.h <<\_ACEOF
-#define TCL_THREADS 1
-_ACEOF
-
-	# USE_THREAD_ALLOC tells us to try the special thread-based
-	# allocator that significantly reduces lock contention
-	cat >>confdefs.h <<\_ACEOF
-#define USE_THREAD_ALLOC 1
-_ACEOF
-
-    else
-	TCL_THREADS=0
-	echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-    fi
-
-
 
 #--------------------------------------------------------------------
 # The statements below define a collection of symbols related to
 # building libtk as a shared library instead of a static library.
 #--------------------------------------------------------------------
 
 
-    echo "$as_me:$LINENO: checking how to build libraries" >&5
-echo $ECHO_N "checking how to build libraries... $ECHO_C" >&6
-    # Check whether --enable-shared or --disable-shared was given.
-if test "${enable_shared+set}" = set; then
-  enableval="$enable_shared"
-  tcl_ok=$enableval
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to build libraries" >&5
+$as_echo_n "checking how to build libraries... " >&6; }
+    # Check whether --enable-shared was given.
+if test "${enable_shared+set}" = set; then :
+  enableval=$enable_shared; tcl_ok=$enableval
 else
   tcl_ok=yes
-fi;
+fi
+
 
     if test "${enable_shared+set}" = set; then
 	enableval="$enable_shared"
 	tcl_ok=$enableval
     else
 	tcl_ok=yes
     fi
 
     if test "$tcl_ok" = "yes" ; then
-	echo "$as_me:$LINENO: result: shared" >&5
-echo "${ECHO_T}shared" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: shared" >&5
+$as_echo "shared" >&6; }
 	SHARED_BUILD=1
     else
-	echo "$as_me:$LINENO: result: static" >&5
-echo "${ECHO_T}static" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: static" >&5
+$as_echo "static" >&6; }
 	SHARED_BUILD=0
 
-cat >>confdefs.h <<\_ACEOF
-#define STATIC_BUILD 1
-_ACEOF
+$as_echo "#define STATIC_BUILD 1" >>confdefs.h
 
     fi
+
 
 
 #--------------------------------------------------------------------
 # Locate and source the tclConfig.sh file.
 #--------------------------------------------------------------------
@@ -3125,38 +3739,36 @@
 
     if test x"${no_tcl}" = x ; then
 	# we reset no_tcl in case something fails here
 	no_tcl=true
 
-# Check whether --with-tcl or --without-tcl was given.
-if test "${with_tcl+set}" = set; then
-  withval="$with_tcl"
-  with_tclconfig="${withval}"
-fi;
-	echo "$as_me:$LINENO: checking for Tcl configuration" >&5
-echo $ECHO_N "checking for Tcl configuration... $ECHO_C" >&6
-	if test "${ac_cv_c_tclconfig+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+# Check whether --with-tcl was given.
+if test "${with_tcl+set}" = set; then :
+  withval=$with_tcl; with_tclconfig="${withval}"
+fi
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Tcl configuration" >&5
+$as_echo_n "checking for Tcl configuration... " >&6; }
+	if ${ac_cv_c_tclconfig+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
 
 
 	    # First check to see if --with-tcl was specified.
 	    if test x"${with_tclconfig}" != x ; then
 		case "${with_tclconfig}" in
 		    */tclConfig.sh )
 			if test -f "${with_tclconfig}"; then
-			    { echo "$as_me:$LINENO: WARNING: --with-tcl argument should refer to directory containing tclConfig.sh, not to tclConfig.sh itself" >&5
-echo "$as_me: WARNING: --with-tcl argument should refer to directory containing tclConfig.sh, not to tclConfig.sh itself" >&2;}
+			    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-tcl argument should refer to directory containing tclConfig.sh, not to tclConfig.sh itself" >&5
+$as_echo "$as_me: WARNING: --with-tcl argument should refer to directory containing tclConfig.sh, not to tclConfig.sh itself" >&2;}
 			    with_tclconfig="`echo "${with_tclconfig}" | sed 's!/tclConfig\.sh$!!'`"
 			fi ;;
 		esac
 		if test -f "${with_tclconfig}/tclConfig.sh" ; then
 		    ac_cv_c_tclconfig="`(cd "${with_tclconfig}"; pwd)`"
 		else
-		    { { echo "$as_me:$LINENO: error: ${with_tclconfig} directory doesn't contain tclConfig.sh" >&5
-echo "$as_me: error: ${with_tclconfig} directory doesn't contain tclConfig.sh" >&2;}
-   { (exit 1); exit 1; }; }
+		    as_fn_error $? "${with_tclconfig} directory doesn't contain tclConfig.sh" "$LINENO" 5
 		fi
 	    fi
 
 	    # then check for a private Tcl installation
 	    if test x"${ac_cv_c_tclconfig}" = x ; then
@@ -3216,32 +3828,30 @@
 fi
 
 
 	if test x"${ac_cv_c_tclconfig}" = x ; then
 	    TCL_BIN_DIR="# no Tcl configs found"
-	    { { echo "$as_me:$LINENO: error: Can't find Tcl configuration definitions. Use --with-tcl to specify a directory containing tclConfig.sh" >&5
-echo "$as_me: error: Can't find Tcl configuration definitions. Use --with-tcl to specify a directory containing tclConfig.sh" >&2;}
-   { (exit 1); exit 1; }; }
+	    as_fn_error $? "Can't find Tcl configuration definitions. Use --with-tcl to specify a directory containing tclConfig.sh" "$LINENO" 5
 	else
 	    no_tcl=
 	    TCL_BIN_DIR="${ac_cv_c_tclconfig}"
-	    echo "$as_me:$LINENO: result: found ${TCL_BIN_DIR}/tclConfig.sh" >&5
-echo "${ECHO_T}found ${TCL_BIN_DIR}/tclConfig.sh" >&6
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: found ${TCL_BIN_DIR}/tclConfig.sh" >&5
+$as_echo "found ${TCL_BIN_DIR}/tclConfig.sh" >&6; }
 	fi
     fi
 
 
-    echo "$as_me:$LINENO: checking for existence of ${TCL_BIN_DIR}/tclConfig.sh" >&5
-echo $ECHO_N "checking for existence of ${TCL_BIN_DIR}/tclConfig.sh... $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for existence of ${TCL_BIN_DIR}/tclConfig.sh" >&5
+$as_echo_n "checking for existence of ${TCL_BIN_DIR}/tclConfig.sh... " >&6; }
 
     if test -f "${TCL_BIN_DIR}/tclConfig.sh" ; then
-        echo "$as_me:$LINENO: result: loading" >&5
-echo "${ECHO_T}loading" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: loading" >&5
+$as_echo "loading" >&6; }
 	. "${TCL_BIN_DIR}/tclConfig.sh"
     else
-        echo "$as_me:$LINENO: result: could not find ${TCL_BIN_DIR}/tclConfig.sh" >&5
-echo "${ECHO_T}could not find ${TCL_BIN_DIR}/tclConfig.sh" >&6
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: could not find ${TCL_BIN_DIR}/tclConfig.sh" >&5
+$as_echo "could not find ${TCL_BIN_DIR}/tclConfig.sh" >&6; }
     fi
 
     #
     # If the TCL_BIN_DIR is the build directory (not the install directory),
     # then set the common variable name to the value of the build variables.
@@ -3259,10 +3869,11 @@
 
     #
     # eval is required to do the TCL_DBGX substitution
     #
 
+    eval "TCL_ZIP_FILE=\"${TCL_ZIP_FILE}\""
     eval "TCL_LIB_FILE=\"${TCL_LIB_FILE}\""
     eval "TCL_LIB_FLAG=\"${TCL_LIB_FLAG}\""
     eval "TCL_LIB_SPEC=\"${TCL_LIB_SPEC}\""
 
     eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\""
@@ -3282,100 +3893,40 @@
 
 
 
 
 
+
+if test "${TCL_MAJOR_VERSION}" -lt 9 ; then
 if test "${TCL_MAJOR_VERSION}" != "${TK_MAJOR_VERSION}"; then
-    { { echo "$as_me:$LINENO: error: ${TCL_BIN_DIR}/tclConfig.sh is for Tcl ${TCL_VERSION}.
-Tk ${TK_VERSION}${TK_PATCH_LEVEL} needs Tcl ${TK_VERSION}.
-Use --with-tcl= option to indicate location of tclConfig.sh file for Tcl ${TK_VERSION}." >&5
-echo "$as_me: error: ${TCL_BIN_DIR}/tclConfig.sh is for Tcl ${TCL_VERSION}.
-Tk ${TK_VERSION}${TK_PATCH_LEVEL} needs Tcl ${TK_VERSION}.
-Use --with-tcl= option to indicate location of tclConfig.sh file for Tcl ${TK_VERSION}." >&2;}
-   { (exit 1); exit 1; }; }
+    as_fn_error $? "${TCL_BIN_DIR}/tclConfig.sh is for Tcl ${TCL_VERSION}.
+Tk ${TK_VERSION}${TK_PATCH_LEVEL} needs Tcl 8.6+.
+Use --with-tcl= option to indicate location of tclConfig.sh file for Tcl 8.6 or better." "$LINENO" 5
 fi
-if test "${TCL_MINOR_VERSION}" -lt "${TK_MINOR_VERSION}"; then
-    { { echo "$as_me:$LINENO: error: ${TCL_BIN_DIR}/tclConfig.sh is for Tcl ${TCL_VERSION}.
-Tk ${TK_VERSION}${TK_PATCH_LEVEL} needs Tcl ${TK_VERSION}.
-Use --with-tcl= option to indicate location of tclConfig.sh file for Tcl ${TK_VERSION}." >&5
-echo "$as_me: error: ${TCL_BIN_DIR}/tclConfig.sh is for Tcl ${TCL_VERSION}.
-Tk ${TK_VERSION}${TK_PATCH_LEVEL} needs Tcl ${TK_VERSION}.
-Use --with-tcl= option to indicate location of tclConfig.sh file for Tcl ${TK_VERSION}." >&2;}
-   { (exit 1); exit 1; }; }
+if test "${TCL_MINOR_VERSION}" -lt 6; then
+    as_fn_error $? "${TCL_BIN_DIR}/tclConfig.sh is for Tcl ${TCL_VERSION}.
+Tk ${TK_VERSION}${TK_PATCH_LEVEL} needs Tcl 8.6+.
+Use --with-tcl= option to indicate location of tclConfig.sh file for Tcl 8.6 or better." "$LINENO" 5
+fi
 fi
 
 #--------------------------------------------------------------------
 # The statements below define a collection of compile flags.  This
 # macro depends on the value of SHARED_BUILD, and should be called
 # after SC_ENABLE_SHARED checks the configure switches.
 #--------------------------------------------------------------------
 
 # On IRIX 5.3, sys/types and inttypes.h are conflicting.
-
-
-
-
-
-
-
-
-
 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
 		  inttypes.h stdint.h unistd.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_Header=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_Header=no"
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 
 fi
 
 done
@@ -3383,92 +3934,102 @@
 
 
 
     # Step 0: Enable 64 bit support?
 
-    echo "$as_me:$LINENO: checking if 64bit support is requested" >&5
-echo $ECHO_N "checking if 64bit support is requested... $ECHO_C" >&6
-    # Check whether --enable-64bit or --disable-64bit was given.
-if test "${enable_64bit+set}" = set; then
-  enableval="$enable_64bit"
-  do64bit=$enableval
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if 64bit support is requested" >&5
+$as_echo_n "checking if 64bit support is requested... " >&6; }
+    # Check whether --enable-64bit was given.
+if test "${enable_64bit+set}" = set; then :
+  enableval=$enable_64bit; do64bit=$enableval
 else
   do64bit=no
-fi;
-    echo "$as_me:$LINENO: result: $do64bit" >&5
-echo "${ECHO_T}$do64bit" >&6
-
-    # Cross-compiling options for Windows/CE builds
-
-    echo "$as_me:$LINENO: checking if Windows/CE build is requested" >&5
-echo $ECHO_N "checking if Windows/CE build is requested... $ECHO_C" >&6
-    # Check whether --enable-wince or --disable-wince was given.
-if test "${enable_wince+set}" = set; then
-  enableval="$enable_wince"
-  doWince=$enableval
-else
-  doWince=no
-fi;
-    echo "$as_me:$LINENO: result: $doWince" >&5
-echo "${ECHO_T}$doWince" >&6
-
-    echo "$as_me:$LINENO: checking for Windows/CE celib directory" >&5
-echo $ECHO_N "checking for Windows/CE celib directory... $ECHO_C" >&6
-
-# Check whether --with-celib or --without-celib was given.
-if test "${with_celib+set}" = set; then
-  withval="$with_celib"
-  CELIB_DIR=$withval
-else
-  CELIB_DIR=NO_CELIB
-fi;
-    echo "$as_me:$LINENO: result: $CELIB_DIR" >&5
-echo "${ECHO_T}$CELIB_DIR" >&6
+fi
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $do64bit" >&5
+$as_echo "$do64bit" >&6; }
 
     # Set some defaults (may get changed below)
     EXTRA_CFLAGS=""
 
-cat >>confdefs.h <<\_ACEOF
-#define MODULE_SCOPE extern
-_ACEOF
+$as_echo "#define MODULE_SCOPE extern" >>confdefs.h
 
 
     # Extract the first word of "cygpath", so it can be a program name with args.
 set dummy cygpath; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CYGPATH+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CYGPATH+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CYGPATH"; then
   ac_cv_prog_CYGPATH="$CYGPATH" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CYGPATH="cygpath -m"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
-done
+  done
+IFS=$as_save_IFS
 
   test -z "$ac_cv_prog_CYGPATH" && ac_cv_prog_CYGPATH="echo"
 fi
 fi
 CYGPATH=$ac_cv_prog_CYGPATH
 if test -n "$CYGPATH"; then
-  echo "$as_me:$LINENO: result: $CYGPATH" >&5
-echo "${ECHO_T}$CYGPATH" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CYGPATH" >&5
+$as_echo "$CYGPATH" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    # Extract the first word of "wine", so it can be a program name with args.
+set dummy wine; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_WINE+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$WINE"; then
+  ac_cv_prog_WINE="$WINE" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_WINE="wine"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+WINE=$ac_cv_prog_WINE
+if test -n "$WINE"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WINE" >&5
+$as_echo "$WINE" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
+
 
 
     SHLIB_SUFFIX=".dll"
 
     # MACHINE is IX86 for LINK, but this is used by the manifest,
@@ -3475,20 +4036,16 @@
     # which requires x86|amd64|ia64.
     MACHINE="X86"
 
     if test "$GCC" = "yes"; then
 
-      echo "$as_me:$LINENO: checking for cross-compile version of gcc" >&5
-echo $ECHO_N "checking for cross-compile version of gcc... $ECHO_C" >&6
-if test "${ac_cv_cross+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cross-compile version of gcc" >&5
+$as_echo_n "checking for cross-compile version of gcc... " >&6; }
+if ${ac_cv_cross+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 	    #ifndef _WIN32
 		#error cross-compiler
 	    #endif
@@ -3499,44 +4056,20 @@
 
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_cross=no
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_cross=yes
+  ac_cv_cross=yes
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_cross" >&5
-echo "${ECHO_T}$ac_cv_cross" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cross" >&5
+$as_echo "$ac_cv_cross" >&6; }
 
       if test "$ac_cv_cross" = "yes"; then
 	case "$do64bit" in
 	    amd64|x64|yes)
 		CC="x86_64-w64-mingw32-gcc"
@@ -3567,24 +4100,24 @@
 	conftest=/tmp/conftest.rc
 	echo "STRINGTABLE BEGIN" > $conftest
 	echo "101 \"name\"" >> $conftest
 	echo "END" >> $conftest
 
-	echo "$as_me:$LINENO: checking for Windows native path bug in windres" >&5
-echo $ECHO_N "checking for Windows native path bug in windres... $ECHO_C" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Windows native path bug in windres" >&5
+$as_echo_n "checking for Windows native path bug in windres... " >&6; }
 	cyg_conftest=`$CYGPATH $conftest`
 	if { ac_try='$RC -o conftest.res.o $cyg_conftest'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } ; then
-	    echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; } ; then
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 	else
-	    echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 	    CYGPATH=echo
 	fi
 	conftest=
 	cyg_conftest=
     fi
@@ -3598,20 +4131,16 @@
     # set various compiler flags depending on whether we are using gcc or cl
 
     if test "${GCC}" = "yes" ; then
 	extra_cflags="-pipe"
 	extra_ldflags="-pipe -static-libgcc"
-	echo "$as_me:$LINENO: checking for mingw32 version of gcc" >&5
-echo $ECHO_N "checking for mingw32 version of gcc... $ECHO_C" >&6
-if test "${ac_cv_win32+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mingw32 version of gcc" >&5
+$as_echo_n "checking for mingw32 version of gcc... " >&6; }
+if ${ac_cv_win32+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 		#ifdef _WIN32
 		    #error win32
 		#endif
@@ -3622,61 +4151,77 @@
 
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_win32=no
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_win32=yes
+  ac_cv_win32=yes
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_win32" >&5
-echo "${ECHO_T}$ac_cv_win32" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_win32" >&5
+$as_echo "$ac_cv_win32" >&6; }
 	if test "$ac_cv_win32" != "yes"; then
-	    { { echo "$as_me:$LINENO: error: ${CC} cannot produce win32 executables." >&5
-echo "$as_me: error: ${CC} cannot produce win32 executables." >&2;}
-   { (exit 1); exit 1; }; }
+	    as_fn_error $? "${CC} cannot produce win32 executables." "$LINENO" 5
 	fi
 
 	hold_cflags=$CFLAGS; CFLAGS="$CFLAGS -mwindows -municode -Dmain=xxmain"
-	echo "$as_me:$LINENO: checking for working -municode linker flag" >&5
-echo $ECHO_N "checking for working -municode linker flag... $ECHO_C" >&6
-if test "${ac_cv_municode+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working -municode linker flag" >&5
+$as_echo_n "checking for working -municode linker flag... " >&6; }
+if ${ac_cv_municode+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+# ac_fn_c_try_link LINENO
+# -----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_link ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  rm -f conftest.$ac_objext conftest$ac_exeext
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>conftest.err
+  ac_status=$?
+  if test -s conftest.err; then
+    grep -v '^ *+' conftest.err >conftest.er1
+    cat conftest.er1 >&5
+    mv -f conftest.er1 conftest.err
+  fi
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 test -x conftest$ac_exeext
+       }; then :
+  ac_retval=0
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_retval=1
+fi
+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+  # interfere with the next link command; also delete a directory that is
+  # left behind by Apple's compiler.  We do this before executing the actions.
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_link
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 	#include <windows.h>
 	int APIENTRY wWinMain(HINSTANCE a, HINSTANCE b, LPWSTR c, int d) {return 0;}
 
@@ -3686,55 +4231,31 @@
 
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_municode=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_municode=no
+  ac_cv_municode=no
 fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 
 fi
-echo "$as_me:$LINENO: result: $ac_cv_municode" >&5
-echo "${ECHO_T}$ac_cv_municode" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_municode" >&5
+$as_echo "$ac_cv_municode" >&6; }
 	CFLAGS=$hold_cflags
 	if test "$ac_cv_municode" = "yes" ; then
 	    extra_ldflags="$extra_ldflags -municode"
 	else
 	    extra_cflags="$extra_cflags -DTCL_BROKEN_MAINARGS"
 	fi
     fi
 
-    echo "$as_me:$LINENO: checking compiler flags" >&5
-echo $ECHO_N "checking compiler flags... $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking compiler flags" >&5
+$as_echo_n "checking compiler flags... " >&6; }
     if test "${GCC}" = "yes" ; then
 	SHLIB_LD=""
 	SHLIB_LD_LIBS='${LIBS}'
 	LIBS="-lnetapi32 -lkernel32 -luser32 -ladvapi32 -luserenv -lws2_32"
 	# mingw needs to link ole32 and oleaut32 for [send], but MSVC doesn't
@@ -3751,27 +4272,24 @@
 	MAKE_EXE="\${CC} -o \$@"
 	LIBPREFIX="lib"
 
 	if test "${SHARED_BUILD}" = "0" ; then
 	    # static
-            echo "$as_me:$LINENO: result: using static flags" >&5
-echo "${ECHO_T}using static flags" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: using static flags" >&5
+$as_echo "using static flags" >&6; }
 	    runtime=
 	    LIBRARIES="\${STATIC_LIBRARIES}"
 	    EXESUFFIX="s\${DBGX}.exe"
 	else
 	    # dynamic
-            echo "$as_me:$LINENO: result: using shared flags" >&5
-echo "${ECHO_T}using shared flags" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: using shared flags" >&5
+$as_echo "using shared flags" >&6; }
 
 	    # ad-hoc check to see if CC supports -shared.
 	    if "${CC}" -shared 2>&1 | egrep ': -shared not supported' >/dev/null; then
-		{ { echo "$as_me:$LINENO: error: ${CC} does not support the -shared option.
-                You will need to upgrade to a newer version of the toolchain." >&5
-echo "$as_me: error: ${CC} does not support the -shared option.
-                You will need to upgrade to a newer version of the toolchain." >&2;}
-   { (exit 1); exit 1; }; }
+		as_fn_error $? "${CC} does not support the -shared option.
+                You will need to upgrade to a newer version of the toolchain." "$LINENO" 5
 	    fi
 
 	    runtime=
 	    # Add SHLIB_LD_LIBS to the Make rule, not here.
 
@@ -3793,11 +4311,11 @@
 
 	EXTRA_CFLAGS="${extra_cflags}"
 
 	CFLAGS_DEBUG=-g
 	CFLAGS_OPTIMIZE="-O2 -fomit-frame-pointer"
-	CFLAGS_WARNING="-Wall -Wdeclaration-after-statement"
+	CFLAGS_WARNING="-Wall -Wwrite-strings -Wsign-compare -Wdeclaration-after-statement"
 	LDFLAGS_DEBUG=
 	LDFLAGS_OPTIMIZE=
 
 	# Specify the CC output file names based on the target name
 	CC_OBJNAME="-o \$@"
@@ -3821,24 +4339,20 @@
 	LDFLAGS_WINDOW="-mwindows ${extra_ldflags}"
 
 	case "$do64bit" in
 	    amd64|x64|yes)
 		MACHINE="AMD64" ; # assume AMD64 as default 64-bit build
-		echo "$as_me:$LINENO: result:    Using 64-bit $MACHINE mode" >&5
-echo "${ECHO_T}   Using 64-bit $MACHINE mode" >&6
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result:    Using 64-bit $MACHINE mode" >&5
+$as_echo "   Using 64-bit $MACHINE mode" >&6; }
 		;;
 	    ia64)
 		MACHINE="IA64"
-		echo "$as_me:$LINENO: result:    Using 64-bit $MACHINE mode" >&5
-echo "${ECHO_T}   Using 64-bit $MACHINE mode" >&6
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result:    Using 64-bit $MACHINE mode" >&5
+$as_echo "   Using 64-bit $MACHINE mode" >&6; }
 		;;
 	    *)
-		cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 		    #ifndef _WIN64
 			#error 32-bit
 		    #endif
@@ -3849,61 +4363,37 @@
 
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   tcl_win_64bit=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-tcl_win_64bit=no
+  tcl_win_64bit=no
 
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 		if test "$tcl_win_64bit" = "yes" ; then
 			do64bit=amd64
 			MACHINE="AMD64"
-			echo "$as_me:$LINENO: result:    Using 64-bit $MACHINE mode" >&5
-echo "${ECHO_T}   Using 64-bit $MACHINE mode" >&6
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: result:    Using 64-bit $MACHINE mode" >&5
+$as_echo "   Using 64-bit $MACHINE mode" >&6; }
 		fi
 		;;
 	esac
     else
 	if test "${SHARED_BUILD}" = "0" ; then
 	    # static
-            echo "$as_me:$LINENO: result: using static flags" >&5
-echo "${ECHO_T}using static flags" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: using static flags" >&5
+$as_echo "using static flags" >&6; }
 	    runtime=-MT
 	    LIBRARIES="\${STATIC_LIBRARIES}"
 	    EXESUFFIX="s\${DBGX}.exe"
 	else
 	    # dynamic
-            echo "$as_me:$LINENO: result: using shared flags" >&5
-echo "${ECHO_T}using shared flags" >&6
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: using shared flags" >&5
+$as_echo "using shared flags" >&6; }
 	    runtime=-MD
 	    # Add SHLIB_LD_LIBS to the Make rule, not here.
 	    LIBRARIES="\${SHARED_LIBRARIES}"
 	    EXESUFFIX="\${DBGX}.exe"
 	    case "x`echo \${VisualStudioVersion}`" in
@@ -3939,15 +4429,15 @@
 		    MACHINE="IA64"
 		    PATH64="${MSSDK}/Bin/Win64"
 		    ;;
 	    esac
 	    if test ! -d "${PATH64}" ; then
-		{ echo "$as_me:$LINENO: WARNING: Could not find 64-bit $MACHINE SDK" >&5
-echo "$as_me: WARNING: Could not find 64-bit $MACHINE SDK" >&2;}
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find 64-bit $MACHINE SDK" >&5
+$as_echo "$as_me: WARNING: Could not find 64-bit $MACHINE SDK" >&2;}
 	    fi
-	    echo "$as_me:$LINENO: result:    Using 64-bit $MACHINE mode" >&5
-echo "${ECHO_T}   Using 64-bit $MACHINE mode" >&6
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: result:    Using 64-bit $MACHINE mode" >&5
+$as_echo "   Using 64-bit $MACHINE mode" >&6; }
 	fi
 
 	LIBS="netapi32.lib kernel32.lib user32.lib advapi32.lib userenv.lib ws2_32.lib"
 
 	case "x`echo \${VisualStudioVersion}`" in
@@ -3962,68 +4452,13 @@
 	    # The space-based-path will work for the Makefile, but will
 	    # not work if AC_TRY_COMPILE is called.  TEA has the
 	    # TEA_PATH_NOSPACE to avoid this issue.
 	    # Check if _WIN64 is already recognized, and if so we don't
 	    # need to modify CC.
-	    echo "$as_me:$LINENO: checking whether _WIN64 is declared" >&5
-echo $ECHO_N "checking whether _WIN64 is declared... $ECHO_C" >&6
-if test "${ac_cv_have_decl__WIN64+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-#ifndef _WIN64
-  char *p = (char *) _WIN64;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_have_decl__WIN64=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_have_decl__WIN64=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_have_decl__WIN64" >&5
-echo "${ECHO_T}$ac_cv_have_decl__WIN64" >&6
-if test $ac_cv_have_decl__WIN64 = yes; then
-  :
+	    ac_fn_c_check_decl "$LINENO" "_WIN64" "ac_cv_have_decl__WIN64" "$ac_includes_default"
+if test "x$ac_cv_have_decl__WIN64" = xyes; then :
+
 else
   CC="\"${PATH64}/cl.exe\" -I\"${MSSDK}/Include\" \
 			 -I\"${MSSDK}/Include/crt\" \
 			 -I\"${MSSDK}/Include/crt/sys\""
 fi
@@ -4046,115 +4481,11 @@
 	    CFLAGS_OPTIMIZE="-nologo -O2 ${runtime}"
 	    lflags="${lflags} -nologo"
 	    LINKBIN="link"
 	fi
 
-	if test "$doWince" != "no" ; then
-	    # Set defaults for common evc4/PPC2003 setup
-	    # Currently Tcl requires 300+, possibly 420+ for sockets
-	    CEVERSION=420; 		# could be 211 300 301 400 420 ...
-	    TARGETCPU=ARMV4;	# could be ARMV4 ARM MIPS SH3 X86 ...
-	    ARCH=ARM;		# could be ARM MIPS X86EM ...
-	    PLATFORM="Pocket PC 2003"; # or "Pocket PC 2002"
-	    if test "$doWince" != "yes"; then
-		# If !yes then the user specified something
-		# Reset ARCH to allow user to skip specifying it
-		ARCH=
-		eval `echo $doWince | awk -F "," '{ \
-	if (length($1)) { printf "CEVERSION=\"%s\"\n", $1; \
-	if ($1 < 400)	  { printf "PLATFORM=\"Pocket PC 2002\"\n" } }; \
-	if (length($2)) { printf "TARGETCPU=\"%s\"\n", toupper($2) }; \
-	if (length($3)) { printf "ARCH=\"%s\"\n", toupper($3) }; \
-	if (length($4)) { printf "PLATFORM=\"%s\"\n", $4 }; \
-		}'`
-		if test "x${ARCH}" = "x" ; then
-		    ARCH=$TARGETCPU;
-		fi
-	    fi
-	    OSVERSION=WCE$CEVERSION;
-	    if test "x${WCEROOT}" = "x" ; then
-		WCEROOT="C:/Program Files/Microsoft eMbedded C++ 4.0"
-		if test ! -d "${WCEROOT}" ; then
-		    WCEROOT="C:/Program Files/Microsoft eMbedded Tools"
-		fi
-	    fi
-	    if test "x${SDKROOT}" = "x" ; then
-		SDKROOT="C:/Program Files/Windows CE Tools"
-		if test ! -d "${SDKROOT}" ; then
-		    SDKROOT="C:/Windows CE Tools"
-		fi
-	    fi
-	    # The space-based-path will work for the Makefile, but will
-	    # not work if AC_TRY_COMPILE is called.
-	    WCEROOT=`echo "$WCEROOT" | sed -e 's!\\\!/!g'`
-	    SDKROOT=`echo "$SDKROOT" | sed -e 's!\\\!/!g'`
-	    CELIB_DIR=`echo "$CELIB_DIR" | sed -e 's!\\\!/!g'`
-	    if test ! -d "${CELIB_DIR}/inc"; then
-		{ { echo "$as_me:$LINENO: error: Invalid celib directory \"${CELIB_DIR}\"" >&5
-echo "$as_me: error: Invalid celib directory \"${CELIB_DIR}\"" >&2;}
-   { (exit 1); exit 1; }; }
-	    fi
-	    if test ! -d "${SDKROOT}/${OSVERSION}/${PLATFORM}/Lib/${TARGETCPU}"\
-		-o ! -d "${WCEROOT}/EVC/${OSVERSION}/bin"; then
-		{ { echo "$as_me:$LINENO: error: could not find PocketPC SDK or target compiler to enable WinCE mode $CEVERSION,$TARGETCPU,$ARCH,$PLATFORM" >&5
-echo "$as_me: error: could not find PocketPC SDK or target compiler to enable WinCE mode $CEVERSION,$TARGETCPU,$ARCH,$PLATFORM" >&2;}
-   { (exit 1); exit 1; }; }
-	    else
-		CEINCLUDE="${SDKROOT}/${OSVERSION}/${PLATFORM}/include"
-		if test -d "${CEINCLUDE}/${TARGETCPU}" ; then
-		    CEINCLUDE="${CEINCLUDE}/${TARGETCPU}"
-		fi
-		CELIBPATH="${SDKROOT}/${OSVERSION}/${PLATFORM}/Lib/${TARGETCPU}"
-	    fi
-	fi
-
-	if test "$doWince" != "no" ; then
-	    CEBINROOT="${WCEROOT}/EVC/${OSVERSION}/bin"
-	    if test "${TARGETCPU}" = "X86"; then
-		CC="${CEBINROOT}/cl.exe"
-	    else
-		CC="${CEBINROOT}/cl${ARCH}.exe"
-	    fi
-	    CC="\"${CC}\" -I\"${CELIB_DIR}/inc\" -I\"${CEINCLUDE}\""
-	    RC="\"${WCEROOT}/Common/EVC/bin/rc.exe\""
-	    arch=`echo ${ARCH} | awk '{print tolower($0)}'`
-	    defs="${ARCH} _${ARCH}_ ${arch} PALM_SIZE _MT _DLL _WINDOWS"
-	    for i in $defs ; do
-		cat >>confdefs.h <<_ACEOF
-#define $i 1
-_ACEOF
-
-	    done
-#	    if test "${ARCH}" = "X86EM"; then
-#		AC_DEFINE_UNQUOTED(_WIN32_WCE_EMULATION)
-#	    fi
-	    cat >>confdefs.h <<_ACEOF
-#define _WIN32_WCE $CEVERSION
-_ACEOF
-
-	    cat >>confdefs.h <<_ACEOF
-#define UNDER_CE $CEVERSION
-_ACEOF
-
-	    CFLAGS_DEBUG="-nologo -Zi -Od"
-	    CFLAGS_OPTIMIZE="-nologo -O2"
-	    lversion=`echo ${CEVERSION} | sed -e 's/\(.\)\(..\)/\1\.\2/'`
-	    lflags="-nodefaultlib -MACHINE:${ARCH} -LIBPATH:\"${CELIBPATH}\" -subsystem:windowsce,${lversion} -nologo"
-	    LINKBIN="\"${CEBINROOT}/link.exe\""
-
-	    if test "${CEVERSION}" -lt 400 ; then
-		LIBS="coredll.lib corelibc.lib winsock.lib"
-	    else
-		LIBS="coredll.lib corelibc.lib ws2.lib"
-	    fi
-	    # celib currently stuck at wce300 status
-	    #LIBS="$LIBS \${CELIB_DIR}/wince-${ARCH}-pocket-${OSVERSION}-release/celib.lib"
-	    LIBS="$LIBS \"\${CELIB_DIR}/wince-${ARCH}-pocket-wce300-release/celib.lib\""
-	    LIBS_GUI="commctrl.lib commdlg.lib"
-	else
-	    LIBS_GUI="gdi32.lib comdlg32.lib imm32.lib comctl32.lib shell32.lib uuid.lib"
-	fi
+	LIBS_GUI="gdi32.lib comdlg32.lib imm32.lib comctl32.lib shell32.lib uuid.lib"
 
 	SHLIB_LD="${LINKBIN} -dll -incremental:no ${lflags}"
 	SHLIB_LD_LIBS='${LIBS}'
 	# link -lib only works when -lib is the first arg
 	STLIB_LD="${LINKBIN} -lib ${lflags}"
@@ -4181,40 +4512,34 @@
 	CC_OBJNAME="-Fo\$@"
 	CC_EXENAME="-Fe\"\$(shell \$(CYGPATH) '\$@')\""
 
 	# Specify linker flags depending on the type of app being
 	# built -- Console vs. Window.
-	if test "$doWince" != "no" -a "${TARGETCPU}" != "X86"; then
+	if test "${TARGETCPU}" != "X86"; then
 	    LDFLAGS_CONSOLE="-link ${lflags}"
 	    LDFLAGS_WINDOW=${LDFLAGS_CONSOLE}
 	else
 	    LDFLAGS_CONSOLE="-link -subsystem:console ${lflags}"
 	    LDFLAGS_WINDOW="-link -subsystem:windows ${lflags}"
 	fi
     fi
 
     if test "$do64bit" != "no" ; then
-	cat >>confdefs.h <<\_ACEOF
-#define TCL_CFG_DO64BIT 1
-_ACEOF
+	$as_echo "#define TCL_CFG_DO64BIT 1" >>confdefs.h
 
     fi
 
     if test "${GCC}" = "yes" ; then
-	echo "$as_me:$LINENO: checking for SEH support in compiler" >&5
-echo $ECHO_N "checking for SEH support in compiler... $ECHO_C" >&6
-if test "${tcl_cv_seh+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SEH support in compiler" >&5
+$as_echo_n "checking for SEH support in compiler... " >&6; }
+if ${tcl_cv_seh+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  if test "$cross_compiling" = yes; then
+  if test "$cross_compiling" = yes; then :
   tcl_cv_seh=no
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 	    #define WIN32_LEAN_AND_MEAN
 	    #include <windows.h>
 	    #undef WIN32_LEAN_AND_MEAN
@@ -4229,60 +4554,41 @@
 		}
 		return 1;
 	    }
 
 _ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_run "$LINENO"; then :
   tcl_cv_seh=yes
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-tcl_cv_seh=no
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
+  tcl_cv_seh=no
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
 
 fi
-echo "$as_me:$LINENO: result: $tcl_cv_seh" >&5
-echo "${ECHO_T}$tcl_cv_seh" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_seh" >&5
+$as_echo "$tcl_cv_seh" >&6; }
 	if test "$tcl_cv_seh" = "no" ; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_NO_SEH 1
-_ACEOF
+$as_echo "#define HAVE_NO_SEH 1" >>confdefs.h
 
 	fi
 
 	#
 	# Check to see if the excpt.h include file provided contains the
 	# definition for EXCEPTION_DISPOSITION; if not, which is the case
 	# with Cygwin's version as of 2002-04-10, define it to be int,
 	# sufficient for getting the current code to work.
 	#
-	echo "$as_me:$LINENO: checking for EXCEPTION_DISPOSITION support in include files" >&5
-echo $ECHO_N "checking for EXCEPTION_DISPOSITION support in include files... $ECHO_C" >&6
-if test "${tcl_cv_eh_disposition+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EXCEPTION_DISPOSITION support in include files" >&5
+$as_echo_n "checking for EXCEPTION_DISPOSITION support in include files... " >&6; }
+if ${tcl_cv_eh_disposition+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #	    define WIN32_LEAN_AND_MEAN
 #	    include <windows.h>
 #	    undef WIN32_LEAN_AND_MEAN
@@ -4295,66 +4601,36 @@
 
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   tcl_cv_eh_disposition=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-tcl_cv_eh_disposition=no
+  tcl_cv_eh_disposition=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:$LINENO: result: $tcl_cv_eh_disposition" >&5
-echo "${ECHO_T}$tcl_cv_eh_disposition" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_eh_disposition" >&5
+$as_echo "$tcl_cv_eh_disposition" >&6; }
 	if test "$tcl_cv_eh_disposition" = "no" ; then
 
-cat >>confdefs.h <<\_ACEOF
-#define EXCEPTION_DISPOSITION int
-_ACEOF
+$as_echo "#define EXCEPTION_DISPOSITION int" >>confdefs.h
 
 	fi
 
 	# Check to see if winnt.h defines CHAR, SHORT, and LONG
 	# even if VOID has already been #defined. The win32api
 	# used by mingw and cygwin is known to do this.
 
-	echo "$as_me:$LINENO: checking for winnt.h that ignores VOID define" >&5
-echo $ECHO_N "checking for winnt.h that ignores VOID define... $ECHO_C" >&6
-if test "${tcl_cv_winnt_ignore_void+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for winnt.h that ignores VOID define" >&5
+$as_echo_n "checking for winnt.h that ignores VOID define... " >&6; }
+if ${tcl_cv_winnt_ignore_void+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 		#define VOID void
 		#define WIN32_LEAN_AND_MEAN
 		#include <windows.h>
@@ -4370,66 +4646,36 @@
 
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   tcl_cv_winnt_ignore_void=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-tcl_cv_winnt_ignore_void=no
+  tcl_cv_winnt_ignore_void=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:$LINENO: result: $tcl_cv_winnt_ignore_void" >&5
-echo "${ECHO_T}$tcl_cv_winnt_ignore_void" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_winnt_ignore_void" >&5
+$as_echo "$tcl_cv_winnt_ignore_void" >&6; }
 	if test "$tcl_cv_winnt_ignore_void" = "yes" ; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_WINNT_IGNORE_VOID 1
-_ACEOF
+$as_echo "#define HAVE_WINNT_IGNORE_VOID 1" >>confdefs.h
 
 	fi
 
 	# See if the compiler supports casting to a union type.
 	# This is used to stop gcc from printing a compiler
 	# warning when initializing a union member.
 
-	echo "$as_me:$LINENO: checking for cast to union support" >&5
-echo $ECHO_N "checking for cast to union support... $ECHO_C" >&6
-if test "${tcl_cv_cast_to_union+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cast to union support" >&5
+$as_echo_n "checking for cast to union support... " >&6; }
+if ${tcl_cv_cast_to_union+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
 main ()
 {
@@ -4439,49 +4685,23 @@
 
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_compile "$LINENO"; then :
   tcl_cv_cast_to_union=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-tcl_cv_cast_to_union=no
+  tcl_cv_cast_to_union=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
-echo "$as_me:$LINENO: result: $tcl_cv_cast_to_union" >&5
-echo "${ECHO_T}$tcl_cv_cast_to_union" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_cast_to_union" >&5
+$as_echo "$tcl_cv_cast_to_union" >&6; }
 	if test "$tcl_cv_cast_to_union" = "yes"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_CAST_TO_UNION 1
-_ACEOF
+$as_echo "#define HAVE_CAST_TO_UNION 1" >>confdefs.h
 
 	fi
     fi
 
     # DL_LIBS is empty, but then we match the Unix version
@@ -4493,149 +4713,13 @@
 
 #--------------------------------------------------------------------
 # man2tcl needs this so that it can use errno.h
 #--------------------------------------------------------------------
 
-if test "${ac_cv_header_errno_h+set}" = set; then
-  echo "$as_me:$LINENO: checking for errno.h" >&5
-echo $ECHO_N "checking for errno.h... $ECHO_C" >&6
-if test "${ac_cv_header_errno_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_errno_h" >&5
-echo "${ECHO_T}$ac_cv_header_errno_h" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking errno.h usability" >&5
-echo $ECHO_N "checking errno.h usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <errno.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking errno.h presence" >&5
-echo $ECHO_N "checking errno.h presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <errno.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: errno.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: errno.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: errno.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: errno.h: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: errno.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: errno.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: errno.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: errno.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: errno.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: errno.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: errno.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: errno.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: errno.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: errno.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: errno.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: errno.h: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists.  ##
-## ------------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for errno.h" >&5
-echo $ECHO_N "checking for errno.h... $ECHO_C" >&6
-if test "${ac_cv_header_errno_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_header_errno_h=$ac_header_preproc
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_errno_h" >&5
-echo "${ECHO_T}$ac_cv_header_errno_h" >&6
-
-fi
-if test $ac_cv_header_errno_h = yes; then
-  :
+ac_fn_c_check_header_mongrel "$LINENO" "errno.h" "ac_cv_header_errno_h" "$ac_includes_default"
+if test "x$ac_cv_header_errno_h" = xyes; then :
+
 else
   MAN2TCLFLAGS="-DNO_ERRNO_H"
 fi
 
 
@@ -4643,21 +4727,17 @@
 
 #-------------------------------------------
 #     Check for _strtoi64
 #-------------------------------------------
 
-echo "$as_me:$LINENO: checking availability of _strtoi64" >&5
-echo $ECHO_N "checking availability of _strtoi64... $ECHO_C" >&6
-if test "${tcl_cv_strtoi64+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking availability of _strtoi64" >&5
+$as_echo_n "checking availability of _strtoi64... " >&6; }
+if ${tcl_cv_strtoi64+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
 
-    cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdlib.h>
 int
 main ()
 {
@@ -4664,168 +4744,46 @@
 _strtoi64(0,0,0)
   ;
   return 0;
 }
 _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
+if ac_fn_c_try_link "$LINENO"; then :
   tcl_cv_strtoi64=yes
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-tcl_cv_strtoi64=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $tcl_cv_strtoi64" >&5
-echo "${ECHO_T}$tcl_cv_strtoi64" >&6
+  tcl_cv_strtoi64=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $tcl_cv_strtoi64" >&5
+$as_echo "$tcl_cv_strtoi64" >&6; }
 if test $tcl_cv_strtoi64 = no; then
 
-cat >>confdefs.h <<\_ACEOF
-#define NO_STRTOI64 1
-_ACEOF
+$as_echo "#define NO_STRTOI64 1" >>confdefs.h
 
 fi
 
 #--------------------------------------------------------------------
 # Windows XP theme engine header for Ttk
 #--------------------------------------------------------------------
 
-echo "$as_me:$LINENO: checking for uxtheme.h" >&5
-echo $ECHO_N "checking for uxtheme.h... $ECHO_C" >&6
-if test "${ac_cv_header_uxtheme_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <windows.h>
-
-#include <uxtheme.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_header_uxtheme_h=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_header_uxtheme_h=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_uxtheme_h" >&5
-echo "${ECHO_T}$ac_cv_header_uxtheme_h" >&6
-if test $ac_cv_header_uxtheme_h = yes; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_UXTHEME_H 1
-_ACEOF
-
-else
-  { echo "$as_me:$LINENO: xpnative theme will be unavailable" >&5
-echo "$as_me: xpnative theme will be unavailable" >&6;}
-fi
-
-
-echo "$as_me:$LINENO: checking for vssym32.h" >&5
-echo $ECHO_N "checking for vssym32.h... $ECHO_C" >&6
-if test "${ac_cv_header_vssym32_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <windows.h>
-#include <uxtheme.h>
-
-#include <vssym32.h>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_header_vssym32_h=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_header_vssym32_h=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_vssym32_h" >&5
-echo "${ECHO_T}$ac_cv_header_vssym32_h" >&6
-if test $ac_cv_header_vssym32_h = yes; then
-  cat >>confdefs.h <<\_ACEOF
-#define HAVE_VSSYM32_H 1
-_ACEOF
+ac_fn_c_check_header_compile "$LINENO" "uxtheme.h" "ac_cv_header_uxtheme_h" "#include <windows.h>
+"
+if test "x$ac_cv_header_uxtheme_h" = xyes; then :
+  $as_echo "#define HAVE_UXTHEME_H 1" >>confdefs.h
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: xpnative theme will be unavailable" >&5
+$as_echo "$as_me: xpnative theme will be unavailable" >&6;}
+fi
+
+
+ac_fn_c_check_header_compile "$LINENO" "vssym32.h" "ac_cv_header_vssym32_h" "#include <windows.h>
+#include <uxtheme.h>
+"
+if test "x$ac_cv_header_vssym32_h" = xyes; then :
+  $as_echo "#define HAVE_VSSYM32_H 1" >>confdefs.h
 
 fi
 
 
 
@@ -4834,76 +4792,66 @@
 # option.  This macro depends on C flags, and should be called
 # after SC_CONFIG_CFLAGS macro is called.
 #--------------------------------------------------------------------
 
 
-    echo "$as_me:$LINENO: checking for build with symbols" >&5
-echo $ECHO_N "checking for build with symbols... $ECHO_C" >&6
-    # Check whether --enable-symbols or --disable-symbols was given.
-if test "${enable_symbols+set}" = set; then
-  enableval="$enable_symbols"
-  tcl_ok=$enableval
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for build with symbols" >&5
+$as_echo_n "checking for build with symbols... " >&6; }
+    # Check whether --enable-symbols was given.
+if test "${enable_symbols+set}" = set; then :
+  enableval=$enable_symbols; tcl_ok=$enableval
 else
   tcl_ok=no
-fi;
+fi
+
 # FIXME: Currently, LDFLAGS_DEFAULT is not used, it should work like CFLAGS_DEFAULT.
     if test "$tcl_ok" = "no"; then
 	CFLAGS_DEFAULT='$(CFLAGS_OPTIMIZE)'
 	LDFLAGS_DEFAULT='$(LDFLAGS_OPTIMIZE)'
 	DBGX=""
 
-cat >>confdefs.h <<\_ACEOF
-#define NDEBUG 1
-_ACEOF
-
-	echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-
-	cat >>confdefs.h <<\_ACEOF
-#define TCL_CFG_OPTIMIZED 1
-_ACEOF
+$as_echo "#define NDEBUG 1" >>confdefs.h
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+	$as_echo "#define TCL_CFG_OPTIMIZED 1" >>confdefs.h
 
     else
 	CFLAGS_DEFAULT='$(CFLAGS_DEBUG)'
 	LDFLAGS_DEFAULT='$(LDFLAGS_DEBUG)'
 	DBGX=g
 	if test "$tcl_ok" = "yes"; then
-	    echo "$as_me:$LINENO: result: yes (standard debugging)" >&5
-echo "${ECHO_T}yes (standard debugging)" >&6
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (standard debugging)" >&5
+$as_echo "yes (standard debugging)" >&6; }
 	fi
     fi
 
 
 
     if test "$tcl_ok" = "mem" -o "$tcl_ok" = "all"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define TCL_MEM_DEBUG 1
-_ACEOF
+$as_echo "#define TCL_MEM_DEBUG 1" >>confdefs.h
 
     fi
 
     if test "$tcl_ok" = "compile" -o "$tcl_ok" = "all"; then
 
-cat >>confdefs.h <<\_ACEOF
-#define TCL_COMPILE_DEBUG 1
-_ACEOF
+$as_echo "#define TCL_COMPILE_DEBUG 1" >>confdefs.h
 
 
-cat >>confdefs.h <<\_ACEOF
-#define TCL_COMPILE_STATS 1
-_ACEOF
+$as_echo "#define TCL_COMPILE_STATS 1" >>confdefs.h
 
     fi
 
     if test "$tcl_ok" != "yes" -a "$tcl_ok" != "no"; then
 	if test "$tcl_ok" = "all"; then
-	    echo "$as_me:$LINENO: result: enabled symbols mem compile debugging" >&5
-echo "${ECHO_T}enabled symbols mem compile debugging" >&6
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: enabled symbols mem compile debugging" >&5
+$as_echo "enabled symbols mem compile debugging" >&6; }
 	else
-	    echo "$as_me:$LINENO: result: enabled $tcl_ok debugging" >&5
-echo "${ECHO_T}enabled $tcl_ok debugging" >&6
+	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: enabled $tcl_ok debugging" >&5
+$as_echo "enabled $tcl_ok debugging" >&6; }
 	fi
     fi
 
 
 TK_DBGX=${DBGX}
@@ -4911,40 +4859,36 @@
 #--------------------------------------------------------------------
 # Embed the manifest if we can determine how
 #--------------------------------------------------------------------
 
 
-    echo "$as_me:$LINENO: checking whether to embed manifest" >&5
-echo $ECHO_N "checking whether to embed manifest... $ECHO_C" >&6
-    # Check whether --enable-embedded-manifest or --disable-embedded-manifest was given.
-if test "${enable_embedded_manifest+set}" = set; then
-  enableval="$enable_embedded_manifest"
-  embed_ok=$enableval
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to embed manifest" >&5
+$as_echo_n "checking whether to embed manifest... " >&6; }
+    # Check whether --enable-embedded-manifest was given.
+if test "${enable_embedded_manifest+set}" = set; then :
+  enableval=$enable_embedded_manifest; embed_ok=$enableval
 else
   embed_ok=yes
-fi;
+fi
+
 
     VC_MANIFEST_EMBED_DLL=
     VC_MANIFEST_EMBED_EXE=
     result=no
     if test "$embed_ok" = "yes" -a "${SHARED_BUILD}" = "1" \
        -a "$GCC" != "yes" ; then
 	# Add the magic to embed the manifest into the dll/exe
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
+	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #if defined(_MSC_VER) && _MSC_VER >= 1400
 print("manifest needed")
 #endif
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "manifest needed" >/dev/null 2>&1; then
+  $EGREP "manifest needed" >/dev/null 2>&1; then :
 
 	# Could do a CHECK_PROG for mt, but should always be with MSVC8+
 	# Could add 'if test -f' check, but manifest should be created
 	# in this compiler case
 	# Add in a manifest argument that may be specified
@@ -4959,30 +4903,30 @@
 
 fi
 rm -f conftest*
 
     fi
-    echo "$as_me:$LINENO: result: $result" >&5
-echo "${ECHO_T}$result" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
 
 
 
 
 
-    echo "$as_me:$LINENO: checking for tclsh in Tcl build directory" >&5
-echo $ECHO_N "checking for tclsh in Tcl build directory... $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tclsh in Tcl build directory" >&5
+$as_echo_n "checking for tclsh in Tcl build directory... " >&6; }
     BUILD_TCLSH=${TCL_BIN_DIR}/tclsh${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}${TCL_DBGX}${EXEEXT}
-    echo "$as_me:$LINENO: result: $BUILD_TCLSH" >&5
-echo "${ECHO_T}$BUILD_TCLSH" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILD_TCLSH" >&5
+$as_echo "$BUILD_TCLSH" >&6; }
 
 
 
-    echo "$as_me:$LINENO: checking for tclsh" >&5
-echo $ECHO_N "checking for tclsh... $ECHO_C" >&6
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tclsh" >&5
+$as_echo_n "checking for tclsh... " >&6; }
 
-    if test "${ac_cv_path_tclsh+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+    if ${ac_cv_path_tclsh+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
 
 	search_path=`echo ${PATH} | sed -e 's/:/ /g'`
 	for dir in $search_path ; do
 	    for j in `ls -r $dir/tclsh[8-9]*.exe 2> /dev/null` \
@@ -4999,17 +4943,17 @@
 fi
 
 
     if test -f "$ac_cv_path_tclsh" ; then
 	TCLSH_PROG="$ac_cv_path_tclsh"
-	echo "$as_me:$LINENO: result: $TCLSH_PROG" >&5
-echo "${ECHO_T}$TCLSH_PROG" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $TCLSH_PROG" >&5
+$as_echo "$TCLSH_PROG" >&6; }
     else
 	# It is not an error if an installed version of Tcl can't be located.
 	TCLSH_PROG=""
-	echo "$as_me:$LINENO: result: No tclsh found on PATH" >&5
-echo "${ECHO_T}No tclsh found on PATH" >&6
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: No tclsh found on PATH" >&5
+$as_echo "No tclsh found on PATH" >&6; }
     fi
 
 
 
 #------------------------------------------------------------------------
@@ -5168,11 +5112,12 @@
 
 
 
 
 
-                              ac_config_files="$ac_config_files Makefile tkConfig.sh wish.exe.manifest"
+ac_config_files="$ac_config_files Makefile tkConfig.sh wish.exe.manifest"
+
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
 # scripts and configure runs, see configure's option --config-cache.
 # It is not useful on other systems.  If it contains results you don't
@@ -5187,512 +5132,653 @@
 
 _ACEOF
 
 # The following way of writing the cache mishandles newlines in values,
 # but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
+# So, we kill variables containing newlines.
 # Ultrix sh set writes to stderr and can't be redirected directly,
 # and sets the high bit in the cache file unless we assign to the vars.
-{
+(
+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
+    eval ac_val=\$$ac_var
+    case $ac_val in #(
+    *${as_nl}*)
+      case $ac_var in #(
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      esac
+      case $ac_var in #(
+      _ | IFS | as_nl) ;; #(
+      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+      *) { eval $ac_var=; unset $ac_var;} ;;
+      esac ;;
+    esac
+  done
+
   (set) 2>&1 |
-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
+    *${as_nl}ac_space=\ *)
+      # `set' does not quote correctly, so add quotes: double-quote
+      # substitution turns \\\\ into \\, and sed turns \\ into \.
       sed -n \
 	"s/'/'\\\\''/g;
 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;;
+      ;; #(
     *)
       # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
       ;;
-    esac;
-} |
+    esac |
+    sort
+) |
   sed '
+     /^ac_cv_env_/b end
      t clear
-     : clear
+     :clear
      s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
      t end
-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
-  if test -w $cache_file; then
-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-    cat confcache >$cache_file
+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+     :end' >>confcache
+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+  if test -w "$cache_file"; then
+    if test "x$cache_file" != "x/dev/null"; then
+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
+      if test ! -f "$cache_file" || test -h "$cache_file"; then
+	cat confcache >"$cache_file"
+      else
+        case $cache_file in #(
+        */* | ?:*)
+	  mv -f confcache "$cache_file"$$ &&
+	  mv -f "$cache_file"$$ "$cache_file" ;; #(
+        *)
+	  mv -f confcache "$cache_file" ;;
+	esac
+      fi
+    fi
   else
-    echo "not updating unwritable cache $cache_file"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
 
 test "x$prefix" = xNONE && prefix=$ac_default_prefix
 # Let make expand exec_prefix.
 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
 
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/;
-s/:*\${srcdir}:*/:/;
-s/:*@srcdir@:*/:/;
-s/^\([^=]*=[	 ]*\):*/\1/;
-s/:*$//;
-s/^[^=]*=[	 ]*$//;
-}'
-fi
-
 # Transform confdefs.h into DEFS.
 # Protect against shell expansion while executing Makefile rules.
 # Protect against Makefile macro expansion.
 #
 # If the first sed substitution is executed (which looks for macros that
-# take arguments), then we branch to the quote section.  Otherwise,
-# look for a macro that doesn't take arguments.
-cat >confdef2opt.sed <<\_ACEOF
-t clear
-: clear
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*([^)]*)\)[	 ]*\(.*\),-D\1=\2,g
-t quote
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\),-D\1=\2,g
-t quote
-d
-: quote
-s,[	 `~#$^&*(){}\\|;'"<>?],\\&,g
-s,\[,\\&,g
-s,\],\\&,g
-s,\$,$$,g
-p
-_ACEOF
-# We use echo to avoid assuming a particular line-breaking character.
-# The extra dot is to prevent the shell from consuming trailing
-# line-breaks from the sub-command output.  A line-break within
-# single-quotes doesn't work because, if this script is created in a
-# platform that uses two characters for line-breaks (e.g., DOS), tr
-# would break.
-ac_LF_and_DOT=`echo; echo .`
-DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
-rm -f confdef2opt.sed
+# take arguments), then branch to the quote section.  Otherwise,
+# look for a macro that doesn't take arguments.
+ac_script='
+:mline
+/\\$/{
+ N
+ s,\\\n,,
+ b mline
+}
+t clear
+:clear
+s/^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*([^)]*)\)[	 ]*\(.*\)/-D\1=\2/g
+t quote
+s/^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\)/-D\1=\2/g
+t quote
+b any
+:quote
+s/[	 `~#$^&*(){}\\|;'\''"<>?]/\\&/g
+s/\[/\\&/g
+s/\]/\\&/g
+s/\$/$$/g
+H
+:any
+${
+	g
+	s/^\n//
+	s/\n/ /g
+	p
+}
+'
+DEFS=`sed -n "$ac_script" confdefs.h`
 
 
 ac_libobjs=
 ac_ltlibobjs=
+U=
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
-  ac_i=`echo "$ac_i" |
-	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
-  # 2. Add them.
-  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
+  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+  # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
+  #    will be set to the directory where LIBOBJS objects are built.
+  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
 done
 LIBOBJS=$ac_libobjs
 
 LTLIBOBJS=$ac_ltlibobjs
 
 
 
-: ${CONFIG_STATUS=./config.status}
+: "${CONFIG_STATUS=./config.status}"
+ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+as_write_fail=0
+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
 # Compiler output produced by configure, useful for debugging
 # configure, is in config.log if it exists.
 
 debug=false
 ac_cs_recheck=false
 ac_cs_silent=false
+
 SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+export SHELL
+_ASEOF
+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
+case $0 in #((
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
+fi
+
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
 PS1='$ '
 PS2='> '
 PS4='+ '
 
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-done
+  $as_echo "$as_me: error: $2" >&2
+  as_fn_exit $as_status
+} # as_fn_error
 
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
   as_expr=expr
 else
   as_expr=false
 fi
 
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
   as_basename=basename
 else
   as_basename=false
 fi
 
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
 
-# Name of the executable.
-as_me=`$as_basename "$0" ||
+as_me=`$as_basename -- "$0" ||
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
 # Avoid depending upon Character Ranges.
 as_cr_letters='abcdefghijklmnopqrstuvwxyz'
 as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
 as_cr_Letters=$as_cr_letters$as_cr_LETTERS
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in #(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -pR'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -pR'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -pR'
+  fi
+else
+  as_ln_s='cp -pR'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p='mkdir -p "$as_dir"'
 else
   test -d ./-p && rmdir ./-p
   as_mkdir_p=false
 fi
 
-as_executable_p="test -f"
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
 
 # Sed expression to map a string onto a valid variable name.
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
 exec 6>&1
+## ----------------------------------- ##
+## Main body of $CONFIG_STATUS script. ##
+## ----------------------------------- ##
+_ASEOF
+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
 
-# Open the log real soon, to keep \$[0] and so on meaningful, and to
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# Save the log message, to keep $0 and so on meaningful, and to
 # report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.  Logging --version etc. is OK.
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-} >&5
-cat >&5 <<_CSEOF
-
+# values after options handling.
+ac_log="
 This file was extended by $as_me, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
   CONFIG_LINKS    = $CONFIG_LINKS
   CONFIG_COMMANDS = $CONFIG_COMMANDS
   $ $0 $@
 
-_CSEOF
-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
-echo >&5
+on `(hostname || uname -n) 2>/dev/null | sed 1q`
+"
+
 _ACEOF
 
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
+
+
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 # Files that config.status was made for.
-if test -n "$ac_config_files"; then
-  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_headers"; then
-  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_links"; then
-  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_commands"; then
-  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
+config_files="$ac_config_files"
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
+\`$as_me' instantiates files and other configuration actions
+from templates according to the current configuration.  Unless the files
+and actions are specified as TAGs, all are instantiated by default.
 
-Usage: $0 [OPTIONS] [FILE]...
+Usage: $0 [OPTION]... [TAG]...
 
   -h, --help       print this help, then exit
-  -V, --version    print version number, then exit
-  -q, --quiet      do not print progress messages
+  -V, --version    print version number and configuration settings, then exit
+      --config     print configuration, then exit
+  -q, --quiet, --silent
+                   do not print progress messages
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
+      --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
 
 Configuration files:
 $config_files
 
-Report bugs to <bug-autoconf@gnu.org>."
+Report bugs to the package provider."
+
 _ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
 config.status
-configured by $0, generated by GNU Autoconf 2.59,
-  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.69,
+  with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2003 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
-srcdir=$srcdir
+
+ac_pwd='$ac_pwd'
+srcdir='$srcdir'
+test -n "\$AWK" || AWK=awk
 _ACEOF
 
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
 ac_need_defaults=:
 while test $# != 0
 do
   case $1 in
-  --*=*)
-    ac_option=`expr "x$1" : 'x\([^=]*\)='`
-    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
+  --*=?*)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+    ac_shift=:
+    ;;
+  --*=)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=
     ac_shift=:
     ;;
-  -*)
+  *)
     ac_option=$1
     ac_optarg=$2
     ac_shift=shift
     ;;
-  *) # This is not an option, so the user has probably given explicit
-     # arguments.
-     ac_option=$1
-     ac_need_defaults=false;;
   esac
 
   case $ac_option in
   # Handling of the options.
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
-  --version | --vers* | -V )
-    echo "$ac_cs_version"; exit 0 ;;
-  --he | --h)
-    # Conflict between --help and --header
-    { { echo "$as_me:$LINENO: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; };;
-  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit 0 ;;
-  --debug | --d* | -d )
+  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+    $as_echo "$ac_cs_version"; exit ;;
+  --config | --confi | --conf | --con | --co | --c )
+    $as_echo "$ac_cs_config"; exit ;;
+  --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    '') as_fn_error $? "missing file argument" ;;
+    esac
+    as_fn_append CONFIG_FILES " '$ac_optarg'"
     ac_need_defaults=false;;
+  --he | --h |  --help | --hel | -h )
+    $as_echo "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; } ;;
+  -*) as_fn_error $? "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
 
-  *) ac_config_targets="$ac_config_targets $1" ;;
+  *) as_fn_append ac_config_targets " $1"
+     ac_need_defaults=false ;;
 
   esac
   shift
 done
 
@@ -5702,35 +5788,49 @@
   exec 6>/dev/null
   ac_configure_extra_args="$ac_configure_extra_args --silent"
 fi
 
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  shift
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+  CONFIG_SHELL='$SHELL'
+  export CONFIG_SHELL
+  exec "\$@"
 fi
 
 _ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+exec 5>>config.log
+{
+  echo
+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## Running $as_me. ##
+_ASBOX
+  $as_echo "$ac_log"
+} >&5
 
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACEOF
 
-
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 
-
-cat >>$CONFIG_STATUS <<\_ACEOF
+# Handling of arguments.
 for ac_config_target in $ac_config_targets
 do
-  case "$ac_config_target" in
-  # Handling of arguments.
-  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-  "tkConfig.sh" ) CONFIG_FILES="$CONFIG_FILES tkConfig.sh" ;;
-  "wish.exe.manifest" ) CONFIG_FILES="$CONFIG_FILES wish.exe.manifest" ;;
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
+  case $ac_config_target in
+    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+    "tkConfig.sh") CONFIG_FILES="$CONFIG_FILES tkConfig.sh" ;;
+    "wish.exe.manifest") CONFIG_FILES="$CONFIG_FILES wish.exe.manifest" ;;
+
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
 done
+
 
 # If the user did not use the arguments to specify the items to instantiate,
 # then the envvar interface is used.  Set only those that are not.
 # We use the long form for the default assignment because of an extremely
 # bizarre bug on SunOS 4.1.3.
@@ -5737,421 +5837,417 @@
 if $ac_need_defaults; then
   test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
 fi
 
 # Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason to put it here, and in addition,
+# simply because there is no reason against having it here, and in addition,
 # creating and moving files from /tmp can sometimes cause problems.
-# Create a temporary directory, and hook for its removal unless debugging.
+# Hook for its removal unless debugging.
+# Note that there is a small window in which the directory will not be cleaned:
+# after its creation but before its name has been assigned to `$tmp'.
 $debug ||
 {
-  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
+  tmp= ac_tmp=
+  trap 'exit_status=$?
+  : "${ac_tmp:=$tmp}"
+  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
+' 0
+  trap 'as_fn_exit 1' 1 2 13 15
 }
-
 # Create a (secure) tmp directory for tmp files.
 
 {
-  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./confstat$$-$RANDOM
-  (umask 077 && mkdir $tmp)
-} ||
-{
-   echo "$me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-
-#
-# CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
-if test -n "\$CONFIG_FILES"; then
-  # Protect against being on the right side of a sed subst in config.status.
-  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
-   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
-s,@SHELL@,$SHELL,;t t
-s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
-s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
-s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
-s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
-s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
-s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
-s,@exec_prefix@,$exec_prefix,;t t
-s,@prefix@,$prefix,;t t
-s,@program_transform_name@,$program_transform_name,;t t
-s,@bindir@,$bindir,;t t
-s,@sbindir@,$sbindir,;t t
-s,@libexecdir@,$libexecdir,;t t
-s,@datadir@,$datadir,;t t
-s,@sysconfdir@,$sysconfdir,;t t
-s,@sharedstatedir@,$sharedstatedir,;t t
-s,@localstatedir@,$localstatedir,;t t
-s,@libdir@,$libdir,;t t
-s,@includedir@,$includedir,;t t
-s,@oldincludedir@,$oldincludedir,;t t
-s,@infodir@,$infodir,;t t
-s,@mandir@,$mandir,;t t
-s,@build_alias@,$build_alias,;t t
-s,@host_alias@,$host_alias,;t t
-s,@target_alias@,$target_alias,;t t
-s,@DEFS@,$DEFS,;t t
-s,@ECHO_C@,$ECHO_C,;t t
-s,@ECHO_N@,$ECHO_N,;t t
-s,@ECHO_T@,$ECHO_T,;t t
-s,@LIBS@,$LIBS,;t t
-s,@CC@,$CC,;t t
-s,@CFLAGS@,$CFLAGS,;t t
-s,@LDFLAGS@,$LDFLAGS,;t t
-s,@CPPFLAGS@,$CPPFLAGS,;t t
-s,@ac_ct_CC@,$ac_ct_CC,;t t
-s,@EXEEXT@,$EXEEXT,;t t
-s,@OBJEXT@,$OBJEXT,;t t
-s,@CPP@,$CPP,;t t
-s,@EGREP@,$EGREP,;t t
-s,@AR@,$AR,;t t
-s,@ac_ct_AR@,$ac_ct_AR,;t t
-s,@RANLIB@,$RANLIB,;t t
-s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
-s,@RC@,$RC,;t t
-s,@ac_ct_RC@,$ac_ct_RC,;t t
-s,@SET_MAKE@,$SET_MAKE,;t t
-s,@TCL_THREADS@,$TCL_THREADS,;t t
-s,@TCL_VERSION@,$TCL_VERSION,;t t
-s,@TCL_BIN_DIR@,$TCL_BIN_DIR,;t t
-s,@TCL_SRC_DIR@,$TCL_SRC_DIR,;t t
-s,@TCL_LIB_FILE@,$TCL_LIB_FILE,;t t
-s,@TCL_LIB_FLAG@,$TCL_LIB_FLAG,;t t
-s,@TCL_LIB_SPEC@,$TCL_LIB_SPEC,;t t
-s,@TCL_STUB_LIB_FILE@,$TCL_STUB_LIB_FILE,;t t
-s,@TCL_STUB_LIB_FLAG@,$TCL_STUB_LIB_FLAG,;t t
-s,@TCL_STUB_LIB_SPEC@,$TCL_STUB_LIB_SPEC,;t t
-s,@TCL_DEFS@,$TCL_DEFS,;t t
-s,@CYGPATH@,$CYGPATH,;t t
-s,@CELIB_DIR@,$CELIB_DIR,;t t
-s,@DL_LIBS@,$DL_LIBS,;t t
-s,@CFLAGS_DEBUG@,$CFLAGS_DEBUG,;t t
-s,@CFLAGS_OPTIMIZE@,$CFLAGS_OPTIMIZE,;t t
-s,@CFLAGS_WARNING@,$CFLAGS_WARNING,;t t
-s,@MAN2TCLFLAGS@,$MAN2TCLFLAGS,;t t
-s,@CFLAGS_DEFAULT@,$CFLAGS_DEFAULT,;t t
-s,@LDFLAGS_DEFAULT@,$LDFLAGS_DEFAULT,;t t
-s,@VC_MANIFEST_EMBED_DLL@,$VC_MANIFEST_EMBED_DLL,;t t
-s,@VC_MANIFEST_EMBED_EXE@,$VC_MANIFEST_EMBED_EXE,;t t
-s,@BUILD_TCLSH@,$BUILD_TCLSH,;t t
-s,@TCLSH_PROG@,$TCLSH_PROG,;t t
-s,@TK_WIN_VERSION@,$TK_WIN_VERSION,;t t
-s,@MACHINE@,$MACHINE,;t t
-s,@TK_VERSION@,$TK_VERSION,;t t
-s,@TK_MAJOR_VERSION@,$TK_MAJOR_VERSION,;t t
-s,@TK_MINOR_VERSION@,$TK_MINOR_VERSION,;t t
-s,@TK_PATCH_LEVEL@,$TK_PATCH_LEVEL,;t t
-s,@TK_DBGX@,$TK_DBGX,;t t
-s,@TK_LIB_FILE@,$TK_LIB_FILE,;t t
-s,@TK_DLL_FILE@,$TK_DLL_FILE,;t t
-s,@TK_STUB_LIB_FILE@,$TK_STUB_LIB_FILE,;t t
-s,@TK_STUB_LIB_FLAG@,$TK_STUB_LIB_FLAG,;t t
-s,@TK_BUILD_STUB_LIB_SPEC@,$TK_BUILD_STUB_LIB_SPEC,;t t
-s,@TK_SRC_DIR@,$TK_SRC_DIR,;t t
-s,@TK_BIN_DIR@,$TK_BIN_DIR,;t t
-s,@TCL_MAJOR_VERSION@,$TCL_MAJOR_VERSION,;t t
-s,@TCL_MINOR_VERSION@,$TCL_MINOR_VERSION,;t t
-s,@TCL_PATCH_LEVEL@,$TCL_PATCH_LEVEL,;t t
-s,@TCL_DBGX@,$TCL_DBGX,;t t
-s,@CFG_TK_SHARED_LIB_SUFFIX@,$CFG_TK_SHARED_LIB_SUFFIX,;t t
-s,@CFG_TK_UNSHARED_LIB_SUFFIX@,$CFG_TK_UNSHARED_LIB_SUFFIX,;t t
-s,@CFG_TK_EXPORT_FILE_SUFFIX@,$CFG_TK_EXPORT_FILE_SUFFIX,;t t
-s,@EXTRA_CFLAGS@,$EXTRA_CFLAGS,;t t
-s,@DEPARG@,$DEPARG,;t t
-s,@CC_OBJNAME@,$CC_OBJNAME,;t t
-s,@CC_EXENAME@,$CC_EXENAME,;t t
-s,@LDFLAGS_DEBUG@,$LDFLAGS_DEBUG,;t t
-s,@LDFLAGS_OPTIMIZE@,$LDFLAGS_OPTIMIZE,;t t
-s,@LDFLAGS_CONSOLE@,$LDFLAGS_CONSOLE,;t t
-s,@LDFLAGS_WINDOW@,$LDFLAGS_WINDOW,;t t
-s,@TK_RES@,$TK_RES,;t t
-s,@STLIB_LD@,$STLIB_LD,;t t
-s,@SHLIB_LD@,$SHLIB_LD,;t t
-s,@SHLIB_LD_LIBS@,$SHLIB_LD_LIBS,;t t
-s,@SHLIB_CFLAGS@,$SHLIB_CFLAGS,;t t
-s,@SHLIB_SUFFIX@,$SHLIB_SUFFIX,;t t
-s,@TK_SHARED_BUILD@,$TK_SHARED_BUILD,;t t
-s,@LIBS_GUI@,$LIBS_GUI,;t t
-s,@DLLSUFFIX@,$DLLSUFFIX,;t t
-s,@LIBPREFIX@,$LIBPREFIX,;t t
-s,@LIBSUFFIX@,$LIBSUFFIX,;t t
-s,@EXESUFFIX@,$EXESUFFIX,;t t
-s,@LIBRARIES@,$LIBRARIES,;t t
-s,@MAKE_LIB@,$MAKE_LIB,;t t
-s,@MAKE_STUB_LIB@,$MAKE_STUB_LIB,;t t
-s,@POST_MAKE_LIB@,$POST_MAKE_LIB,;t t
-s,@MAKE_DLL@,$MAKE_DLL,;t t
-s,@MAKE_EXE@,$MAKE_EXE,;t t
-s,@TK_LIB_FLAG@,$TK_LIB_FLAG,;t t
-s,@TK_LIB_SPEC@,$TK_LIB_SPEC,;t t
-s,@TK_BUILD_LIB_SPEC@,$TK_BUILD_LIB_SPEC,;t t
-s,@TK_STUB_LIB_SPEC@,$TK_STUB_LIB_SPEC,;t t
-s,@TK_STUB_LIB_PATH@,$TK_STUB_LIB_PATH,;t t
-s,@TK_BUILD_STUB_LIB_PATH@,$TK_BUILD_STUB_LIB_PATH,;t t
-s,@TK_CC_SEARCH_FLAGS@,$TK_CC_SEARCH_FLAGS,;t t
-s,@TK_LD_SEARCH_FLAGS@,$TK_LD_SEARCH_FLAGS,;t t
-s,@RC_OUT@,$RC_OUT,;t t
-s,@RC_TYPE@,$RC_TYPE,;t t
-s,@RC_INCLUDE@,$RC_INCLUDE,;t t
-s,@RC_DEFINE@,$RC_DEFINE,;t t
-s,@RC_DEFINES@,$RC_DEFINES,;t t
-s,@RES@,$RES,;t t
-s,@LIBOBJS@,$LIBOBJS,;t t
-s,@LTLIBOBJS@,$LTLIBOBJS,;t t
-CEOF
-
-_ACEOF
-
-  cat >>$CONFIG_STATUS <<\_ACEOF
-  # Split the substitutions into bite-sized pieces for seds with
-  # small command number limits, like on Digital OSF/1 and HP-UX.
-  ac_max_sed_lines=48
-  ac_sed_frag=1 # Number of current file.
-  ac_beg=1 # First line for current file.
-  ac_end=$ac_max_sed_lines # Line after last line for current file.
-  ac_more_lines=:
-  ac_sed_cmds=
-  while $ac_more_lines; do
-    if test $ac_beg -gt 1; then
-      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    else
-      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    fi
-    if test ! -s $tmp/subs.frag; then
-      ac_more_lines=false
-    else
-      # The purpose of the label and of the branching condition is to
-      # speed up the sed processing (if there are no `@' at all, there
-      # is no need to browse any of the substitutions).
-      # These are the two extra sed commands mentioned above.
-      (echo ':t
-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-      if test -z "$ac_sed_cmds"; then
-	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-      else
-	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-      fi
-      ac_sed_frag=`expr $ac_sed_frag + 1`
-      ac_beg=$ac_end
-      ac_end=`expr $ac_end + $ac_max_sed_lines`
-    fi
-  done
-  if test -z "$ac_sed_cmds"; then
-    ac_sed_cmds=cat
-  fi
-fi # test -n "$CONFIG_FILES"
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-	cat >$tmp/stdin
-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
-  esac
-
-  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
+  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+  test -d "$tmp"
+}  ||
+{
+  tmp=./conf$$-$RANDOM
+  (umask 077 && mkdir "$tmp")
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
+
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
+if test -n "$CONFIG_FILES"; then
+
+
+ac_cr=`echo X | tr X '\015'`
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
+# But we know of no other shell where ac_cr would be empty at this
+# point, so we can use a bashism as a fallback.
+if test "x$ac_cr" = x; then
+  eval ac_cr=\$\'\\r\'
+fi
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\\r'
+else
+  ac_cs_awk_cr=$ac_cr
+fi
+
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
+_ACEOF
+
+
+{
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+  echo "_ACEOF"
+} >conf$$subs.sh ||
+  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+ac_delim='%!_!# '
+for ac_last_try in false false false false false :; do
+  . ./conf$$subs.sh ||
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+
+  ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+  if test $ac_delim_n = $ac_delim_num; then
+    break
+  elif $ac_last_try; then
+    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+  else
+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+rm -f conf$$subs.sh
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\)..*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\)..*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+  N
+  s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = ""
+
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
+
+  print line
+}
+
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
+  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+_ACEOF
+
+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
+# trailing colons and then remove the whole line if VPATH becomes empty
+# (actually we leave an empty line to preserve line numbers).
+if test "x$srcdir" = x.; then
+  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
+h
+s///
+s/^/:/
+s/[	 ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
+s/:*$//
+x
+s/\(=[	 ]*\).*/\1/
+G
+s/\n//
+s/^[^=]*=[	 ]*$//
+}'
+fi
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+fi # test -n "$CONFIG_FILES"
+
+
+eval set X "  :F $CONFIG_FILES      "
+shift
+for ac_tag
+do
+  case $ac_tag in
+  :[FHLC]) ac_mode=$ac_tag; continue;;
+  esac
+  case $ac_mode$ac_tag in
+  :[FHL]*:*);;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
+  :[FH]-) ac_tag=-:-;;
+  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+  esac
+  ac_save_IFS=$IFS
+  IFS=:
+  set x $ac_tag
+  IFS=$ac_save_IFS
+  shift
+  ac_file=$1
+  shift
+
+  case $ac_mode in
+  :L) ac_source=$1;;
+  :[FH])
+    ac_file_inputs=
+    for ac_f
+    do
+      case $ac_f in
+      -) ac_f="$ac_tmp/stdin";;
+      *) # Look for the file first in the build tree, then in the source tree
+	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
+	 # because $ac_f cannot contain `:'.
+	 test -f "$ac_f" ||
+	   case $ac_f in
+	   [\\/$]*) false;;
+	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+	   esac ||
+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+      esac
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      as_fn_append ac_file_inputs " '$ac_f'"
+    done
+
+    # Let's still pretend it is `configure' which instantiates (i.e., don't
+    # use $as_me), people would be surprised to read:
+    #    /* config.h.  Generated by config.status.  */
+    configure_input='Generated from '`
+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	`' by configure.'
+    if test x"$ac_file" != x-; then
+      configure_input="$ac_file.  $configure_input"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
+    fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
+
+    case $ac_tag in
+    *:-:* | *:-) cat >"$ac_tmp/stdin" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+    esac
+    ;;
+  esac
+
+  ac_dir=`$as_dirname -- "$ac_file" ||
 $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
+	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$ac_file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  as_dir="$ac_dir"; as_fn_mkdir_p
   ac_builddir=.
 
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
 
 case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-
-
-  if test x"$ac_file" != x-; then
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    rm -f "$ac_file"
-  fi
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    configure_input=
-  else
-    configure_input="$ac_file.  "
-  fi
-  configure_input=$configure_input"Generated from `echo $ac_file_in |
-				     sed 's,.*/,,'` by configure."
-
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-	 # Absolute (can't be DOS-style, as IFS=:)
-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 echo "$f";;
-      *) # Relative
-	 if test -f "$f"; then
-	   # Build tree
-	   echo "$f"
-	 elif test -f "$srcdir/$f"; then
-	   # Source tree
-	   echo "$srcdir/$f"
-	 else
-	   # /dev/null tree
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 fi;;
-      esac
-    done` || { (exit 1); exit 1; }
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+
+  case $ac_mode in
+  :F)
+  #
+  # CONFIG_FILE
+  #
+
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# If the template does not know about datarootdir, expand it.
+# FIXME: This hack should be removed a few years after 2.60.
+ac_datarootdir_hack=; ac_datarootdir_seen=
+ac_sed_dataroot='
+/datarootdir/ {
+  p
+  q
+}
+/@datadir@/p
+/@docdir@/p
+/@infodir@/p
+/@localedir@/p
+/@mandir@/p'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
+*datarootdir*) ac_datarootdir_seen=yes;;
+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+  ac_datarootdir_hack='
+  s&@datadir@&$datadir&g
+  s&@docdir@&$docdir&g
+  s&@infodir@&$infodir&g
+  s&@localedir@&$localedir&g
+  s&@mandir@&$mandir&g
+  s&\\\${datarootdir}&$datarootdir&g' ;;
+esac
+_ACEOF
+
+# Neutralize VPATH when `$srcdir' = `.'.
+# Shell code in configure.ac might set extrasub.
+# FIXME: do we really want to maintain this feature?
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
 $extrasub
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s,@configure_input@,$configure_input,;t t
-s,@srcdir@,$ac_srcdir,;t t
-s,@abs_srcdir@,$ac_abs_srcdir,;t t
-s,@top_srcdir@,$ac_top_srcdir,;t t
-s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
-s,@builddir@,$ac_builddir,;t t
-s,@abs_builddir@,$ac_abs_builddir,;t t
-s,@top_builddir@,$ac_top_builddir,;t t
-s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
-  rm -f $tmp/stdin
-  if test x"$ac_file" != x-; then
-    mv $tmp/out $ac_file
-  else
-    cat $tmp/out
-    rm -f $tmp/out
-  fi
-
-done
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-{ (exit 0); exit 0; }
-_ACEOF
-chmod +x $CONFIG_STATUS
-ac_clean_files=$ac_clean_files_save
+s|@configure_input@|$ac_sed_conf_input|;t t
+s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
+s&@srcdir@&$ac_srcdir&;t t
+s&@abs_srcdir@&$ac_abs_srcdir&;t t
+s&@top_srcdir@&$ac_top_srcdir&;t t
+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
+s&@builddir@&$ac_builddir&;t t
+s&@abs_builddir@&$ac_abs_builddir&;t t
+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+$ac_datarootdir_hack
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+
+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
+      "$ac_tmp/out"`; test -z "$ac_out"; } &&
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined" >&5
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined" >&2;}
+
+  rm -f "$ac_tmp/stdin"
+  case $ac_file in
+  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
+  esac \
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ ;;
+
+
+
+  esac
+
+done # for ac_tag
+
+
+as_fn_exit 0
+_ACEOF
+ac_clean_files=$ac_clean_files_save
+
+test $ac_write_fail = 0 ||
+  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
 
 
 # configure is writing to config.log, and then calls config.status.
 # config.status does its own redirection, appending to config.log.
 # Unfortunately, on DOS this fails, as config.log is still kept open
@@ -6168,9 +6264,13 @@
   exec 5>/dev/null
   $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
   exec 5>>config.log
   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
   # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
+  $ac_cs_success || as_fn_exit 1
+fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
 

ADDED   win/configure.ac
Index: win/configure.ac
==================================================================
--- /dev/null
+++ win/configure.ac
@@ -0,0 +1,310 @@
+#! /bin/bash -norc
+# This file is an input file used by the GNU "autoconf" program to
+# generate the file "configure", which is run during Tk installation
+# to configure the system for the local environment.
+
+AC_INIT(../generic/tk.h)
+AC_PREREQ(2.69)
+
+# The following define is needed when building with Cygwin since newer
+# versions of autoconf incorrectly set SHELL to /bin/bash instead of
+# /bin/sh. The bash shell seems to suffer from some strange failures.
+SHELL=/bin/sh
+
+TK_VERSION=8.7
+TK_MAJOR_VERSION=8
+TK_MINOR_VERSION=7
+TK_PATCH_LEVEL="a2"
+VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION
+
+#------------------------------------------------------------------------
+# Handle the --prefix=... option
+#------------------------------------------------------------------------
+
+if test "${prefix}" = "NONE"; then
+    prefix=/usr/local
+fi
+if test "${exec_prefix}" = "NONE"; then
+    exec_prefix=$prefix
+fi
+# libdir must be a fully qualified path (not ${exec_prefix}/lib)
+eval libdir="$libdir"
+
+#------------------------------------------------------------------------
+# Standard compiler checks
+#------------------------------------------------------------------------
+
+# If the user did not set CFLAGS, set it now to keep
+# the AC_PROG_CC macro from adding "-g -O2".
+if test "${CFLAGS+set}" != "set" ; then
+    CFLAGS=""
+fi
+
+AC_PROG_CC
+AC_C_INLINE
+AC_HEADER_STDC
+
+AC_CHECK_TOOL(AR, ar)
+AC_CHECK_TOOL(RANLIB, ranlib)
+AC_CHECK_TOOL(RC, windres)
+
+#--------------------------------------------------------------------
+# Checks to see if the make program sets the $MAKE variable.
+#--------------------------------------------------------------------
+
+AC_PROG_MAKE_SET
+
+#--------------------------------------------------------------------
+# Determines the correct binary file extension (.o, .obj, .exe etc.)
+#--------------------------------------------------------------------
+
+AC_OBJEXT
+AC_EXEEXT
+
+#--------------------------------------------------------------------
+# The statements below define a collection of symbols related to
+# building libtk as a shared library instead of a static library.
+#--------------------------------------------------------------------
+
+SC_ENABLE_SHARED
+
+#--------------------------------------------------------------------
+# Locate and source the tclConfig.sh file.
+#--------------------------------------------------------------------
+
+SC_PATH_TCLCONFIG($TK_PATCH_LEVEL)
+SC_LOAD_TCLCONFIG
+
+if test "${TCL_MAJOR_VERSION}" -lt 9 ; then
+if test "${TCL_MAJOR_VERSION}" != "${TK_MAJOR_VERSION}"; then
+    AC_MSG_ERROR([${TCL_BIN_DIR}/tclConfig.sh is for Tcl ${TCL_VERSION}.
+Tk ${TK_VERSION}${TK_PATCH_LEVEL} needs Tcl 8.6+.
+Use --with-tcl= option to indicate location of tclConfig.sh file for Tcl 8.6 or better.])
+fi
+if test "${TCL_MINOR_VERSION}" -lt 6; then
+    AC_MSG_ERROR([${TCL_BIN_DIR}/tclConfig.sh is for Tcl ${TCL_VERSION}.
+Tk ${TK_VERSION}${TK_PATCH_LEVEL} needs Tcl 8.6+.
+Use --with-tcl= option to indicate location of tclConfig.sh file for Tcl 8.6 or better.])
+fi
+fi
+
+#--------------------------------------------------------------------
+# The statements below define a collection of compile flags.  This
+# macro depends on the value of SHARED_BUILD, and should be called
+# after SC_ENABLE_SHARED checks the configure switches.
+#--------------------------------------------------------------------
+
+SC_CONFIG_CFLAGS
+
+#--------------------------------------------------------------------
+# man2tcl needs this so that it can use errno.h
+#--------------------------------------------------------------------
+
+AC_CHECK_HEADER(errno.h, , MAN2TCLFLAGS="-DNO_ERRNO_H")
+AC_SUBST(MAN2TCLFLAGS)
+
+#-------------------------------------------
+#     Check for _strtoi64
+#-------------------------------------------
+
+AC_CACHE_CHECK([availability of _strtoi64], tcl_cv_strtoi64, [
+    AC_TRY_LINK([#include <stdlib.h>],
+	    [_strtoi64(0,0,0)],
+	    tcl_cv_strtoi64=yes, tcl_cv_strtoi64=no)])
+if test $tcl_cv_strtoi64 = no; then
+    AC_DEFINE(NO_STRTOI64, 1, [Is _strtoi64 function available?])
+fi
+
+#--------------------------------------------------------------------
+# Windows XP theme engine header for Ttk
+#--------------------------------------------------------------------
+
+AC_CHECK_HEADER([uxtheme.h], [AC_DEFINE(HAVE_UXTHEME_H)],
+	[AC_MSG_NOTICE([xpnative theme will be unavailable])],
+	[#include <windows.h>])
+AC_CHECK_HEADER([vssym32.h], [AC_DEFINE(HAVE_VSSYM32_H)], [],
+	[#include <windows.h>
+#include <uxtheme.h>])
+
+#--------------------------------------------------------------------
+# Set the default compiler switches based on the --enable-symbols
+# option.  This macro depends on C flags, and should be called
+# after SC_CONFIG_CFLAGS macro is called.
+#--------------------------------------------------------------------
+
+SC_ENABLE_SYMBOLS
+
+TK_DBGX=${DBGX}
+
+#--------------------------------------------------------------------
+# Embed the manifest if we can determine how
+#--------------------------------------------------------------------
+
+SC_EMBED_MANIFEST(wish.exe.manifest)
+
+SC_BUILD_TCLSH
+SC_PROG_TCLSH
+
+#------------------------------------------------------------------------
+# tkConfig.sh refers to this by a different name
+#------------------------------------------------------------------------
+
+TK_SHARED_BUILD=${SHARED_BUILD}
+
+#--------------------------------------------------------------------
+# Perform final evaluations of variables with possible substitutions.
+#--------------------------------------------------------------------
+
+TK_SHARED_LIB_SUFFIX="\${NODOT_VERSION}${DLLSUFFIX}"
+TK_UNSHARED_LIB_SUFFIX="\${NODOT_VERSION}${LIBSUFFIX}"
+TK_EXPORT_FILE_SUFFIX="\${NODOT_VERSION}${LIBSUFFIX}"
+
+eval "TK_SRC_DIR=\"`cd $srcdir/..; pwd`\""
+
+eval "TK_DLL_FILE=tk$VER${DLLSUFFIX}"
+eval "TK_LIB_FILE=${LIBPREFIX}tk$VER${LIBSUFFIX}"
+
+eval "TK_STUB_LIB_FILE=${LIBPREFIX}tkstub${VER}${LIBSUFFIX}"
+# FIXME: All of this var junk needs to be done in tcl.m4 !!!!
+# I left out the other vars that also need to get defined here.
+# we also need to double check about spaces in path names
+eval "TK_LIB_FLAG=\"-ltk${VER}${LIBFLAGSUFFIX}\""
+TK_LIB_SPEC="-L${libdir} ${TK_LIB_FLAG}"
+TK_BUILD_LIB_SPEC="-L`pwd` ${TK_LIB_FLAG}"
+
+eval "TK_STUB_LIB_FLAG=\"-ltkstub${VER}${LIBFLAGSUFFIX}\""
+TK_BUILD_STUB_LIB_SPEC="-L`pwd` ${TK_STUB_LIB_FLAG}"
+
+TK_STUB_LIB_SPEC="-L${libdir} ${TK_STUB_LIB_FLAG}"
+TK_STUB_LIB_PATH="${libdir}/${TK_STUB_LIB_FILE}"
+TK_BUILD_STUB_LIB_PATH="`pwd`/${TK_STUB_LIB_FILE}"
+
+eval "DLLSUFFIX=${DLLSUFFIX}"
+eval "LIBPREFIX=${LIBPREFIX}"
+eval "LIBSUFFIX=${LIBSUFFIX}"
+eval "EXESUFFIX=${EXESUFFIX}"
+
+CFG_TK_SHARED_LIB_SUFFIX=${TK_SHARED_LIB_SUFFIX}
+CFG_TK_UNSHARED_LIB_SUFFIX=${TK_UNSHARED_LIB_SUFFIX}
+CFG_TK_EXPORT_FILE_SUFFIX=${TK_EXPORT_FILE_SUFFIX}
+
+#--------------------------------------------------------------------
+# Adjust the defines for how the resources are built depending
+# on symbols and static vs. shared.
+#--------------------------------------------------------------------
+
+if test ${SHARED_BUILD} = 0 -o "$TCL_NEEDS_EXP_FILE" = 0; then
+    if test "${DBGX}" = "d"; then
+        RC_DEFINES="${RC_DEFINE} STATIC_BUILD ${RC_DEFINE} DEBUG"
+    else
+        RC_DEFINES="${RC_DEFINE} STATIC_BUILD"
+    fi
+    TK_RES=""
+else
+    if test "${DBGX}" = "d"; then
+        RC_DEFINES="${RC_DEFINE} DEBUG"
+    else
+        RC_DEFINES=""
+    fi
+    TK_RES='tk.$(RES)'
+fi
+
+# The wish.exe.manifest requires these
+# TK_WIN_VERSION is the 4 dotted pair Windows version format which needs
+# the release level, and must account for interim release versioning
+case "$TK_PATCH_LEVEL" in
+     *a*) TK_RELEASE_LEVEL=0 ;;
+     *b*) TK_RELEASE_LEVEL=1 ;;
+     *)   TK_RELEASE_LEVEL=2 ;;
+esac
+TK_WIN_VERSION="$TK_VERSION.$TK_RELEASE_LEVEL.`echo $TK_PATCH_LEVEL | tr -d ab.`"
+AC_SUBST(TK_WIN_VERSION)
+# X86|AMD64|IA64 for manifest
+AC_SUBST(MACHINE)
+
+AC_SUBST(TK_VERSION)
+AC_SUBST(TK_MAJOR_VERSION)
+AC_SUBST(TK_MINOR_VERSION)
+AC_SUBST(TK_PATCH_LEVEL)
+AC_SUBST(TK_DBGX)
+AC_SUBST(TK_LIB_FILE)
+AC_SUBST(TK_DLL_FILE)
+AC_SUBST(TK_STUB_LIB_FILE)
+AC_SUBST(TK_STUB_LIB_FLAG)
+AC_SUBST(TK_BUILD_STUB_LIB_SPEC)
+AC_SUBST(TK_SRC_DIR)
+AC_SUBST(TK_BIN_DIR)
+
+AC_SUBST(TCL_VERSION)
+AC_SUBST(TCL_MAJOR_VERSION)
+AC_SUBST(TCL_MINOR_VERSION)
+AC_SUBST(TCL_PATCH_LEVEL)
+
+AC_SUBST(TCL_SRC_DIR)
+AC_SUBST(TCL_BIN_DIR)
+AC_SUBST(TCL_DBGX)
+AC_SUBST(CFG_TK_SHARED_LIB_SUFFIX)
+AC_SUBST(CFG_TK_UNSHARED_LIB_SUFFIX)
+AC_SUBST(CFG_TK_EXPORT_FILE_SUFFIX)
+
+AC_SUBST(CFLAGS_DEFAULT)
+AC_SUBST(EXTRA_CFLAGS)
+AC_SUBST(CYGPATH)
+AC_SUBST(DEPARG)
+AC_SUBST(CC_OBJNAME)
+AC_SUBST(CC_EXENAME)
+
+# win/tcl.m4 doesn't set (LDFLAGS)
+AC_SUBST(LDFLAGS_DEFAULT)
+AC_SUBST(LDFLAGS_DEBUG)
+AC_SUBST(LDFLAGS_OPTIMIZE)
+AC_SUBST(LDFLAGS_CONSOLE)
+AC_SUBST(LDFLAGS_WINDOW)
+AC_SUBST(AR)
+AC_SUBST(RANLIB)
+AC_SUBST(TK_RES)
+
+AC_SUBST(STLIB_LD)
+AC_SUBST(SHLIB_LD)
+AC_SUBST(SHLIB_LD_LIBS)
+AC_SUBST(SHLIB_CFLAGS)
+AC_SUBST(SHLIB_SUFFIX)
+AC_SUBST(TK_SHARED_BUILD)
+
+AC_SUBST(LIBS)
+AC_SUBST(LIBS_GUI)
+AC_SUBST(DLLSUFFIX)
+AC_SUBST(LIBPREFIX)
+AC_SUBST(LIBSUFFIX)
+AC_SUBST(EXESUFFIX)
+AC_SUBST(LIBRARIES)
+AC_SUBST(MAKE_LIB)
+AC_SUBST(MAKE_STUB_LIB)
+AC_SUBST(POST_MAKE_LIB)
+AC_SUBST(MAKE_DLL)
+AC_SUBST(MAKE_EXE)
+
+AC_SUBST(TK_LIB_FLAG)
+AC_SUBST(TK_LIB_SPEC)
+AC_SUBST(TK_BUILD_LIB_SPEC)
+AC_SUBST(TK_STUB_LIB_SPEC)
+AC_SUBST(TK_STUB_LIB_PATH)
+AC_SUBST(TK_BUILD_STUB_LIB_PATH)
+
+# undefined at this point for win
+AC_SUBST(TK_CC_SEARCH_FLAGS)
+AC_SUBST(TK_LD_SEARCH_FLAGS)
+
+AC_SUBST(RC)
+AC_SUBST(RC_OUT)
+AC_SUBST(RC_TYPE)
+AC_SUBST(RC_INCLUDE)
+AC_SUBST(RC_DEFINE)
+AC_SUBST(RC_DEFINES)
+AC_SUBST(RES)
+
+AC_OUTPUT(Makefile tkConfig.sh wish.exe.manifest)
+
+dnl Local Variables:
+dnl mode: autoconf;
+dnl End:

DELETED win/configure.in
Index: win/configure.in
==================================================================
--- win/configure.in
+++ /dev/null
@@ -1,314 +0,0 @@
-#! /bin/bash -norc
-# This file is an input file used by the GNU "autoconf" program to
-# generate the file "configure", which is run during Tk installation
-# to configure the system for the local environment.
-
-AC_INIT(../generic/tk.h)
-AC_PREREQ(2.59)
-
-# The following define is needed when building with Cygwin since newer
-# versions of autoconf incorrectly set SHELL to /bin/bash instead of
-# /bin/sh. The bash shell seems to suffer from some strange failures.
-SHELL=/bin/sh
-
-TK_VERSION=8.6
-TK_MAJOR_VERSION=8
-TK_MINOR_VERSION=6
-TK_PATCH_LEVEL=".6"
-VER=$TK_MAJOR_VERSION$TK_MINOR_VERSION
-
-#------------------------------------------------------------------------
-# Handle the --prefix=... option
-#------------------------------------------------------------------------
-
-if test "${prefix}" = "NONE"; then
-    prefix=/usr/local
-fi
-if test "${exec_prefix}" = "NONE"; then
-    exec_prefix=$prefix
-fi
-# libdir must be a fully qualified path (not ${exec_prefix}/lib)
-eval libdir="$libdir"
-
-#------------------------------------------------------------------------
-# Standard compiler checks
-#------------------------------------------------------------------------
-
-# If the user did not set CFLAGS, set it now to keep
-# the AC_PROG_CC macro from adding "-g -O2".
-if test "${CFLAGS+set}" != "set" ; then
-    CFLAGS=""
-fi
-
-AC_PROG_CC
-AC_C_INLINE
-AC_HEADER_STDC
-
-AC_CHECK_TOOL(AR, ar)
-AC_CHECK_TOOL(RANLIB, ranlib)
-AC_CHECK_TOOL(RC, windres)
-
-#--------------------------------------------------------------------
-# Checks to see if the make program sets the $MAKE variable.
-#--------------------------------------------------------------------
-
-AC_PROG_MAKE_SET
-
-#--------------------------------------------------------------------
-# Determines the correct binary file extension (.o, .obj, .exe etc.)
-#--------------------------------------------------------------------
-
-AC_OBJEXT
-AC_EXEEXT
-
-#--------------------------------------------------------------------
-# Check whether --enable-threads or --disable-threads was given.
-#--------------------------------------------------------------------
-
-SC_ENABLE_THREADS
-
-#--------------------------------------------------------------------
-# The statements below define a collection of symbols related to
-# building libtk as a shared library instead of a static library.
-#--------------------------------------------------------------------
-
-SC_ENABLE_SHARED
-
-#--------------------------------------------------------------------
-# Locate and source the tclConfig.sh file.
-#--------------------------------------------------------------------
-
-SC_PATH_TCLCONFIG($TK_PATCH_LEVEL)
-SC_LOAD_TCLCONFIG
-
-if test "${TCL_MAJOR_VERSION}" != "${TK_MAJOR_VERSION}"; then
-    AC_MSG_ERROR([${TCL_BIN_DIR}/tclConfig.sh is for Tcl ${TCL_VERSION}.
-Tk ${TK_VERSION}${TK_PATCH_LEVEL} needs Tcl ${TK_VERSION}.
-Use --with-tcl= option to indicate location of tclConfig.sh file for Tcl ${TK_VERSION}.])
-fi
-if test "${TCL_MINOR_VERSION}" -lt "${TK_MINOR_VERSION}"; then
-    AC_MSG_ERROR([${TCL_BIN_DIR}/tclConfig.sh is for Tcl ${TCL_VERSION}.
-Tk ${TK_VERSION}${TK_PATCH_LEVEL} needs Tcl ${TK_VERSION}.
-Use --with-tcl= option to indicate location of tclConfig.sh file for Tcl ${TK_VERSION}.])
-fi
-
-#--------------------------------------------------------------------
-# The statements below define a collection of compile flags.  This
-# macro depends on the value of SHARED_BUILD, and should be called
-# after SC_ENABLE_SHARED checks the configure switches.
-#--------------------------------------------------------------------
-
-SC_CONFIG_CFLAGS
-
-#--------------------------------------------------------------------
-# man2tcl needs this so that it can use errno.h
-#--------------------------------------------------------------------
-
-AC_CHECK_HEADER(errno.h, , MAN2TCLFLAGS="-DNO_ERRNO_H")
-AC_SUBST(MAN2TCLFLAGS)
-
-#-------------------------------------------
-#     Check for _strtoi64
-#-------------------------------------------
-
-AC_CACHE_CHECK([availability of _strtoi64], tcl_cv_strtoi64, [
-    AC_TRY_LINK([#include <stdlib.h>],
-	    [_strtoi64(0,0,0)],
-	    tcl_cv_strtoi64=yes, tcl_cv_strtoi64=no)])
-if test $tcl_cv_strtoi64 = no; then
-    AC_DEFINE(NO_STRTOI64, 1, [Is _strtoi64 function available?])
-fi
-
-#--------------------------------------------------------------------
-# Windows XP theme engine header for Ttk
-#--------------------------------------------------------------------
-
-AC_CHECK_HEADER([uxtheme.h], [AC_DEFINE(HAVE_UXTHEME_H)],
-	[AC_MSG_NOTICE([xpnative theme will be unavailable])],
-	[#include <windows.h>])
-AC_CHECK_HEADER([vssym32.h], [AC_DEFINE(HAVE_VSSYM32_H)], [],
-	[#include <windows.h>
-#include <uxtheme.h>])
-
-#--------------------------------------------------------------------
-# Set the default compiler switches based on the --enable-symbols
-# option.  This macro depends on C flags, and should be called
-# after SC_CONFIG_CFLAGS macro is called.
-#--------------------------------------------------------------------
-
-SC_ENABLE_SYMBOLS
-
-TK_DBGX=${DBGX}
-
-#--------------------------------------------------------------------
-# Embed the manifest if we can determine how
-#--------------------------------------------------------------------
-
-SC_EMBED_MANIFEST(wish.exe.manifest)
-
-SC_BUILD_TCLSH
-SC_PROG_TCLSH
-
-#------------------------------------------------------------------------
-# tkConfig.sh refers to this by a different name
-#------------------------------------------------------------------------
-
-TK_SHARED_BUILD=${SHARED_BUILD}
-
-#--------------------------------------------------------------------
-# Perform final evaluations of variables with possible substitutions.
-#--------------------------------------------------------------------
-
-TK_SHARED_LIB_SUFFIX="\${NODOT_VERSION}${DLLSUFFIX}"
-TK_UNSHARED_LIB_SUFFIX="\${NODOT_VERSION}${LIBSUFFIX}"
-TK_EXPORT_FILE_SUFFIX="\${NODOT_VERSION}${LIBSUFFIX}"
-
-eval "TK_SRC_DIR=\"`cd $srcdir/..; pwd`\""
-
-eval "TK_DLL_FILE=tk$VER${DLLSUFFIX}"
-eval "TK_LIB_FILE=${LIBPREFIX}tk$VER${LIBSUFFIX}"
-
-eval "TK_STUB_LIB_FILE=${LIBPREFIX}tkstub${VER}${LIBSUFFIX}"
-# FIXME: All of this var junk needs to be done in tcl.m4 !!!!
-# I left out the other vars that also need to get defined here.
-# we also need to double check about spaces in path names
-eval "TK_LIB_FLAG=\"-ltk${VER}${LIBFLAGSUFFIX}\""
-TK_LIB_SPEC="-L${libdir} ${TK_LIB_FLAG}"
-TK_BUILD_LIB_SPEC="-L`pwd` ${TK_LIB_FLAG}"
-
-eval "TK_STUB_LIB_FLAG=\"-ltkstub${VER}${LIBFLAGSUFFIX}\""
-TK_BUILD_STUB_LIB_SPEC="-L`pwd` ${TK_STUB_LIB_FLAG}"
-
-TK_STUB_LIB_SPEC="-L${libdir} ${TK_STUB_LIB_FLAG}"
-TK_STUB_LIB_PATH="${libdir}/${TK_STUB_LIB_FILE}"
-TK_BUILD_STUB_LIB_PATH="`pwd`/${TK_STUB_LIB_FILE}"
-
-eval "DLLSUFFIX=${DLLSUFFIX}"
-eval "LIBPREFIX=${LIBPREFIX}"
-eval "LIBSUFFIX=${LIBSUFFIX}"
-eval "EXESUFFIX=${EXESUFFIX}"
-
-CFG_TK_SHARED_LIB_SUFFIX=${TK_SHARED_LIB_SUFFIX}
-CFG_TK_UNSHARED_LIB_SUFFIX=${TK_UNSHARED_LIB_SUFFIX}
-CFG_TK_EXPORT_FILE_SUFFIX=${TK_EXPORT_FILE_SUFFIX}
-
-#--------------------------------------------------------------------
-# Adjust the defines for how the resources are built depending
-# on symbols and static vs. shared.
-#--------------------------------------------------------------------
-
-if test ${SHARED_BUILD} = 0 -o "$TCL_NEEDS_EXP_FILE" = 0; then
-    if test "${DBGX}" = "d"; then
-        RC_DEFINES="${RC_DEFINE} STATIC_BUILD ${RC_DEFINE} DEBUG"
-    else
-        RC_DEFINES="${RC_DEFINE} STATIC_BUILD"
-    fi
-    TK_RES=""
-else
-    if test "${DBGX}" = "d"; then
-        RC_DEFINES="${RC_DEFINE} DEBUG"
-    else
-        RC_DEFINES=""
-    fi
-    TK_RES='tk.$(RES)'
-fi
-
-# The wish.exe.manifest requires these
-# TK_WIN_VERSION is the 4 dotted pair Windows version format which needs
-# the release level, and must account for interim release versioning
-case "$TK_PATCH_LEVEL" in
-     *a*) TK_RELEASE_LEVEL=0 ;;
-     *b*) TK_RELEASE_LEVEL=1 ;;
-     *)   TK_RELEASE_LEVEL=2 ;;
-esac
-TK_WIN_VERSION="$TK_VERSION.$TK_RELEASE_LEVEL.`echo $TK_PATCH_LEVEL | tr -d ab.`"
-AC_SUBST(TK_WIN_VERSION)
-# X86|AMD64|IA64 for manifest
-AC_SUBST(MACHINE)
-
-AC_SUBST(TK_VERSION)
-AC_SUBST(TK_MAJOR_VERSION)
-AC_SUBST(TK_MINOR_VERSION)
-AC_SUBST(TK_PATCH_LEVEL)
-AC_SUBST(TK_DBGX)
-AC_SUBST(TK_LIB_FILE)
-AC_SUBST(TK_DLL_FILE)
-AC_SUBST(TK_STUB_LIB_FILE)
-AC_SUBST(TK_STUB_LIB_FLAG)
-AC_SUBST(TK_BUILD_STUB_LIB_SPEC)
-AC_SUBST(TK_SRC_DIR)
-AC_SUBST(TK_BIN_DIR)
-
-AC_SUBST(TCL_VERSION)
-AC_SUBST(TCL_MAJOR_VERSION)
-AC_SUBST(TCL_MINOR_VERSION)
-AC_SUBST(TCL_PATCH_LEVEL)
-
-AC_SUBST(TCL_SRC_DIR)
-AC_SUBST(TCL_BIN_DIR)
-AC_SUBST(TCL_DBGX)
-AC_SUBST(CFG_TK_SHARED_LIB_SUFFIX)
-AC_SUBST(CFG_TK_UNSHARED_LIB_SUFFIX)
-AC_SUBST(CFG_TK_EXPORT_FILE_SUFFIX)
-
-AC_SUBST(CFLAGS_DEFAULT)
-AC_SUBST(EXTRA_CFLAGS)
-AC_SUBST(CYGPATH)
-AC_SUBST(DEPARG)
-AC_SUBST(CC_OBJNAME)
-AC_SUBST(CC_EXENAME)
-
-# win/tcl.m4 doesn't set (LDFLAGS)
-AC_SUBST(LDFLAGS_DEFAULT)
-AC_SUBST(LDFLAGS_DEBUG)
-AC_SUBST(LDFLAGS_OPTIMIZE)
-AC_SUBST(LDFLAGS_CONSOLE)
-AC_SUBST(LDFLAGS_WINDOW)
-AC_SUBST(AR)
-AC_SUBST(RANLIB)
-AC_SUBST(TK_RES)
-
-AC_SUBST(STLIB_LD)
-AC_SUBST(SHLIB_LD)
-AC_SUBST(SHLIB_LD_LIBS)
-AC_SUBST(SHLIB_CFLAGS)
-AC_SUBST(SHLIB_SUFFIX)
-AC_SUBST(TK_SHARED_BUILD)
-
-AC_SUBST(LIBS)
-AC_SUBST(LIBS_GUI)
-AC_SUBST(DLLSUFFIX)
-AC_SUBST(LIBPREFIX)
-AC_SUBST(LIBSUFFIX)
-AC_SUBST(EXESUFFIX)
-AC_SUBST(LIBRARIES)
-AC_SUBST(MAKE_LIB)
-AC_SUBST(MAKE_STUB_LIB)
-AC_SUBST(POST_MAKE_LIB)
-AC_SUBST(MAKE_DLL)
-AC_SUBST(MAKE_EXE)
-
-AC_SUBST(TK_LIB_FLAG)
-AC_SUBST(TK_LIB_SPEC)
-AC_SUBST(TK_BUILD_LIB_SPEC)
-AC_SUBST(TK_STUB_LIB_SPEC)
-AC_SUBST(TK_STUB_LIB_PATH)
-AC_SUBST(TK_BUILD_STUB_LIB_PATH)
-
-# undefined at this point for win
-AC_SUBST(TK_CC_SEARCH_FLAGS)
-AC_SUBST(TK_LD_SEARCH_FLAGS)
-
-AC_SUBST(RC)
-AC_SUBST(RC_OUT)
-AC_SUBST(RC_TYPE)
-AC_SUBST(RC_INCLUDE)
-AC_SUBST(RC_DEFINE)
-AC_SUBST(RC_DEFINES)
-AC_SUBST(RES)
-
-AC_OUTPUT(Makefile tkConfig.sh wish.exe.manifest)
-
-dnl Local Variables:
-dnl mode: autoconf;
-dnl End:

DELETED win/makefile.bc
Index: win/makefile.bc
==================================================================
--- win/makefile.bc
+++ /dev/null
@@ -1,537 +0,0 @@
-#
-# Makefile for Borland C++ 5.5 (or C++ Builder 5), adapted from the makefile
-#   for Visual C++ that came with tk 8.3.3
-#
-# Some "not so obvious" details in this makefile are preceded by a comment
-# "maintenance hint", which tries to explain what's going on. Better to
-# leave those in place.
-# Helmut Giese, July 2002
-#
-# See the file "license.terms" for information on usage and redistribution
-# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
-#
-# Copyright (c) 1995-1997 Sun Microsystems, Inc.
-# Copyright (c) 1998-2000 Ajuba Solutions.
-
-# Does not depend on the presence of any environment variables in
-# order to compile tcl; all needed information is derived from
-# location of the compiler directories.
-
-#
-# Project directories
-#
-# ROOT    = top of source tree
-#
-# TMPDIR  = location where .obj files should be stored during build
-#
-# TOOLS32 = location of Borland development tools.
-#
-# TCLDIR = location of top of Tcl source hierarchy
-#
-
-ROOT        = ..
-TCLDIR      = ..\..\tcl8.4
-INSTALLDIR  = D:\tmp\tcl
-
-# If you have C++ Builder 5 or the free Borland C++ 5.5 compiler
-# adapt the following paths as appropriate for your system
-TOOLS32    = d:\cbld5
-TOOLS32_rc = d:\cbld5
-#TOOLS32    = c:\bc55
-#TOOLS32_rc = c:\bc55
-
-cc32      = "$(TOOLS32)\bin\bcc32.exe"
-link32    = "$(TOOLS32)\bin\ilink32.exe"
-lib32     = "$(TOOLS32)\bin\tlib.exe"
-rc32      = "$(TOOLS32_rc)\bin\brcc32.exe"
-include32 = -I"$(TOOLS32)\include;$(TOOLS32)\include\mfc"
-libpath32 = -L"$(TOOLS32)\lib"
-
-# Uncomment the following line to compile with thread support
-#THREADDEFINES = -DTCL_THREADS=1
-
-# Allow definition of NDEBUG via command line
-# Set NODEBUG to 0 to compile with symbols
-!if !defined(NODEBUG)
-NODEBUG = 1
-!endif
-
-# uncomment the following two lines to compile with TCL_MEM_DEBUG
-#DEBUGDEFINES =-DTCL_MEM_DEBUG
-
-######################################################################
-# Do not modify below this line
-######################################################################
-
-TCLNAMEPREFIX = tcl
-TKNAMEPREFIX = tk
-WISHNAMEPREFIX = wish
-VERSION = 84
-DOTVERSION = 8.4
-
-TCLSTUBPREFIX = $(TCLNAMEPREFIX)stub
-TKSTUBPREFIX  = $(TKNAMEPREFIX)stub
-
-
-BINROOT   = .
-!IF "$(NODEBUG)" == "1"
-TMPDIRNAME  = Release
-DBGX        =
-!ELSE
-TMPDIRNAME  = Debug
-DBGX        =
-#DBGX       = d
-!ENDIF
-TMPDIR      = $(BINROOT)\$(TMPDIRNAME)
-OUTDIRNAME  = $(TMPDIRNAME)
-OUTDIR      = $(TMPDIR)
-
-TCLLIB        = $(TCLNAMEPREFIX)$(VERSION)$(DBGX).lib
-TCLPLUGINLIB  = $(TCLNAMEPREFIX)$(VERSION)p.lib
-TCLSTUBLIB    = $(TCLSTUBPREFIX)$(VERSION)$(DBGX).lib
-TKDLLNAME     = $(TKNAMEPREFIX)$(VERSION)$(DBGX).dll
-TKDLL         = $(OUTDIR)\$(TKDLLNAME)
-TKLIB         = $(OUTDIR)\$(TKNAMEPREFIX)$(VERSION)$(DBGX).lib
-TKSTUBLIBNAME = $(TKSTUBPREFIX)$(VERSION)$(DBGX).lib
-TKSTUBLIB     = $(OUTDIR)\$(TKSTUBLIBNAME)
-TKPLUGINDLLNAME = $(TKNAMEPREFIX)$(VERSION)p$(DBG).dll
-TKPLUGINDLL   = $(OUTDIR)\$(TKPLUGINDLLNAME)
-TKPLUGINLIB   = $(OUTDIR)\$(TKNAMEPREFIX)$(VERSION)p$(DBGX).lib
-
-WISH      = $(OUTDIR)\$(WISHNAMEPREFIX)$(VERSION)$(DBGX).exe
-WISHC     = $(OUTDIR)\$(WISHNAMEPREFIX)c$(VERSION)$(DBGX).exe
-WISHP     = $(OUTDIR)\$(WISHNAMEPREFIX)p$(VERSION)$(DBGX).exe
-TKTEST    = $(OUTDIR)\$(TKNAMEPREFIX)test.exe
-CAT32     = $(TMPDIR)\cat32.exe
-
-BIN_INSTALL_DIR     = $(INSTALLDIR)\bin
-INCLUDE_INSTALL_DIR = $(INSTALLDIR)\include
-LIB_INSTALL_DIR     = $(INSTALLDIR)\lib
-SCRIPT_INSTALL_DIR  = $(LIB_INSTALL_DIR)\tk$(DOTVERSION)
-
-WISHOBJS = \
-  $(TMPDIR)\winMain.obj
-
-TKTESTOBJS = \
-  $(TMPDIR)\tkTest.obj \
-  $(TMPDIR)\tkSquare.obj \
-  $(TMPDIR)\testMain.obj \
-  $(TMPDIR)\tkOldTest.obj \
-  $(TMPDIR)\tkWinTest.obj \
-  $(TCLLIBDIR)\tclThreadTest.obj
-
-XLIBOBJS = \
-  $(TMPDIR)\xcolors.obj \
-  $(TMPDIR)\xdraw.obj \
-  $(TMPDIR)\xgc.obj \
-  $(TMPDIR)\ximage.obj \
-  $(TMPDIR)\xutil.obj
-
-TKOBJS = \
-	$(TMPDIR)\tkConsole.obj \
-	$(TMPDIR)\tkUnixMenubu.obj \
-	$(TMPDIR)\tkUnixScale.obj \
-	$(XLIBOBJS) \
-	$(TMPDIR)\tkWin3d.obj \
-	$(TMPDIR)\tkWin32Dll.obj \
-	$(TMPDIR)\tkWinButton.obj \
-	$(TMPDIR)\tkWinClipboard.obj \
-	$(TMPDIR)\tkWinColor.obj \
-	$(TMPDIR)\tkWinConfig.obj \
-	$(TMPDIR)\tkWinCursor.obj \
-	$(TMPDIR)\tkWinDialog.obj \
-	$(TMPDIR)\tkWinDraw.obj \
-	$(TMPDIR)\tkWinEmbed.obj \
-	$(TMPDIR)\tkWinFont.obj \
-	$(TMPDIR)\tkWinImage.obj \
-	$(TMPDIR)\tkWinInit.obj \
-	$(TMPDIR)\tkWinKey.obj \
-	$(TMPDIR)\tkWinMenu.obj \
-	$(TMPDIR)\tkWinPixmap.obj \
-	$(TMPDIR)\tkWinPointer.obj \
-	$(TMPDIR)\tkWinRegion.obj \
-	$(TMPDIR)\tkWinScrlbr.obj \
-	$(TMPDIR)\tkWinSend.obj \
-	$(TMPDIR)\tkWinWindow.obj \
-	$(TMPDIR)\tkWinWm.obj \
-	$(TMPDIR)\tkWinX.obj \
-	$(TMPDIR)\stubs.obj \
-	$(TMPDIR)\tk3d.obj \
-	$(TMPDIR)\tkArgv.obj \
-	$(TMPDIR)\tkAtom.obj \
-	$(TMPDIR)\tkBind.obj \
-	$(TMPDIR)\tkBitmap.obj \
-	$(TMPDIR)\tkBusy.obj \
-	$(TMPDIR)\tkButton.obj \
-	$(TMPDIR)\tkCanvArc.obj \
-	$(TMPDIR)\tkCanvBmap.obj \
-	$(TMPDIR)\tkCanvImg.obj \
-	$(TMPDIR)\tkCanvLine.obj \
-	$(TMPDIR)\tkCanvPoly.obj \
-	$(TMPDIR)\tkCanvPs.obj \
-	$(TMPDIR)\tkCanvText.obj \
-	$(TMPDIR)\tkCanvUtil.obj \
-	$(TMPDIR)\tkCanvWind.obj \
-	$(TMPDIR)\tkCanvas.obj \
-	$(TMPDIR)\tkClipboard.obj \
-	$(TMPDIR)\tkCmds.obj \
-	$(TMPDIR)\tkColor.obj \
-	$(TMPDIR)\tkConfig.obj \
-	$(TMPDIR)\tkCursor.obj \
-	$(TMPDIR)\tkEntry.obj \
-	$(TMPDIR)\tkError.obj \
-	$(TMPDIR)\tkEvent.obj \
-	$(TMPDIR)\tkFileFilter.obj \
-	$(TMPDIR)\tkFocus.obj \
-	$(TMPDIR)\tkFont.obj \
-	$(TMPDIR)\tkFrame.obj \
-	$(TMPDIR)\tkGC.obj \
-	$(TMPDIR)\tkGeometry.obj \
-	$(TMPDIR)\tkGet.obj \
-	$(TMPDIR)\tkGrab.obj \
-	$(TMPDIR)\tkGrid.obj \
-	$(TMPDIR)\tkImage.obj \
-	$(TMPDIR)\tkImgBmap.obj \
-	$(TMPDIR)\tkImgGIF.obj \
-	$(TMPDIR)\tkImgPPM.obj \
-	$(TMPDIR)\tkImgPhoto.obj \
-	$(TMPDIR)\tkImgPhInstance.obj \
-	$(TMPDIR)\tkImgUtil.obj \
-	$(TMPDIR)\tkListbox.obj \
-	$(TMPDIR)\tkMacWinMenu.obj \
-	$(TMPDIR)\tkMain.obj \
-	$(TMPDIR)\tkMenu.obj \
-	$(TMPDIR)\tkMenubutton.obj \
-	$(TMPDIR)\tkMenuDraw.obj \
-	$(TMPDIR)\tkMessage.obj \
-	$(TMP_DIR)\tkPanedWindow.obj \
-	$(TMPDIR)\tkObj.obj \
-	$(TMPDIR)\tkOldConfig.obj \
-	$(TMPDIR)\tkOption.obj \
-	$(TMPDIR)\tkPack.obj \
-	$(TMPDIR)\tkPlace.obj \
-	$(TMPDIR)\tkPointer.obj \
-	$(TMPDIR)\tkRectOval.obj \
-	$(TMPDIR)\tkScale.obj \
-	$(TMPDIR)\tkScrollbar.obj \
-	$(TMPDIR)\tkSelect.obj \
-	$(TMPDIR)\tkText.obj \
-	$(TMPDIR)\tkTextBTree.obj \
-	$(TMPDIR)\tkTextDisp.obj \
-	$(TMPDIR)\tkTextImage.obj \
-	$(TMPDIR)\tkTextIndex.obj \
-	$(TMPDIR)\tkTextMark.obj \
-	$(TMPDIR)\tkTextTag.obj \
-	$(TMPDIR)\tkTextWind.obj \
-	$(TMPDIR)\tkTrig.obj \
-	$(TMPDIR)\tkUtil.obj \
-	$(TMPDIR)\tkVisual.obj \
-	$(TMPDIR)\tkStubInit.obj \
-	$(TMPDIR)\tkWindow.obj
-
-# Maintenance hint: Please have multiple members of TKSTUBOBJS be separated
-# by exactly one ' ' (see below the rule for making TKSTUBLIB)
-TKSTUBOBJS = $(TMPDIR)\tkStubLib.obj
-
-WINDIR      = $(ROOT)\win
-GENERICDIR  = $(ROOT)\generic
-XLIBDIR     = $(ROOT)\xlib
-BITMAPDIR   = $(ROOT)\bitmaps
-TCLLIBDIR   = $(TCLDIR)\win\$(OUTDIRNAME)
-RCDIR       = $(WINDIR)\rc
-
-TK_INCLUDES = -I$(WINDIR) -I$(GENERICDIR) -I$(BITMAPDIR) -I$(XLIBDIR) \
-      -I$(TCLDIR)\generic -I$(TCLDIR)\win
-
-TK_DEFINES  = -D_WIN32 $(DEBUGDEFINES) $(THREADDEFINES) SUPPORT_CONFIG_EMBEDDED
-
-######################################################################
-# Compile flags
-######################################################################
-
-!IF "$(NODEBUG)" == "1"
-# these macros cause maximum optimization and no symbols
-cdebug = -v- -vi- -O2 -D_DEBUG
-!ELSE
-# these macros enable debugging
-cdebug = -k -Od -r- -v -vi- -y
-!ENDIF
-
-SYSDEFINES = _MT;NO_STRICT;_NO_VCL
-
-# declarations common to all compiler options
-cbase = -3 -a4 -c -g0 -tWM -Ve -Vx -X-
-WARNINGS = -w-rch -w-pch -w-par -w-dup -w-pro -w-dpu
-
-ccons = -tWC
-
-CFLAGS      = $(cdebug) $(cbase) $(WARNINGS) -D$(SYSDEFINES)
-
-CON_CFLAGS  = $(CFLAGS) $(TK_DEFINES) $(include32) $(ccons)
-WISH_CFLAGS = $(CFLAGS) $(include32) $(TK_INCLUDES) $(TK_DEFINES)
-TK_CFLAGS   = $(CFLAGS) $(include32) $(TK_INCLUDES) $(TK_DEFINES) \
-                   -DUSE_TCL_STUBS
-
-######################################################################
-# Link flags
-######################################################################
-
-!IF "$(NODEBUG)" == "1"
-ldebug =
-!ELSE
-ldebug = -v
-!ENDIF
-
-# declarations common to all linker options
-LNFLAGS = -D"" -Gn -I$(TMPDIR) -x $(ldebug) $(libpath32)
-# -Gi: create lib file (is -Gl in doc)
-# -aa: Windows app, -ap: Windows console app
-LNFLAGS_DLL  = -ap -Gi -Tpd
-LNFLAGS_CONS = -ap -Tpe
-LNFLAGS_GUI  = -aa -Tpe
-
-LNLIBS = import32 cw32mt
-
-
-######################################################################
-# Project specific targets
-######################################################################
-
-all:      setup $(WISH) $(CAT32)
-install:  install-binaries install-libraries
-plugin:   setup $(TKPLUGINDLL) $(WISHP)
-tktest:   setup $(TKTEST) $(CAT32)
-
-# Maintenance hint: We want to set environment variables before calling tktest.
-#  If we do this in the form of normal commands, they will not persist up to
-#  the call of tktest. Therfore we put all commands wanted into a batch file.
-#  The normal way of using 'echo >x.bat' and 'echo >>x.bat' does not work here
-#  because we cannot write '... > tktest.txt' this way. Hence this advanced
-#  form of loop hopping:
-#    - Have MAKE produce a temporary file with the content we want.
-#    - Use it as input to the COPY command to produce a batch file.
-#    - Run the batch file and be happy.
-#
-test:     setup $(TKTEST) $(TKLIB) $(CAT32)
-  copy &&!
-  set TCL_LIBRARY=$(TCLDIR)/library
-  set PATH=$(TCLDIR)\win\$(TMPDIRNAME);$(PATH)
-  $(TKTEST) $(ROOT)/tests/all.tcl > tktest.txt
-! _test.bat
-  _test.bat
-#  del _test.bat
-
-runtest:  setup $(TKTEST) $(TKLIB) $(CAT32)
-  echo set TCL_LIBRARY=$(TCLDIR)/library             > _test2.bat
-  echo set PATH=$(TCLDIR)\win\$(TMPDIRNAME);$(PATH) >> _test2.bat
-  echo $(TKTEST)                                    >> _test2.bat
-  _test2.bat
-#  del _test2.bat
-
-console-wish : all $(WISHC)
-
-stubs:
-  $(TCLDIR)\win\$(TMPDIRNAME)\tclsh$(VERSION)$(DBGX) \
-    $(TCLDIR)\tools\genStubs.tcl $(GENERICDIR) \
-    $(GENERICDIR)\tk.decls $(GENERICDIR)\tkInt.decls
-
-setup:
-  @mkd $(TMPDIR)
-  @mkd $(OUTDIR)
-
-install-binaries:
-  @mkd "$(BIN_INSTALL_DIR)"
-  copy $(TKDLL) "$(BIN_INSTALL_DIR)"
-  copy $(WISH) "$(BIN_INSTALL_DIR)"
-  @mkd "$(LIB_INSTALL_DIR)"
-  copy $(TKLIB) "$(LIB_INSTALL_DIR)"
-
-install-libraries:
-  @mkd "$(INCLUDE_INSTALL_DIR)"
-  @mkd "$(INCLUDE_INSTALL_DIR)\X11"
-  copy "$(GENERICDIR)\tk.h"             "$(INCLUDE_INSTALL_DIR)"
-  copy "$(GENERICDIR)\tkDecls.h"        "$(INCLUDE_INSTALL_DIR)"
-  copy "$(GENERICDIR)\tkPlatDecls.h"    "$(INCLUDE_INSTALL_DIR)"
-  copy "$(GENERICDIR)\tkIntXlibDecls.h" "$(INCLUDE_INSTALL_DIR)"
-  xcopy "$(XLIBDIR)\X11\*.h"            "$(INCLUDE_INSTALL_DIR)\X11"
-  @mkd "$(SCRIPT_INSTALL_DIR)"
-  @mkd "$(SCRIPT_INSTALL_DIR)\images"
-  @mkd "$(SCRIPT_INSTALL_DIR)\demos"
-  @mkd "$(SCRIPT_INSTALL_DIR)\demos\images"
-  @mkd "$(SCRIPT_INSTALL_DIR)\msgs"
-  xcopy "$(ROOT)\library"		"$(SCRIPT_INSTALL_DIR)"
-  xcopy "$(ROOT)\library\images"	"$(SCRIPT_INSTALL_DIR)\images"
-  xcopy "$(ROOT)\library\demos"		"$(SCRIPT_INSTALL_DIR)\demos"
-  xcopy "$(ROOT)\library\demos\images"	"$(SCRIPT_INSTALL_DIR)\demos\images"
-  xcopy "$(ROOT)\library\msgs"		"$(SCRIPT_INSTALL_DIR)\msgs"
-
-$(TKLIB): $(TKDLL) $(TKSTUBLIB)
-
-# Maintenance hint: The macro puts a '+-' before the first member of
-#   TKSTUBOBJS, than replaces any ' ' with ' +-' - together putting '+-' in
-#   front of any member of TKSTUBOBJS (provided, they are separated in their
-#   defintion by just one space).
-#
-# The first time you *make* this target, you will get a warning
-#   tkStubLib not found in library
-# This is (probably) because of the '-' option, telling TLIB to remove
-# 'tkStubLib' when it does not yet exist. Forcing a re-make when it already
-# exists avoids this warning.
-#
-$(TKSTUBLIB): $(TKSTUBOBJS)
-    $(lib32) $@ +-$(TKSTUBOBJS: = +-)
-
-#    $(lib32) $@ @&&!
-#+-$(TKSTUBOBJS: = &^
-#+-)
-#!
-
-$(TKDLL): $(TKOBJS) $(TMPDIR)\tk.res
-    $(link32) $(ldebug) $(LNFLAGS) $(LNFLAGS_DLL) $(TOOLS32)\lib\c0d32 @&&!
-      $(TKOBJS), $@, -x, $(LNLIBS) $(TCLLIBDIR)\$(TCLSTUBLIB),, $(TMPDIR)\tk.res
-!
-
-$(TKPLUGINLIB): $(TKPLUGINDLL)
-
-#$(TKPLUGINDLL): $(TKOBJS) $(TMPDIR)\tk.res
-#        $(link32) $(ldebug) $(dlllflags) \
-#    -out:$@ $(TMPDIR)\tk.res $(TCLLIBDIR)\$(TCLPLUGINLIB) \
-#    $(guilibsdll) @<<
-#      $(TKOBJS)
-#<<
-
-$(WISH): $(WISHOBJS) $(TKLIB) $(TMPDIR)\wish.res
-  $(link32) $(ldebug) -S:2400000 $(LNFLAGS) $(LNFLAGS_GUI) $(TOOLS32)\lib\c0x32 @&&!
-    $(WISHOBJS), $@, -x, $(LNLIBS) $(TCLLIBDIR)\$(TCLLIB) $(TKLIB),, $(TMPDIR)\wish.res
-!
-
-$(WISHC): $(WISHOBJS) $(TKLIB) $(TMPDIR)\wish.res
-  $(link32) $(ldebug) -S:2400000 $(LNFLAGS) $(LNFLAGS_CONS) $(TOOLS32)\lib\c0x32 @&&!
-    $(WISHOBJS), $@, -x, $(LNLIBS) $(TCLLIBDIR)\$(TCLLIB) $(TKLIB),, $(TMPDIR)\wish.res
-!
-
-$(WISHP): $(WISHOBJS) $(TKPLUGINLIB) $(TMPDIR)\wish.res
-  $(link32) $(ldebug) $(guilflags) $(TMPDIR)\wish.res -out:$@ \
-    $(guilibsdll) $(TCLLIBDIR)\$(TCLPLUGINLIB) \
-    $(TKPLUGINLIB) $(WISHOBJS)
-
-$(TKTEST): $(TKTESTOBJS) $(TKLIB) $(TMPDIR)\wish.res
-  $(link32) $(ldebug) -S:2400000 $(LNFLAGS) $(LNFLAGS_GUI) $(TOOLS32)\lib\c0x32 @&&!
-    $(TKTESTOBJS), $@, -x, $(LNLIBS) $(TCLLIBDIR)\$(TCLLIB) $(TKLIB),, $(TMPDIR)\wish.res
-!
-#  $(link32) $(ldebug) $(guilflags) $(TMPDIR)\wish.res -out:$@ \
-#    $(guilibsdll) $(TCLLIBDIR)\$(TCLLIB) $(TKLIB) $(TKTESTOBJS)
-
-#$(CAT32): $(TCLDIR)\win\cat.c
-#  $(cc32) $(CON_CFLAGS) -o$(TMPDIR)\cat.obj $?
-#  $(link32) $(conlflags) -out:$@ -stack:16384 $(TMPDIR)\cat.obj $(conlibs)
-
-$(CAT32): $(TCLDIR)\win\cat.c
-  $(cc32) $(CONS_CFLAGS) -o$(TMPDIR)\cat.obj $?
-  $(link32) $(ldebug) $(LNFLAGS) $(LNFLAGS_CONS) $(TOOLS32)\lib\c0x32 \
-      $(TMPDIR)\cat.obj, $@, -x, $(LNLIBS),,
-
-#
-# Regenerate the stubs files.
-#
-
-genstubs:
-  tclsh$(VERSION) $(TCLDIR)\tools\genStubs.tcl $(GENERICDIR) \
-    $(GENERICDIR)\tk.decls $(GENERICDIR)\tkInt.decls
-
-#
-# Special case object file targets
-#
-
-$(TMPDIR)\testMain.obj: $(WINDIR)\winMain.c
-  $(cc32) $(WISH_CFLAGS) -DTK_TEST -o$@ $?
-
-$(TMPDIR)\tkTest.obj: $(GENERICDIR)\tkTest.c
-  $(cc32) $(WISH_CFLAGS) -o$@ $?
-
-$(TMPDIR)\tkOldTest.obj: $(GENERICDIR)\tkOldTest.c
-  $(cc32) $(WISH_CFLAGS) -o$@ $?
-
-$(TMPDIR)\tkWinTest.obj: $(WINDIR)\tkWinTest.c
-  $(cc32) $(WISH_CFLAGS) -o$@ $?
-
-$(TMPDIR)\tkSquare.obj: $(GENERICDIR)\tkSquare.c
-  $(cc32) $(WISH_CFLAGS) -o$@ $?
-
-$(TMPDIR)\winMain.obj: $(WINDIR)\winMain.c
-  $(cc32) $(WISH_CFLAGS) -o$@ $?
-
-$(TMPDIR)\tkStubLib.obj : $(GENERICDIR)\tkStubLib.c
-  $(cc32) $(TK_CFLAGS) -DSTATIC_BUILD -o$@ $?
-
-#
-# Implicit rules
-#
-
-{$(XLIBDIR)}.c{$(TMPDIR)}.obj:
-  $(cc32) -DDLL_BUILD -DBUILD_tk $(TK_CFLAGS) -o$@ $<
-
-{$(GENERICDIR)}.c{$(TMPDIR)}.obj:
-  $(cc32) -DDLL_BUILD -DBUILD_tk $(TK_CFLAGS) -o$@ $<
-
-{$(WINDIR)}.c{$(TMPDIR)}.obj:
-  $(cc32) -DDLL_BUILD -DBUILD_tk $(TK_CFLAGS) -o$@ $<
-
-{$(ROOT)\unix}.c{$(TMPDIR)}.obj:
-  $(cc32) -DDLL_BUILD -DBUILD_tk $(TK_CFLAGS) -o$@ $<
-
-{$(RCDIR)}.rc{$(TMPDIR)}.res:
-  $(rc32) -I"$(GENERICDIR)" -I"$(TOOLS32)\include" -I"$(TCLDIR)\generic" \
-      -D$(USERDEFINES);$(SYSDEFINES) -fo$@ $<
-
-clean:
-  -@del $(OUTDIR)\*.exp
-  -@del $(OUTDIR)\*.lib
-  -@del $(OUTDIR)\*.dll
-  -@del $(OUTDIR)\*.exe
-  -@del $(OUTDIR)\*.pdb
-  -@del $(TMPDIR)\*.pch
-  -@del $(TMPDIR)\*.obj
-  -@del $(TMPDIR)\*.res
-  -@del $(TMPDIR)\*.exe
-  -@rmd $(OUTDIR)
-  -@rmd $(TMPDIR)
-
-# dependencies
-
-$(TMPDIR)\tk.res: \
-    $(RCDIR)\buttons.bmp \
-    $(RCDIR)\cursor*.cur \
-    $(RCDIR)\tk.ico
-
-$(GENERICDIR)/default.h: $(WINDIR)/tkWinDefault.h
-$(GENERICDIR)/tkButton.c: $(GENERICDIR)/default.h
-$(GENERICDIR)/tkCanvas.c: $(GENERICDIR)/default.h
-$(GENERICDIR)/tkEntry.c: $(GENERICDIR)/default.h
-$(GENERICDIR)/tkFrame.c: $(GENERICDIR)/default.h
-$(GENERICDIR)/tkListbox.c: $(GENERICDIR)/default.h
-$(GENERICDIR)/tkMenu.c: $(GENERICDIR)/default.h
-$(GENERICDIR)/tkMenubutton.c: $(GENERICDIR)/default.h
-$(GENERICDIR)/tkMessage.c: $(GENERICDIR)/default.h
-$(GENERICDIR)/tkScale.c: $(GENERICDIR)/default.h
-$(GENERICDIR)/tkScrollbar.c: $(GENERICDIR)/default.h
-$(GENERICDIR)/tkText.c: $(GENERICDIR)/default.h
-$(GENERICDIR)/tkTextIndex.c: $(GENERICDIR)/default.h
-$(GENERICDIR)/tkTextTag.c: $(GENERICDIR)/default.h
-
-$(GENERICDIR)/tkText.c: $(GENERICDIR)/tkText.h
-$(GENERICDIR)/tkTextBTree.c: $(GENERICDIR)/tkText.h
-$(GENERICDIR)/tkTextDisp.c: $(GENERICDIR)/tkText.h
-$(GENERICDIR)/tkTextDisp.c: $(GENERICDIR)/tkText.h
-$(GENERICDIR)/tkTextImage.c: $(GENERICDIR)/tkText.h
-$(GENERICDIR)/tkTextIndex.c: $(GENERICDIR)/tkText.h
-$(GENERICDIR)/tkTextMark.c: $(GENERICDIR)/tkText.h
-$(GENERICDIR)/tkTextTag.c: $(GENERICDIR)/tkText.h
-$(GENERICDIR)/tkTextWind.c: $(GENERICDIR)/tkText.h
-
-$(GENERICDIR)/tkMacWinMenu.c: $(GENERICDIR)/tkMenu.h
-$(GENERICDIR)/tkMenu.c: $(GENERICDIR)/tkMenu.h
-$(GENERICDIR)/tkMenuDraw.c: $(GENERICDIR)/tkMenu.h
-$(WINDIR)/tkWinMenu.c: $(GENERICDIR)/tkMenu.h
-
-

Index: win/makefile.vc
==================================================================
--- win/makefile.vc
+++ win/makefile.vc
@@ -9,41 +9,24 @@
 # Copyright (c) 1995-1996 Sun Microsystems, Inc.
 # Copyright (c) 1998-2000 Ajuba Solutions.
 # Copyright (c) 2001-2005 ActiveState Corporation.
 # Copyright (c) 2001-2004 David Gravereaux.
 # Copyright (c) 2003-2008 Pat Thoyts.
-#------------------------------------------------------------------------------
-
-# Check to see we are configured to build with MSVC (MSDEVDIR, MSVCDIR or
-# VCINSTALLDIR) or with the MS Platform SDK (MSSDK or WindowsSDKDir)
-!if !defined(MSDEVDIR) && !defined(MSVCDIR) && !defined(VCINSTALLDIR) && !defined(MSSDK) && !defined(WINDOWSSDKDIR)
-MSG = ^
-You need to run vcvars32.bat from Developer Studio or setenv.bat from the^
-Platform SDK first to setup the environment.  Jump to this line to read^
-the build instructions.
-!error $(MSG)
-!endif
-
-#------------------------------------------------------------------------------
-# HOW TO USE this makefile:
-#
-# 1)  It is now necessary to have MSVCDir, MSDevDir or MSSDK set in the
-#     environment.  This is used as a check to see if vcvars32.bat had been
-#     run prior to running nmake or during the installation of Microsoft
-#     Visual C++, MSVCDir had been set globally and the PATH adjusted.
-#     Either way is valid.
-#
-#     You'll need to run vcvars32.bat contained in the MsDev's vc(98)/bin
-#     directory to setup the proper environment, if needed, for your
-#     current setup.  This is a needed bootstrap requirement and allows the
-#     swapping of different environments to be easier.
-#
-# 2)  To use the Platform SDK (not expressly needed), run setenv.bat after
-#     vcvars32.bat according to the instructions for it.  This can also
-#     turn on the 64-bit compiler, if your SDK has it.
-#
-# 3)  Targets are:
+# Copyright (c) 2017 Ashok P. Nadkarni
+#------------------------------------------------------------------------------
+
+# General usage:
+#   nmake [-nologo] -f makefile.vc [TARGET|MACRODEF [TARGET|MACRODEF] [...]]
+#
+# For MACRODEF, see TIP 477 (https://core.tcl.tk/tips/doc/trunk/tip/477.md)
+# or examine Sections 6-8 in rules.vc. This makefile has the following
+# values for the OPTS macro in addition to the ones described there.
+#	noxp     = If you do not have the uxtheme.h header then you
+#                  cannot include support for XP themeing.
+#	square   = Include the demo square widget.
+#
+# Possible values for TARGET are:
 #	release  -- Builds the core, the shell and the dlls. (default)
 #	dlls     -- Just builds the windows extensions.
 #	shell    -- Just builds the shell and the core.
 #	core     -- Only builds the core [tkXX.(dll|lib)].
 #	all      -- Builds everything.
@@ -60,140 +43,62 @@
 #		    headers like tkInt.h just get small changes.
 #	htmlhelp -- Builds a Windows .chm help file for Tcl and Tk from the
 #		    troff manual pages found in $(ROOT)\doc. You need to
 #		    have installed the HTML Help Compiler package from Microsoft
 #		    to produce the .chm file.
-#	winhelp  -- Builds the windows .hlp file for Tcl from the troff man
-#		    files found in $(ROOT)\doc.
-#
-# 4)  Macros usable on the commandline:
-#	TCLDIR=<path>
-#		Sets the location for where to find the Tcl headers and
-#		libraries.  The install point is assumed when not specified.
-#		Tk does need the source directory, though.  Tk comes very close
-#		to not needing the sources, but does, in fact, require them.
-#
-#	INSTALLDIR=<path>
-#		Sets where to install Tcl from the built binaries.
-#		C:\Progra~1\Tcl is assumed when not specified.
-#
-#	OPTS=loimpact,msvcrt,nothreads,noxp,pdbs,profile,square,static,staticpkg,symbols,unchecked,none
-#		Sets special options for the core.  The default is for none.
-#		Any combination of the above may be used (comma separated).
-#		'none' will over-ride everything to nothing.
-#
-#		loimpact = Adds a flag for how NT treats the heap to keep memory
-#			   in use, low.  This is said to impact alloc performance.
-#		msvcrt   = Affects the static option only to switch it from
-#			   using libcmt(d) as the C runtime [by default] to
-#			   msvcrt(d). This is useful for static embedding
-#			   support.
-#		nothreads= Turns off full multithreading support.
-#		noxp     = If you do not have the uxtheme.h header then you
-#                          cannot include support for XP themeing.
-#		square   = Include the demo square widget.
-#		static   = Builds a static library of the core instead of a
-#			   dll.  The shell will be static (and large), as well.
-#		staticpkg= Affects the static option only to switch wishXX.exe
-#			   to have the dde and reg extension linked inside it.
-#		pdbs     = Build detached symbols for release builds.
-#		profile  = Adds profiling hooks.  Map file is assumed.
-#		thrdalloc = Use the thread allocator (shared global free pool)
-#			   This is the default on threaded builds.
-#		tclalloc = Use the old non-thread allocator
-#		symbols  = Debug build. Links to the debug C runtime, disables
-#			   optimizations and creates pdb symbols files.
-#		unchecked = Allows a symbols build to not use the debug
-#			   enabled runtime (msvcrt.dll not msvcrtd.dll
-#			   or libcmt.lib not libcmtd.lib).
-#
-#	STATS=compdbg,memdbg,none
-#		Sets optional memory and bytecode compiler debugging code added
-#		to the core.  The default is for none.  Any combination of the
-#		above may be used (comma separated).  'none' will over-ride
-#		everything to nothing.
-#
-#		compdbg  = Enables byte compilation logging.
-#		memdbg   = Enables the debugging memory allocator.
-#
-#	CHECKS=64bit,fullwarn,nodep,none
-#		Sets special macros for checking compatability.
-#
-#		64bit    = Enable 64bit portability warnings (if available)
-#		fullwarn = Builds with full compiler and link warnings enabled.
-#			    Very verbose.
-#		nodep	 = Turns off compatability macros to ensure the core
-#			    isn't being built with deprecated functions.
-#
-#	MACHINE=(ALPHA|AMD64|IA64|IX86)
-#		Set the machine type used for the compiler, linker, and
-#		resource compiler.  This hook is needed to tell the tools
-#		when alternate platforms are requested.  IX86 is the default
-#		when not specified. If the CPU environment variable has been
-#		set (ie: recent Platform SDK) then MACHINE is set from CPU.
-#
-#	TMP_DIR=<path>
-#	OUT_DIR=<path>
-#		Hooks to allow the intermediate and output directories to be
-#		changed.  $(OUT_DIR) is assumed to be
-#		$(BINROOT)\(Release|Debug) based on if symbols are requested.
-#		$(TMP_DIR) will de $(OUT_DIR)\<buildtype> by default.
-#
-#	TESTPAT=<file>
-#		Reads the tests requested to be run from this file.
-#
-# 5)  Examples:
-#
-#	Basic syntax of calling nmake looks like this:
-#	nmake [-nologo] -f makefile.vc [target|macrodef [target|macrodef] [...]]
-#
-#                        Standard (no frills)
-#       c:\tk_src\win\>c:\progra~1\micros~1\vc98\bin\vcvars32.bat
-#       Setting environment for using Microsoft Visual C++ tools.
-#       c:\tk_src\win\>nmake -f makefile.vc release
-#       c:\tk_src\win\>nmake -f makefile.vc install INSTALLDIR=c:\progra~1\tcl
-#
-#                         Building for Win64
-#       c:\tk_src\win\>c:\progra~1\micros~1\vc98\bin\vcvars32.bat
-#       Setting environment for using Microsoft Visual C++ tools.
-#       c:\tk_src\win\>c:\progra~1\platfo~1\setenv.bat /pre64 /RETAIL
-#       Targeting Windows pre64 RETAIL
-#       c:\tk_src\win\>nmake -f makefile.vc MACHINE=IA64
-#
-#------------------------------------------------------------------------------
-#==============================================================================
-###############################################################################
-
-
-#    //==================================================================\\
-#   >>[               -> Do not modify below this line. <-               ]<<
-#   >>[  Please, use the commandline macros to modify how Tcl is built.  ]<<
-#   >>[  If you need more features, send us a patch for more macros.     ]<<
-#    \\==================================================================//
-
-
-###############################################################################
-#==============================================================================
-#------------------------------------------------------------------------------
-
-!if !exist("makefile.vc")
-MSG = ^
-You must run this makefile only from the directory it is in.^
-Please `cd` to its location first.
-!error $(MSG)
-!endif
-
-PROJECT = tk
-!include "rules.vc"
-
+#
+# The steps to setup a Visual C++ environment depend on which
+# version of Visual Studio and/or the Windows SDK you are building
+# against and are not described here. The simplest method is generally
+# to start a command shell using one of the short cuts installed by
+# Visual Studio/Windows SDK for the appropriate target architecture.
+#
+# NOTE: For older (Visual C++ 6 or the 2003 SDK), to use the Platform
+# SDK (not expressly needed), run setenv.bat after vcvars32.bat
+# according to the instructions for it.  This can also turn on the
+# 64-bit compiler, if your SDK has it.
+#
+# Examples:
+# Assumign Tcl sources lie in ../../tcl
+#       c:\tcl_src\win\>nmake -f makefile.vc release
+# If Tcl sources are not in ../../tcl, use the TCLDIR macro to specify dir
+#       c:\tcl_src\win\>nmake -f makefile.vc release TCLDIR=c:\src\tcl
+# Run the test suite
+#       c:\tcl_src\win\>nmake -f makefile.vc test
+# Install Tk in location specified by INSTALLDIR macro
+#       c:\tcl_src\win\>nmake -f makefile.vc install INSTALLDIR=c:\progra~1\tcl
+# Build release with PDF files
+#       c:\tcl_src\win\>nmake -f makefile.vc release OPTS=pdbs
+# Build debug version
+#       c:\tcl_src\win\>nmake -f makefile.vc release OPTS=symbols
+#
+###############################################################################
+
+# The PROJECT macro is used by rules.vc for generating appropriate
+# macros and rules.
+PROJECT = tk
+
+# Default target to build if no target is specified. If unspecified, the
+# rules.vc file will set up "all" as the target.
+DEFAULT_BUILD_TARGET = release
+
+# We have a custom resource file
+RCFILE = tk.rc
+
+# The rules.vc file does much of the hard work in terms of defining
+# the build configuration, macros, output directories etc.
+!include "rules-ext.vc"
+
+# TCLINSTALL is set to 1 by rules.vc to indicate we are building against
+# an installed Tcl and 0 if building against Tcl source. Tk needs the latter.
 !if $(TCLINSTALL)
 !message *** Warning: Tk requires the source distribution of Tcl to build from,
 !message ***    at this time, sorry.  Please set the TCLDIR macro to point to the
 !message ***    Tcl sources.
 !endif
 
-# Extra makefile options processing...
+# Extra makefile options processing for non-standard OPTS values ...
 !if "$(OPTS)" == "" || [nmakehlp -f "$(OPTS)" "none"]
 HAVE_UXTHEME_H    = 1
 TTK_SQUARE_WIDGET = 0
 !else
 !if [nmakehlp -f $(OPTS) "noxp"]
@@ -208,37 +113,22 @@
 !else
 TTK_SQUARE_WIDGET   = 0
 !endif
 !endif
 
-STUBPREFIX = $(PROJECT)stub
-WISHNAMEPREFIX = wish
-
-BINROOT		= $(MAKEDIR)     # originally .
-ROOT		= $(MAKEDIR)\..  # originally ..
-
-TK_LIBRARY	= $(ROOT)\library
-
-TKIMPLIB	= "$(OUT_DIR)\$(PROJECT)$(TK_VERSION)$(SUFX).lib"
-TKLIBNAME	= $(PROJECT)$(TK_VERSION)$(SUFX).$(EXT)
-TKLIB		= "$(OUT_DIR)\$(TKLIBNAME)"
-
-TKSTUBLIBNAME	= $(STUBPREFIX)$(TK_VERSION).lib
-TKSTUBLIB	= "$(OUT_DIR)\$(TKSTUBLIBNAME)"
-
-WISH 		= "$(OUT_DIR)\$(WISHNAMEPREFIX)$(TK_VERSION)$(SUFX).exe"
-WISHC 		= "$(OUT_DIR)\$(WISHNAMEPREFIX)c$(TK_VERSION)$(SUFX).exe"
+TK_NO_DEPRECATED = 0
+!if "$(CHECKS)" != "" && ![nmakehlp -f "$(CHECKS)" "none"]
+!if [nmakehlp -f $(CHECKS) "nodep"]
+TK_NO_DEPRECATED = 1
+!endif
+!endif
+
+WISHC 		= "$(OUT_DIR)\$(WISHNAMEPREFIX)c$(VERSION)$(SUFX).exe"
 
 TKTEST		= "$(OUT_DIR)\$(PROJECT)test.exe"
 CAT32		= "$(OUT_DIR)\cat32.exe"
 
-LIB_INSTALL_DIR		= $(_INSTALLDIR)\lib
-BIN_INSTALL_DIR		= $(_INSTALLDIR)\bin
-DOC_INSTALL_DIR		= $(_INSTALLDIR)\doc
-SCRIPT_INSTALL_DIR	= $(_INSTALLDIR)\lib\$(PROJECT)$(TK_DOTVERSION)
-INCLUDE_INSTALL_DIR	= $(_INSTALLDIR)\include
-
 WISHOBJS = \
 	$(TMP_DIR)\winMain.obj \
 !if $(TCL_USE_STATIC_PACKAGES)
 	$(TCLDDELIB) \
 	$(TCLREGLIB) \
@@ -323,10 +213,11 @@
 	$(TMP_DIR)\tkGet.obj \
 	$(TMP_DIR)\tkGrab.obj \
 	$(TMP_DIR)\tkGrid.obj \
 	$(TMP_DIR)\tkImage.obj \
 	$(TMP_DIR)\tkImgBmap.obj \
+	$(TMP_DIR)\tkImgListFormat.obj \
 	$(TMP_DIR)\tkImgGIF.obj \
 	$(TMP_DIR)\tkImgPNG.obj \
 	$(TMP_DIR)\tkImgPPM.obj \
 	$(TMP_DIR)\tkImgPhoto.obj \
 	$(TMP_DIR)\tkImgPhInstance.obj \
@@ -407,21 +298,19 @@
 
 TKSTUBOBJS = \
 	$(TMP_DIR)\tkStubLib.obj \
 	$(TMP_DIR)\ttkStubLib.obj
 
-
-WINDIR          = $(ROOT)\win
-GENERICDIR	= $(ROOT)\generic
+### The following paths CANNOT have spaces in them as they appear on
+### the left side of implicit rules.
 XLIBDIR		= $(ROOT)\xlib
 TTKDIR		= $(ROOT)\generic\ttk
 BITMAPDIR	= $(ROOT)\bitmaps
-DOCDIR		= $(ROOT)\doc
-RCDIR		= $(WINDIR)\rc
 
-TK_INCLUDES	= -I"$(WINDIR)" -I"$(GENERICDIR)" -I"$(BITMAPDIR)" -I"$(XLIBDIR)" \
-			$(TCL_INCLUDES)
+# Additional include and C macro definitions for the implicit rules
+# defined in rules.vc
+PRJ_INCLUDES	= -I"$(BITMAPDIR)" -I"$(XLIBDIR)"
 
 CONFIG_DEFS     =-DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 \
 		 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 \
 		 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 \
 		 -DSUPPORT_CONFIG_EMBEDDED \
@@ -429,125 +318,27 @@
 		 -DHAVE_UXTHEME_H=1 \
 !endif
 !if $(TTK_SQUARE_WIDGET)
 		 -DTTK_SQUARE_WIDGET=1 \
 !endif
-
-TK_DEFINES	=-DBUILD_ttk $(OPTDEFINES)  $(CONFIG_DEFS) -Dinline=__inline
-
-#---------------------------------------------------------------------
-# Compile flags
-#---------------------------------------------------------------------
-
-!if !$(DEBUG)
-!if $(OPTIMIZING)
-### This cranks the optimization level to maximize speed
-###  We can't use -O2 because sometimes it causes problems.
-cdebug	= $(OPTIMIZATIONS)
-!else
-cdebug	=
-!endif
-!if $(SYMBOLS)
-cdebug	= $(cdebug) -Zi
-!endif
-!else if "$(MACHINE)" == "IA64" || "$(MACHINE)" == "AMD64"
-### Warnings are too many, can't support warnings into errors.
-cdebug	= -Zi -Od $(DEBUGFLAGS)
-!else
-cdebug	= -Zi -WX $(DEBUGFLAGS)
-!endif
-
-### Declarations common to all compiler options
-cwarn = $(WARNINGS) -D _CRT_SECURE_NO_DEPRECATE -D _CRT_NONSTDC_NO_DEPRECATE
-cflags = -nologo -c $(COMPILERFLAGS) $(cwarn) -Fp$(TMP_DIR)^\
-
-!if $(MSVCRT)
-!if $(DEBUG) && !$(UNCHECKED)
-crt = -MDd
-!else
-crt = -MD
-!endif
-!else
-!if $(DEBUG) && !$(UNCHECKED)
-crt = -MTd
-!else
-crt = -MT
-!endif
-!endif
-
-BASE_CFLAGS	= $(cdebug) $(cflags) $(crt) $(TK_INCLUDES)
-TK_CFLAGS	= $(BASE_CFLAGS) $(TK_DEFINES) -DUSE_TCL_STUBS
-CON_CFLAGS	= $(cdebug) $(cflags) $(crt) -DCONSOLE
-WISH_CFLAGS	= $(BASE_CFLAGS) $(TK_DEFINES)
-STUB_CFLAGS     = $(cflags) $(cdebug) $(TK_DEFINES)
-
-
-#---------------------------------------------------------------------
-# Link flags
-#---------------------------------------------------------------------
-
-!if $(DEBUG)
-ldebug	= -debug -debugtype:cv
-!else
-ldebug	= -release -opt:ref -opt:icf,3
-!if $(SYMBOLS)
-ldebug	= $(ldebug) -debug -debugtype:cv
-!endif
-!endif
-
-### Declarations common to all linker options
-lflags	= -nologo -machine:$(MACHINE) $(LINKERFLAGS) $(ldebug)
-
-!if $(PROFILE)
-lflags	= $(lflags) -profile
-!endif
-
-!if $(MSVCRT) && !($(DEBUG) && !$(UNCHECKED)) && $(VCVERSION) >= 1900
-lflags	= $(lflags) -nodefaultlib:libucrt.lib
-!endif
-
-!if $(ALIGN98_HACK) && !$(STATIC_BUILD)
-### Align sections for PE size savings.
-lflags	= $(lflags) -opt:nowin98
-!else if !$(ALIGN98_HACK) && $(STATIC_BUILD)
-### Align sections for speed in loading by choosing the virtual page size.
-lflags	= $(lflags) -align:4096
-!endif
-
-!if $(LOIMPACT)
-lflags	= $(lflags) -ws:aggressive
-!endif
-
-dlllflags = $(lflags) -dll
-conlflags = $(lflags) -subsystem:console
-guilflags = $(lflags) -subsystem:windows
-
-tcllibs    = $(TCLSTUBLIB) $(TCLIMPLIB)
-
-baselibs   = netapi32.lib kernel32.lib user32.lib advapi32.lib userenv.lib ws2_32.lib
-# Avoid 'unresolved external symbol __security_cookie' errors.
-# c.f. http://support.microsoft.com/?id=894573
-!if "$(MACHINE)" == "IA64" || "$(MACHINE)" == "AMD64"
-!if $(VCVERSION) > 1399 && $(VCVERSION) < 1500
-baselibs   = $(baselibs) bufferoverflowU.lib
-!endif
-!endif
-!if $(MSVCRT) && !($(DEBUG) && !$(UNCHECKED)) && $(VCVERSION) >= 1900
-baselibs   = $(baselibs) ucrt.lib
-!endif
-
-guilibs	  = $(baselibs) gdi32.lib
+!if $(TK_NO_DEPRECATED)
+		 -DTK_NO_DEPRECATED=1
+!endif
+
+PRJ_DEFINES	= -DBUILD_ttk $(CONFIG_DEFS) -Dinline=__inline -D _CRT_SECURE_NO_DEPRECATE -D _CRT_NONSTDC_NO_DEPRECATE
+
+# Additional Link libraries needed beyond those in rules.vc
+PRJ_LIBS   = netapi32.lib gdi32.lib user32.lib userenv.lib
 
 
 #---------------------------------------------------------------------
 # TkTest flags
 #---------------------------------------------------------------------
 
 !if "$(TESTPAT)" != ""
 TESTFLAGS = $(TESTFLAGS) -file $(TESTPAT)
 !endif
-
 
 #---------------------------------------------------------------------
 # Project specific targets
 #---------------------------------------------------------------------
 
@@ -556,16 +347,17 @@
 core:	  setup $(TKSTUBLIB) $(TKLIB)
 cwish:	  $(WISHC)
 install:  install-binaries install-libraries install-docs
 tktest:	  setup $(TKTEST) $(CAT32)
 
+setup: default-setup
 
 test: test-classic test-ttk
 
 test-classic: setup $(TKTEST) $(TKLIB) $(CAT32)
 	@set TCL_LIBRARY=$(TCL_LIBRARY:\=/)
-	@set TK_LIBRARY=$(TK_LIBRARY:\=/)
+	@set TK_LIBRARY=$(LIBDIR:\=/)
 	@set TCLLIBPATH=
 !if $(TCLINSTALL)
 	@set PATH=$(_TCLDIR)\bin;$(PATH)
 !else
 	@set PATH=$(_TCLDIR)\win\$(BUILDDIRTOP);$(PATH)
@@ -572,11 +364,11 @@
 !endif
 	$(DEBUGGER) $(TKTEST) "$(ROOT:\=/)/tests/all.tcl" $(TESTFLAGS) | $(CAT32)
 
 test-ttk: setup $(TKTEST) $(TKLIB) $(CAT32)
 	@set TCL_LIBRARY=$(TCL_LIBRARY:\=/)
-	@set TK_LIBRARY=$(TK_LIBRARY:\=/)
+	@set TK_LIBRARY=$(LIBDIR:\=/)
 	@set TCLLIBPATH=
 !if $(TCLINSTALL)
 	@set PATH=$(_TCLDIR)\bin;$(PATH)
 !else
 	@set PATH=$(_TCLDIR)\win\$(BUILDDIRTOP);$(PATH)
@@ -583,11 +375,11 @@
 !endif
 	$(DEBUGGER) $(TKTEST) "$(ROOT:\=/)/tests/ttk/all.tcl" $(TESTFLAGS) | $(CAT32)
 
 runtest: setup $(TKTEST) $(TKLIB) $(CAT32)
 	@set TCL_LIBRARY=$(TCL_LIBRARY:\=/)
-	@set TK_LIBRARY=$(TK_LIBRARY:\=/)
+	@set TK_LIBRARY=$(LIBDIR:\=/)
 	@set TCLLIBPATH=
 !if $(TCLINSTALL)
 	@set PATH=$(_TCLDIR)\bin;$(PATH)
 !else
 	@set PATH=$(_TCLDIR)\win\$(BUILDDIRTOP);$(PATH)
@@ -594,11 +386,11 @@
 !endif
 	$(DEBUGGER) $(TKTEST)
 
 rundemo: setup $(TKTEST) $(TKLIB) $(CAT32)
 	@set TCL_LIBRARY=$(TCL_LIBRARY:\=/)
-	@set TK_LIBRARY=$(TK_LIBRARY:\=/)
+	@set TK_LIBRARY=$(LIBDIR:\=/)
 	@set TCLLIBPATH=
 !if $(TCLINSTALL)
 	@set PATH=$(_TCLDIR)\bin;$(PATH)
 !else
 	@set PATH=$(_TCLDIR)\win\$(BUILDDIRTOP);$(PATH)
@@ -605,11 +397,11 @@
 !endif
 	$(TKTEST) $(ROOT:\=/)\library\demos\widget
 
 shell: setup $(WISH)
 	@set TCL_LIBRARY=$(TCL_LIBRARY:\=/)
-	@set TK_LIBRARY=$(TK_LIBRARY:\=/)
+	@set TK_LIBRARY=$(LIBDIR:\=/)
 	@set TCLLIBPATH=
 !if $(TCLINSTALL)
 	@set PATH=$(_TCLDIR)\bin;$(PATH)
 !else
 	@set PATH=$(_TCLDIR)\win\$(BUILDDIRTOP);$(PATH)
@@ -618,64 +410,61 @@
 	console show
 <<
 
 dbgshell: setup $(WISH)
 	@set TCL_LIBRARY=$(TCL_LIBRARY:\=/)
-	@set TK_LIBRARY=$(TK_LIBRARY:\=/)
+	@set TK_LIBRARY=$(LIBDIR:\=/)
 	@set TCLLIBPATH=
 !if $(TCLINSTALL)
 	@set PATH=$(_TCLDIR)\bin;$(PATH)
 !else
 	@set PATH=$(_TCLDIR)\win\$(BUILDDIRTOP);$(PATH)
 !endif
 	windbg $(WISH)
 
-setup:
-	@if not exist $(OUT_DIR)\nul mkdir $(OUT_DIR)
-	@if not exist $(TMP_DIR)\nul mkdir $(TMP_DIR)
+!if $(STATIC_BUILD)
+
+$(TKLIB): $(TKOBJS)
+	$(LIBCMD) @<<
+$**
+<<
 
-!if !$(STATIC_BUILD)
-$(TKIMPLIB): $(TKLIB)
-!endif
+!else
 
 $(TKLIB): $(TKOBJS)
-!if $(STATIC_BUILD)
-	$(lib32) -nologo -out:$@ @<<
-$**
-<<
-!else
-	$(link32) $(dlllflags) -base:@$(COFFBASE),tk -out:$@ $(guilibs) \
-		$(TCLSTUBLIB) @<<
+	$(DLLCMD) @<<
 $**
 <<
 	$(_VC_MANIFEST_EMBED_DLL)
-	-@del $*.exp
-!endif
+	@if exist $*.exp del $*.exp
+
+$(TKIMPLIB): $(TKLIB)
 
+!endif # $(STATIC_BUILD)
 
 $(TKSTUBLIB): $(TKSTUBOBJS)
-	$(lib32) -nologo -nodefaultlib -out:$@ $**
+	$(LIBCMD) -nodefaultlib $**
 
 
 $(WISH): $(WISHOBJS) $(TKSTUBLIB) $(TKIMPLIB)
-	$(link32) $(guilflags) -stack:2300000 -out:$@ $(guilibs) $(tcllibs) $**
+	$(GUIEXECMD) -stack:2300000 $**
 	$(_VC_MANIFEST_EMBED_EXE)
 
 
 $(WISHC): $(WISHOBJS) $(TKSTUBLIB) $(TKIMPLIB)
-	$(link32) $(conlflags) -stack:2300000 -out:$@ $(guilibs) $(tcllibs) $**
+	$(CONEXECMD) -stack:2300000 $**
 	$(_VC_MANIFEST_EMBED_EXE)
 
 
 $(TKTEST): $(TKTESTOBJS) $(TKSTUBLIB) $(TKIMPLIB)
-	$(link32) $(guilflags) -stack:2300000 -out:$@ $(guilibs) $(tcllibs) $**
+	$(GUIEXECMD) -stack:2300000 $**
 	$(_VC_MANIFEST_EMBED_EXE)
 
 
 $(CAT32): $(_TCLDIR)\win\cat.c
-	$(cc32) $(CON_CFLAGS) -Fo$(TMP_DIR)\ $?
-	$(link32) $(conlflags) -out:$@ -stack:16384 $(TMP_DIR)\cat.obj $(baselibs)
+	$(cc32) $(cflags) $(crt) -D_CRT_NONSTDC_NO_DEPRECATE -DCONSOLE -Fo$(TMP_DIR)\ $?
+	$(CONEXECMD) -DCONSOLE -stack:16384 $(TMP_DIR)\cat.obj
 	$(_VC_MANIFEST_EMBED_EXE)
 
 #---------------------------------------------------------------------
 # Regenerate the stubs files.  [Development use only]
 #---------------------------------------------------------------------
@@ -692,32 +481,33 @@
 
 #---------------------------------------------------------------------
 # Build the Windows HTML help file.
 #---------------------------------------------------------------------
 
-# NOTE: you can define HHC on the command-line to override this
-!ifndef HHC
-HHC=""%ProgramFiles%\HTML Help Workshop\hhc.exe""
+!if defined(PROCESSOR_ARCHITECTURE) && "$(PROCESSOR_ARCHITECTURE)" == "AMD64"
+HHC="%ProgramFiles(x86)%\HTML Help Workshop\hhc.exe"
+!else
+HHC="%ProgramFiles%\HTML Help Workshop\hhc.exe"
 !endif
 HTMLDIR=$(ROOT)\html
-HTMLBASE=TclTk$(VERSION)
+HTMLBASE=TclTk$(TCL_VERSION)
 HHPFILE=$(HTMLDIR)\$(HTMLBASE).hhp
 CHMFILE=$(HTMLDIR)\$(HTMLBASE).chm
 
 htmlhelp: chmsetup $(CHMFILE)
 
 $(CHMFILE): $(DOCDIR)\*
 	@$(TCLSH) $(TCLTOOLSDIR)\tcltk-man2html.tcl
 	@echo Compiling HTML help project
-	@$(HHC) <<$(HHPFILE) >NUL
+	@"$(HHC)" <<$(HHPFILE) >NUL
 [OPTIONS]
 Compatibility=1.1 or later
 Compiled file=$(HTMLBASE).chm
 Display compile progress=no
 Error log file=$(HTMLBASE).log
 Language=0x409 English (United States)
-Title=Tcl/Tk $(DOT_VERSION) Help
+Title=Tcl/Tk $(TCL_DOTVERSION) Help
 [FILES]
 contents.htm
 docs.css
 Keywords
 TclCmd
@@ -728,141 +518,58 @@
 <<
 
 chmsetup:
 	@if not exist $(HTMLDIR)\nul mkdir $(HTMLDIR)
 
-#-------------------------------------------------------------------------
-# Build the old-style Windows .hlp file
-#-------------------------------------------------------------------------
-
-HLPBASE		= $(PROJECT)$(TK_VERSION)
-HELPFILE	= $(OUT_DIR)\$(HLPBASE).hlp
-HELPCNT		= $(OUT_DIR)\$(HLPBASE).cnt
-DOCTMP_DIR	= $(OUT_DIR)\$(PROJECT)_docs
-HELPRTF		= $(DOCTMP_DIR)\$(PROJECT).rtf
-MAN2HELP	= $(DOCTMP_DIR)\man2help.tcl
-MAN2HELP2	= $(DOCTMP_DIR)\man2help2.tcl
-INDEX		= $(DOCTMP_DIR)\index.tcl
-BMP		= $(DOCTMP_DIR)\lamp.bmp
-BMP_NOPATH	= lamp.bmp
-MAN2TCL		= $(DOCTMP_DIR)\man2tcl.exe
-
-winhelp: docsetup $(HELPFILE)
-
-docsetup:
-	@if not exist $(DOCTMP_DIR)\nul mkdir $(DOCTMP_DIR)
-
-$(MAN2HELP) $(MAN2HELP2) $(INDEX): $(TCLTOOLSDIR)\$$(@F)
-	$(CPY) $(TCLTOOLSDIR)\$(@F) $(@D)
-
-$(BMP):
-	$(CPY) $(WINDIR)\rc\$(@F) $(@D)
-
-$(HELPFILE): $(HELPRTF) $(BMP)
-	cd $(DOCTMP_DIR)
-	start /wait hcrtf.exe -x <<$(PROJECT).hpj
-[OPTIONS]
-COMPRESS=12 Hall Zeck
-LCID=0x409 0x0 0x0 ; English (United States)
-TITLE=Tk Reference Manual
-BMROOT=.
-CNT=$(@B).cnt
-HLP=$(@B).hlp
-
-[FILES]
-$(PROJECT).rtf
-
-[WINDOWS]
-main="Tcl/Tk Reference Manual",,27648,(r15263976),(r4227327)
-
-[CONFIG]
-BrowseButtons()
-CreateButton(1, "Web", ExecFile("http://www.tcl.tk"))
-CreateButton(2, "SF", ExecFile("http://sf.net/projects/tcl"))
-CreateButton(3, "Wiki", ExecFile("http://wiki.tcl.tk"))
-CreateButton(4, "FAQ", ExecFile("http://www.purl.org/NET/Tcl-FAQ/"))
-<<
-	cd $(MAKEDIR)
-	@$(CPY) "$(DOCTMP_DIR)\$(@B).hlp" "$(OUT_DIR)"
-	@$(CPY) "$(DOCTMP_DIR)\$(@B).cnt" "$(OUT_DIR)"
-
-$(MAN2TCL): $(TCLTOOLSDIR)\$$(@B).c
-	$(cc32) $(TK_CFLAGS) -Fo$(@D)\ $(TCLTOOLSDIR)\$(@B).c
-	$(link32) $(conlflags) -out:$@ -stack:16384 $(@D)\man2tcl.obj
-	$(_VC_MANIFEST_EMBED_EXE)
-
-$(HELPRTF): $(MAN2TCL) $(MAN2HELP) $(MAN2HELP2) $(INDEX)
-	$(TCLSH) $(MAN2HELP) -bitmap $(BMP_NOPATH) $(PROJECT) $(TK_VERSION) $(DOCDIR:\=/)
-
 install-docs:
-!if exist($(HELPFILE))
-	$(CPY) "$(HELPFILE)" "$(DOC_INSTALL_DIR)\"
-	$(CPY) "$(HELPCNT)" "$(DOC_INSTALL_DIR)\"
-	$(TCLSH) <<
-puts "Installing $(PROJECT)'s helpfile contents into Tcl's ..."
-set f [open "$(DOC_INSTALL_DIR:\=/)/tcl$(TK_VERSION).cnt" r]
-while {![eof $$f]} {
-    if {[regexp {:Include $(PROJECT)([0-9]{2}).cnt} [gets $$f] dummy ver]} {
-	if {$$ver == $(TK_VERSION)} {
-	    puts "Already installed."
-	    exit
-	} else {
-	    # do something here logical to remove (or replace) it.
-	    puts "$$ver != $(TK_VERSION), unfinished code path, die, die!"
-	    exit 1
-	}
-    }
-}
-close $$f
-set f [open "$(DOC_INSTALL_DIR:\=/)/tcl$(TK_VERSION).cnt" a]
-puts $$f {:Include $(HLPBASE).cnt}
-close $$f
-<<
-	start /wait winhlp32 -g $(DOC_INSTALL_DIR)\tcl$(TK_VERSION).hlp
+!if exist("$(CHMFILE)")
+	@echo Installing compiled HTML help
+	@$(CPY) "$(CHMFILE)" "$(DOC_INSTALL_DIR)\"
 !endif
+# "emacs font-lock highlighting fix
 
 #---------------------------------------------------------------------
 # Special case object file targets
 #---------------------------------------------------------------------
 
 $(TMP_DIR)\testMain.obj: $(WINDIR)\winMain.c
-	$(cc32) $(WISH_CFLAGS) -DTK_TEST \
+	$(cc32) $(appcflags_nostubs) -DTK_TEST \
 	    -DTCL_USE_STATIC_PACKAGES=$(TCL_USE_STATIC_PACKAGES) \
 	    -Fo$@ $?
 
 $(TMP_DIR)\tkTest.obj: $(GENERICDIR)\tkTest.c
-	$(cc32) $(WISH_CFLAGS) -Fo$@ $?
+	$(cc32) $(appcflags_nostubs) -Fo$@ $?
 
 $(TMP_DIR)\tkOldTest.obj: $(GENERICDIR)\tkOldTest.c
-	$(cc32) $(WISH_CFLAGS) -Fo$@ $?
+	$(cc32) $(appcflags_nostubs) -Fo$@ $?
 
 $(TMP_DIR)\tkWinTest.obj: $(WINDIR)\tkWinTest.c
-	$(cc32) $(WISH_CFLAGS) -Fo$@ $?
+	$(cc32) $(appcflags_nostubs) -Fo$@ $?
 
 $(TMP_DIR)\tkSquare.obj: $(GENERICDIR)\tkSquare.c
-	$(cc32) $(WISH_CFLAGS) -Fo$@ $?
+	$(cc32) $(appcflags_nostubs) -Fo$@ $?
 
 $(TMP_DIR)\winMain.obj: $(WINDIR)\winMain.c
-	$(cc32) $(WISH_CFLAGS) \
+	$(cc32) $(appcflags_nostubs) \
 	    -DTCL_USE_STATIC_PACKAGES=$(TCL_USE_STATIC_PACKAGES) \
 	    -Fo$@ $?
 
 $(TMP_DIR)\tkMain2.obj: $(GENERICDIR)\tkMain.c
-	$(cc32) -DBUILD_tk $(TK_CFLAGS) -DTK_ASCII_MAIN -Fo$@ $?
+	$(cc32) $(pkgcflags) -DTK_ASCII_MAIN -Fo$@ $?
 
 # The following objects are part of the stub library and should not
 # be built as DLL objects but none of the symbols should be exported
 # and no reference made to a C runtime.
 
 $(TMP_DIR)\tkStubLib.obj : $(GENERICDIR)\tkStubLib.c
-	$(cc32) $(STUB_CFLAGS) $(TK_INCLUDES) -Zl -DSTATIC_BUILD -Fo$@ $?
+	$(cc32) $(stubscflags) -Fo$@ $?
 
 
 $(TMP_DIR)\wish.exe.manifest: $(WINDIR)\wish.exe.manifest.in
 	@nmakehlp -s << $** >$@
 @MACHINE@	  $(MACHINE:IX86=X86)
-@TK_WIN_VERSION@  $(TK_DOTVERSION).0.0
+@TK_WIN_VERSION@  $(DOTVERSION).0.0
 <<
 
 #---------------------------------------------------------------------
 # Generate the source dependencies.  Having dependency rules will
 # improve incremental build accuracy without having to resort to a
@@ -906,41 +613,24 @@
 #---------------------------------------------------------------------
 # Implicit rules
 #---------------------------------------------------------------------
 
 {$(XLIBDIR)}.c{$(TMP_DIR)}.obj::
-	$(cc32) -DBUILD_tk $(TK_CFLAGS) -Fo$(TMP_DIR)\ @<<
-$<
-<<
-
-{$(GENERICDIR)}.c{$(TMP_DIR)}.obj::
-	$(cc32) -DBUILD_tk $(TK_CFLAGS) -Fo$(TMP_DIR)\ @<<
+	$(CCPKGCMD) @<<
 $<
 <<
 
 {$(TTKDIR)}.c{$(TMP_DIR)}.obj::
-	$(cc32) -DBUILD_tk $(TK_CFLAGS) -Fo$(TMP_DIR)\ @<<
-$<
-<<
-
-{$(WINDIR)}.c{$(TMP_DIR)}.obj::
-	$(cc32) -DBUILD_tk $(TK_CFLAGS) -Fo$(TMP_DIR)\ @<<
+	$(CCPKGCMD) @<<
 $<
 <<
 
 {$(ROOT)\unix}.c{$(TMP_DIR)}.obj::
-	$(cc32) -DBUILD_tk $(TK_CFLAGS) -Fo$(TMP_DIR)\ @<<
+	$(CCPKGCMD) @<<
 $<
 <<
 
-{$(RCDIR)}.rc{$(TMP_DIR)}.res:
-	$(rc32) -fo $@ -r -i "$(GENERICDIR)" -i "$(TMP_DIR)" $(TCL_INCLUDES) \
-	    -d DEBUG=$(DEBUG) -d UNCHECKED=$(UNCHECKED) \
-	    -d TCL_THREADS=$(TCL_THREADS) \
-	    -d STATIC_BUILD=$(STATIC_BUILD) \
-	    $<
-
 $(TMP_DIR)\tk.res: $(TMP_DIR)\wish.exe.manifest
 $(TMP_DIR)\wish.res: $(TMP_DIR)\wish.exe.manifest
 
 .SUFFIXES:
 .SUFFIXES:.c .rc
@@ -951,22 +641,22 @@
 #---------------------------------------------------------------------
 
 install-binaries:
 	@echo installing binaries
 	@$(CPY) "$(WISH)" "$(BIN_INSTALL_DIR)\"
-!if $(TKLIB) != $(TKIMPLIB)
+!if "$(TKLIB)" != "$(TKIMPLIB)"
 	@$(CPY) "$(TKLIB)" "$(BIN_INSTALL_DIR)\"
 !endif
 	@$(CPY) "$(TKIMPLIB)" "$(LIB_INSTALL_DIR)\"
 	@$(CPY) "$(TKSTUBLIB)" "$(LIB_INSTALL_DIR)\"
 !if !$(STATIC_BUILD)
 	@echo creating package index
 	@type << > $(OUT_DIR)\pkgIndex.tcl
-if {[catch {package present Tcl 8.6.0}]} { return }
+if {[catch {package present Tcl 8.6-}]} { return }
 if {($$::tcl_platform(platform) eq "unix") && ([info exists ::env(DISPLAY)]
 	|| ([info exists ::argv] && ("-display" in $$::argv)))} {
-    package ifneeded Tk $(TK_PATCH_LEVEL) [list load [file join $$dir .. .. bin libtk$(TK_DOTVERSION).dll] Tk]
+    package ifneeded Tk $(TK_PATCH_LEVEL) [list load [file join $$dir .. .. bin libtk$(DOTVERSION).dll] Tk]
 } else {
     package ifneeded Tk $(TK_PATCH_LEVEL) [list load [file join $$dir .. .. bin $(TKLIBNAME)] Tk]
 }
 <<
 	@$(CPY) $(OUT_DIR)\pkgIndex.tcl "$(SCRIPT_INSTALL_DIR)\"
@@ -980,29 +670,32 @@
 	@$(CPY) "$(GENERICDIR)\tkDecls.h" "$(INCLUDE_INSTALL_DIR)\"
 	@$(CPY) "$(GENERICDIR)\tkPlatDecls.h" "$(INCLUDE_INSTALL_DIR)\"
 	@$(CPY) "$(GENERICDIR)\tkIntXlibDecls.h" "$(INCLUDE_INSTALL_DIR)\"
 	@$(CPY) "$(XLIBDIR)\X11\*.h" "$(INCLUDE_INSTALL_DIR)\X11\"
 	@echo installing script library
-	@$(CPY) "$(ROOT)\library\*" "$(SCRIPT_INSTALL_DIR)\"
+	@$(CPY) "$(LIBDIR)\*" "$(SCRIPT_INSTALL_DIR)\"
 	@echo installing theme library
-	@$(CPY) "$(ROOT)\library\ttk\*" "$(SCRIPT_INSTALL_DIR)\ttk\"
-	@echo installing demos
-	@$(CPY) "$(ROOT)\library\demos\*" "$(SCRIPT_INSTALL_DIR)\demos\"
-	@$(CPY) "$(ROOT)\library\demos\images\*" "$(SCRIPT_INSTALL_DIR)\demos\images\"
+	@$(CPY) "$(LIBDIR)\ttk\*" "$(SCRIPT_INSTALL_DIR)\ttk\"
 	@echo installing images
-	@$(CPY) "$(ROOT)\library\images\*" "$(SCRIPT_INSTALL_DIR)\images\"
+	@$(CPY) "$(LIBDIR)\images\*" "$(SCRIPT_INSTALL_DIR)\images\"
 	@echo installing language files
-	@$(CPY) "$(ROOT)\library\msgs\*" "$(SCRIPT_INSTALL_DIR)\msgs\"
+	@$(CPY) "$(LIBDIR)\msgs\*" "$(SCRIPT_INSTALL_DIR)\msgs\"
+	@echo installing demos
+	@$(CPY) "$(DEMODIR)\*" "$(DEMO_INSTALL_DIR)\"
+	@$(CPY) "$(DEMODIR)\images\*" "$(DEMO_INSTALL_DIR)\images\"
 
 #"
 
 #---------------------------------------------------------------------
 # Clean up
 #---------------------------------------------------------------------
 
+clean: default-clean
+realclean: hose
+hose: default-hose
 tidy:
-!if $(TKLIB) != $(TKIMPLIB)
+!if "$(TKLIB)" != "$(TKIMPLIB)"
 	@echo Removing $(TKLIB) ...
 	@if exist $(TKLIB) del $(TKLIB)
 !endif
 	@echo Removing $(TKIMPLIB) ...
 	@if exist $(TKIMPLIB) del $(TKIMPLIB)
@@ -1011,26 +704,5 @@
 	@echo Removing $(TKTEST) ...
 	@if exist $(TKTEST) del $(TKTEST)
 	@echo Removing $(TKSTUBLIB) ...
 	@if exist $(TKSTUBLIB) del $(TKSTUBLIB)
 
-clean:
-	@echo Cleaning $(TMP_DIR)\* ...
-	@if exist $(TMP_DIR)\nul $(RMDIR) $(TMP_DIR)
-	@echo Cleaning $(WINDIR)\nmakehlp.obj ...
-	@if exist $(WINDIR)\nmakehlp.obj del $(WINDIR)\nmakehlp.obj
-	@echo Cleaning $(WINDIR)\nmakehlp.exe ...
-	@if exist $(WINDIR)\nmakehlp.exe del $(WINDIR)\nmakehlp.exe
-	@echo Cleaning $(WINDIR)\_junk.pch ...
-	@if exist $(WINDIR)\_junk.pch del $(WINDIR)\_junk.pch
-	@echo Cleaning $(WINDIR)\vercl.x ...
-	@if exist $(WINDIR)\vercl.x del $(WINDIR)\vercl.x
-	@echo Cleaning $(WINDIR)\vercl.i ...
-	@if exist $(WINDIR)\vercl.i del $(WINDIR)\vercl.i
-	@echo Cleaning $(WINDIR)\versions.vc ...
-	@if exist $(WINDIR)\versions.vc del $(WINDIR)\versions.vc
-
-realclean: hose
-
-hose:
-	@echo Hosing $(OUT_DIR)\* ...
-	@if exist $(OUT_DIR)\nul $(RMDIR) $(OUT_DIR)

DELETED win/mkd.bat
Index: win/mkd.bat
==================================================================
--- win/mkd.bat
+++ /dev/null
@@ -1,12 +0,0 @@
-@echo off
-
-if exist %1\nul goto end
-
-md %1
-if errorlevel 1 goto end
-
-echo Created directory %1
-
-:end
-
-

Index: win/nmakehlp.c
==================================================================
--- win/nmakehlp.c
+++ win/nmakehlp.c
@@ -37,18 +37,18 @@
 #ifdef _MSC_VER
 #define   snprintf	_snprintf
 #endif
 
 
-
 /* protos */
 
 static int CheckForCompilerFeature(const char *option);
-static int CheckForLinkerFeature(const char *option);
+static int CheckForLinkerFeature(const char **options, int count);
 static int IsIn(const char *string, const char *substring);
 static int SubstituteFile(const char *substs, const char *filename);
 static int QualifyPath(const char *path);
+static int LocateDependency(const char *keyfile);
 static const char *GetVersionFromFile(const char *filename, const char *match, int numdots);
 static DWORD WINAPI ReadFromPipe(LPVOID args);
 
 /* globals */
 
@@ -72,10 +72,11 @@
     char *argv[])
 {
     char msg[300];
     DWORD dwWritten;
     int chars;
+    char *s;
 
     /*
      * Make sure children (cl.exe and link.exe) are kept quiet.
      */
 
@@ -100,20 +101,20 @@
 			&dwWritten, NULL);
 		return 2;
 	    }
 	    return CheckForCompilerFeature(argv[2]);
 	case 'l':
-	    if (argc != 3) {
+	    if (argc < 3) {
 		chars = snprintf(msg, sizeof(msg) - 1,
-	       		"usage: %s -l <linker option>\n"
+	       		"usage: %s -l <linker option> ?<mandatory option> ...?\n"
 			"Tests for whether link.exe supports an option\n"
 			"exitcodes: 0 == no, 1 == yes, 2 == error\n", argv[0]);
 		WriteFile(GetStdHandle(STD_ERROR_HANDLE), msg, chars,
 			&dwWritten, NULL);
 		return 2;
 	    }
-	    return CheckForLinkerFeature(argv[2]);
+	    return CheckForLinkerFeature(&argv[2], argc-2);
 	case 'f':
 	    if (argc == 2) {
 		chars = snprintf(msg, sizeof(msg) - 1,
 			"usage: %s -f <string> <substring>\n"
 			"Find a substring within another\n"
@@ -151,12 +152,17 @@
 		    argv[0]);
 		WriteFile(GetStdHandle(STD_ERROR_HANDLE), msg, chars,
 		    &dwWritten, NULL);
 		return 0;
 	    }
-	    printf("%s\n", GetVersionFromFile(argv[2], argv[3], *(argv[1]+2) - '0'));
-	    return 0;
+	    s = GetVersionFromFile(argv[2], argv[3], *(argv[1]+2) - '0');
+	    if (s && *s) {
+		printf("%s\n", s);
+		return 0;
+	    } else
+		return 1; /* Version not found. Return non-0 exit code */
+
 	case 'Q':
 	    if (argc != 3) {
 		chars = snprintf(msg, sizeof(msg) - 1,
 		    "usage: %s -Q path\n"
 		    "Emit the fully qualified path\n"
@@ -164,10 +170,22 @@
 		WriteFile(GetStdHandle(STD_ERROR_HANDLE), msg, chars,
 		    &dwWritten, NULL);
 		return 2;
 	    }
 	    return QualifyPath(argv[2]);
+
+	case 'L':
+	    if (argc != 3) {
+		chars = snprintf(msg, sizeof(msg) - 1,
+		    "usage: %s -L keypath\n"
+		    "Emit the fully qualified path of directory containing keypath\n"
+		    "exitcodes: 0 == success, 1 == not found, 2 == error\n", argv[0]);
+		WriteFile(GetStdHandle(STD_ERROR_HANDLE), msg, chars,
+		    &dwWritten, NULL);
+		return 2;
+	    }
+	    return LocateDependency(argv[2]);
 	}
     }
     chars = snprintf(msg, sizeof(msg) - 1,
 	    "usage: %s -c|-f|-l|-Q|-s|-V ...\n"
 	    "This is a little helper app to equalize shell differences between WinNT and\n"
@@ -311,20 +329,22 @@
              || strstr(Err.buffer, "D2021") != NULL);
 }
 
 static int
 CheckForLinkerFeature(
-    const char *option)
+    const char **options,
+    int count)
 {
     STARTUPINFO si;
     PROCESS_INFORMATION pi;
     SECURITY_ATTRIBUTES sa;
     DWORD threadID;
     char msg[300];
     BOOL ok;
     HANDLE hProcess, h, pipeThreads[2];
-    char cmdline[100];
+    int i;
+    char cmdline[255];
 
     hProcess = GetCurrentProcess();
 
     ZeroMemory(&pi, sizeof(PROCESS_INFORMATION));
     ZeroMemory(&si, sizeof(STARTUPINFO));
@@ -366,11 +386,15 @@
 
     /*
      * Append our option for testing.
      */
 
-    lstrcat(cmdline, option);
+    for (i = 0; i < count; i++) {
+	lstrcat(cmdline, " \"");
+	lstrcat(cmdline, options[i]);
+	lstrcat(cmdline, "\"");
+    }
 
     ok = CreateProcess(
 	    NULL,	    /* Module name. */
 	    cmdline,	    /* Command line. */
 	    NULL,	    /* Process handle not inheritable. */
@@ -431,11 +455,13 @@
      */
 
     return !(strstr(Out.buffer, "LNK1117") != NULL ||
 	    strstr(Err.buffer, "LNK1117") != NULL ||
 	    strstr(Out.buffer, "LNK4044") != NULL ||
-	    strstr(Err.buffer, "LNK4044") != NULL);
+	    strstr(Err.buffer, "LNK4044") != NULL ||
+	    strstr(Out.buffer, "LNK4224") != NULL ||
+	    strstr(Err.buffer, "LNK4224") != NULL);
 }
 
 static DWORD WINAPI
 ReadFromPipe(
     LPVOID args)
@@ -683,10 +709,101 @@
     PathCombine(szTmp, szCwd, szPath);
     PathCanonicalize(szCwd, szTmp);
     printf("%s\n", szCwd);
     return 0;
 }
+
+/*
+ * Implements LocateDependency for a single directory. See that command
+ * for an explanation.
+ * Returns 0 if found after printing the directory.
+ * Returns 1 if not found but no errors.
+ * Returns 2 on any kind of error
+ * Basically, these are used as exit codes for the process.
+ */
+static int LocateDependencyHelper(const char *dir, const char *keypath)
+{
+    HANDLE hSearch;
+    char path[MAX_PATH+1];
+    int dirlen, keylen, ret;
+    WIN32_FIND_DATA finfo;
+
+    if (dir == NULL || keypath == NULL)
+	return 2; /* Have no real error reporting mechanism into nmake */
+    dirlen = strlen(dir);
+    if ((dirlen + 3) > sizeof(path))
+	return 2;
+    strncpy(path, dir, dirlen);
+    strncpy(path+dirlen, "\\*", 3);	/* Including terminating \0 */
+    keylen = strlen(keypath);
+
+#if 0 /* This function is not available in Visual C++ 6 */
+    /*
+     * Use numerics 0 -> FindExInfoStandard,
+     * 1 -> FindExSearchLimitToDirectories,
+     * as these are not defined in Visual C++ 6
+     */
+    hSearch = FindFirstFileEx(path, 0, &finfo, 1, NULL, 0);
+#else
+    hSearch = FindFirstFile(path, &finfo);
+#endif
+    if (hSearch == INVALID_HANDLE_VALUE)
+	return 1; /* Not found */
+
+    /* Loop through all subdirs checking if the keypath is under there */
+    ret = 1; /* Assume not found */
+    do {
+	int sublen;
+	/*
+	 * We need to check it is a directory despite the
+	 * FindExSearchLimitToDirectories in the above call. See SDK docs
+	 */
+	if ((finfo.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0)
+	    continue;
+	sublen = strlen(finfo.cFileName);
+	if ((dirlen+1+sublen+1+keylen+1) > sizeof(path))
+	    continue;		/* Path does not fit, assume not matched */
+	strncpy(path+dirlen+1, finfo.cFileName, sublen);
+	path[dirlen+1+sublen] = '\\';
+	strncpy(path+dirlen+1+sublen+1, keypath, keylen+1);
+	if (PathFileExists(path)) {
+	    /* Found a match, print to stdout */
+	    path[dirlen+1+sublen] = '\0';
+	    QualifyPath(path);
+	    ret = 0;
+	    break;
+	}
+    } while (FindNextFile(hSearch, &finfo));
+    FindClose(hSearch);
+    return ret;
+}
+
+/*
+ * LocateDependency --
+ *
+ *	Locates a dependency for a package.
+ *        keypath - a relative path within the package directory
+ *          that is used to confirm it is the correct directory.
+ *	The search path for the package directory is currently only
+ *      the parent and grandparent of the current working directory.
+ *      If found, the command prints
+ *         name_DIRPATH=<full path of located directory>
+ *      and returns 0. If not found, does not print anything and returns 1.
+ */
+static int LocateDependency(const char *keypath)
+{
+    int i, ret;
+    static char *paths[] = {"..", "..\\..", "..\\..\\.."};
+
+    for (i = 0; i < (sizeof(paths)/sizeof(paths[0])); ++i) {
+	ret = LocateDependencyHelper(paths[i], keypath);
+	if (ret == 0)
+	    return ret;
+    }
+    return ret;
+}
+
 
 /*
  * Local variables:
  *   mode: c
  *   c-basic-offset: 4

Index: win/rc/tk.rc
==================================================================
--- win/rc/tk.rc
+++ win/rc/tk.rc
@@ -6,23 +6,17 @@
 #include <tk.h>
 
 //
 // build-up the name suffix that defines the type of build this is.
 //
-#if TCL_THREADS
-#define SUFFIX_THREADS	    "t"
-#else
-#define SUFFIX_THREADS	    ""
-#endif
-
 #if DEBUG && !UNCHECKED
 #define SUFFIX_DEBUG	    "g"
 #else
 #define SUFFIX_DEBUG	    ""
 #endif
 
-#define SUFFIX		    SUFFIX_THREADS SUFFIX_DEBUG
+#define SUFFIX		    SUFFIX_DEBUG
 
 
 VS_VERSION_INFO	VERSIONINFO
  FILEVERSION	TK_MAJOR_VERSION,TK_MINOR_VERSION,TK_RELEASE_LEVEL,TK_RELEASE_SERIAL
  PRODUCTVERSION	TK_MAJOR_VERSION,TK_MINOR_VERSION,TK_RELEASE_LEVEL,TK_RELEASE_SERIAL

Index: win/rc/wish.rc
==================================================================
--- win/rc/wish.rc
+++ win/rc/wish.rc
@@ -6,16 +6,10 @@
 #include <tk.h>
 
 //
 // build-up the name suffix that defines the type of build this is.
 //
-#if TCL_THREADS
-#define SUFFIX_THREADS	    "t"
-#else
-#define SUFFIX_THREADS	    ""
-#endif
-
 #if STATIC_BUILD
 #define SUFFIX_STATIC	    "s"
 #else
 #define SUFFIX_STATIC	    ""
 #endif
@@ -24,11 +18,11 @@
 #define SUFFIX_DEBUG	    "g"
 #else
 #define SUFFIX_DEBUG	    ""
 #endif
 
-#define SUFFIX		    SUFFIX_THREADS SUFFIX_STATIC SUFFIX_DEBUG
+#define SUFFIX		    SUFFIX_STATIC SUFFIX_DEBUG
 
 
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION    TK_MAJOR_VERSION,TK_MINOR_VERSION,TK_RELEASE_LEVEL,TK_RELEASE_SERIAL
  PRODUCTVERSION TK_MAJOR_VERSION,TK_MINOR_VERSION,TK_RELEASE_LEVEL,TK_RELEASE_SERIAL

DELETED win/rmd.bat
Index: win/rmd.bat
==================================================================
--- win/rmd.bat
+++ /dev/null
@@ -1,20 +0,0 @@
-@echo off
-
-if not exist %1\nul goto end
-
-echo Removing directory %1
-
-if "%OS%" == "Windows_NT" goto winnt
-
-deltree /y %1
-if errorlevel 1 goto end
-goto success
-
-:winnt
-rmdir /s /q %1
-if errorlevel 1 goto end
-
-:success
-echo Deleted directory %1
-
-:end

ADDED   win/rules-ext.vc
Index: win/rules-ext.vc
==================================================================
--- /dev/null
+++ win/rules-ext.vc
@@ -0,0 +1,118 @@
+# This file should only be included in makefiles for Tcl extensions,
+# NOT in the makefile for Tcl itself.
+
+!ifndef _RULES_EXT_VC
+
+# We need to run from the directory the parent makefile is located in.
+# nmake does not tell us what makefile was used to invoke it so parent
+# makefile has to set the MAKEFILEVC macro or we just make a guess and
+# warn if we think that is not the case.
+!if "$(MAKEFILEVC)" == ""
+
+!if exist("$(PROJECT).vc")
+MAKEFILEVC = $(PROJECT).vc
+!elseif exist("makefile.vc")
+MAKEFILEVC = makefile.vc
+!endif
+!endif # "$(MAKEFILEVC)" == ""
+
+!if !exist("$(MAKEFILEVC)")
+MSG = ^
+You must run nmake from the directory containing the project makefile.^
+If you are doing that and getting this message, set the MAKEFILEVC^
+macro to the name of the project makefile.
+!message WARNING: $(MSG)
+!endif
+
+!if "$(PROJECT)" == "tcl"
+!error The rules-ext.vc file is not intended for Tcl itself.
+!endif
+
+# We extract version numbers using the nmakehlp program. For now use
+# the local copy of nmakehlp. Once we locate Tcl, we will use that
+# one if it is newer.
+!if [$(CC) -nologo "nmakehlp.c" -link -subsystem:console > nul]
+!endif
+
+# First locate the Tcl directory that we are working with.
+!if "$(TCLDIR)" != ""
+
+_RULESDIR = $(TCLDIR:/=\)
+
+!else
+
+# If an installation path is specified, that is also the Tcl directory.
+# Also Tk never builds against an installed Tcl, it needs Tcl sources
+!if defined(INSTALLDIR) && "$(PROJECT)" != "tk"
+_RULESDIR=$(INSTALLDIR:/=\)
+!else
+# Locate Tcl sources
+!if [echo _RULESDIR = \> nmakehlp.out] \
+   || [nmakehlp -L generic\tcl.h >> nmakehlp.out]
+_RULESDIR = ..\..\tcl
+!else
+!include nmakehlp.out
+!endif
+
+!endif # defined(INSTALLDIR)....
+
+!endif # ifndef TCLDIR
+
+# Now look for the targets.vc file under the Tcl root. Note we check this
+# file and not rules.vc because the latter also exists on older systems.
+!if exist("$(_RULESDIR)\lib\nmake\targets.vc") # Building against installed Tcl
+_RULESDIR = $(_RULESDIR)\lib\nmake
+!elseif exist("$(_RULESDIR)\win\targets.vc")   # Building against Tcl sources
+_RULESDIR = $(_RULESDIR)\win
+!else
+# If we have not located Tcl's targets file, most likely we are compiling
+# against an older version of Tcl and so must use our own support files.
+_RULESDIR = .
+!endif
+
+!if "$(_RULESDIR)" != "."
+# Potentially using Tcl's support files. If this extension has its own
+# nmake support files, need to compare the versions and pick newer.
+
+!if exist("rules.vc") # The extension has its own copy
+
+!if [echo TCL_RULES_MAJOR = \> versions.vc] \
+   && [nmakehlp -V "$(_RULESDIR)\rules.vc" RULES_VERSION_MAJOR >> versions.vc]
+!endif
+!if [echo TCL_RULES_MINOR = \>> versions.vc] \
+   && [nmakehlp -V "$(_RULESDIR)\rules.vc" RULES_VERSION_MINOR >> versions.vc]
+!endif
+
+!if [echo OUR_RULES_MAJOR = \>> versions.vc] \
+   && [nmakehlp -V "rules.vc" RULES_VERSION_MAJOR >> versions.vc]
+!endif
+!if [echo OUR_RULES_MINOR = \>> versions.vc] \
+   && [nmakehlp -V "rules.vc" RULES_VERSION_MINOR >> versions.vc]
+!endif
+!include versions.vc
+# We have a newer version of the support files, use them
+!if ($(TCL_RULES_MAJOR) != $(OUR_RULES_MAJOR)) || ($(TCL_RULES_MINOR) < $(OUR_RULES_MINOR))
+_RULESDIR = .
+!endif
+
+!endif # if exist("rules.vc")
+
+!endif # if $(_RULESDIR) != "."
+
+# Let rules.vc know what copy of nmakehlp.c to use.
+NMAKEHLPC = $(_RULESDIR)\nmakehlp.c
+
+# Get rid of our internal defines before calling rules.vc
+!undef TCL_RULES_MAJOR
+!undef TCL_RULES_MINOR
+!undef OUR_RULES_MAJOR
+!undef OUR_RULES_MINOR
+
+!if exist("$(_RULESDIR)\rules.vc")
+!message *** Using $(_RULESDIR)\rules.vc
+!include "$(_RULESDIR)\rules.vc"
+!else
+!error *** Could not locate rules.vc in $(_RULESDIR)
+!endif
+
+!endif # _RULES_EXT_VC

Index: win/rules.vc
==================================================================
--- win/rules.vc
+++ win/rules.vc
@@ -1,62 +1,437 @@
-#------------------------------------------------------------------------------
+#------------------------------------------------------------- -*- makefile -*-
 # rules.vc --
 #
-#	Microsoft Visual C++ makefile include for decoding the commandline
-#	macros.  This file does not need editing to build Tcl.
+# Part of the nmake based build system for Tcl and its extensions.
+# This file does all the hard work in terms of parsing build options,
+# compiler switches, defining common targets and macros. The Tcl makefile
+# directly includes this. Extensions include it via "rules-ext.vc".
+#
+# See TIP 477 (https://core.tcl.tk/tips/doc/trunk/tip/477.md) for
+# detailed documentation.
 #
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
 # Copyright (c) 2001-2003 David Gravereaux.
 # Copyright (c) 2003-2008 Patrick Thoyts
+# Copyright (c) 2017      Ashok P. Nadkarni
 #------------------------------------------------------------------------------
 
 !ifndef _RULES_VC
 _RULES_VC = 1
 
-cc32		= $(CC)   # built-in default.
-link32		= link
-lib32		= lib
-rc32		= $(RC)   # built-in default.
-
-!ifndef INSTALLDIR
-### Assume the normal default.
-_INSTALLDIR	= C:\Program Files\Tcl
+# The following macros define the version of the rules.vc nmake build system
+# For modifications that are not backward-compatible, you *must* change
+# the major version.
+RULES_VERSION_MAJOR = 1
+RULES_VERSION_MINOR = 3
+
+# The PROJECT macro must be defined by parent makefile.
+!if "$(PROJECT)" == ""
+!error *** Error: Macro PROJECT not defined! Please define it before including rules.vc
+!endif
+
+!if "$(PRJ_PACKAGE_TCLNAME)" == ""
+PRJ_PACKAGE_TCLNAME = $(PROJECT)
+!endif
+
+# Also special case Tcl and Tk to save some typing later
+DOING_TCL = 0
+DOING_TK  = 0
+!if "$(PROJECT)" == "tcl"
+DOING_TCL = 1
+!elseif "$(PROJECT)" == "tk"
+DOING_TK = 1
+!endif
+
+!ifndef NEED_TK
+# Backwards compatibility
+!ifdef PROJECT_REQUIRES_TK
+NEED_TK = $(PROJECT_REQUIRES_TK)
+!else
+NEED_TK = 0
+!endif
+!endif
+
+!ifndef NEED_TCL_SOURCE
+NEED_TCL_SOURCE = 0
+!endif
+
+!ifdef NEED_TK_SOURCE
+!if $(NEED_TK_SOURCE)
+NEED_TK = 1
+!endif
 !else
-### Fix the path separators.
-_INSTALLDIR	= $(INSTALLDIR:/=\)
+NEED_TK_SOURCE = 0
 !endif
+
+################################################################
+# Nmake is a pretty weak environment in syntax and capabilities
+# so this file is necessarily verbose. It's broken down into
+# the following parts.
+#
+# 0. Sanity check that compiler environment is set up and initialize
+#    any built-in settings from the parent makefile
+# 1. First define the external tools used for compiling, copying etc.
+#    as this is independent of everything else.
+# 2. Figure out our build structure in terms of the directory, whether
+#    we are building Tcl or an extension, etc.
+# 3. Determine the compiler and linker versions
+# 4. Build the nmakehlp helper application
+# 5. Determine the supported compiler options and features
+# 6. Parse the OPTS macro value for user-specified build configuration
+# 7. Parse the STATS macro value for statistics instrumentation
+# 8. Parse the CHECKS macro for additional compilation checks
+# 9. Extract Tcl, and possibly Tk, version numbers from the headers
+# 10. Based on this selected configuration, construct the output
+#     directory and file paths
+# 11. Construct the paths where the package is to be installed
+# 12. Set up the actual options passed to compiler and linker based
+#     on the information gathered above.
+# 13. Define some standard build targets and implicit rules. These may
+#     be optionally disabled by the parent makefile.
+# 14. (For extensions only.) Compare the configuration of the target
+#     Tcl and the extensions and warn against discrepancies.
+#
+# One final note about the macro names used. They are as they are
+# for historical reasons. We would like legacy extensions to
+# continue to work with this make include file so be wary of
+# changing them for consistency or clarity.
+
+# 0. Sanity check compiler environment
+
+# Check to see we are configured to build with MSVC (MSDEVDIR, MSVCDIR or
+# VCINSTALLDIR) or with the MS Platform SDK (MSSDK or WindowsSDKDir)
+
+!if !defined(MSDEVDIR) && !defined(MSVCDIR) && !defined(VCINSTALLDIR) && !defined(MSSDK) && !defined(WINDOWSSDKDIR)
+MSG = ^
+Visual C++ compiler environment not initialized.
+!error $(MSG)
+!endif
+
+# We need to run from the directory the parent makefile is located in.
+# nmake does not tell us what makefile was used to invoke it so parent
+# makefile has to set the MAKEFILEVC macro or we just make a guess and
+# warn if we think that is not the case.
+!if "$(MAKEFILEVC)" == ""
+
+!if exist("$(PROJECT).vc")
+MAKEFILEVC = $(PROJECT).vc
+!elseif exist("makefile.vc")
+MAKEFILEVC = makefile.vc
+!endif
+!endif # "$(MAKEFILEVC)" == ""
+
+!if !exist("$(MAKEFILEVC)")
+MSG = ^
+You must run nmake from the directory containing the project makefile.^
+If you are doing that and getting this message, set the MAKEFILEVC^
+macro to the name of the project makefile.
+!message WARNING: $(MSG)
+!endif
+
+
+################################################################
+# 1. Define external programs being used
 
 #----------------------------------------------------------
 # Set the proper copy method to avoid overwrite questions
 # to the user when copying files and selecting the right
 # "delete all" method.
 #----------------------------------------------------------
 
-!if "$(OS)" == "Windows_NT"
 RMDIR	= rmdir /S /Q
-ERRNULL  = 2>NUL
-!if ![ver | find "4.0" > nul]
-CPY	= echo y | xcopy /i >NUL
-COPY	= copy >NUL
-!else
 CPY	= xcopy /i /y >NUL
+CPYDIR  = xcopy /e /i /y >NUL
 COPY	= copy /y >NUL
-!endif
-!else # "$(OS)" != "Windows_NT"
-CPY	= xcopy /i >_JUNK.OUT # On Win98 NUL does not work here.
-COPY	= copy >_JUNK.OUT # On Win98 NUL does not work here.
-RMDIR	= deltree /Y
-NULL    = \NUL # Used in testing directory existence
-ERRNULL = >NUL # Win9x shell cannot redirect stderr
-!endif
 MKDIR   = mkdir
 
-#------------------------------------------------------------------------------
-# Determine the host and target architectures and compiler version.
-#------------------------------------------------------------------------------
+######################################################################
+# 2. Figure out our build environment in terms of what we're building.
+#
+# (a) Tcl itself
+# (b) Tk
+# (c) a Tcl extension using libraries/includes from an *installed* Tcl
+# (d) a Tcl extension using libraries/includes from Tcl source directory
+#
+# This last is needed because some extensions still need
+# some Tcl interfaces that are not publicly exposed.
+#
+# The fragment will set the following macros:
+# ROOT - root of this module sources
+# COMPATDIR - source directory that holds compatibility sources
+# DOCDIR - source directory containing documentation files
+# GENERICDIR - platform-independent source directory
+# WINDIR - Windows-specific source directory
+# TESTDIR - directory containing test files
+# TOOLSDIR - directory containing build tools
+# _TCLDIR - root of the Tcl installation OR the Tcl sources. Not set
+#    when building Tcl itself.
+# _INSTALLDIR - native form of the installation path. For Tcl
+#    this will be the root of the Tcl installation. For extensions
+#    this will be the lib directory under the root.
+# TCLINSTALL  - set to 1 if _TCLDIR refers to
+#    headers and libraries from an installed Tcl, and 0 if built against
+#    Tcl sources. Not set when building Tcl itself. Yes, not very well
+#    named.
+# _TCL_H - native path to the tcl.h file
+#
+# If Tk is involved, also sets the following
+# _TKDIR - native form Tk installation OR Tk source. Not set if building
+#    Tk itself.
+# TKINSTALL - set 1 if _TKDIR refers to installed Tk and 0 if Tk sources
+# _TK_H - native path to the tk.h file
+
+# Root directory for sources and assumed subdirectories
+ROOT = $(MAKEDIR)\..
+# The following paths CANNOT have spaces in them as they appear on the
+# left side of implicit rules.
+!ifndef COMPATDIR
+COMPATDIR	= $(ROOT)\compat
+!endif
+!ifndef DOCDIR
+DOCDIR		= $(ROOT)\doc
+!endif
+!ifndef GENERICDIR
+GENERICDIR	= $(ROOT)\generic
+!endif
+!ifndef TOOLSDIR
+TOOLSDIR	= $(ROOT)\tools
+!endif
+!ifndef TESTDIR
+TESTDIR	= $(ROOT)\tests
+!endif
+!ifndef LIBDIR
+!if exist("$(ROOT)\library")
+LIBDIR          = $(ROOT)\library
+!else
+LIBDIR          = $(ROOT)\lib
+!endif
+!endif
+!ifndef DEMODIR
+!if exist("$(LIBDIR)\demos")
+DEMODIR		= $(LIBDIR)\demos
+!else
+DEMODIR		= $(ROOT)\demos
+!endif
+!endif # ifndef DEMODIR
+# Do NOT enclose WINDIR in a !ifndef because Windows always defines
+# WINDIR env var to point to c:\windows!
+# TBD - This is a potentially dangerous conflict, rename WINDIR to
+# something else
+WINDIR		= $(ROOT)\win
+
+!ifndef RCDIR
+!if exist("$(WINDIR)\rc")
+RCDIR           = $(WINDIR)\rc
+!else
+RCDIR           = $(WINDIR)
+!endif
+!endif
+RCDIR = $(RCDIR:/=\)
+
+# The target directory where the built packages and binaries will be installed.
+# INSTALLDIR is the (optional) path specified by the user.
+# _INSTALLDIR is INSTALLDIR using the backslash separator syntax
+!ifdef INSTALLDIR
+### Fix the path separators.
+_INSTALLDIR	= $(INSTALLDIR:/=\)
+!else
+### Assume the normal default.
+_INSTALLDIR	= $(HOMEDRIVE)\Tcl
+!endif
+
+!if $(DOING_TCL)
+
+# BEGIN Case 2(a) - Building Tcl itself
+
+# Only need to define _TCL_H
+_TCL_H = ..\generic\tcl.h
+
+# END Case 2(a) - Building Tcl itself
+
+!elseif $(DOING_TK)
+
+# BEGIN Case 2(b) - Building Tk
+
+TCLINSTALL = 0 # Tk always builds against Tcl source, not an installed Tcl
+!if "$(TCLDIR)" == ""
+!if [echo TCLDIR = \> nmakehlp.out] \
+   || [nmakehlp -L generic\tcl.h >> nmakehlp.out]
+!error *** Could not locate Tcl source directory.
+!endif
+!include nmakehlp.out
+!endif # TCLDIR == ""
+
+_TCLDIR	= $(TCLDIR:/=\)
+_TCL_H  = $(_TCLDIR)\generic\tcl.h
+!if !exist("$(_TCL_H)")
+!error Could not locate tcl.h. Please set the TCLDIR macro to point to the Tcl *source* directory.
+!endif
+
+_TK_H = ..\generic\tk.h
+
+# END Case 2(b) - Building Tk
+
+!else
+
+# BEGIN Case 2(c) or (d) - Building an extension other than Tk
+
+# If command line has specified Tcl location through TCLDIR, use it
+# else default to the INSTALLDIR setting
+!if "$(TCLDIR)" != ""
+
+_TCLDIR	= $(TCLDIR:/=\)
+!if exist("$(_TCLDIR)\include\tcl.h") # Case 2(c) with TCLDIR defined
+TCLINSTALL	= 1
+_TCL_H          = $(_TCLDIR)\include\tcl.h
+!elseif exist("$(_TCLDIR)\generic\tcl.h") # Case 2(d) with TCLDIR defined
+TCLINSTALL	= 0
+_TCL_H          = $(_TCLDIR)\generic\tcl.h
+!endif
+
+!else  #  # Case 2(c) for extensions with TCLDIR undefined
+
+# Need to locate Tcl depending on whether it needs Tcl source or not.
+# If we don't, check the INSTALLDIR for an installed Tcl first
+
+!if exist("$(_INSTALLDIR)\include\tcl.h") && !$(NEED_TCL_SOURCE)
+
+TCLINSTALL	= 1
+TCLDIR          = $(_INSTALLDIR)\..
+# NOTE: we will be resetting _INSTALLDIR to _INSTALLDIR/lib for extensions
+# later so the \.. accounts for the /lib
+_TCLDIR		= $(_INSTALLDIR)\..
+_TCL_H          = $(_TCLDIR)\include\tcl.h
+
+!else # exist(...) && ! $(NEED_TCL_SOURCE)
+
+!if [echo _TCLDIR = \> nmakehlp.out] \
+   || [nmakehlp -L generic\tcl.h >> nmakehlp.out]
+!error *** Could not locate Tcl source directory.
+!endif
+!include nmakehlp.out
+TCLINSTALL      = 0
+TCLDIR         = $(_TCLDIR)
+_TCL_H          = $(_TCLDIR)\generic\tcl.h
+
+!endif # exist(...) && ! $(NEED_TCL_SOURCE)
+
+!endif # TCLDIR
+
+!ifndef _TCL_H
+MSG =^
+Failed to find tcl.h. The TCLDIR macro is set incorrectly or is not set and default path does not contain tcl.h.
+!error $(MSG)
+!endif
+
+# Now do the same to locate Tk headers and libs if project requires Tk
+!if $(NEED_TK)
+
+!if "$(TKDIR)" != ""
+
+_TKDIR = $(TKDIR:/=\)
+!if exist("$(_TKDIR)\include\tk.h")
+TKINSTALL      = 1
+_TK_H          = $(_TKDIR)\include\tk.h
+!elseif exist("$(_TKDIR)\generic\tk.h")
+TKINSTALL      = 0
+_TK_H          = $(_TKDIR)\generic\tk.h
+!endif
+
+!else # TKDIR not defined
+
+# Need to locate Tcl depending on whether it needs Tcl source or not.
+# If we don't, check the INSTALLDIR for an installed Tcl first
+
+!if exist("$(_INSTALLDIR)\include\tk.h") && !$(NEED_TK_SOURCE)
+
+TKINSTALL      = 1
+# NOTE: we will be resetting _INSTALLDIR to _INSTALLDIR/lib for extensions
+# later so the \.. accounts for the /lib
+_TKDIR         = $(_INSTALLDIR)\..
+_TK_H          = $(_TKDIR)\include\tk.h
+TKDIR          = $(_TKDIR)
+
+!else # exist("$(_INSTALLDIR)\include\tk.h") && !$(NEED_TK_SOURCE)
+
+!if [echo _TKDIR = \> nmakehlp.out] \
+   || [nmakehlp -L generic\tk.h >> nmakehlp.out]
+!error *** Could not locate Tk source directory.
+!endif
+!include nmakehlp.out
+TKINSTALL      = 0
+TKDIR          = $(_TKDIR)
+_TK_H          = $(_TKDIR)\generic\tk.h
+
+!endif # exist("$(_INSTALLDIR)\include\tk.h") && !$(NEED_TK_SOURCE)
+
+!endif # TKDIR
+
+!ifndef _TK_H
+MSG =^
+Failed to find tk.h. The TKDIR macro is set incorrectly or is not set and default path does not contain tk.h.
+!error $(MSG)
+!endif
+
+!endif # NEED_TK
+
+!if $(NEED_TCL_SOURCE) && $(TCLINSTALL)
+MSG = ^
+*** Warning: This extension requires the source distribution of Tcl.^
+*** Please set the TCLDIR macro to point to the Tcl sources.
+!error $(MSG)
+!endif
+
+!if $(NEED_TK_SOURCE)
+!if $(TKINSTALL)
+MSG = ^
+*** Warning: This extension requires the source distribution of Tk.^
+*** Please set the TKDIR macro to point to the Tk sources.
+!error $(MSG)
+!endif
+!endif
+
+
+# If INSTALLDIR set to Tcl installation root dir then reset to the
+# lib dir for installing extensions
+!if exist("$(_INSTALLDIR)\include\tcl.h")
+_INSTALLDIR=$(_INSTALLDIR)\lib
+!endif
+
+# END Case 2(c) or (d) - Building an extension
+!endif # if $(DOING_TCL)
+
+################################################################
+# 3. Determine compiler version and architecture
+# In this section, we figure out the compiler version and the
+# architecture for which we are building. This sets the
+# following macros:
+# VCVERSION - the internal compiler version as 1200, 1400, 1910 etc.
+#     This is also printed by the compiler in dotted form 19.10 etc.
+# VCVER - the "marketing version", for example Visual C++ 6 for internal
+#     compiler version 1200. This is kept only for legacy reasons as it
+#     does not make sense for recent Microsoft compilers. Only used for
+#     output directory names.
+# ARCH - set to IX86 or AMD64 depending on 32- or 64-bit target
+# NATIVE_ARCH - set to IX86 or AMD64 for the host machine
+# MACHINE - same as $(ARCH) - legacy
+# _VC_MANIFEST_EMBED_{DLL,EXE} - commands for embedding a manifest if needed
+# CFG_ENCODING - set to an character encoding.
+#   TBD - this is passed to compiler as TCL_CFGVAL_ENCODING but can't
+#   see where it is used
+
+cc32		= $(CC)   # built-in default.
+link32		= link
+lib32		= lib
+rc32		= $(RC)   # built-in default.
+
+#----------------------------------------------------------------
+# Figure out the compiler architecture and version by writing
+# the C macros to a file, preprocessing them with the C
+# preprocessor and reading back the created file
 
 _HASH=^#
 _VC_MANIFEST_EMBED_EXE=
 _VC_MANIFEST_EMBED_DLL=
 VCVER=0
@@ -64,20 +439,47 @@
     && ![echo $(_HASH)if defined(_M_IX86) >> vercl.x] \
     && ![echo ARCH=IX86 >> vercl.x] \
     && ![echo $(_HASH)elif defined(_M_AMD64) >> vercl.x] \
     && ![echo ARCH=AMD64 >> vercl.x] \
     && ![echo $(_HASH)endif >> vercl.x] \
-    && ![cl -nologo -TC -P vercl.x $(ERRNULL)]
+    && ![$(cc32) -nologo -TC -P vercl.x 2>NUL]
 !include vercl.i
+!if $(VCVERSION) < 1900
 !if ![echo VCVER= ^\> vercl.vc] \
     && ![set /a $(VCVERSION) / 100 - 6 >> vercl.vc]
 !include vercl.vc
 !endif
+!else
+# The simple calculation above does not apply to new Visual Studio releases
+# Keep the compiler version in its native form.
+VCVER = $(VCVERSION)
 !endif
-!if ![del $(ERRNUL) /q/f vercl.x vercl.i vercl.vc]
 !endif
 
+!if ![del 2>NUL /q/f vercl.x vercl.i vercl.vc]
+!endif
+
+#----------------------------------------------------------------
+# The MACHINE macro is used by legacy makefiles so set it as well
+!ifdef MACHINE
+!if "$(MACHINE)" == "x86"
+!undef MACHINE
+MACHINE = IX86
+!elseif "$(MACHINE)" == "x64"
+!undef MACHINE
+MACHINE = AMD64
+!endif
+!if "$(MACHINE)" != "$(ARCH)"
+!error Specified MACHINE macro $(MACHINE) does not match detected target architecture $(ARCH).
+!endif
+!else
+MACHINE=$(ARCH)
+!endif
+
+#------------------------------------------------------------
+# Figure out the *host* architecture by reading the registry
+
 !if ![reg query HKLM\Hardware\Description\System\CentralProcessor\0 /v Identifier | findstr /i x86]
 NATIVE_ARCH=IX86
 !else
 NATIVE_ARCH=AMD64
 !endif
@@ -86,152 +488,231 @@
 !if $(VCVERSION) >= 1400
 _VC_MANIFEST_EMBED_EXE=if exist $@.manifest mt -nologo -manifest $@.manifest -outputresource:$@;1
 _VC_MANIFEST_EMBED_DLL=if exist $@.manifest mt -nologo -manifest $@.manifest -outputresource:$@;2
 !endif
 
-!ifndef MACHINE
-MACHINE=$(ARCH)
-!endif
-
 !ifndef CFG_ENCODING
 CFG_ENCODING	= \"cp1252\"
 !endif
 
-!message ===============================================================================
-
-#----------------------------------------------------------
-# build the helper app we need to overcome nmake's limiting
-# environment.
-#----------------------------------------------------------
-
-!if !exist(nmakehlp.exe)
-!if [$(cc32) -nologo nmakehlp.c -link -subsystem:console > nul]
-!endif
-!endif
-
-#----------------------------------------------------------
-# Test for compiler features
-#----------------------------------------------------------
-
-### test for optimizations
-!if [nmakehlp -c -Ot]
-!message *** Compiler has 'Optimizations'
-OPTIMIZING	= 1
-!else
-!message *** Compiler does not have 'Optimizations'
-OPTIMIZING	= 0
-!endif
-
-OPTIMIZATIONS   =
-
-!if [nmakehlp -c -Ot]
-OPTIMIZATIONS  = $(OPTIMIZATIONS) -Ot
-!endif
-
-!if [nmakehlp -c -Oi]
-OPTIMIZATIONS  = $(OPTIMIZATIONS) -Oi
-!endif
-
+################################################################
+# 4. Build the nmakehlp program
+# This is a helper app we need to overcome nmake's limiting
+# environment. We will call out to it to get various bits of
+# information about supported compiler options etc.
+#
+# Tcl itself will always use the nmakehlp.c program which is
+# in its own source. This is the "master" copy and kept updated.
+#
+# Extensions built against an installed Tcl will use the installed
+# copy of Tcl's nmakehlp.c if there is one and their own version
+# otherwise. In the latter case, they would also be using their own
+# rules.vc. Note that older versions of Tcl do not install nmakehlp.c
+# or rules.vc.
+#
+# Extensions built against Tcl sources will use the one from the Tcl source.
+#
+# When building an extension using a sufficiently new version of Tcl,
+# rules-ext.vc will define NMAKEHLPC appropriately to point to the
+# copy of nmakehlp.c to be used.
+
+!ifndef NMAKEHLPC
+# Default to the one in the current directory (the extension's own nmakehlp.c)
+NMAKEHLPC = nmakehlp.c
+
+!if !$(DOING_TCL)
+!if $(TCLINSTALL)
+!if exist("$(_TCLDIR)\lib\nmake\nmakehlp.c")
+NMAKEHLPC = $(_TCLDIR)\lib\nmake\nmakehlp.c
+!endif
+!else # ! $(TCLINSTALL)
+!if exist("$(_TCLDIR)\win\nmakehlp.c")
+NMAKEHLPC = $(_TCLDIR)\win\nmakehlp.c
+!endif
+!endif # $(TCLINSTALL)
+!endif # !$(DOING_TCL)
+
+!endif # NMAKEHLPC
+
+# We always build nmakehlp even if it exists since we do not know
+# what source it was built from.
+!if [$(cc32) -nologo "$(NMAKEHLPC)" -link -subsystem:console > nul]
+!endif
+
+################################################################
+# 5. Test for compiler features
+# Visual C++ compiler options have changed over the years. Check
+# which options are supported by the compiler in use.
+#
+# The following macros are set:
+# OPTIMIZATIONS - the compiler flags to be used for optimized builds
+# DEBUGFLAGS - the compiler flags to be used for debug builds
+# LINKERFLAGS - Flags passed to the linker
+#
+# Note that these are the compiler settings *available*, not those
+# that will be *used*. The latter depends on the OPTS macro settings
+# which we have not yet parsed.
+#
+# Also note that some of the flags in OPTIMIZATIONS are not really
+# related to optimization. They are placed there only for legacy reasons
+# as some extensions expect them to be included in that macro.
+
+# -Op improves float consistency. Note only needed for older compilers
+# Newer compilers do not need or support this option.
 !if [nmakehlp -c -Op]
-OPTIMIZATIONS  = $(OPTIMIZATIONS) -Op
+FPOPTS  = -Op
 !endif
 
+# Strict floating point semantics - present in newer compilers in lieu of -Op
 !if [nmakehlp -c -fp:strict]
-OPTIMIZATIONS  = $(OPTIMIZATIONS) -fp:strict
-!endif
-
-!if [nmakehlp -c -Gs]
-OPTIMIZATIONS  = $(OPTIMIZATIONS) -Gs
-!endif
-
-!if [nmakehlp -c -GS]
-OPTIMIZATIONS  = $(OPTIMIZATIONS) -GS
-!endif
-
-!if [nmakehlp -c -GL]
-OPTIMIZATIONS  = $(OPTIMIZATIONS) -GL
-!endif
-
-DEBUGFLAGS     =
-
-!if [nmakehlp -c -RTC1]
-DEBUGFLAGS     = $(DEBUGFLAGS) -RTC1
-!elseif [nmakehlp -c -GZ]
-DEBUGFLAGS     = $(DEBUGFLAGS) -GZ
-!endif
-
-COMPILERFLAGS  =-W3 -DUNICODE -D_UNICODE
-
-# In v13 -GL and -YX are incompatible.
-!if [nmakehlp -c -YX]
-!if ![nmakehlp -c -GL]
-OPTIMIZATIONS  = $(OPTIMIZATIONS) -YX
-!endif
+FPOPTS  = $(FPOPTS) -fp:strict
 !endif
 
 !if "$(MACHINE)" == "IX86"
 ### test for pentium errata
 !if [nmakehlp -c -QI0f]
 !message *** Compiler has 'Pentium 0x0f fix'
-COMPILERFLAGS  = $(COMPILERFLAGS) -QI0f
+FPOPTS  = $(FPOPTS) -QI0f
 !else
 !message *** Compiler does not have 'Pentium 0x0f fix'
 !endif
 !endif
 
-!if "$(MACHINE)" == "IA64"
-### test for Itanium errata
-!if [nmakehlp -c -QIA64_Bx]
-!message *** Compiler has 'B-stepping errata workarounds'
-COMPILERFLAGS   = $(COMPILERFLAGS) -QIA64_Bx
-!else
-!message *** Compiler does not have 'B-stepping errata workarounds'
-!endif
-!endif
-
-!if "$(MACHINE)" == "IX86"
-### test for -align:4096, when align:512 will do.
-!if [nmakehlp -l -opt:nowin98]
-!message *** Linker has 'Win98 alignment problem'
-ALIGN98_HACK	= 1
-!else
-!message *** Linker does not have 'Win98 alignment problem'
-ALIGN98_HACK	= 0
-!endif
-!else
-ALIGN98_HACK	= 0
+### test for optimizations
+# /O2 optimization includes /Og /Oi /Ot /Oy /Ob2 /Gs /GF /Gy as per
+# documentation. Note we do NOT want /Gs as that inserts a _chkstk
+# stack probe at *every* function entry, not just those with more than
+# a page of stack allocation resulting in a performance hit.  However,
+# /O2 documentation is misleading as its stack probes are simply the
+# default page size locals allocation probes and not what is implied
+# by an explicit /Gs option.
+
+OPTIMIZATIONS = $(FPOPTS)
+
+!if [nmakehlp -c -O2]
+OPTIMIZING = 1
+OPTIMIZATIONS   = $(OPTIMIZATIONS) -O2
+!else
+# Legacy, really. All modern compilers support this
+!message *** Compiler does not have 'Optimizations'
+OPTIMIZING = 0
+!endif
+
+# Checks for buffer overflows in local arrays
+!if [nmakehlp -c -GS]
+OPTIMIZATIONS  = $(OPTIMIZATIONS) -GS
+!endif
+
+# Link time optimization. Note that this option (potentially) makes
+# generated libraries only usable by the specific VC++ version that
+# created it. Requires /LTCG linker option
+!if [nmakehlp -c -GL]
+OPTIMIZATIONS  = $(OPTIMIZATIONS) -GL
+CC_GL_OPT_ENABLED = 1
+!else
+# In newer compilers -GL and -YX are incompatible.
+!if [nmakehlp -c -YX]
+OPTIMIZATIONS  = $(OPTIMIZATIONS) -YX
+!endif
+!endif # [nmakehlp -c -GL]
+
+DEBUGFLAGS     = $(FPOPTS)
+
+# Run time error checks. Not available or valid in a release, non-debug build
+# RTC is for modern compilers, -GZ is legacy
+!if [nmakehlp -c -RTC1]
+DEBUGFLAGS     = $(DEBUGFLAGS) -RTC1
+!elseif [nmakehlp -c -GZ]
+DEBUGFLAGS     = $(DEBUGFLAGS) -GZ
+!endif
+
+#----------------------------------------------------------------
+# Linker flags
+
+# LINKER_TESTFLAGS are for internal use when we call nmakehlp to test
+# if the linker supports a specific option. Without these flags link will
+# return "LNK1561: entry point must be defined" error compiling from VS-IDE:
+# They are not passed through to the actual application / extension
+# link rules.
+!ifndef LINKER_TESTFLAGS
+LINKER_TESTFLAGS = /DLL /NOENTRY /OUT:nmakehlp.out
 !endif
 
 LINKERFLAGS     =
 
-!if [nmakehlp -l -ltcg]
-LINKERFLAGS     =-ltcg
+# If compiler has enabled link time optimization, linker must too with -ltcg
+!ifdef CC_GL_OPT_ENABLED
+!if [nmakehlp -l -ltcg $(LINKER_TESTFLAGS)]
+LINKERFLAGS     = $(LINKERFLAGS) -ltcg
+!endif
 !endif
 
-#----------------------------------------------------------
-# Decode the options requested.
-#----------------------------------------------------------
+########################################################################
+# 6. Parse the OPTS macro to work out the requested build configuration.
+# Based on this, we will construct the actual switches to be passed to the
+# compiler and linker using the macros defined in the previous section.
+# The following macros are defined by this section based on OPTS
+# STATIC_BUILD - 0 -> Tcl is to be built as a shared library
+#                1 -> build as a static library and shell
+# TCL_THREADS - legacy but always 1 on Windows since winsock requires it.
+# DEBUG - 1 -> debug build, 0 -> release builds
+# SYMBOLS - 1 -> generate PDB's, 0 -> no PDB's
+# PROFILE - 1 -> generate profiling info, 0 -> no profiling
+# PGO     - 1 -> profile based optimization, 0 -> no
+# MSVCRT  - 1 -> link to dynamic C runtime even when building static Tcl build
+#           0 -> link to static C runtime for static Tcl build.
+#           Does not impact shared Tcl builds (STATIC_BUILD == 0)
+# TCL_USE_STATIC_PACKAGES - 1 -> statically link the registry and dde extensions
+#           in the Tcl shell. 0 -> keep them as shared libraries
+#           Does not impact shared Tcl builds.
+# USE_THREAD_ALLOC - 1 -> Use a shared global free pool for allocation.
+#           0 -> Use the non-thread allocator.
+# UNCHECKED - 1 -> when doing a debug build with symbols, use the release
+#           C runtime, 0 -> use the debug C runtime.
+# USE_STUBS - 1 -> compile to use stubs interfaces, 0 -> direct linking
+# CONFIG_CHECK - 1 -> check current build configuration against Tcl
+#           configuration (ignored for Tcl itself)
+# Further, LINKERFLAGS are modified based on above.
 
-!if "$(OPTS)" == "" || [nmakehlp -f "$(OPTS)" "none"]
+# Default values for all the above
 STATIC_BUILD	= 0
 TCL_THREADS	= 1
 DEBUG		= 0
 SYMBOLS		= 0
 PROFILE		= 0
 PGO		= 0
 MSVCRT		= 1
-LOIMPACT	= 0
 TCL_USE_STATIC_PACKAGES	= 0
 USE_THREAD_ALLOC = 1
 UNCHECKED	= 0
+CONFIG_CHECK    = 1
+!if $(DOING_TCL)
+USE_STUBS       = 0
 !else
+USE_STUBS       = 1
+!endif
+
+# If OPTS is not empty AND does not contain "none" which turns off all OPTS
+# set the above macros based on OPTS content
+!if "$(OPTS)" != "" && ![nmakehlp -f "$(OPTS)" "none"]
+
+# OPTS are specified, parse them
+
 !if [nmakehlp -f $(OPTS) "static"]
 !message *** Doing static
 STATIC_BUILD	= 1
+!endif
+
+!if [nmakehlp -f $(OPTS) "nostubs"]
+!message *** Not using stubs
+USE_STUBS	= 0
+!endif
+
+!if [nmakehlp -f $(OPTS) "nomsvcrt"]
+!message *** Doing nomsvcrt
+MSVCRT		= 0
 !else
-STATIC_BUILD	= 0
-!endif
 !if [nmakehlp -f $(OPTS) "msvcrt"]
 !message *** Doing msvcrt
 MSVCRT		= 1
 !else
 !if !$(STATIC_BUILD)
@@ -238,89 +719,266 @@
 MSVCRT		= 1
 !else
 MSVCRT		= 0
 !endif
 !endif
+!endif # [nmakehlp -f $(OPTS) "nomsvcrt"]
+
 !if [nmakehlp -f $(OPTS) "staticpkg"] && $(STATIC_BUILD)
 !message *** Doing staticpkg
 TCL_USE_STATIC_PACKAGES	= 1
 !else
 TCL_USE_STATIC_PACKAGES	= 0
 !endif
-!if [nmakehlp -f $(OPTS) "nothreads"]
-!message *** Compile explicitly for non-threaded tcl
-TCL_THREADS	= 0
-USE_THREAD_ALLOC= 0
-!else
-TCL_THREADS	= 1
-USE_THREAD_ALLOC= 1
-!endif
+
 !if [nmakehlp -f $(OPTS) "symbols"]
 !message *** Doing symbols
 DEBUG		= 1
 !else
 DEBUG		= 0
 !endif
+
 !if [nmakehlp -f $(OPTS) "pdbs"]
 !message *** Doing pdbs
 SYMBOLS		= 1
 !else
 SYMBOLS		= 0
 !endif
+
 !if [nmakehlp -f $(OPTS) "profile"]
 !message *** Doing profile
 PROFILE		= 1
 !else
 PROFILE		= 0
 !endif
+
 !if [nmakehlp -f $(OPTS) "pgi"]
 !message *** Doing profile guided optimization instrumentation
 PGO		= 1
 !elseif [nmakehlp -f $(OPTS) "pgo"]
 !message *** Doing profile guided optimization
 PGO		= 2
 !else
 PGO		= 0
 !endif
+
 !if [nmakehlp -f $(OPTS) "loimpact"]
-!message *** Doing loimpact
-LOIMPACT	= 1
-!else
-LOIMPACT	= 0
-!endif
-!if [nmakehlp -f $(OPTS) "thrdalloc"]
-!message *** Doing thrdalloc
-USE_THREAD_ALLOC = 1
-!endif
-!if [nmakehlp -f $(OPTS) "tclalloc"]
-!message *** Doing tclalloc
+!message *** Warning: ignoring option "loimpact" - deprecated on modern Windows.
+!endif
+
+!if [nmakehlp -f $(OPTS) "tclalloc"]
 USE_THREAD_ALLOC = 0
 !endif
+
 !if [nmakehlp -f $(OPTS) "unchecked"]
 !message *** Doing unchecked
 UNCHECKED = 1
 !else
 UNCHECKED = 0
 !endif
+
+!if [nmakehlp -f $(OPTS) "noconfigcheck"]
+CONFIG_CHECK = 1
+!else
+CONFIG_CHECK = 0
 !endif
 
-#----------------------------------------------------------
+!endif # "$(OPTS)" != ""  && ... parsing of OPTS
+
+# Set linker flags based on above
+
+!if $(PGO) > 1
+!if [nmakehlp -l -ltcg:pgoptimize $(LINKER_TESTFLAGS)]
+LINKERFLAGS	= $(LINKERFLAGS:-ltcg=) -ltcg:pgoptimize
+!else
+MSG=^
+This compiler does not support profile guided optimization.
+!error $(MSG)
+!endif
+!elseif $(PGO) > 0
+!if [nmakehlp -l -ltcg:pginstrument $(LINKER_TESTFLAGS)]
+LINKERFLAGS	= $(LINKERFLAGS:-ltcg=) -ltcg:pginstrument
+!else
+MSG=^
+This compiler does not support profile guided optimization.
+!error $(MSG)
+!endif
+!endif
+
+################################################################
+# 7. Parse the STATS macro to configure code instrumentation
+# The following macros are set by this section:
+# TCL_MEM_DEBUG - 1 -> enables memory allocation instrumentation
+#                 0 -> disables
+# TCL_COMPILE_DEBUG - 1 -> enables byte compiler logging
+#                     0 -> disables
+
+# Default both are off
+TCL_MEM_DEBUG	    = 0
+TCL_COMPILE_DEBUG   = 0
+
+!if "$(STATS)" != "" && ![nmakehlp -f "$(STATS)" "none"]
+
+!if [nmakehlp -f $(STATS) "memdbg"]
+!message *** Doing memdbg
+TCL_MEM_DEBUG	    = 1
+!else
+TCL_MEM_DEBUG	    = 0
+!endif
+
+!if [nmakehlp -f $(STATS) "compdbg"]
+!message *** Doing compdbg
+TCL_COMPILE_DEBUG   = 1
+!else
+TCL_COMPILE_DEBUG   = 0
+!endif
+
+!endif
+
+####################################################################
+# 8. Parse the CHECKS macro to configure additional compiler checks
+# The following macros are set by this section:
+# WARNINGS - compiler switches that control the warnings level
+# TCL_NO_DEPRECATED - 1 -> disable support for deprecated functions
+#                     0 -> enable deprecated functions
+
+# Defaults - Permit deprecated functions and warning level 3
+TCL_NO_DEPRECATED	    = 0
+WARNINGS		    = -W3
+
+!if "$(CHECKS)" != "" && ![nmakehlp -f "$(CHECKS)" "none"]
+
+!if [nmakehlp -f $(CHECKS) "nodep"]
+!message *** Doing nodep check
+TCL_NO_DEPRECATED	    = 1
+!endif
+
+!if [nmakehlp -f $(CHECKS) "fullwarn"]
+!message *** Doing full warnings check
+WARNINGS		    = -W4
+!if [nmakehlp -l -warn:3 $(LINKER_TESTFLAGS)]
+LINKERFLAGS		    = $(LINKERFLAGS) -warn:3
+!endif
+!endif
+
+!if [nmakehlp -f $(CHECKS) "64bit"] && [nmakehlp -c -Wp64]
+!message *** Doing 64bit portability warnings
+WARNINGS		    = $(WARNINGS) -Wp64
+!endif
+
+!endif
+
+################################################################
+# 9. Extract various version numbers
+# For Tcl and Tk, version numbers are extracted from tcl.h and tk.h
+# respectively. For extensions, versions are extracted from the
+# configure.in or configure.ac from the TEA configuration if it
+# exists, and unset otherwise.
+# Sets the following macros:
+# TCL_MAJOR_VERSION
+# TCL_MINOR_VERSION
+# TCL_PATCH_LEVEL
+# TCL_VERSION
+# TK_MAJOR_VERSION
+# TK_MINOR_VERSION
+# TK_PATCH_LEVEL
+# TK_VERSION
+# DOTVERSION - set as (for example) 2.5
+# VERSION - set as (for example 25)
+#--------------------------------------------------------------
+
+!if [echo REM = This file is generated from rules.vc > versions.vc]
+!endif
+!if [echo TCL_MAJOR_VERSION = \>> versions.vc] \
+   && [nmakehlp -V "$(_TCL_H)" TCL_MAJOR_VERSION >> versions.vc]
+!endif
+!if [echo TCL_MINOR_VERSION = \>> versions.vc] \
+   && [nmakehlp -V "$(_TCL_H)" TCL_MINOR_VERSION >> versions.vc]
+!endif
+!if [echo TCL_PATCH_LEVEL = \>> versions.vc] \
+   && [nmakehlp -V "$(_TCL_H)" TCL_PATCH_LEVEL >> versions.vc]
+!endif
+
+!if defined(_TK_H)
+!if [echo TK_MAJOR_VERSION = \>> versions.vc] \
+   && [nmakehlp -V $(_TK_H) TK_MAJOR_VERSION >> versions.vc]
+!endif
+!if [echo TK_MINOR_VERSION = \>> versions.vc] \
+   && [nmakehlp -V $(_TK_H) TK_MINOR_VERSION >> versions.vc]
+!endif
+!if [echo TK_PATCH_LEVEL = \>> versions.vc] \
+   && [nmakehlp -V $(_TK_H) TK_PATCH_LEVEL >> versions.vc]
+!endif
+!endif # _TK_H
+
+!include versions.vc
+
+TCL_VERSION	= $(TCL_MAJOR_VERSION)$(TCL_MINOR_VERSION)
+TCL_DOTVERSION	= $(TCL_MAJOR_VERSION).$(TCL_MINOR_VERSION)
+!if defined(_TK_H)
+TK_VERSION	= $(TK_MAJOR_VERSION)$(TK_MINOR_VERSION)
+TK_DOTVERSION	= $(TK_MAJOR_VERSION).$(TK_MINOR_VERSION)
+!endif
+
+# Set DOTVERSION and VERSION
+!if $(DOING_TCL)
+
+DOTVERSION = $(TCL_MAJOR_VERSION).$(TCL_MINOR_VERSION)
+VERSION = $(TCL_VERSION)
+
+!elseif $(DOING_TK)
+
+DOTVERSION = $(TK_DOTVERSION)
+VERSION = $(TK_VERSION)
+
+!else # Doing a non-Tk extension
+
+# If parent makefile has not defined DOTVERSION, try to get it from TEA
+# first from a configure.in file, and then from configure.ac
+!ifndef DOTVERSION
+!if [echo DOTVERSION = \> versions.vc] \
+   || [nmakehlp -V $(ROOT)\configure.in ^[$(PROJECT)^] >> versions.vc]
+!if [echo DOTVERSION = \> versions.vc] \
+   || [nmakehlp -V $(ROOT)\configure.ac ^[$(PROJECT)^] >> versions.vc]
+!error *** Could not figure out extension version. Please define DOTVERSION in parent makefile before including rules.vc.
+!endif
+!endif
+!include versions.vc
+!endif # DOTVERSION
+VERSION         = $(DOTVERSION:.=)
+
+!endif # $(DOING_TCL) ... etc.
+
+################################################################
+# 10. Construct output directory and file paths
 # Figure-out how to name our intermediate and output directories.
-# We wouldn't want different builds to use the same .obj files
-# by accident.
-#----------------------------------------------------------
-
-#----------------------------------------
-# Naming convention:
-#   t = full thread support.
-#   s = static library (as opposed to an
-#	import library)
-#   g = linked to the debug enabled C
-#	run-time.
-#   x = special static build when it
-#	links to the dynamic C run-time.
-#----------------------------------------
+# In order to avoid inadvertent mixing of object files built using
+# different compilers, build configurations etc.,
+#
+# Naming convention (suffixes):
+#   t = full thread support. (Not used for Tcl >= 8.7)
+#   s = static library (as opposed to an import library)
+#   g = linked to the debug enabled C run-time.
+#   x = special static build when it links to the dynamic C run-time.
+#
+# The following macros are set in this section:
+# SUFX - the suffix to use for binaries based on above naming convention
+# BUILDDIRTOP - the toplevel default output directory
+#      is of the form {Release,Debug}[_AMD64][_COMPILERVERSION]
+# TMP_DIR - directory where object files are created
+# OUT_DIR - directory where output executables are created
+# Both TMP_DIR and OUT_DIR are defaulted only if not defined by the
+# parent makefile (or command line). The default values are
+# based on BUILDDIRTOP.
+# STUBPREFIX - name of the stubs library for this project
+# PRJIMPLIB - output path of the generated project import library
+# PRJLIBNAME - name of generated project library
+# PRJLIB     - output path of generated project library
+# PRJSTUBLIBNAME - name of the generated project stubs library
+# PRJSTUBLIB - output path of the generated project stubs library
+# RESFILE - output resource file (only if not static build)
+
 SUFX	    = tsgx
 
 !if $(DEBUG)
 BUILDDIRTOP = Debug
 !else
@@ -353,11 +1011,11 @@
 TMP_DIRFULL = $(TMP_DIRFULL:X=)
 SUFX	    = $(SUFX:x=)
 !endif
 !endif
 
-!if !$(TCL_THREADS)
+!if !$(TCL_THREADS) || $(TCL_VERSION) > 86
 TMP_DIRFULL = $(TMP_DIRFULL:Threaded=)
 SUFX	    = $(SUFX:t=)
 !endif
 
 !ifndef TMP_DIR
@@ -369,94 +1027,225 @@
 !ifndef OUT_DIR
 OUT_DIR	    = $(TMP_DIR)
 !endif
 !endif
 
-
-#----------------------------------------------------------
-# Decode the statistics requested.
-#----------------------------------------------------------
-
-!if "$(STATS)" == "" || [nmakehlp -f "$(STATS)" "none"]
-TCL_MEM_DEBUG	    = 0
-TCL_COMPILE_DEBUG   = 0
-!else
-!if [nmakehlp -f $(STATS) "memdbg"]
-!message *** Doing memdbg
-TCL_MEM_DEBUG	    = 1
-!else
-TCL_MEM_DEBUG	    = 0
-!endif
-!if [nmakehlp -f $(STATS) "compdbg"]
-!message *** Doing compdbg
-TCL_COMPILE_DEBUG   = 1
-!else
-TCL_COMPILE_DEBUG   = 0
-!endif
-!endif
-
-
-#----------------------------------------------------------
-# Decode the checks requested.
-#----------------------------------------------------------
-
-!if "$(CHECKS)" == "" || [nmakehlp -f "$(CHECKS)" "none"]
-TCL_NO_DEPRECATED	    = 0
-WARNINGS		    = -W3
-!else
-!if [nmakehlp -f $(CHECKS) "nodep"]
-!message *** Doing nodep check
-TCL_NO_DEPRECATED	    = 1
-!else
-TCL_NO_DEPRECATED	    = 0
-!endif
-!if [nmakehlp -f $(CHECKS) "fullwarn"]
-!message *** Doing full warnings check
-WARNINGS		    = -W4
-!if [nmakehlp -l -warn:3]
-LINKERFLAGS		    = $(LINKERFLAGS) -warn:3
-!endif
-!else
-WARNINGS		    = -W3
-!endif
-!if [nmakehlp -f $(CHECKS) "64bit"] && [nmakehlp -c -Wp64]
-!message *** Doing 64bit portability warnings
-WARNINGS		    = $(WARNINGS) -Wp64
-!endif
-!endif
-
-!if $(PGO) > 1
-!if [nmakehlp -l -ltcg:pgoptimize]
-LINKERFLAGS	= $(LINKERFLAGS:-ltcg=) -ltcg:pgoptimize
-!else
-MSG=^
-This compiler does not support profile guided optimization.
-!error $(MSG)
-!endif
-!elseif $(PGO) > 0
-!if [nmakehlp -l -ltcg:pginstrument]
-LINKERFLAGS	= $(LINKERFLAGS:-ltcg=) -ltcg:pginstrument
-!else
-MSG=^
-This compiler does not support profile guided optimization.
-!error $(MSG)
-!endif
-!endif
-
-#----------------------------------------------------------
-# Set our defines now armed with our options.
-#----------------------------------------------------------
+# Relative paths -> absolute
+!if [echo OUT_DIR = \> nmakehlp.out] \
+   || [nmakehlp -Q "$(OUT_DIR)" >> nmakehlp.out]
+!error *** Could not fully qualify path OUT_DIR=$(OUT_DIR)
+!endif
+!if [echo TMP_DIR = \>> nmakehlp.out] \
+   || [nmakehlp -Q "$(TMP_DIR)" >> nmakehlp.out]
+!error *** Could not fully qualify path TMP_DIR=$(TMP_DIR)
+!endif
+!include nmakehlp.out
+
+# The name of the stubs library for the project being built
+STUBPREFIX      = $(PROJECT)stub
+
+# Set up paths to various Tcl executables and libraries needed by extensions
+!if $(DOING_TCL)
+
+TCLSHNAME       = $(PROJECT)sh$(VERSION)$(SUFX).exe
+TCLSH		= $(OUT_DIR)\$(TCLSHNAME)
+TCLIMPLIB	= $(OUT_DIR)\$(PROJECT)$(VERSION)$(SUFX).lib
+TCLLIBNAME	= $(PROJECT)$(VERSION)$(SUFX).$(EXT)
+TCLLIB		= $(OUT_DIR)\$(TCLLIBNAME)
+
+TCLSTUBLIBNAME	= $(STUBPREFIX)$(VERSION).lib
+TCLSTUBLIB	= $(OUT_DIR)\$(TCLSTUBLIBNAME)
+TCL_INCLUDES    = -I"$(WINDIR)" -I"$(GENERICDIR)"
+
+!else # ! $(DOING_TCL)
+
+!if $(TCLINSTALL) # Building against an installed Tcl
+
+# When building extensions, we need to locate tclsh. Depending on version
+# of Tcl we are building against, this may or may not have a "t" suffix.
+# Try various possibilities in turn.
+TCLSH		= $(_TCLDIR)\bin\tclsh$(TCL_VERSION)$(SUFX:t=).exe
+!if !exist("$(TCLSH)")
+TCLSH           = $(_TCLDIR)\bin\tclsh$(TCL_VERSION)t$(SUFX:t=).exe
+!endif
+
+TCLSTUBLIB	= $(_TCLDIR)\lib\tclstub$(TCL_VERSION).lib
+TCLIMPLIB	= $(_TCLDIR)\lib\tcl$(TCL_VERSION)$(SUFX:t=).lib
+# When building extensions, may be linking against Tcl that does not add
+# "t" suffix (e.g. 8.5 or 8.7). If lib not found check for that possibility.
+!if !exist("$(TCLIMPLIB)")
+TCLIMPLIB	= $(_TCLDIR)\lib\tcl$(TCL_VERSION)t$(SUFX:t=).lib
+!endif
+TCL_LIBRARY	= $(_TCLDIR)\lib
+TCLREGLIB	= $(_TCLDIR)\lib\tclreg13$(SUFX:t=).lib
+TCLDDELIB	= $(_TCLDIR)\lib\tcldde14$(SUFX:t=).lib
+TCLTOOLSDIR	= \must\have\tcl\sources\to\build\this\target
+TCL_INCLUDES    = -I"$(_TCLDIR)\include"
+
+!else # Building against Tcl sources
+
+TCLSH		= $(_TCLDIR)\win\$(BUILDDIRTOP)\tclsh$(TCL_VERSION)$(SUFX:t=).exe
+!if !exist($(TCLSH))
+TCLSH		= $(_TCLDIR)\win\$(BUILDDIRTOP)\tclsh$(TCL_VERSION)t$(SUFX:t=).exe
+!endif
+TCLSTUBLIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\tclstub$(TCL_VERSION).lib
+TCLIMPLIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\tcl$(TCL_VERSION)$(SUFX:t=).lib
+# When building extensions, may be linking against Tcl that does not add
+# "t" suffix (e.g. 8.5 or 8.7). If lib not found check for that possibility.
+!if !exist("$(TCLIMPLIB)")
+TCLIMPLIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\tcl$(TCL_VERSION)t$(SUFX:t=).lib
+!endif
+TCL_LIBRARY	= $(_TCLDIR)\library
+TCLREGLIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\tclreg13$(SUFX:t=).lib
+TCLDDELIB	= $(_TCLDIR)\win\$(BUILDDIRTOP)\tcldde14$(SUFX:t=).lib
+TCLTOOLSDIR	= $(_TCLDIR)\tools
+TCL_INCLUDES	= -I"$(_TCLDIR)\generic" -I"$(_TCLDIR)\win"
+
+!endif # TCLINSTALL
+
+tcllibs = "$(TCLSTUBLIB)" "$(TCLIMPLIB)"
+
+!endif # $(DOING_TCL)
+
+# We need a tclsh that will run on the host machine as part of the build.
+# IX86 runs on all architectures.
+!ifndef TCLSH_NATIVE
+!if "$(MACHINE)" == "IX86" || "$(MACHINE)" == "$(NATIVE_ARCH)"
+TCLSH_NATIVE	= $(TCLSH)
+!else
+!error You must explicitly set TCLSH_NATIVE for cross-compilation
+!endif
+!endif
+
+# Do the same for Tk and Tk extensions that require the Tk libraries
+!if $(DOING_TK) || $(NEED_TK)
+WISHNAMEPREFIX = wish
+WISHNAME = $(WISHNAMEPREFIX)$(TK_VERSION)$(SUFX).exe
+TKLIBNAME	= $(PROJECT)$(TK_VERSION)$(SUFX).$(EXT)
+TKSTUBLIBNAME	= tkstub$(TK_VERSION).lib
+TKIMPLIBNAME	= tk$(TK_VERSION)$(SUFX).lib
+
+!if $(DOING_TK)
+WISH 		= $(OUT_DIR)\$(WISHNAME)
+TKSTUBLIB	= $(OUT_DIR)\$(TKSTUBLIBNAME)
+TKIMPLIB	= $(OUT_DIR)\$(TKIMPLIBNAME)
+TKLIB		= $(OUT_DIR)\$(TKLIBNAME)
+TK_INCLUDES    = -I"$(WINDIR)" -I"$(GENERICDIR)"
+
+!else # effectively NEED_TK
+
+!if $(TKINSTALL) # Building against installed Tk
+WISH		= $(_TKDIR)\bin\$(WISHNAME)
+TKSTUBLIB	= $(_TKDIR)\lib\$(TKSTUBLIBNAME)
+TKIMPLIB	= $(_TKDIR)\lib\$(TKIMPLIBNAME)
+# When building extensions, may be linking against Tk that does not add
+# "t" suffix (e.g. 8.5 or 8.7). If lib not found check for that possibility.
+!if !exist("$(TKIMPLIB)")
+TKIMPLIBNAME	= tk$(TK_VERSION)$(SUFX:t=).lib
+TKIMPLIB	= $(_TKDIR)\lib\$(TKIMPLIBNAME)
+!endif
+TK_INCLUDES     = -I"$(_TKDIR)\include"
+!else # Building against Tk sources
+WISH		= $(_TKDIR)\win\$(BUILDDIRTOP)\$(WISHNAME)
+TKSTUBLIB	= $(_TKDIR)\win\$(BUILDDIRTOP)\$(TKSTUBLIBNAME)
+TKIMPLIB	= $(_TKDIR)\win\$(BUILDDIRTOP)\$(TKIMPLIBNAME)
+# When building extensions, may be linking against Tk that does not add
+# "t" suffix (e.g. 8.5 or 8.7). If lib not found check for that possibility.
+!if !exist("$(TKIMPLIB)")
+TKIMPLIBNAME	= tk$(TK_VERSION)$(SUFX:t=).lib
+TKIMPLIB	= $(_TKDIR)\win\$(BUILDDIRTOP)\$(TKIMPLIBNAME)
+!endif
+TK_INCLUDES     = -I"$(_TKDIR)\generic" -I"$(_TKDIR)\win" -I"$(_TKDIR)\xlib"
+!endif # TKINSTALL
+tklibs = "$(TKSTUBLIB)" "$(TKIMPLIB)"
+
+!endif # $(DOING_TK)
+!endif # $(DOING_TK) || $(NEED_TK)
+
+# Various output paths
+PRJIMPLIB	= $(OUT_DIR)\$(PROJECT)$(VERSION)$(SUFX:t=).lib
+PRJLIBNAME	= $(PROJECT)$(VERSION)$(SUFX:t=).$(EXT)
+PRJLIB		= $(OUT_DIR)\$(PRJLIBNAME)
+
+PRJSTUBLIBNAME	= $(STUBPREFIX)$(VERSION).lib
+PRJSTUBLIB	= $(OUT_DIR)\$(PRJSTUBLIBNAME)
+
+# If extension parent makefile has not defined a resource definition file,
+# we will generate one from standard template.
+!if !$(DOING_TCL) && !$(DOING_TK) && !$(STATIC_BUILD)
+!ifdef RCFILE
+RESFILE = $(TMP_DIR)\$(RCFILE:.rc=.res)
+!else
+RESFILE = $(TMP_DIR)\$(PROJECT).res
+!endif
+!endif
+
+###################################################################
+# 11. Construct the paths for the installation directories
+# The following macros get defined in this section:
+# LIB_INSTALL_DIR - where libraries should be installed
+# BIN_INSTALL_DIR - where the executables should be installed
+# DOC_INSTALL_DIR - where documentation should be installed
+# SCRIPT_INSTALL_DIR - where scripts should be installed
+# INCLUDE_INSTALL_DIR - where C include files should be installed
+# DEMO_INSTALL_DIR - where demos should be installed
+# PRJ_INSTALL_DIR - where package will be installed (not set for Tcl and Tk)
+
+!if $(DOING_TCL) || $(DOING_TK)
+LIB_INSTALL_DIR		= $(_INSTALLDIR)\lib
+BIN_INSTALL_DIR		= $(_INSTALLDIR)\bin
+DOC_INSTALL_DIR		= $(_INSTALLDIR)\doc
+!if $(DOING_TCL)
+SCRIPT_INSTALL_DIR	= $(_INSTALLDIR)\lib\$(PROJECT)$(TCL_MAJOR_VERSION).$(TCL_MINOR_VERSION)
+!else # DOING_TK
+SCRIPT_INSTALL_DIR	= $(_INSTALLDIR)\lib\$(PROJECT)$(TK_MAJOR_VERSION).$(TK_MINOR_VERSION)
+!endif
+DEMO_INSTALL_DIR	= $(SCRIPT_INSTALL_DIR)\demos
+INCLUDE_INSTALL_DIR	= $(_INSTALLDIR)\include
+
+!else # extension other than Tk
+
+PRJ_INSTALL_DIR         = $(_INSTALLDIR)\$(PROJECT)$(DOTVERSION)
+LIB_INSTALL_DIR		= $(PRJ_INSTALL_DIR)
+BIN_INSTALL_DIR		= $(PRJ_INSTALL_DIR)
+DOC_INSTALL_DIR		= $(PRJ_INSTALL_DIR)
+SCRIPT_INSTALL_DIR	= $(PRJ_INSTALL_DIR)
+DEMO_INSTALL_DIR	= $(PRJ_INSTALL_DIR)\demos
+INCLUDE_INSTALL_DIR	= $(_INSTALLDIR)\..\include
+
+!endif
+
+###################################################################
+# 12. Set up actual options to be passed to the compiler and linker
+# Now we have all the information we need, set up the actual flags and
+# options that we will pass to the compiler and linker. The main
+# makefile should use these in combination with whatever other flags
+# and switches are specific to it.
+# The following macros are defined, names are for historical compatibility:
+# OPTDEFINES - /Dxxx C macro flags based on user-specified OPTS
+# COMPILERFLAGS - /Dxxx C macro flags independent of any configuration opttions
+# crt - Compiler switch that selects the appropriate C runtime
+# cdebug - Compiler switches related to debug AND optimizations
+# cwarn - Compiler switches that set warning levels
+# cflags - complete compiler switches (subsumes cdebug and cwarn)
+# ldebug - Linker switches controlling debug information and optimization
+# lflags - complete linker switches (subsumes ldebug) except subsystem type
+# dlllflags - complete linker switches to build DLLs (subsumes lflags)
+# conlflags - complete linker switches for console program (subsumes lflags)
+# guilflags - complete linker switches for GUI program (subsumes lflags)
+# baselibs - minimum Windows libraries required. Parent makefile can
+#    define PRJ_LIBS before including rules.rc if additional libs are needed
 
 OPTDEFINES	= -DTCL_CFGVAL_ENCODING=$(CFG_ENCODING) -DSTDC_HEADERS
 
 !if $(TCL_MEM_DEBUG)
 OPTDEFINES	= $(OPTDEFINES) -DTCL_MEM_DEBUG
 !endif
 !if $(TCL_COMPILE_DEBUG)
 OPTDEFINES	= $(OPTDEFINES) -DTCL_COMPILE_DEBUG -DTCL_COMPILE_STATS
 !endif
-!if $(TCL_THREADS)
+!if $(TCL_THREADS) && $(TCL_VERSION) < 86
 OPTDEFINES	= $(OPTDEFINES) -DTCL_THREADS=1
 !if $(USE_THREAD_ALLOC)
 OPTDEFINES	= $(OPTDEFINES) -DUSE_THREAD_ALLOC=1
 !endif
 !endif
@@ -465,252 +1254,463 @@
 !endif
 !if $(TCL_NO_DEPRECATED)
 OPTDEFINES	= $(OPTDEFINES) -DTCL_NO_DEPRECATED
 !endif
 
+!if $(USE_STUBS)
+# Note we do not define USE_TCL_STUBS even when building tk since some
+# test targets in tk do not use stubs
+!if ! $(DOING_TCL)
+USE_STUBS_DEFS  = -DUSE_TCL_STUBS -DUSE_TCLOO_STUBS
+!if $(NEED_TK)
+USE_STUBS_DEFS  = $(USE_STUBS_DEFS) -DUSE_TK_STUBS
+!endif
+!endif
+!endif # USE_STUBS
+
 !if !$(DEBUG)
 OPTDEFINES	= $(OPTDEFINES) -DNDEBUG
 !if $(OPTIMIZING)
 OPTDEFINES	= $(OPTDEFINES) -DTCL_CFG_OPTIMIZED
 !endif
 !endif
 !if $(PROFILE)
 OPTDEFINES	= $(OPTDEFINES) -DTCL_CFG_PROFILED
 !endif
-!if "$(MACHINE)" == "IA64" || "$(MACHINE)" == "AMD64"
+!if "$(MACHINE)" == "AMD64"
 OPTDEFINES	= $(OPTDEFINES) -DTCL_CFG_DO64BIT
 !endif
 !if $(VCVERSION) < 1300
 OPTDEFINES	= $(OPTDEFINES) -DNO_STRTOI64
 !endif
 
-#----------------------------------------------------------
-# Locate the Tcl headers to build against
-#----------------------------------------------------------
-
-!if "$(PROJECT)" == "tcl"
-
-_TCL_H          = ..\generic\tcl.h
-
-!else
-
-# If INSTALLDIR set to tcl root dir then reset to the lib dir.
-!if exist("$(_INSTALLDIR)\include\tcl.h")
-_INSTALLDIR=$(_INSTALLDIR)\lib
-!endif
-
-!if !defined(TCLDIR)
-!if exist("$(_INSTALLDIR)\..\include\tcl.h")
-TCLINSTALL	= 1
-_TCLDIR		= $(_INSTALLDIR)\..
-_TCL_H          = $(_INSTALLDIR)\..\include\tcl.h
-TCLDIR          = $(_INSTALLDIR)\..
-!else
-MSG=^
-Failed to find tcl.h.  Set the TCLDIR macro.
-!error $(MSG)
-!endif
-!else
-_TCLDIR	= $(TCLDIR:/=\)
-!if exist("$(_TCLDIR)\include\tcl.h")
-TCLINSTALL	= 1
-_TCL_H          = $(_TCLDIR)\include\tcl.h
-!elseif exist("$(_TCLDIR)\generic\tcl.h")
-TCLINSTALL	= 0
-_TCL_H          = $(_TCLDIR)\generic\tcl.h
-!else
-MSG =^
-Failed to find tcl.h.  The TCLDIR macro does not appear correct.
-!error $(MSG)
-!endif
-!endif
-!endif
-
-#--------------------------------------------------------------
-# Extract various version numbers from tcl headers
-# The generated file is then included in the makefile.
-#--------------------------------------------------------------
-
-!if [echo REM = This file is generated from rules.vc > versions.vc]
-!endif
-!if [echo TCL_MAJOR_VERSION = \>> versions.vc] \
-   && [nmakehlp -V "$(_TCL_H)" TCL_MAJOR_VERSION >> versions.vc]
-!endif
-!if [echo TCL_MINOR_VERSION = \>> versions.vc] \
-   && [nmakehlp -V "$(_TCL_H)" TCL_MINOR_VERSION >> versions.vc]
-!endif
-!if [echo TCL_PATCH_LEVEL = \>> versions.vc] \
-   && [nmakehlp -V "$(_TCL_H)" TCL_PATCH_LEVEL >> versions.vc]
-!endif
-
-# If building the tcl core then we need additional package versions
-!if "$(PROJECT)" == "tcl"
-!if [echo PKG_HTTP_VER = \>> versions.vc] \
-   && [nmakehlp -V ..\library\http\pkgIndex.tcl http >> versions.vc]
-!endif
-!if [echo PKG_TCLTEST_VER = \>> versions.vc] \
-   && [nmakehlp -V ..\library\tcltest\pkgIndex.tcl tcltest >> versions.vc]
-!endif
-!if [echo PKG_MSGCAT_VER = \>> versions.vc] \
-   && [nmakehlp -V ..\library\msgcat\pkgIndex.tcl msgcat >> versions.vc]
-!endif
-!if [echo PKG_PLATFORM_VER = \>> versions.vc] \
-   && [nmakehlp -V ..\library\platform\pkgIndex.tcl "platform " >> versions.vc]
-!endif
-!if [echo PKG_SHELL_VER = \>> versions.vc] \
-   && [nmakehlp -V ..\library\platform\pkgIndex.tcl "platform::shell" >> versions.vc]
-!endif
-!if [echo PKG_DDE_VER = \>> versions.vc] \
-   && [nmakehlp -V ..\library\dde\pkgIndex.tcl "dde " >> versions.vc]
-!endif
-!if [echo PKG_REG_VER =\>> versions.vc] \
-   && [nmakehlp -V ..\library\reg\pkgIndex.tcl registry >> versions.vc]
-!endif
-!endif
-
-!include versions.vc
-
-#--------------------------------------------------------------
-# Setup tcl version dependent stuff headers
-#--------------------------------------------------------------
-
-!if "$(PROJECT)" != "tcl"
-
-TCL_VERSION	= $(TCL_MAJOR_VERSION)$(TCL_MINOR_VERSION)
-
-!if $(TCLINSTALL)
-TCLSH		= "$(_TCLDIR)\bin\tclsh$(TCL_VERSION)$(SUFX).exe"
-!if !exist($(TCLSH))
-TCLSH           = "$(_TCLDIR)\bin\tclsh$(TCL_VERSION)$(SUFX:x=).exe"
-!endif
-TCLSTUBLIB	= "$(_TCLDIR)\lib\tclstub$(TCL_VERSION).lib"
-TCLIMPLIB	= "$(_TCLDIR)\lib\tcl$(TCL_VERSION)$(SUFX).lib"
-!if !exist($(TCLIMPLIB))
-TCLIMPLIB	= "$(_TCLDIR)\lib\tcl$(TCL_VERSION)$(SUFX:x=).lib"
-!endif
-TCL_LIBRARY	= $(_TCLDIR)\lib
-TCLREGLIB	= "$(_TCLDIR)\lib\tclreg13$(SUFX:t=).lib"
-TCLDDELIB	= "$(_TCLDIR)\lib\tcldde14$(SUFX:t=).lib"
-COFFBASE	= \must\have\tcl\sources\to\build\this\target
-TCLTOOLSDIR	= \must\have\tcl\sources\to\build\this\target
-TCL_INCLUDES    = -I"$(_TCLDIR)\include"
-!else
-TCLSH		= "$(_TCLDIR)\win\$(BUILDDIRTOP)\tclsh$(TCL_VERSION)$(SUFX).exe"
-!if !exist($(TCLSH))
-TCLSH		= "$(_TCLDIR)\win\$(BUILDDIRTOP)\tclsh$(TCL_VERSION)$(SUFX:x=).exe"
-!endif
-TCLSTUBLIB	= "$(_TCLDIR)\win\$(BUILDDIRTOP)\tclstub$(TCL_VERSION).lib"
-TCLIMPLIB	= "$(_TCLDIR)\win\$(BUILDDIRTOP)\tcl$(TCL_VERSION)$(SUFX).lib"
-!if !exist($(TCLIMPLIB))
-TCLIMPLIB	= "$(_TCLDIR)\win\$(BUILDDIRTOP)\tcl$(TCL_VERSION)$(SUFX:x=).lib"
-!endif
-TCL_LIBRARY	= $(_TCLDIR)\library
-TCLREGLIB	= "$(_TCLDIR)\win\$(BUILDDIRTOP)\tclreg13$(SUFX:t=).lib"
-TCLDDELIB	= "$(_TCLDIR)\win\$(BUILDDIRTOP)\tcldde14$(SUFX:t=).lib"
-COFFBASE	= "$(_TCLDIR)\win\coffbase.txt"
-TCLTOOLSDIR	= $(_TCLDIR)\tools
-TCL_INCLUDES	= -I"$(_TCLDIR)\generic" -I"$(_TCLDIR)\win"
-!endif
-
-!endif
-
-#-------------------------------------------------------------------------
-# Locate the Tk headers to build against
-#-------------------------------------------------------------------------
-
-!if "$(PROJECT)" == "tk"
-_TK_H          = ..\generic\tk.h
-_INSTALLDIR    = $(_INSTALLDIR)\..
-!endif
-
-!ifdef PROJECT_REQUIRES_TK
-!if !defined(TKDIR)
-!if exist("$(_INSTALLDIR)\..\include\tk.h")
-TKINSTALL      = 1
-_TKDIR         = $(_INSTALLDIR)\..
-_TK_H          = $(_TKDIR)\include\tk.h
-TKDIR          = $(_TKDIR)
-!elseif exist("$(_TCLDIR)\include\tk.h")
-TKINSTALL      = 1
-_TKDIR         = $(_TCLDIR)
-_TK_H          = $(_TKDIR)\include\tk.h
-TKDIR          = $(_TKDIR)
-!endif
-!else
-_TKDIR = $(TKDIR:/=\)
-!if exist("$(_TKDIR)\include\tk.h")
-TKINSTALL      = 1
-_TK_H          = $(_TKDIR)\include\tk.h
-!elseif exist("$(_TKDIR)\generic\tk.h")
-TKINSTALL      = 0
-_TK_H          = $(_TKDIR)\generic\tk.h
-!else
-MSG =^
-Failed to find tk.h. The TKDIR macro does not appear correct.
-!error $(MSG)
-!endif
-!endif
-!endif
-
-#-------------------------------------------------------------------------
-# Extract Tk version numbers
-#-------------------------------------------------------------------------
-
-!if defined(PROJECT_REQUIRES_TK) || "$(PROJECT)" == "tk"
-
-!if [echo TK_MAJOR_VERSION = \>> versions.vc] \
-   && [nmakehlp -V $(_TK_H) TK_MAJOR_VERSION >> versions.vc]
-!endif
-!if [echo TK_MINOR_VERSION = \>> versions.vc] \
-   && [nmakehlp -V $(_TK_H) TK_MINOR_VERSION >> versions.vc]
-!endif
-!if [echo TK_PATCH_LEVEL = \>> versions.vc] \
-   && [nmakehlp -V $(_TK_H) TK_PATCH_LEVEL >> versions.vc]
-!endif
-
-!include versions.vc
-
-TK_DOTVERSION	= $(TK_MAJOR_VERSION).$(TK_MINOR_VERSION)
-TK_VERSION	= $(TK_MAJOR_VERSION)$(TK_MINOR_VERSION)
-
-!if "$(PROJECT)" != "tk"
-!if $(TKINSTALL)
-WISH		= "$(_TKDIR)\bin\wish$(TK_VERSION)$(SUFX).exe"
-!if !exist($(WISH))
-WISH		= "$(_TKDIR)\bin\wish$(TK_VERSION)$(SUFX:x=).exe"
-!endif
-TKSTUBLIB	= "$(_TKDIR)\lib\tkstub$(TK_VERSION).lib"
-TKIMPLIB	= "$(_TKDIR)\lib\tk$(TK_VERSION)$(SUFX).lib"
-!if !exist($(TKIMPLIB))
-TKIMPLIB	= "$(_TKDIR)\win\$(BUILDDIRTOP)\tk$(TCL_VERSION)$(SUFX:x=).lib"
-!endif
-TK_INCLUDES     = -I"$(_TKDIR)\include"
-!else
-WISH		= "$(_TKDIR)\win\$(BUILDDIRTOP)\wish$(TCL_VERSION)$(SUFX).exe"
-!if !exist($(WISH))
-WISH		= "$(_TKDIR)\win\$(BUILDDIRTOP)\wish$(TCL_VERSION)$(SUFX:x=).exe"
-!endif
-TKSTUBLIB	= "$(_TKDIR)\win\$(BUILDDIRTOP)\tkstub$(TCL_VERSION).lib"
-TKIMPLIB	= "$(_TKDIR)\win\$(BUILDDIRTOP)\tk$(TCL_VERSION)$(SUFX).lib"
-!if !exist($(TKIMPLIB))
-TKIMPLIB	= "$(_TKDIR)\win\$(BUILDDIRTOP)\tk$(TCL_VERSION)$(SUFX:x=).lib"
-!endif
-TK_INCLUDES     = -I"$(_TKDIR)\generic" -I"$(_TKDIR)\win" -I"$(_TKDIR)\xlib"
-!endif
-!endif
-
-!endif
+# _ATL_XP_TARGETING - Newer SDK's need this to build for XP
+COMPILERFLAGS  = /D_ATL_XP_TARGETING
+
+# Following is primarily for the benefit of extensions. Tcl 8.5 builds
+# Tcl without /DUNICODE, while 8.6 builds with it defined. When building
+# an extension, it is advisable (but not mandated) to use the same Windows
+# API as the Tcl build. This is accordingly defaulted below. A particular
+# extension can override this by pre-definining USE_WIDECHAR_API.
+!ifndef USE_WIDECHAR_API
+!if $(TCL_VERSION) > 85
+USE_WIDECHAR_API = 1
+!else
+USE_WIDECHAR_API = 0
+!endif
+!endif
+
+!if $(USE_WIDECHAR_API)
+COMPILERFLAGS = $(COMPILERFLAGS) /DUNICODE /D_UNICODE
+!endif
+
+# Like the TEA system only set this non empty for non-Tk extensions
+# Note: some extensions use PACKAGE_NAME and others use PACKAGE_TCLNAME
+# so we pass both
+!if !$(DOING_TCL) && !$(DOING_TK)
+PKGNAMEFLAGS = -DPACKAGE_NAME="\"$(PRJ_PACKAGE_TCLNAME)\"" \
+               -DPACKAGE_TCLNAME="\"$(PRJ_PACKAGE_TCLNAME)\"" \
+               -DPACKAGE_VERSION="\"$(DOTVERSION)\"" \
+               -DMODULE_SCOPE=extern
+!endif
+
+# crt picks the C run time based on selected OPTS
+!if $(MSVCRT)
+!if $(DEBUG) && !$(UNCHECKED)
+crt = -MDd
+!else
+crt = -MD
+!endif
+!else
+!if $(DEBUG) && !$(UNCHECKED)
+crt = -MTd
+!else
+crt = -MT
+!endif
+!endif
+
+# cdebug includes compiler options for debugging as well as optimization.
+!if $(DEBUG)
+
+# In debugging mode, optimizations need to be disabled
+cdebug = -Zi -Od $(DEBUGFLAGS)
+
+!else
+
+cdebug = $(OPTIMIZATIONS)
+!if $(SYMBOLS)
+cdebug = $(cdebug) -Zi
+!endif
+
+!endif # $(DEBUG)
+
+# cwarn includes default warning levels.
+cwarn = $(WARNINGS)
+
+!if "$(MACHINE)" == "AMD64"
+# Disable pointer<->int warnings related to cast between different sizes
+# There are a gadzillion of these due to use of ClientData and
+# clutter up compiler
+# output increasing chance of a real warning getting lost. So disable them.
+# Eventually some day, Tcl will be 64-bit clean.
+cwarn = $(cwarn) -wd4311 -wd4312
+!endif
+
+### Common compiler options that are architecture specific
+!if "$(MACHINE)" == "ARM"
+carch = -D_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE
+!else
+carch =
+!endif
+
+!if $(DEBUG)
+# Turn warnings into errors
+cwarn = $(cwarn) -WX
+!endif
+
+INCLUDES = $(TCL_INCLUDES) $(TK_INCLUDES) $(PRJ_INCLUDES)
+!if !$(DOING_TCL) && !$(DOING_TK)
+INCLUDES = $(INCLUDES) -I"$(GENERICDIR)" -I"$(WINDIR)" -I"$(COMPATDIR)"
+!endif
+
+# These flags are defined roughly in the order of the pre-reform
+# rules.vc/makefile.vc to help visually compare that the pre- and
+# post-reform build logs
+
+# cflags contains generic flags used for building practically all object files
+cflags = -nologo -c $(COMPILERFLAGS) $(carch) $(cwarn) -Fp$(TMP_DIR)^\ $(cdebug)
+
+# appcflags contains $(cflags) and flags for building the application
+# object files (e.g. tclsh, or wish) pkgcflags contains $(cflags) plus
+# flags used for building shared object files The two differ in the
+# BUILD_$(PROJECT) macro which should be defined only for the shared
+# library *implementation* and not for its caller interface
+
+appcflags = $(cflags) $(crt) $(INCLUDES) $(TCL_DEFINES) $(PRJ_DEFINES) $(OPTDEFINES) $(USE_STUBS_DEFS)
+appcflags_nostubs = $(cflags) $(crt) $(INCLUDES) $(TCL_DEFINES) $(PRJ_DEFINES) $(OPTDEFINES)
+pkgcflags = $(appcflags) $(PKGNAMEFLAGS) -DBUILD_$(PROJECT)
+pkgcflags_nostubs = $(appcflags_nostubs) $(PKGNAMEFLAGS) -DBUILD_$(PROJECT)
+
+# stubscflags contains $(cflags) plus flags used for building a stubs
+# library for the package.  Note: -DSTATIC_BUILD is defined in
+# $(OPTDEFINES) only if the OPTS configuration indicates a static
+# library. However the stubs library is ALWAYS static hence included
+# here irrespective of the OPTS setting.
+#
+# TBD - tclvfs has a comment that stubs libs should not be compiled with -GL
+# without stating why. Tcl itself compiled stubs libs with this flag.
+# so we do not remove it from cflags. -GL may prevent extensions
+# compiled with one VC version to fail to link against stubs library
+# compiled with another VC version. Check for this and fix accordingly.
+stubscflags = $(cflags) $(PKGNAMEFLAGS) $(PRJ_DEFINES) $(OPTDEFINES) -Zl -DSTATIC_BUILD $(INCLUDES)
+
+# Link flags
+
+!if $(DEBUG)
+ldebug	= -debug -debugtype:cv
+!else
+ldebug	= -release -opt:ref -opt:icf,3
+!if $(SYMBOLS)
+ldebug	= $(ldebug) -debug -debugtype:cv
+!endif
+!endif
+
+# Note: Profiling is currently only possible with the Visual Studio Enterprise
+!if $(PROFILE)
+ldebug= $(ldebug) -profile
+!endif
+
+### Declarations common to all linker versions
+lflags	= -nologo -machine:$(MACHINE) $(LINKERFLAGS) $(ldebug)
+
+!if $(MSVCRT) && !($(DEBUG) && !$(UNCHECKED)) && $(VCVERSION) >= 1900
+lflags	= $(lflags) -nodefaultlib:libucrt.lib
+!endif
+
+dlllflags = $(lflags) -dll
+conlflags = $(lflags) -subsystem:console
+guilflags = $(lflags) -subsystem:windows
+
+# Libraries that are required for every image.
+# Extensions should define any additional libraries with $(PRJ_LIBS)
+winlibs   = kernel32.lib advapi32.lib
+
+!if $(NEED_TK)
+winlibs = $(winlibs) gdi32.lib user32.lib uxtheme.lib
+!endif
+
+# Avoid 'unresolved external symbol __security_cookie' errors.
+# c.f. http://support.microsoft.com/?id=894573
+!if "$(MACHINE)" == "AMD64"
+!if $(VCVERSION) > 1399 && $(VCVERSION) < 1500
+winlibs   = $(winlibs) bufferoverflowU.lib
+!endif
+!endif
+
+baselibs = $(winlibs) $(PRJ_LIBS)
+
+!if $(MSVCRT) && !($(DEBUG) && !$(UNCHECKED)) && $(VCVERSION) >= 1900
+baselibs   = $(baselibs) ucrt.lib
+!endif
+
+################################################################
+# 13. Define standard commands, common make targets and implicit rules
+
+CCPKGCMD = $(cc32) $(pkgcflags) -Fo$(TMP_DIR)^\
+CCAPPCMD = $(cc32) $(appcflags) -Fo$(TMP_DIR)^\
+CCSTUBSCMD = $(cc32) $(stubscflags) -Fo$(TMP_DIR)^\
+
+LIBCMD = $(lib32) -nologo $(LINKERFLAGS) -out:$@
+DLLCMD = $(link32) $(dlllflags) -out:$@ $(baselibs) $(tcllibs) $(tklibs)
+
+CONEXECMD = $(link32) $(conlflags) -out:$@ $(baselibs) $(tcllibs) $(tklibs)
+GUIEXECMD = $(link32) $(guilflags) -out:$@ $(baselibs) $(tcllibs) $(tklibs)
+RESCMD  = $(rc32) -fo $@ -r -i "$(GENERICDIR)" -i "$(TMP_DIR)" \
+	    $(TCL_INCLUDES) \
+	    -DDEBUG=$(DEBUG) -d UNCHECKED=$(UNCHECKED) \
+	    -DCOMMAVERSION=$(DOTVERSION:.=,),0 \
+	    -DDOTVERSION=\"$(DOTVERSION)\" \
+	    -DVERSION=\"$(VERSION)\" \
+	    -DSUFX=\"$(SUFX:t=)\" \
+	    -DPROJECT=\"$(PROJECT)\" \
+	    -DPRJLIBNAME=\"$(PRJLIBNAME)\"
+
+!ifndef DEFAULT_BUILD_TARGET
+DEFAULT_BUILD_TARGET = $(PROJECT)
+!endif
+
+default-target: $(DEFAULT_BUILD_TARGET)
+
+default-pkgindex:
+	@echo package ifneeded $(PRJ_PACKAGE_TCLNAME) $(DOTVERSION) \
+	    [list load [file join $$dir $(PRJLIBNAME)]] > $(OUT_DIR)\pkgIndex.tcl
+
+default-pkgindex-tea:
+	@if exist $(ROOT)\pkgIndex.tcl.in nmakehlp -s << $(ROOT)\pkgIndex.tcl.in > $(OUT_DIR)\pkgIndex.tcl
+@PACKAGE_VERSION@    $(DOTVERSION)
+@PACKAGE_NAME@       $(PRJ_PACKAGE_TCLNAME)
+@PACKAGE_TCLNAME@    $(PRJ_PACKAGE_TCLNAME)
+@PKG_LIB_FILE@       $(PRJLIBNAME)
+<<
+
+
+default-install: default-install-binaries default-install-libraries
+
+default-install-binaries: $(PRJLIB)
+	@echo Installing binaries to '$(SCRIPT_INSTALL_DIR)'
+	@if not exist "$(SCRIPT_INSTALL_DIR)" mkdir "$(SCRIPT_INSTALL_DIR)"
+	@$(CPY) $(PRJLIB) "$(SCRIPT_INSTALL_DIR)" >NUL
+
+default-install-libraries: $(OUT_DIR)\pkgIndex.tcl
+	@echo Installing libraries to '$(SCRIPT_INSTALL_DIR)'
+	@if exist $(LIBDIR) $(CPY) $(LIBDIR)\*.tcl "$(SCRIPT_INSTALL_DIR)"
+	@echo Installing package index in '$(SCRIPT_INSTALL_DIR)'
+	@$(CPY) $(OUT_DIR)\pkgIndex.tcl $(SCRIPT_INSTALL_DIR)
+
+default-install-stubs:
+	@echo Installing stubs library to '$(SCRIPT_INSTALL_DIR)'
+	@if not exist "$(SCRIPT_INSTALL_DIR)" mkdir "$(SCRIPT_INSTALL_DIR)"
+	@$(CPY) $(PRJSTUBLIB) "$(SCRIPT_INSTALL_DIR)" >NUL
+
+default-install-docs-html:
+	@echo Installing documentation files to '$(DOC_INSTALL_DIR)'
+	@if not exist "$(DOC_INSTALL_DIR)" mkdir "$(DOC_INSTALL_DIR)"
+	@if exist $(DOCDIR) for %f in ("$(DOCDIR)\*.html" "$(DOCDIR)\*.css" "$(DOCDIR)\*.png") do @$(COPY) %f "$(DOC_INSTALL_DIR)"
+
+default-install-docs-n:
+	@echo Installing documentation files to '$(DOC_INSTALL_DIR)'
+	@if not exist "$(DOC_INSTALL_DIR)" mkdir "$(DOC_INSTALL_DIR)"
+	@if exist $(DOCDIR) for %f in ("$(DOCDIR)\*.n") do @$(COPY) %f "$(DOC_INSTALL_DIR)"
+
+default-install-demos:
+	@echo Installing demos to '$(DEMO_INSTALL_DIR)'
+	@if not exist "$(DEMO_INSTALL_DIR)" mkdir "$(DEMO_INSTALL_DIR)"
+	@if exist $(DEMODIR) $(CPYDIR) "$(DEMODIR)" "$(DEMO_INSTALL_DIR)"
+
+default-clean:
+	@echo Cleaning $(TMP_DIR)\* ...
+	@if exist $(TMP_DIR)\nul $(RMDIR) $(TMP_DIR)
+	@echo Cleaning $(WINDIR)\nmakehlp.obj, nmakehlp.exe ...
+	@if exist $(WINDIR)\nmakehlp.obj del $(WINDIR)\nmakehlp.obj
+	@if exist $(WINDIR)\nmakehlp.exe del $(WINDIR)\nmakehlp.exe
+	@if exist $(WINDIR)\nmakehlp.out del $(WINDIR)\nmakehlp.out
+	@echo Cleaning $(WINDIR)\nmhlp-out.txt ...
+	@if exist $(WINDIR)\nmhlp-out.txt del $(WINDIR)\nmhlp-out.txt
+	@echo Cleaning $(WINDIR)\_junk.pch ...
+	@if exist $(WINDIR)\_junk.pch del $(WINDIR)\_junk.pch
+	@echo Cleaning $(WINDIR)\vercl.x, vercl.i ...
+	@if exist $(WINDIR)\vercl.x del $(WINDIR)\vercl.x
+	@if exist $(WINDIR)\vercl.i del $(WINDIR)\vercl.i
+	@echo Cleaning $(WINDIR)\versions.vc, version.vc ...
+	@if exist $(WINDIR)\versions.vc del $(WINDIR)\versions.vc
+	@if exist $(WINDIR)\version.vc del $(WINDIR)\version.vc
+
+default-hose: default-clean
+	@echo Hosing $(OUT_DIR)\* ...
+	@if exist $(OUT_DIR)\nul $(RMDIR) $(OUT_DIR)
+
+# Only for backward compatibility
+default-distclean: default-hose
+
+default-setup:
+	@if not exist $(OUT_DIR)\nul mkdir $(OUT_DIR)
+	@if not exist $(TMP_DIR)\nul mkdir $(TMP_DIR)
+
+!if "$(TESTPAT)" != ""
+TESTFLAGS = $(TESTFLAGS) -file $(TESTPAT)
+!endif
+
+default-test: default-setup $(PROJECT)
+	@set TCLLIBPATH=$(OUT_DIR:\=/)
+	@if exist $(LIBDIR) for %f in ("$(LIBDIR)\*.tcl") do @$(COPY) %f "$(OUT_DIR)"
+	cd "$(TESTDIR)" && $(DEBUGGER) $(TCLSH) all.tcl $(TESTFLAGS)
+
+default-shell: default-setup $(PROJECT)
+	@set TCLLIBPATH=$(OUT_DIR:\=/)
+	@if exist $(LIBDIR) for %f in ("$(LIBDIR)\*.tcl") do @$(COPY) %f "$(OUT_DIR)"
+	$(DEBUGGER) $(TCLSH)
+
+# Generation of Windows version resource
+!ifdef RCFILE
+
+# Note: don't use $** in below rule because there may be other dependencies
+# and only the "master" rc must be passed to the resource compiler
+$(TMP_DIR)\$(PROJECT).res: $(RCDIR)\$(PROJECT).rc
+	$(RESCMD) $(RCDIR)\$(PROJECT).rc
+
+!else
+
+# If parent makefile has not defined a resource definition file,
+# we will generate one from standard template.
+$(TMP_DIR)\$(PROJECT).res: $(TMP_DIR)\$(PROJECT).rc
+
+$(TMP_DIR)\$(PROJECT).rc:
+	@$(COPY) << $(TMP_DIR)\$(PROJECT).rc
+#include <winver.h>
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION	COMMAVERSION
+ PRODUCTVERSION	COMMAVERSION
+ FILEFLAGSMASK	0x3fL
+#ifdef DEBUG
+ FILEFLAGS	VS_FF_DEBUG
+#else
+ FILEFLAGS	0x0L
+#endif
+ FILEOS		VOS_NT_WINDOWS32
+ FILETYPE	VFT_DLL
+ FILESUBTYPE	0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "FileDescription",  "Tcl extension " PROJECT
+            VALUE "OriginalFilename", PRJLIBNAME
+            VALUE "FileVersion",      DOTVERSION
+            VALUE "ProductName",      "Package " PROJECT " for Tcl"
+            VALUE "ProductVersion",   DOTVERSION
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+<<
+
+!endif # ifdef RCFILE
+
+!ifndef DISABLE_IMPLICIT_RULES
+DISABLE_IMPLICIT_RULES = 0
+!endif
+
+!if !$(DISABLE_IMPLICIT_RULES)
+# Implicit rule definitions - only for building library objects. For stubs and
+# main application, the master makefile should define explicit rules.
+
+{$(ROOT)}.c{$(TMP_DIR)}.obj::
+	$(CCPKGCMD) @<<
+$<
+<<
+
+{$(WINDIR)}.c{$(TMP_DIR)}.obj::
+	$(CCPKGCMD) @<<
+$<
+<<
+
+{$(GENERICDIR)}.c{$(TMP_DIR)}.obj::
+	$(CCPKGCMD) @<<
+$<
+<<
+
+{$(COMPATDIR)}.c{$(TMP_DIR)}.obj::
+	$(CCPKGCMD) @<<
+$<
+<<
+
+{$(RCDIR)}.rc{$(TMP_DIR)}.res:
+	$(RESCMD) $<
+
+{$(WINDIR)}.rc{$(TMP_DIR)}.res:
+	$(RESCMD) $<
+
+{$(TMP_DIR)}.rc{$(TMP_DIR)}.res:
+	$(RESCMD) $<
+
+.SUFFIXES:
+.SUFFIXES:.c .rc
+
+!endif
+
+################################################################
+# 14. Sanity check selected options against Tcl build options
+# When building an extension, certain configuration options should
+# match the ones used when Tcl was built. Here we check and
+# warn on a mismatch.
+!if ! $(DOING_TCL)
+
+!if $(TCLINSTALL) # Building against an installed Tcl
+!if exist("$(_TCLDIR)\lib\nmake\tcl.nmake")
+TCLNMAKECONFIG = "$(_TCLDIR)\lib\nmake\tcl.nmake"
+!endif
+!else # ! $(TCLINSTALL) - building against Tcl source
+!if exist("$(OUT_DIR)\tcl.nmake")
+TCLNMAKECONFIG = "$(OUT_DIR)\tcl.nmake"
+!endif
+!endif # TCLINSTALL
+
+!if $(CONFIG_CHECK)
+!ifdef TCLNMAKECONFIG
+!include $(TCLNMAKECONFIG)
+
+!if defined(CORE_MACHINE) && "$(CORE_MACHINE)" != "$(MACHINE)"
+!error ERROR: Build target ($(MACHINE)) does not match the Tcl library architecture ($(CORE_MACHINE)).
+!endif
+!if defined(CORE_DEBUG) && $(CORE_DEBUG) != $(DEBUG)
+!message WARNING: Value of DEBUG ($(DEBUG)) does not match its Tcl library configuration ($(DEBUG)).
+!endif
+!endif
+
+!endif # TCLNMAKECONFIG
+
+!endif # ! $(DOING_TCL)
+
 
 #----------------------------------------------------------
 # Display stats being used.
 #----------------------------------------------------------
 
+!if !$(DOING_TCL)
+!message *** Building against Tcl at '$(_TCLDIR)'
+!endif
+!if !$(DOING_TK) && $(NEED_TK)
+!message *** Building against Tk at '$(_TKDIR)'
+!endif
 !message *** Intermediate directory will be '$(TMP_DIR)'
 !message *** Output directory will be '$(OUT_DIR)'
+!message *** Installation, if selected, will be in '$(_INSTALLDIR)'
 !message *** Suffix for binaries will be '$(SUFX)'
-!message *** Optional defines are '$(OPTDEFINES)'
-!message *** Compiler version $(VCVER). Target machine is $(MACHINE)
-!message *** Host architecture is $(NATIVE_ARCH)
-!message *** Compiler options '$(COMPILERFLAGS) $(OPTIMIZATIONS) $(DEBUGFLAGS) $(WARNINGS)'
-!message *** Link options '$(LINKERFLAGS)'
+!message *** Compiler version $(VCVER). Target $(MACHINE), host $(NATIVE_ARCH).
 
-!endif
+!endif # ifdef _RULES_VC

Index: win/stubs.c
==================================================================
--- win/stubs.c
+++ win/stubs.c
@@ -1,6 +1,6 @@
-#include "tk.h"
+#include "tkInt.h"
 
 /*
  * Undocumented Xlib internal function
  */
 

ADDED   win/targets.vc
Index: win/targets.vc
==================================================================
--- /dev/null
+++ win/targets.vc
@@ -0,0 +1,98 @@
+#------------------------------------------------------------- -*- makefile -*-
+# targets.vc --
+#
+# Part of the nmake based build system for Tcl and its extensions.
+# This file defines some standard targets for the convenience of extensions
+# and can be optionally included by the extension makefile.
+# See TIP 477 (https://core.tcl.tk/tips/doc/trunk/tip/477.md) for docs.
+
+$(PROJECT): setup pkgindex $(PRJLIB)
+
+!ifdef PRJ_STUBOBJS
+$(PROJECT): $(PRJSTUBLIB)
+$(PRJSTUBLIB): $(PRJ_STUBOBJS)
+	$(LIBCMD) $**
+
+$(PRJ_STUBOBJS):
+	$(CCSTUBSCMD) %s
+!endif # PRJ_STUBOBJS
+
+!ifdef PRJ_MANIFEST
+$(PROJECT): $(PRJLIB).manifest
+$(PRJLIB).manifest: $(PRJ_MANIFEST)
+	@nmakehlp -s << $** >$@
+@MACHINE@	  $(MACHINE:IX86=X86)
+<<
+!endif
+
+!if "$(PROJECT)" != "tcl" && "$(PROJECT)" != "tk"
+$(PRJLIB): $(PRJ_OBJS) $(RESFILE)
+!if $(STATIC_BUILD)
+       $(LIBCMD) $**
+!else
+       $(DLLCMD) $**
+       $(_VC_MANIFEST_EMBED_DLL)
+!endif
+       -@del $*.exp
+!endif
+
+!if "$(PRJ_HEADERS)" != "" && "$(PRJ_OBJS)" != ""
+$(PRJ_OBJS): $(PRJ_HEADERS)
+!endif
+
+# If parent makefile has defined stub objects, add their installation
+# to the default install
+!if "$(PRJ_STUBOBJS)" != ""
+default-install: default-install-stubs
+!endif
+
+# Unlike the other default targets, these cannot be in rules.vc because
+# the executed command depends on existence of macro PRJ_HEADERS_PUBLIC
+# that the parent makefile will not define until after including rules-ext.vc
+!if "$(PRJ_HEADERS_PUBLIC)" != ""
+default-install: default-install-headers
+default-install-headers:
+	@echo Installing headers to '$(INCLUDE_INSTALL_DIR)'
+	@for %f in ($(PRJ_HEADERS_PUBLIC)) do @$(COPY) %f "$(INCLUDE_INSTALL_DIR)"
+!endif
+
+!if "$(DISABLE_STANDARD_TARGETS)" == ""
+DISABLE_STANDARD_TARGETS = 0
+!endif
+
+!if "$(DISABLE_TARGET_setup)" == ""
+DISABLE_TARGET_setup = 0
+!endif
+!if "$(DISABLE_TARGET_install)" == ""
+DISABLE_TARGET_install = 0
+!endif
+!if "$(DISABLE_TARGET_clean)" == ""
+DISABLE_TARGET_clean = 0
+!endif
+!if "$(DISABLE_TARGET_test)" == ""
+DISABLE_TARGET_test = 0
+!endif
+!if "$(DISABLE_TARGET_shell)" == ""
+DISABLE_TARGET_shell = 0
+!endif
+
+!if !$(DISABLE_STANDARD_TARGETS)
+!if !$(DISABLE_TARGET_setup)
+setup: default-setup
+!endif
+!if !$(DISABLE_TARGET_install)
+install: default-install
+!endif
+!if !$(DISABLE_TARGET_clean)
+clean: default-clean
+realclean: hose
+hose: default-hose
+distclean: realclean default-distclean
+!endif
+!if !$(DISABLE_TARGET_test)
+test: default-test
+!endif
+!if !$(DISABLE_TARGET_shell)
+shell: default-shell
+!endif
+!endif # DISABLE_STANDARD_TARGETS

Index: win/tcl.m4
==================================================================
--- win/tcl.m4
+++ win/tcl.m4
@@ -249,10 +249,11 @@
 #
 #	Substitutes the following vars:
 #		TCL_BIN_DIR
 #		TCL_SRC_DIR
 #		TCL_LIB_FILE
+#		TCL_ZIP_FILE
 #
 #------------------------------------------------------------------------
 
 AC_DEFUN([SC_LOAD_TCLCONFIG], [
     AC_MSG_CHECKING([for existence of ${TCL_BIN_DIR}/tclConfig.sh])
@@ -281,10 +282,11 @@
 
     #
     # eval is required to do the TCL_DBGX substitution
     #
 
+    eval "TCL_ZIP_FILE=\"${TCL_ZIP_FILE}\""
     eval "TCL_LIB_FILE=\"${TCL_LIB_FILE}\""
     eval "TCL_LIB_FLAG=\"${TCL_LIB_FLAG}\""
     eval "TCL_LIB_SPEC=\"${TCL_LIB_SPEC}\""
 
     eval "TCL_STUB_LIB_FILE=\"${TCL_STUB_LIB_FILE}\""
@@ -293,10 +295,11 @@
 
     AC_SUBST(TCL_VERSION)
     AC_SUBST(TCL_BIN_DIR)
     AC_SUBST(TCL_SRC_DIR)
 
+    AC_SUBST(TCL_ZIP_FILE)
     AC_SUBST(TCL_LIB_FILE)
     AC_SUBST(TCL_LIB_FLAG)
     AC_SUBST(TCL_LIB_SPEC)
 
     AC_SUBST(TCL_STUB_LIB_FILE)
@@ -378,46 +381,11 @@
     else
 	AC_MSG_RESULT([static])
 	SHARED_BUILD=0
 	AC_DEFINE(STATIC_BUILD, 1, [Is this a static build?])
     fi
-])
-
-#------------------------------------------------------------------------
-# SC_ENABLE_THREADS --
-#
-#	Specify if thread support should be enabled
-#
-# Arguments:
-#	none
-#
-# Results:
-#
-#	Adds the following arguments to configure:
-#		--enable-threads=yes|no
-#
-#	Defines the following vars:
-#		TCL_THREADS
-#------------------------------------------------------------------------
-
-AC_DEFUN([SC_ENABLE_THREADS], [
-    AC_MSG_CHECKING(for building with threads)
-    AC_ARG_ENABLE(threads, [  --enable-threads        build with threads (default: on)],
-	[tcl_ok=$enableval], [tcl_ok=yes])
-
-    if test "$tcl_ok" = "yes"; then
-	AC_MSG_RESULT([yes (default)])
-	TCL_THREADS=1
-	AC_DEFINE(TCL_THREADS)
-	# USE_THREAD_ALLOC tells us to try the special thread-based
-	# allocator that significantly reduces lock contention
-	AC_DEFINE(USE_THREAD_ALLOC)
-    else
-	TCL_THREADS=0
-	AC_MSG_RESULT(no)
-    fi
-    AC_SUBST(TCL_THREADS)
+    AC_SUBST(SHARED_BUILD)
 ])
 
 #------------------------------------------------------------------------
 # SC_ENABLE_SYMBOLS --
 #
@@ -542,26 +510,16 @@
 
     AC_MSG_CHECKING([if 64bit support is requested])
     AC_ARG_ENABLE(64bit,[  --enable-64bit          enable 64bit support (where applicable)], [do64bit=$enableval], [do64bit=no])
     AC_MSG_RESULT($do64bit)
 
-    # Cross-compiling options for Windows/CE builds
-
-    AC_MSG_CHECKING([if Windows/CE build is requested])
-    AC_ARG_ENABLE(wince,[  --enable-wince          enable Win/CE support (where applicable)], [doWince=$enableval], [doWince=no])
-    AC_MSG_RESULT($doWince)
-
-    AC_MSG_CHECKING([for Windows/CE celib directory])
-    AC_ARG_WITH(celib,[  --with-celib=DIR        use Windows/CE support library from DIR],
-	    CELIB_DIR=$withval, CELIB_DIR=NO_CELIB)
-    AC_MSG_RESULT([$CELIB_DIR])
-
     # Set some defaults (may get changed below)
     EXTRA_CFLAGS=""
 	AC_DEFINE(MODULE_SCOPE, [extern], [No need to mark inidividual symbols as hidden])
 
     AC_CHECK_PROG(CYGPATH, cygpath, cygpath -m, echo)
+    AC_CHECK_PROG(WINE, wine, wine,)
 
     SHLIB_SUFFIX=".dll"
 
     # MACHINE is IX86 for LINK, but this is used by the manifest,
     # which requires x86|amd64|ia64.
@@ -725,11 +683,11 @@
 
 	EXTRA_CFLAGS="${extra_cflags}"
 
 	CFLAGS_DEBUG=-g
 	CFLAGS_OPTIMIZE="-O2 -fomit-frame-pointer"
-	CFLAGS_WARNING="-Wall -Wdeclaration-after-statement"
+	CFLAGS_WARNING="-Wall -Wwrite-strings -Wsign-compare -Wdeclaration-after-statement"
 	LDFLAGS_DEBUG=
 	LDFLAGS_OPTIMIZE=
 
 	# Specify the CC output file names based on the target name
 	CC_OBJNAME="-o \[$]@"
@@ -869,102 +827,11 @@
 	    CFLAGS_OPTIMIZE="-nologo -O2 ${runtime}"
 	    lflags="${lflags} -nologo"
 	    LINKBIN="link"
 	fi
 
-	if test "$doWince" != "no" ; then
-	    # Set defaults for common evc4/PPC2003 setup
-	    # Currently Tcl requires 300+, possibly 420+ for sockets
-	    CEVERSION=420; 		# could be 211 300 301 400 420 ...
-	    TARGETCPU=ARMV4;	# could be ARMV4 ARM MIPS SH3 X86 ...
-	    ARCH=ARM;		# could be ARM MIPS X86EM ...
-	    PLATFORM="Pocket PC 2003"; # or "Pocket PC 2002"
-	    if test "$doWince" != "yes"; then
-		# If !yes then the user specified something
-		# Reset ARCH to allow user to skip specifying it
-		ARCH=
-		eval `echo $doWince | awk -F "," '{ \
-	if (length([$]1)) { printf "CEVERSION=\"%s\"\n", [$]1; \
-	if ([$]1 < 400)	  { printf "PLATFORM=\"Pocket PC 2002\"\n" } }; \
-	if (length([$]2)) { printf "TARGETCPU=\"%s\"\n", toupper([$]2) }; \
-	if (length([$]3)) { printf "ARCH=\"%s\"\n", toupper([$]3) }; \
-	if (length([$]4)) { printf "PLATFORM=\"%s\"\n", [$]4 }; \
-		}'`
-		if test "x${ARCH}" = "x" ; then
-		    ARCH=$TARGETCPU;
-		fi
-	    fi
-	    OSVERSION=WCE$CEVERSION;
-	    if test "x${WCEROOT}" = "x" ; then
-		WCEROOT="C:/Program Files/Microsoft eMbedded C++ 4.0"
-		if test ! -d "${WCEROOT}" ; then
-		    WCEROOT="C:/Program Files/Microsoft eMbedded Tools"
-		fi
-	    fi
-	    if test "x${SDKROOT}" = "x" ; then
-		SDKROOT="C:/Program Files/Windows CE Tools"
-		if test ! -d "${SDKROOT}" ; then
-		    SDKROOT="C:/Windows CE Tools"
-		fi
-	    fi
-	    # The space-based-path will work for the Makefile, but will
-	    # not work if AC_TRY_COMPILE is called.
-	    WCEROOT=`echo "$WCEROOT" | sed -e 's!\\\!/!g'`
-	    SDKROOT=`echo "$SDKROOT" | sed -e 's!\\\!/!g'`
-	    CELIB_DIR=`echo "$CELIB_DIR" | sed -e 's!\\\!/!g'`
-	    if test ! -d "${CELIB_DIR}/inc"; then
-		AC_MSG_ERROR([Invalid celib directory "${CELIB_DIR}"])
-	    fi
-	    if test ! -d "${SDKROOT}/${OSVERSION}/${PLATFORM}/Lib/${TARGETCPU}"\
-		-o ! -d "${WCEROOT}/EVC/${OSVERSION}/bin"; then
-		AC_MSG_ERROR([could not find PocketPC SDK or target compiler to enable WinCE mode [$CEVERSION,$TARGETCPU,$ARCH,$PLATFORM]])
-	    else
-		CEINCLUDE="${SDKROOT}/${OSVERSION}/${PLATFORM}/include"
-		if test -d "${CEINCLUDE}/${TARGETCPU}" ; then
-		    CEINCLUDE="${CEINCLUDE}/${TARGETCPU}"
-		fi
-		CELIBPATH="${SDKROOT}/${OSVERSION}/${PLATFORM}/Lib/${TARGETCPU}"
-	    fi
-	fi
-
-	if test "$doWince" != "no" ; then
-	    CEBINROOT="${WCEROOT}/EVC/${OSVERSION}/bin"
-	    if test "${TARGETCPU}" = "X86"; then
-		CC="${CEBINROOT}/cl.exe"
-	    else
-		CC="${CEBINROOT}/cl${ARCH}.exe"
-	    fi
-	    CC="\"${CC}\" -I\"${CELIB_DIR}/inc\" -I\"${CEINCLUDE}\""
-	    RC="\"${WCEROOT}/Common/EVC/bin/rc.exe\""
-	    arch=`echo ${ARCH} | awk '{print tolower([$]0)}'`
-	    defs="${ARCH} _${ARCH}_ ${arch} PALM_SIZE _MT _DLL _WINDOWS"
-	    for i in $defs ; do
-		AC_DEFINE_UNQUOTED($i)
-	    done
-#	    if test "${ARCH}" = "X86EM"; then
-#		AC_DEFINE_UNQUOTED(_WIN32_WCE_EMULATION)
-#	    fi
-	    AC_DEFINE_UNQUOTED(_WIN32_WCE, $CEVERSION)
-	    AC_DEFINE_UNQUOTED(UNDER_CE, $CEVERSION)
-	    CFLAGS_DEBUG="-nologo -Zi -Od"
-	    CFLAGS_OPTIMIZE="-nologo -O2"
-	    lversion=`echo ${CEVERSION} | sed -e 's/\(.\)\(..\)/\1\.\2/'`
-	    lflags="-nodefaultlib -MACHINE:${ARCH} -LIBPATH:\"${CELIBPATH}\" -subsystem:windowsce,${lversion} -nologo"
-	    LINKBIN="\"${CEBINROOT}/link.exe\""
-	    AC_SUBST(CELIB_DIR)
-	    if test "${CEVERSION}" -lt 400 ; then
-		LIBS="coredll.lib corelibc.lib winsock.lib"
-	    else
-		LIBS="coredll.lib corelibc.lib ws2.lib"
-	    fi
-	    # celib currently stuck at wce300 status
-	    #LIBS="$LIBS \${CELIB_DIR}/wince-${ARCH}-pocket-${OSVERSION}-release/celib.lib"
-	    LIBS="$LIBS \"\${CELIB_DIR}/wince-${ARCH}-pocket-wce300-release/celib.lib\""
-	    LIBS_GUI="commctrl.lib commdlg.lib"
-	else
-	    LIBS_GUI="gdi32.lib comdlg32.lib imm32.lib comctl32.lib shell32.lib uuid.lib"
-	fi
+	LIBS_GUI="gdi32.lib comdlg32.lib imm32.lib comctl32.lib shell32.lib uuid.lib"
 
 	SHLIB_LD="${LINKBIN} -dll -incremental:no ${lflags}"
 	SHLIB_LD_LIBS='${LIBS}'
 	# link -lib only works when -lib is the first arg
 	STLIB_LD="${LINKBIN} -lib ${lflags}"
@@ -991,11 +858,11 @@
 	CC_OBJNAME="-Fo\[$]@"
 	CC_EXENAME="-Fe\"\$(shell \$(CYGPATH) '\[$]@')\""
 
 	# Specify linker flags depending on the type of app being
 	# built -- Console vs. Window.
-	if test "$doWince" != "no" -a "${TARGETCPU}" != "X86"; then
+	if test "${TARGETCPU}" != "X86"; then
 	    LDFLAGS_CONSOLE="-link ${lflags}"
 	    LDFLAGS_WINDOW=${LDFLAGS_CONSOLE}
 	else
 	    LDFLAGS_CONSOLE="-link -subsystem:console ${lflags}"
 	    LDFLAGS_WINDOW="-link -subsystem:windows ${lflags}"
@@ -1124,17 +991,17 @@
 #	Defines the following vars:
 #		TCL_BIN_DIR	Full path to the tcl build dir.
 #------------------------------------------------------------------------
 
 AC_DEFUN([SC_WITH_TCL], [
-    if test -d ../../tcl8.6$1/win;  then
-	TCL_BIN_DEFAULT=../../tcl8.6$1/win
+    if test -d ../../tcl8.7$1/win;  then
+	TCL_BIN_DEFAULT=../../tcl8.7$1/win
     else
-	TCL_BIN_DEFAULT=../../tcl8.6/win
+	TCL_BIN_DEFAULT=../../tcl8.7/win
     fi
 
-    AC_ARG_WITH(tcl, [  --with-tcl=DIR          use Tcl 8.6 binaries from DIR],
+    AC_ARG_WITH(tcl, [  --with-tcl=DIR          use Tcl 8.7 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)
     fi
     if test ! -f $TCL_BIN_DIR/Makefile; then
@@ -1295,5 +1162,128 @@
     fi
     AC_MSG_RESULT([$result])
     AC_SUBST(VC_MANIFEST_EMBED_DLL)
     AC_SUBST(VC_MANIFEST_EMBED_EXE)
 ])
+
+#------------------------------------------------------------------------
+# SC_CC_FOR_BUILD
+#	For cross compiles, locate a C compiler that can generate native binaries.
+#
+# Arguments:
+#	none
+#
+# Results:
+#	Substitutes the following vars:
+#		CC_FOR_BUILD
+#		EXEEXT_FOR_BUILD
+#------------------------------------------------------------------------
+
+dnl Get a default for CC_FOR_BUILD to put into Makefile.
+AC_DEFUN([AX_CC_FOR_BUILD],
+[# Put a plausible default for CC_FOR_BUILD in Makefile.
+if test -z "$CC_FOR_BUILD"; then
+  if test "x$cross_compiling" = "xno"; then
+    CC_FOR_BUILD='$(CC)'
+  else
+    AC_MSG_CHECKING([for gcc])
+    AC_CACHE_VAL(ac_cv_path_cc, [
+	search_path=`echo ${PATH} | sed -e 's/:/ /g'`
+	for dir in $search_path ; do
+	    for j in `ls -r $dir/gcc 2> /dev/null` \
+		    `ls -r $dir/gcc 2> /dev/null` ; do
+		if test x"$ac_cv_path_cc" = x ; then
+		    if test -f "$j" ; then
+			ac_cv_path_cc=$j
+			break
+		    fi
+		fi
+	    done
+	done
+    ])
+  fi
+fi
+AC_SUBST(CC_FOR_BUILD)
+# Also set EXEEXT_FOR_BUILD.
+if test "x$cross_compiling" = "xno"; then
+  EXEEXT_FOR_BUILD='$(EXEEXT)'
+  OBJEXT_FOR_BUILD='$(OBJEXT)'
+else
+  OBJEXT_FOR_BUILD='.no'
+  AC_CACHE_CHECK([for build system executable suffix], bfd_cv_build_exeext,
+    [rm -f conftest*
+     echo 'int main () { return 0; }' > conftest.c
+     bfd_cv_build_exeext=
+     ${CC_FOR_BUILD} -o conftest conftest.c 1>&5 2>&5
+     for file in conftest.*; do
+       case $file in
+       *.c | *.o | *.obj | *.ilk | *.pdb) ;;
+       *) bfd_cv_build_exeext=`echo $file | sed -e s/conftest//` ;;
+       esac
+     done
+     rm -f conftest*
+     test x"${bfd_cv_build_exeext}" = x && bfd_cv_build_exeext=no])
+  EXEEXT_FOR_BUILD=""
+  test x"${bfd_cv_build_exeext}" != xno && EXEEXT_FOR_BUILD=${bfd_cv_build_exeext}
+fi
+AC_SUBST(EXEEXT_FOR_BUILD)])dnl
+AC_SUBST(OBJEXT_FOR_BUILD)])dnl
+
+
+
+#------------------------------------------------------------------------
+# SC_ZIPFS_SUPPORT
+#	Locate a zip encoder installed on the system path, or none.
+#
+# Arguments:
+#	none
+#
+# Results:
+#	Substitutes the following vars:
+#		ZIP_PROG
+#       ZIP_PROG_OPTIONS
+#       ZIP_PROG_VFSSEARCH
+#       ZIP_INSTALL_OBJS
+#------------------------------------------------------------------------
+
+AC_DEFUN([SC_ZIPFS_SUPPORT], [
+    ZIP_PROG=""
+    ZIP_PROG_OPTIONS=""
+    ZIP_PROG_VFSSEARCH=""
+    ZIP_INSTALL_OBJS=""
+
+    AC_MSG_CHECKING([for zip])
+    AC_CACHE_VAL(ac_cv_path_zip, [
+    search_path=`echo ${PATH} | sed -e 's/:/ /g'`
+    for dir in $search_path ; do
+        for j in `ls -r $dir/zip 2> /dev/null` \
+            `ls -r $dir/zip 2> /dev/null` ; do
+        if test x"$ac_cv_path_zip" = x ; then
+            if test -f "$j" ; then
+            ac_cv_path_zip=$j
+            break
+            fi
+        fi
+        done
+    done
+    ])
+    if test -f "$ac_cv_path_zip" ; then
+        ZIP_PROG="$ac_cv_path_zip "
+        AC_MSG_RESULT([$ZIP_PROG])
+        ZIP_PROG_OPTIONS="-rq"
+        ZIP_PROG_VFSSEARCH="."
+        AC_MSG_RESULT([Found INFO Zip in environment])
+        # Use standard arguments for zip
+    else
+        # It is not an error if an installed version of Zip can't be located.
+        # We can use the locally distributed minizip instead
+        ZIP_PROG="../minizip${EXEEXT_FOR_BUILD}"
+        ZIP_PROG_OPTIONS="-o -r"
+        ZIP_PROG_VFSSEARCH="."
+        ZIP_INSTALL_OBJS="minizip${EXEEXT_FOR_BUILD}"
+        AC_MSG_RESULT([No zip found on PATH building minizip])
+    fi
+    AC_SUBST(ZIP_PROG)
+    AC_SUBST(ZIP_PROG_OPTIONS)
+    AC_SUBST(ZIP_PROG_VFSSEARCH)
+    AC_SUBST(ZIP_INSTALL_OBJS)
+])

Index: win/tkWin.h
==================================================================
--- win/tkWin.h
+++ win/tkWin.h
@@ -16,18 +16,22 @@
 /*
  * We must specify the lower version we intend to support. In particular
  * the SystemParametersInfo API doesn't like to receive structures that
  * are larger than it expects which affects the font assignments.
  *
- * WINVER = 0x0500 means Windows 2000 and above
+ * WINVER = 0x0600 means Windows Vista and above. Even though we still
+ * support Windows XP, but the Vista-specifics are tested at runtime.
  */
 
 #ifndef WINVER
-#define WINVER 0x0500
+#   define WINVER 0x0600
 #endif
 #ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0500
+#   define _WIN32_WINNT 0x0600
+#endif
+#ifndef _WIN32_IE
+#   define _WIN32_IE 0x0700
 #endif
 
 #ifndef _TK
 #include <tk.h>
 #endif

Index: win/tkWinClipboard.c
==================================================================
--- win/tkWinClipboard.c
+++ win/tkWinClipboard.c
@@ -329,11 +329,11 @@
      * encoding before placing it on the clipboard.
      */
 
 #ifdef UNICODE
 	Tcl_DStringInit(&ds);
-	Tcl_UtfToUniCharDString(rawText, -1, &ds);
+	Tcl_WinUtfToTChar(rawText, -1, &ds);
 	ckfree(rawText);
 	handle = GlobalAlloc(GMEM_MOVEABLE|GMEM_DDESHARE,
 		(unsigned) Tcl_DStringLength(&ds) + 2);
 	if (!handle) {
 	    Tcl_DStringFree(&ds);
@@ -412,20 +412,11 @@
 {
     TkWinUpdatingClipboard(TRUE);
     OpenClipboard(hwnd);
     EmptyClipboard();
 
-    /*
-     * CF_UNICODETEXT is only supported on NT, but it it is prefered when
-     * possible.
-     */
-
-    if (TkWinGetPlatformId() != VER_PLATFORM_WIN32_WINDOWS) {
-	SetClipboardData(CF_UNICODETEXT, NULL);
-    } else {
-	SetClipboardData(CF_TEXT, NULL);
-    }
+    SetClipboardData(CF_UNICODETEXT, NULL);
     CloseClipboard();
     TkWinUpdatingClipboard(FALSE);
 }
 
 /*

Index: win/tkWinColor.c
==================================================================
--- win/tkWinColor.c
+++ win/tkWinColor.c
@@ -362,11 +362,11 @@
 	if (new) {
 	    refCount = 1;
 	} else {
 	    refCount = (size_t)Tcl_GetHashValue(entryPtr) + 1;
 	}
-	Tcl_SetHashValue(entryPtr, (void *)refCount);
+	Tcl_SetHashValue(entryPtr, INT2PTR(refCount));
     } else {
 	/*
 	 * Determine what color will actually be used on non-colormap systems.
 	 */
 
@@ -444,11 +444,11 @@
 		} else {
 		    Tcl_Panic("Tried to free a color that isn't allocated");
 		}
 		Tcl_DeleteHashEntry(entryPtr);
 	    } else {
-		Tcl_SetHashValue(entryPtr, (size_t)refCount);
+		Tcl_SetHashValue(entryPtr, INT2PTR(refCount));
 	    }
 	}
     }
     ReleaseDC(NULL, dc);
     return Success;

Index: win/tkWinDefault.h
==================================================================
--- win/tkWinDefault.h
+++ win/tkWinDefault.h
@@ -155,10 +155,12 @@
 #define DEF_ENTRY_INSERT_BD_MONO	"0"
 #define DEF_ENTRY_INSERT_OFF_TIME	"300"
 #define DEF_ENTRY_INSERT_ON_TIME	"600"
 #define DEF_ENTRY_INSERT_WIDTH		"2"
 #define DEF_ENTRY_JUSTIFY		"left"
+#define DEF_ENTRY_PLACEHOLDER		""
+#define DEF_ENTRY_PLACEHOLDERFG		"#b3b3b3"
 #define DEF_ENTRY_READONLY_BG_COLOR	"SystemButtonFace"
 #define DEF_ENTRY_READONLY_BG_MONO	WHITE
 #define DEF_ENTRY_RELIEF		"sunken"
 #define DEF_ENTRY_SCROLL_COMMAND	""
 #define DEF_ENTRY_SELECT_COLOR		SELECT_BG
@@ -275,10 +277,11 @@
 #define DEF_MENU_ACTIVE_BG_COLOR	SELECT_BG
 #define DEF_MENU_ACTIVE_BG_MONO		BLACK
 #define DEF_MENU_ACTIVE_BORDER_WIDTH	"0"
 #define DEF_MENU_ACTIVE_FG_COLOR	SELECT_FG
 #define DEF_MENU_ACTIVE_FG_MONO		WHITE
+#define DEF_MENU_ACTIVE_RELIEF		"flat"
 #define DEF_MENU_BG_COLOR		MENU_BG
 #define DEF_MENU_BG_MONO		WHITE
 #define DEF_MENU_BORDER_WIDTH		"0"
 #define DEF_MENU_CURSOR			"arrow"
 #define DEF_MENU_DISABLED_FG_COLOR	DISABLED
@@ -288,11 +291,11 @@
 #define DEF_MENU_POST_COMMAND		""
 #define DEF_MENU_RELIEF			"flat"
 #define DEF_MENU_SELECT_COLOR		MENU_FG
 #define DEF_MENU_SELECT_MONO		BLACK
 #define DEF_MENU_TAKE_FOCUS		"0"
-#define DEF_MENU_TEAROFF		"1"
+#define DEF_MENU_TEAROFF		"0"
 #define DEF_MENU_TEAROFF_CMD		((char *) NULL)
 #define DEF_MENU_TITLE			""
 #define DEF_MENU_TYPE			"normal"
 
 /*

Index: win/tkWinDialog.c
==================================================================
--- win/tkWinDialog.c
+++ win/tkWinDialog.c
@@ -642,16 +642,11 @@
     static HMODULE shell32_handle = NULL;
 
     if (shell32_handle != NULL)
         return; /* We have already been through here. */
 
-    /*
-     * XXX - Note we never call FreeLibrary. There is no point because
-     * shell32.dll is loaded at startup anyways and stays for the duration
-     * of the process so why bother with keeping track of when to unload
-     */
-    shell32_handle = LoadLibrary(TEXT("shell32.dll"));
+    shell32_handle = GetModuleHandle(TEXT("shell32.dll"));
     if (shell32_handle == NULL) /* Should never happen but check anyways. */
         return;
 
     ShellProcs.SHCreateItemFromParsingName =
         (SHCreateItemFromParsingNameProc*) GetProcAddress(shell32_handle,
@@ -1377,21 +1372,31 @@
     hr = fdlgIf->lpVtbl->SetOptions(fdlgIf, flags);
     if (FAILED(hr))
         goto vamoose;
 
     if (optsPtr->extObj != NULL) {
-        wstr = Tcl_GetUnicode(optsPtr->extObj);
+        Tcl_DString ds;
+        const char *src;
+
+        src = Tcl_GetString(optsPtr->extObj);
+        wstr = (LPWSTR) Tcl_WinUtfToTChar(src, optsPtr->extObj->length, &ds);
         if (wstr[0] == L'.')
             ++wstr;
         hr = fdlgIf->lpVtbl->SetDefaultExtension(fdlgIf, wstr);
+        Tcl_DStringFree(&ds);
         if (FAILED(hr))
             goto vamoose;
     }
 
     if (optsPtr->titleObj != NULL) {
-        hr = fdlgIf->lpVtbl->SetTitle(fdlgIf,
-                                       Tcl_GetUnicode(optsPtr->titleObj));
+        Tcl_DString ds;
+        const char *src;
+
+        src = Tcl_GetString(optsPtr->titleObj);
+        wstr = (LPWSTR) Tcl_WinUtfToTChar(src, optsPtr->titleObj->length, &ds);
+        hr = fdlgIf->lpVtbl->SetTitle(fdlgIf, wstr);
+        Tcl_DStringFree(&ds);
         if (FAILED(hr))
             goto vamoose;
     }
 
     if (optsPtr->file[0]) {
@@ -1462,16 +1467,18 @@
                             break;
                         hr = itemIf->lpVtbl->GetDisplayName(itemIf,
                                         SIGDN_FILESYSPATH, &wstr);
                         if (SUCCEEDED(hr)) {
                             Tcl_DString fnds;
+
                             ConvertExternalFilename(wstr, &fnds);
                             CoTaskMemFree(wstr);
                             Tcl_ListObjAppendElement(
                                 interp, multiObj,
                                 Tcl_NewStringObj(Tcl_DStringValue(&fnds),
                                                  Tcl_DStringLength(&fnds)));
+                            Tcl_DStringFree(&fnds);
                         }
                         itemIf->lpVtbl->Release(itemIf);
                         if (FAILED(hr))
                             break;
                     }
@@ -1488,28 +1495,37 @@
             if (SUCCEEDED(hr)) {
                 hr = resultIf->lpVtbl->GetDisplayName(resultIf, SIGDN_FILESYSPATH,
                                                       &wstr);
                 if (SUCCEEDED(hr)) {
                     Tcl_DString fnds;
+
                     ConvertExternalFilename(wstr, &fnds);
                     resultObj = Tcl_NewStringObj(Tcl_DStringValue(&fnds),
                                                  Tcl_DStringLength(&fnds));
                     CoTaskMemFree(wstr);
+                    Tcl_DStringFree(&fnds);
                 }
                 resultIf->lpVtbl->Release(resultIf);
             }
         }
         if (SUCCEEDED(hr)) {
             if (filterPtr && optsPtr->typeVariableObj) {
                 UINT ftix;
+
                 hr = fdlgIf->lpVtbl->GetFileTypeIndex(fdlgIf, &ftix);
                 if (SUCCEEDED(hr)) {
                     /* Note ftix is a 1-based index */
                     if (ftix > 0 && ftix <= nfilters) {
+                        Tcl_DString ftds;
+                        Tcl_Obj *ftobj;
+
+                        Tcl_WinTCharToUtf(filterPtr[ftix-1].pszName, -1, &ftds);
+                        ftobj = Tcl_NewStringObj(Tcl_DStringValue(&ftds),
+                                Tcl_DStringLength(&ftds));
                         Tcl_ObjSetVar2(interp, optsPtr->typeVariableObj, NULL,
-                               Tcl_NewUnicodeObj(filterPtr[ftix-1].pszName, -1),
-                               TCL_GLOBAL_ONLY|TCL_LEAVE_ERR_MSG);
+                                ftobj, TCL_GLOBAL_ONLY|TCL_LEAVE_ERR_MSG);
+                        Tcl_DStringFree(&ftds);
                     }
                 }
             }
         }
     } else {
@@ -2209,13 +2225,13 @@
 {
     if (dlgFilterPtr != NULL) {
         DWORD dw;
         for (dw = 0; dw < count; ++dw) {
             if (dlgFilterPtr[dw].pszName != NULL)
-                ckfree(dlgFilterPtr[dw].pszName);
+                ckfree((char *)dlgFilterPtr[dw].pszName);
             if (dlgFilterPtr[dw].pszSpec != NULL)
-                ckfree(dlgFilterPtr[dw].pszSpec);
+                ckfree((char *)dlgFilterPtr[dw].pszSpec);
         }
         ckfree(dlgFilterPtr);
     }
 }
 
@@ -2784,10 +2800,13 @@
 	MSG_DEFAULT,	MSG_DETAIL,	MSG_ICON,	MSG_MESSAGE,
 	MSG_PARENT,	MSG_TITLE,	MSG_TYPE
     };
     ThreadSpecificData *tsdPtr =
 	    Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData));
+    Tcl_DString titleBuf, tmpBuf;
+    const WCHAR *titlePtr, *tmpPtr;
+    const char *src;
 
     defaultBtn = -1;
     detailObj = NULL;
     icon = MB_ICONINFORMATION;
     messageObj = NULL;
@@ -2894,11 +2913,13 @@
 
     tmpObj = messageObj ? Tcl_DuplicateObj(messageObj)
 	    : Tcl_NewUnicodeObj(NULL, 0);
     Tcl_IncrRefCount(tmpObj);
     if (detailObj) {
-	Tcl_AppendUnicodeToObj(tmpObj, L"\n\n", 2);
+	const Tcl_UniChar twoNL[] = { '\n', '\n' };
+
+	Tcl_AppendUnicodeToObj(tmpObj, twoNL, 2);
 	Tcl_AppendObjToObj(tmpObj, detailObj);
     }
 
     oldMode = Tcl_SetServiceMode(TCL_SERVICE_ALL);
 
@@ -2913,12 +2934,22 @@
 
     tsdPtr->hSmallIcon = TkWinGetIcon(parent, ICON_SMALL);
     tsdPtr->hBigIcon   = TkWinGetIcon(parent, ICON_BIG);
     tsdPtr->hMsgBoxHook = SetWindowsHookEx(WH_CBT, MsgBoxCBTProc, NULL,
 	    GetCurrentThreadId());
-    winCode = MessageBox(hWnd, Tcl_GetUnicode(tmpObj),
-	    titleObj ? Tcl_GetUnicode(titleObj) : L"", flags);
+    src = Tcl_GetString(tmpObj);
+    tmpPtr = Tcl_WinUtfToTChar(src, tmpObj->length, &tmpBuf);
+    if (titleObj != NULL) {
+	src = Tcl_GetString(titleObj);
+	titlePtr = Tcl_WinUtfToTChar(src, titleObj->length, &titleBuf);
+    } else {
+	titlePtr = L"";
+	Tcl_DStringInit(&titleBuf);
+    }
+    winCode = MessageBox(hWnd, tmpPtr, titlePtr, flags);
+    Tcl_DStringFree(&titleBuf);
+    Tcl_DStringFree(&tmpBuf);
     UnhookWindowsHookEx(tsdPtr->hMsgBoxHook);
     (void) Tcl_SetServiceMode(oldMode);
 
     /*
      * Ensure that hWnd is enabled, because it can happen that we have updated
@@ -3345,11 +3376,11 @@
 	    break;
 	case FontchooserFont:
 	    if (hdPtr->fontObj) {
 		Tcl_DecrRefCount(hdPtr->fontObj);
 	    }
-	    (void)Tcl_GetString(objv[i+1]);
+	    Tcl_GetString(objv[i+1]);
 	    if (objv[i+1]->length) {
 		hdPtr->fontObj = objv[i+1];
 		if (Tcl_IsShared(hdPtr->fontObj)) {
 		    hdPtr->fontObj = Tcl_DuplicateObj(hdPtr->fontObj);
 		}
@@ -3360,11 +3391,11 @@
 	    break;
 	case FontchooserCmd:
 	    if (hdPtr->cmdObj) {
 		Tcl_DecrRefCount(hdPtr->cmdObj);
 	    }
-	    (void)Tcl_GetString(objv[i+1]);
+	    Tcl_GetString(objv[i+1]);
 	    if (objv[i+1]->length) {
 		hdPtr->cmdObj = objv[i+1];
 		if (Tcl_IsShared(hdPtr->cmdObj)) {
 		    hdPtr->cmdObj = Tcl_DuplicateObj(hdPtr->cmdObj);
 		}
@@ -3449,11 +3480,11 @@
 	Tcl_WinUtfToTChar(fontPtr->fa.family, -1, &ds);
 	_tcsncpy(lf.lfFaceName, (TCHAR *)Tcl_DStringValue(&ds),
 		LF_FACESIZE-1);
 	Tcl_DStringFree(&ds);
 	lf.lfFaceName[LF_FACESIZE-1] = 0;
-	lf.lfHeight = -MulDiv(TkFontGetPoints(tkwin, fontPtr->fa.size),
+	lf.lfHeight = -MulDiv((int)(TkFontGetPoints(tkwin, fontPtr->fa.size) + 0.5),
 	    GetDeviceCaps(hdc, LOGPIXELSY), 72);
 	if (fontPtr->fa.weight == TK_FW_BOLD) {
 	    lf.lfWeight = FW_BOLD;
 	}
 	if (fontPtr->fa.slant != TK_FS_ROMAN) {

Index: win/tkWinDraw.c
==================================================================
--- win/tkWinDraw.c
+++ win/tkWinDraw.c
@@ -484,11 +484,11 @@
 }
 
 /*
  *----------------------------------------------------------------------
  *
- * TkPutImage --
+ * TkPutImage, XPutImage --
  *
  *	Copies a subimage from an in-memory image to a rectangle of of the
  *	specified drawable.
  *
  * Results:
@@ -597,10 +597,25 @@
     DeleteObject(SelectObject(dcMem, bitmap));
     DeleteDC(dcMem);
     TkWinReleaseDrawableDC(d, dc, &state);
     return Success;
 }
+
+int
+XPutImage(
+    Display *display,
+    Drawable d,			/* Destination drawable. */
+    GC gc,
+    XImage *image,		/* Source image. */
+    int src_x, int src_y,	/* Offset of subimage. */
+    int dest_x, int dest_y,	/* Position of subimage origin in drawable. */
+    unsigned int width, unsigned int height)
+				/* Dimensions of subimage. */
+{
+    return TkPutImage(NULL, 0, display, d, gc, image,
+		src_x, src_y, dest_x, dest_y, width, height);
+}
 
 /*
  *----------------------------------------------------------------------
  *
  * XFillRectangles --
@@ -623,11 +638,10 @@
     GC gc,
     XRectangle *rectangles,
     int nrectangles)
 {
     HDC dc;
-    int i;
     RECT rect;
     TkWinDCState state;
     HBRUSH brush, oldBrush;
 
     if (d == None) {
@@ -664,53 +678,56 @@
 	 * For each rectangle, create a drawing surface which is the size of
 	 * the rectangle and fill it with the background color. Then merge the
 	 * result with the stipple pattern.
 	 */
 
-	for (i = 0; i < nrectangles; i++) {
-	    bitmap = CreateCompatibleBitmap(dc, rectangles[i].width,
-		    rectangles[i].height);
+	while (nrectangles-- > 0) {
+	    bitmap = CreateCompatibleBitmap(dc, rectangles[0].width,
+		    rectangles[0].height);
 	    oldBitmap = SelectObject(dcMem, bitmap);
 	    rect.left = 0;
 	    rect.top = 0;
-	    rect.right = rectangles[i].width;
-	    rect.bottom = rectangles[i].height;
+	    rect.right = rectangles[0].width;
+	    rect.bottom = rectangles[0].height;
 	    FillRect(dcMem, &rect, brush);
-	    BitBlt(dc, rectangles[i].x, rectangles[i].y, rectangles[i].width,
-		    rectangles[i].height, dcMem, 0, 0, COPYFG);
+	    BitBlt(dc, rectangles[0].x, rectangles[0].y, rectangles[0].width,
+		    rectangles[0].height, dcMem, 0, 0, COPYFG);
 	    if (gc->fill_style == FillOpaqueStippled) {
 		FillRect(dcMem, &rect, bgBrush);
-		BitBlt(dc, rectangles[i].x, rectangles[i].y,
-			rectangles[i].width, rectangles[i].height, dcMem,
+		BitBlt(dc, rectangles[0].x, rectangles[0].y,
+			rectangles[0].width, rectangles[0].height, dcMem,
 			0, 0, COPYBG);
 	    }
 	    SelectObject(dcMem, oldBitmap);
 	    DeleteObject(bitmap);
+	    ++rectangles;
 	}
 
 	DeleteDC(dcMem);
 	SelectObject(dc, oldBrush);
 	DeleteObject(stipple);
 	DeleteObject(bgBrush);
     } else {
 	if (gc->function == GXcopy) {
-	    for (i = 0; i < nrectangles; i++) {
-		rect.left = rectangles[i].x;
-		rect.right = rect.left + rectangles[i].width;
-		rect.top = rectangles[i].y;
-		rect.bottom = rect.top + rectangles[i].height;
+	    while (nrectangles-- > 0) {
+		rect.left = rectangles[0].x;
+		rect.right = rect.left + rectangles[0].width;
+		rect.top = rectangles[0].y;
+		rect.bottom = rect.top + rectangles[0].height;
 		FillRect(dc, &rect, brush);
+		++rectangles;
 	    }
 	} else {
 	    HPEN newPen = CreatePen(PS_NULL, 0, gc->foreground);
 	    HPEN oldPen = SelectObject(dc, newPen);
 	    oldBrush = SelectObject(dc, brush);
 
-	    for (i = 0; i < nrectangles; i++) {
-		Rectangle(dc, rectangles[i].x, rectangles[i].y,
-		    rectangles[i].x + rectangles[i].width + 1,
-		    rectangles[i].y + rectangles[i].height + 1);
+	    while (nrectangles-- > 0) {
+		Rectangle(dc, rectangles[0].x, rectangles[0].y,
+		    rectangles[0].x + rectangles[0].width + 1,
+		    rectangles[0].y + rectangles[0].height + 1);
+		++rectangles;
 	    }
 
 	    SelectObject(dc, oldBrush);
 	    SelectObject(dc, oldPen);
 	    DeleteObject(newPen);
@@ -718,10 +735,56 @@
     }
     DeleteObject(brush);
     TkWinReleaseDrawableDC(d, dc, &state);
     return Success;
 }
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * MakeAndStrokePath --
+ *
+ *	This function draws a shape using a list of points, a stipple pattern,
+ *	and the specified drawing function. It does it through creation of a
+ *	so-called 'path' (see GDI documentation on MSDN).
+ *
+ * Results:
+ *	None.
+ *
+ * Side effects:
+ *	None.
+ *
+ *----------------------------------------------------------------------
+ */
+static void
+MakeAndStrokePath(
+    HDC dc,
+    POINT *winPoints,
+    int npoints,
+    WinDrawFunc func)        /* Name of the Windows GDI drawing function:
+                                this is either Polyline or Polygon. */
+{
+    BeginPath(dc);
+    func(dc, winPoints, npoints);
+    /*
+     * In the case of closed polylines, the first and last points
+     * are the same. We want miter or bevel join be rendered also
+     * at this point, this needs telling the Windows GDI that the
+     * path is closed.
+     */
+    if (func == Polyline) {
+        if ((winPoints[0].x == winPoints[npoints-1].x) &&
+                (winPoints[0].y == winPoints[npoints-1].y)) {
+            CloseFigure(dc);
+        }
+        EndPath(dc);
+        StrokePath(dc);
+    } else {
+        EndPath(dc);
+        StrokeAndFillPath(dc);
+    }
+}
 
 /*
  *----------------------------------------------------------------------
  *
  * RenderObject --
@@ -814,11 +877,11 @@
 	 */
 
 	SetPolyFillMode(dcMem, (gc->fill_rule == EvenOddRule) ? ALTERNATE
 		: WINDING);
 	oldMemBrush = SelectObject(dcMem, CreateSolidBrush(gc->foreground));
-	func(dcMem, winPoints, npoints);
+        MakeAndStrokePath(dcMem, winPoints, npoints, func);
 	BitBlt(dc, rect.left, rect.top, width, height, dcMem, 0, 0, COPYFG);
 
 	/*
 	 * If we are rendering an opaque stipple, then draw the polygon in the
 	 * background color and copy it to the destination wherever the
@@ -826,11 +889,11 @@
 	 */
 
 	if (gc->fill_style == FillOpaqueStippled) {
 	    DeleteObject(SelectObject(dcMem,
 		    CreateSolidBrush(gc->background)));
-	    func(dcMem, winPoints, npoints);
+            MakeAndStrokePath(dcMem, winPoints, npoints, func);
 	    BitBlt(dc, rect.left, rect.top, width, height, dcMem, 0, 0,
 		    COPYBG);
 	}
 
 	SelectObject(dcMem, oldPen);
@@ -842,11 +905,11 @@
 	oldBrush = SelectObject(dc, CreateSolidBrush(gc->foreground));
 	SetROP2(dc, tkpWinRopModes[gc->function]);
 
 	SetPolyFillMode(dc, (gc->fill_rule == EvenOddRule) ? ALTERNATE
 		: WINDING);
-	func(dc, winPoints, npoints);
+        MakeAndStrokePath(dc, winPoints, npoints, func);
 	SelectObject(dc, oldPen);
     }
     DeleteObject(SelectObject(dc, oldBrush));
 }
 
@@ -938,11 +1001,11 @@
 }
 
 /*
  *----------------------------------------------------------------------
  *
- * XDrawRectangle --
+ * XDrawRectangle, XDrawRectangles --
  *
  *	Draws a rectangle.
  *
  * Results:
  *	None.
@@ -983,15 +1046,36 @@
     DeleteObject(SelectObject(dc, oldPen));
     SelectObject(dc, oldBrush);
     TkWinReleaseDrawableDC(d, dc, &state);
     return Success;
 }
+
+int
+XDrawRectangles(
+    Display *display,
+    Drawable d,
+    GC gc,
+    XRectangle rects[],
+    int nrects)
+{
+    int ret = Success;
+
+    while (nrects-- > 0) {
+	ret = XDrawRectangle(display, d, gc, rects[0].x, rects[0].y,
+		    rects[0].width, rects[0].height);
+	if (ret != Success) {
+	    break;
+	}
+	++rects;
+    }
+    return ret;
+}
 
 /*
  *----------------------------------------------------------------------
  *
- * XDrawArc --
+ * XDrawArc, XDrawArcs --
  *
  *	Draw an arc.
  *
  * Results:
  *	None.
@@ -1013,15 +1097,39 @@
 {
     display->request++;
 
     return DrawOrFillArc(display, d, gc, x, y, width, height, start, extent, 0);
 }
+
+int
+XDrawArcs(
+    Display *display,
+    Drawable d,
+    GC gc,
+    XArc *arcs,
+    int narcs)
+{
+    int ret = Success;
+
+    display->request++;
+
+    while (narcs-- > 0) {
+	ret = DrawOrFillArc(display, d, gc, arcs[0].x, arcs[0].y,
+		    arcs[0].width, arcs[0].height,
+		    arcs[0].angle1, arcs[0].angle2, 0);
+	if (ret != Success) {
+	    break;
+	}
+	++arcs;
+    }
+    return ret;
+}
 
 /*
  *----------------------------------------------------------------------
  *
- * XFillArc --
+ * XFillArc, XFillArcs --
  *
  *	Draw a filled arc.
  *
  * Results:
  *	None.
@@ -1043,10 +1151,34 @@
 {
     display->request++;
 
     return DrawOrFillArc(display, d, gc, x, y, width, height, start, extent, 1);
 }
+
+int
+XFillArcs(
+    Display *display,
+    Drawable d,
+    GC gc,
+    XArc *arcs,
+    int narcs)
+{
+    int ret = Success;
+
+    display->request++;
+
+    while (narcs-- > 0) {
+	ret = DrawOrFillArc(display, d, gc, arcs[0].x, arcs[0].y,
+		    arcs[0].width, arcs[0].height,
+		    arcs[0].angle1, arcs[0].angle2, 1);
+	if (ret != Success) {
+	    break;
+	}
+	++arcs;
+    }
+    return ret;
+}
 
 /*
  *----------------------------------------------------------------------
  *
  * DrawOrFillArc --

Index: win/tkWinEmbed.c
==================================================================
--- win/tkWinEmbed.c
+++ win/tkWinEmbed.c
@@ -198,11 +198,11 @@
  *		othersize.
  *
  *	The TK_INFO messages are required in order to verify if the window to
  *	use is a valid container. Without an id verification, an invalid
  *	window attachment may cause unexpected crashes/panics (bug 1096074).
- *	Additional sub messages may be definded/used in future for other
+ *	Additional sub messages may be defined/used in future for other
  *	needs.
  *
  *	We do not enforce the above protocol for the reason of backward
  *	compatibility. If the window to use is unable to handle TK_INFO
  *	messages (e.g., legacy Tk container applications before 8.5), a dialog
@@ -301,14 +301,14 @@
 	 * Proceed if the user decide to do so because it can be a legacy
 	 * container application. However we may have to return a TCL_ERROR in
 	 * order to avoid bug 1096074 in future.
 	 */
 
-	char msg[256];
+	TCHAR msg[256];
 
-	sprintf(msg, "Unable to get information of window \"%.80s\".  Attach to this\nwindow may have unpredictable results if it is not a valid container.\n\nPress Ok to proceed or Cancel to abort attaching.", string);
-	if (IDCANCEL == MessageBoxA(hwnd, msg, "Tk Warning",
+	wsprintf(msg, TEXT("Unable to get information of window \"%.40hs\".  Attach to this\nwindow may have unpredictable results if it is not a valid container.\n\nPress Ok to proceed or Cancel to abort attaching."), string);
+	if (IDCANCEL == MessageBox(hwnd, msg, TEXT("Tk Warning"),
 		MB_OKCANCEL | MB_ICONWARNING)) {
     	    Tcl_SetObjResult(interp, Tcl_NewStringObj(
 		    "Operation has been canceled", -1));
 	    Tcl_SetErrorCode(interp, "TK", "EMBED", "CANCEL", NULL);
 	    return TCL_ERROR;

Index: win/tkWinFont.c
==================================================================
--- win/tkWinFont.c
+++ win/tkWinFont.c
@@ -24,13 +24,13 @@
  * a given Unicode character.
  *
  * Under Windows, a "font family" is uniquely identified by its face name.
  */
 
-#define FONTMAP_SHIFT	    10
+#define FONTMAP_SHIFT	    12
 
-#define FONTMAP_PAGES	    	(1 << (sizeof(Tcl_UniChar)*8 - FONTMAP_SHIFT))
+#define FONTMAP_PAGES	    	(1 << (21 - FONTMAP_SHIFT))
 #define FONTMAP_BITSPERPAGE	(1 << FONTMAP_SHIFT)
 
 typedef struct FontFamily {
     struct FontFamily *nextPtr;	/* Next in list of all known font families. */
     size_t refCount;		/* How many SubFonts are referring to this
@@ -260,20 +260,11 @@
 
 void
 TkpFontPkgInit(
     TkMainInfo *mainPtr)	/* The application being created. */
 {
-    if (TkWinGetPlatformId() == VER_PLATFORM_WIN32_NT) {
-	/*
-	 * If running NT, then we will be calling some Unicode functions
-	 * explictly. So, even if the Tcl system encoding isn't Unicode, make
-	 * sure we convert to/from the Unicode char set.
-	 */
-
-	systemEncoding = TkWinGetUnicodeEncoding();
-    }
-
+    systemEncoding = TkWinGetUnicodeEncoding();
     TkWinSetupSystemFonts(mainPtr);
 }
 
 /*
  *---------------------------------------------------------------------------
@@ -569,11 +560,11 @@
 
   found:
     ReleaseDC(hwnd, hdc);
 
     hFont = GetScreenFont(faPtr, faceName,
-	    TkFontGetPixels(tkwin, faPtr->size), 0.0);
+	    (int)(TkFontGetPixels(tkwin, faPtr->size) + 0.5), 0.0);
     if (tkFontPtr == NULL) {
 	fontPtr = ckalloc(sizeof(WinFont));
     } else {
 	fontPtr = (WinFont *) tkFontPtr;
 	ReleaseFont(fontPtr);
@@ -741,11 +732,11 @@
 
 void
 TkpGetFontAttrsForChar(
     Tk_Window tkwin,		/* Window on the font's display */
     Tk_Font tkfont,		/* Font to query */
-    Tcl_UniChar c,		/* Character of interest */
+    int c,         		/* Character of interest */
     TkFontAttributes *faPtr)	/* Output: Font attributes */
 {
     WinFont *fontPtr = (WinFont *) tkfont;
 				/* Structure describing the logical font */
     HDC hdc = GetDC(fontPtr->hwnd);
@@ -758,23 +749,23 @@
 	    FindSubFontForChar(fontPtr, c, &lastSubFontPtr);
 				/* Pointer to the subfont to use for the given
 				 * character */
     FontFamily *familyPtr = thisSubFontPtr->familyPtr;
     HFONT oldfont;		/* Saved font from the device context */
-    TEXTMETRICA tm;		/* Font metrics of the selected subfont */
+    TEXTMETRIC tm;		/* Font metrics of the selected subfont */
 
     /*
      * Get the font attributes.
      */
 
     oldfont = SelectObject(hdc, thisSubFontPtr->hFont0);
-    GetTextMetricsA(hdc, &tm);
+    GetTextMetrics(hdc, &tm);
     SelectObject(hdc, oldfont);
     ReleaseDC(fontPtr->hwnd, hdc);
     faPtr->family = familyPtr->faceName;
     faPtr->size = TkFontGetPoints(tkwin,
-	    tm.tmInternalLeading - tm.tmHeight);
+	    (double)(tm.tmInternalLeading - tm.tmHeight));
     faPtr->weight = (tm.tmWeight > FW_MEDIUM) ? TK_FW_BOLD : TK_FW_NORMAL;
     faPtr->slant = tm.tmItalic ? TK_FS_ITALIC : TK_FS_ROMAN;
     faPtr->underline = (tm.tmUnderlined != 0);
     faPtr->overstrike = fontPtr->font.fa.overstrike;
 }
@@ -826,11 +817,11 @@
 {
     HDC hdc;
     HFONT oldFont;
     WinFont *fontPtr;
     int curX, moretomeasure;
-    Tcl_UniChar ch;
+    int ch;
     SIZE size;
     FontFamily *familyPtr;
     Tcl_DString runString;
     SubFont *thisSubFontPtr, *lastSubFontPtr;
     const char *p, *end, *next = NULL, *start;
@@ -857,11 +848,11 @@
     moretomeasure = 0;
     curX = 0;
     start = source;
     end = start + numBytes;
     for (p = start; p < end; ) {
-	next = p + Tcl_UtfToUniChar(p, &ch);
+	next = p + TkUtfToUniChar(p, &ch);
 	thisSubFontPtr = FindSubFontForChar(fontPtr, ch, &lastSubFontPtr);
 	if (thisSubFontPtr != lastSubFontPtr) {
 	    familyPtr = lastSubFontPtr->familyPtr;
 	    Tcl_UtfToExternalDString(familyPtr->encoding, start,
 		    (int) (p - start), &runString);
@@ -919,11 +910,11 @@
 	int lastSize = 0;
 
 	familyPtr = lastSubFontPtr->familyPtr;
 	Tcl_DStringInit(&runString);
 	for (p = start; p < end; ) {
-	    next = p + Tcl_UtfToUniChar(p, &ch);
+	    next = p + TkUtfToUniChar(p, &ch);
 	    Tcl_UtfToExternal(NULL, familyPtr->encoding, p,
 		    (int) (next - p), 0, NULL, buf, sizeof(buf), NULL,
 		    &dstWrote, NULL);
 	    Tcl_DStringAppend(&runString,buf,dstWrote);
 	    size.cx = 0;
@@ -968,17 +959,17 @@
 	 * Scan the string for the last word break and than repeat the whole
 	 * procedure without the maxLength limit or any flags.
 	 */
 
 	const char *lastWordBreak = NULL;
-	Tcl_UniChar ch2;
+	int ch2;
 
 	end = p;
 	p = source;
 	ch = ' ';
 	while (p < end) {
-	    next = p + Tcl_UtfToUniChar(p, &ch2);
+	    next = p + TkUtfToUniChar(p, &ch2);
 	    if ((ch != ' ') && (ch2 == ' ')) {
 		lastWordBreak = p;
 	    }
 	    p = next;
 	    ch = ch2;
@@ -1116,11 +1107,11 @@
 	    && gc->stipple != None) {
 	TkWinDrawable *twdPtr = (TkWinDrawable *) gc->stipple;
 	HBRUSH oldBrush, stipple;
 	HBITMAP oldBitmap, bitmap;
 	HDC dcMem;
-	TEXTMETRICA tm;
+	TEXTMETRIC tm;
 	SIZE size;
 
 	if (twdPtr->type != TWD_BITMAP) {
 	    Tcl_Panic("unexpected drawable type in stipple");
 	}
@@ -1143,11 +1134,11 @@
 	/*
 	 * Compute the bounding box and create a compatible bitmap.
 	 */
 
 	GetTextExtentPointA(dcMem, source, numBytes, &size);
-	GetTextMetricsA(dcMem, &tm);
+	GetTextMetrics(dcMem, &tm);
 	size.cx -= tm.tmOverhang;
 	bitmap = CreateCompatibleBitmap(dc, size.cx, size.cy);
 	oldBitmap = SelectObject(dcMem, bitmap);
 
 	/*
@@ -1182,11 +1173,11 @@
 	SetBkMode(dc, TRANSPARENT);
 	MultiFontTextOut(dc, fontPtr, source, numBytes, x, y, 0.0);
     } else {
 	HBITMAP oldBitmap, bitmap;
 	HDC dcMem;
-	TEXTMETRICA tm;
+	TEXTMETRIC tm;
 	SIZE size;
 
 	dcMem = CreateCompatibleDC(dc);
 
 	SetTextAlign(dcMem, TA_LEFT | TA_BASELINE);
@@ -1197,11 +1188,11 @@
 	/*
 	 * Compute the bounding box and create a compatible bitmap.
 	 */
 
 	GetTextExtentPointA(dcMem, source, numBytes, &size);
-	GetTextMetricsA(dcMem, &tm);
+	GetTextMetrics(dcMem, &tm);
 	size.cx -= tm.tmOverhang;
 	bitmap = CreateCompatibleBitmap(dc, size.cx, size.cy);
 	oldBitmap = SelectObject(dcMem, bitmap);
 
 	MultiFontTextOut(dcMem, fontPtr, source, numBytes, 0, tm.tmAscent,
@@ -1264,11 +1255,11 @@
 	    && gc->stipple != None) {
 	TkWinDrawable *twdPtr = (TkWinDrawable *)gc->stipple;
 	HBRUSH oldBrush, stipple;
 	HBITMAP oldBitmap, bitmap;
 	HDC dcMem;
-	TEXTMETRICA tm;
+	TEXTMETRIC tm;
 	SIZE size;
 
 	if (twdPtr->type != TWD_BITMAP) {
 	    Tcl_Panic("unexpected drawable type in stipple");
 	}
@@ -1291,11 +1282,11 @@
 	/*
 	 * Compute the bounding box and create a compatible bitmap.
 	 */
 
 	GetTextExtentPointA(dcMem, source, numBytes, &size);
-	GetTextMetricsA(dcMem, &tm);
+	GetTextMetrics(dcMem, &tm);
 	size.cx -= tm.tmOverhang;
 	bitmap = CreateCompatibleBitmap(dc, size.cx, size.cy);
 	oldBitmap = SelectObject(dcMem, bitmap);
 
 	/*
@@ -1330,11 +1321,11 @@
 	SetBkMode(dc, TRANSPARENT);
 	MultiFontTextOut(dc, fontPtr, source, numBytes, (int)x, (int)y, angle);
     } else {
 	HBITMAP oldBitmap, bitmap;
 	HDC dcMem;
-	TEXTMETRICA tm;
+	TEXTMETRIC tm;
 	SIZE size;
 
 	dcMem = CreateCompatibleDC(dc);
 
 	SetTextAlign(dcMem, TA_LEFT | TA_BASELINE);
@@ -1345,11 +1336,11 @@
 	/*
 	 * Compute the bounding box and create a compatible bitmap.
 	 */
 
 	GetTextExtentPointA(dcMem, source, numBytes, &size);
-	GetTextMetricsA(dcMem, &tm);
+	GetTextMetrics(dcMem, &tm);
 	size.cx -= tm.tmOverhang;
 	bitmap = CreateCompatibleBitmap(dc, size.cx, size.cy);
 	oldBitmap = SelectObject(dcMem, bitmap);
 
 	MultiFontTextOut(dcMem, fontPtr, source, numBytes, 0, tm.tmAscent,
@@ -1405,13 +1396,17 @@
     int rangeLength,		/* Length of range to draw in bytes. */
     int x, int y)		/* Coordinates at which to place origin of the
 				 * whole (not just the range) string when
 				 * drawing. */
 {
+    int widthUntilStart;
+
     (void) numBytes; /*unused*/
+
+    Tk_MeasureChars(tkfont, source, rangeStart, -1, 0, &widthUntilStart);
     Tk_DrawChars(display, drawable, gc, tkfont, source + rangeStart,
-	    rangeLength, x, y);
+	    rangeLength, x+widthUntilStart, y);
 }
 
 /*
  *-------------------------------------------------------------------------
  *
@@ -1441,28 +1436,36 @@
     int numBytes,		/* Length of string in bytes. */
     int x, int y,		/* Coordinates at which to place origin of
 				 * string when drawing. */
     double angle)
 {
-    Tcl_UniChar ch;
+    int ch;
     SIZE size;
     HFONT oldFont;
     FontFamily *familyPtr;
     Tcl_DString runString;
     const char *p, *end, *next;
     SubFont *lastSubFontPtr, *thisSubFontPtr;
-    TEXTMETRICA tm;
+    TEXTMETRIC tm;
 
     lastSubFontPtr = &fontPtr->subFontArray[0];
     oldFont = SelectFont(hdc, fontPtr, lastSubFontPtr, angle);
-    GetTextMetricsA(hdc, &tm);
+    GetTextMetrics(hdc, &tm);
 
     end = source + numBytes;
     for (p = source; p < end; ) {
-	next = p + Tcl_UtfToUniChar(p, &ch);
+	next = p + TkUtfToUniChar(p, &ch);
 	thisSubFontPtr = FindSubFontForChar(fontPtr, ch, &lastSubFontPtr);
-	if (thisSubFontPtr != lastSubFontPtr) {
+
+	/*
+	 * The drawing API has a limit of 32767 pixels in one go.
+	 * To avoid spending time on a rare case we do not measure each char,
+	 * instead we limit to drawing chunks of 200 bytes since that works
+	 * well in practice.
+	 */
+
+	if ((thisSubFontPtr != lastSubFontPtr) || (p-source > 200)) {
 	    if (p > source) {
 		familyPtr = lastSubFontPtr->familyPtr;
  		Tcl_UtfToExternalDString(familyPtr->encoding, source,
 			(int) (p - source), &runString);
 		familyPtr->textOutProc(hdc, x-(tm.tmOverhang/2), y,
@@ -1476,11 +1479,11 @@
 		Tcl_DStringFree(&runString);
 	    }
 	    lastSubFontPtr = thisSubFontPtr;
 	    source = p;
 	    SelectFont(hdc, fontPtr, lastSubFontPtr, angle);
-	    GetTextMetricsA(hdc, &tm);
+	    GetTextMetrics(hdc, &tm);
 	}
 	p = next;
     }
     if (p > source) {
 	familyPtr = lastSubFontPtr->familyPtr;
@@ -1554,11 +1557,11 @@
 				 * the above arguments. */
 {
     HDC hdc;
     HWND hwnd;
     HFONT oldFont;
-    TEXTMETRICA tm;
+    TEXTMETRIC tm;
     Window window;
     TkFontMetrics *fmPtr;
     Tcl_Encoding encoding;
     Tcl_DString faceString;
     TkFontAttributes *faPtr;
@@ -1567,11 +1570,11 @@
     window = Tk_WindowId(tkwin);
     hwnd = (window == None) ? NULL : TkWinGetHWND(window);
     hdc = GetDC(hwnd);
     oldFont = SelectObject(hdc, hFont);
 
-    GetTextMetricsA(hdc, &tm);
+    GetTextMetrics(hdc, &tm);
 
     /*
      * On any version NT, there may fonts with international names. Use the
      * NT-only Unicode version of GetTextFace to get the font's name. If we
      * used the ANSI version on a non-internationalized version of NT, we
@@ -1595,11 +1598,11 @@
 
     faPtr		= &fontPtr->font.fa;
     faPtr->family	= Tk_GetUid(Tcl_DStringValue(&faceString));
 
     faPtr->size =
-	TkFontGetPoints(tkwin,  -(fontPtr->pixelSize));
+	TkFontGetPoints(tkwin,  (double)-(fontPtr->pixelSize));
     faPtr->weight =
 	    (tm.tmWeight > FW_MEDIUM) ? TK_FW_BOLD : TK_FW_NORMAL;
     faPtr->slant	= (tm.tmItalic != 0) ? TK_FS_ITALIC : TK_FS_ROMAN;
     faPtr->underline	= (tm.tmUnderlined != 0) ? 1 : 0;
     faPtr->overstrike	= overstrike;
@@ -2523,26 +2526,10 @@
     const char *faceName)	/* Font family to query. */
 {
     int result;
     Tcl_DString faceString;
 
-    /*
-     * Just immediately rule out the following fonts, because they look so
-     * ugly on windows. The caller's fallback mechanism will cause the
-     * corresponding appropriate TrueType fonts to be selected.
-     */
-
-    if (strcasecmp(faceName, "Courier") == 0) {
-	return 0;
-    }
-    if (strcasecmp(faceName, "Times") == 0) {
-	return 0;
-    }
-    if (strcasecmp(faceName, "Helvetica") == 0) {
-	return 0;
-    }
-
     Tcl_UtfToExternalDString(systemEncoding, faceName, -1, &faceString);
 
     /*
      * If the family exists, WinFontExistProc() will be called and
      * EnumFontFamilies() will return whatever WinFontExistProc() returns. If

Index: win/tkWinInit.c
==================================================================
--- win/tkWinInit.c
+++ win/tkWinInit.c
@@ -179,10 +179,13 @@
     HRESULT hrError)
 {
     LPTSTR lpBuffer = NULL, p = NULL;
     TCHAR  sBuffer[30];
     Tcl_Obj* errPtr = NULL;
+#ifdef _UNICODE
+    Tcl_DString ds;
+#endif
 
     FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM
 	    | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, (DWORD)hrError,
 	    LANG_NEUTRAL, (LPTSTR)&lpBuffer, 0, NULL);
 
@@ -194,11 +197,13 @@
     if ((p = _tcsrchr(lpBuffer, TEXT('\r'))) != NULL) {
 	*p = TEXT('\0');
     }
 
 #ifdef _UNICODE
-    errPtr = Tcl_NewUnicodeObj(lpBuffer, (int)wcslen(lpBuffer));
+    Tcl_WinTCharToUtf(lpBuffer, (int)wcslen(lpBuffer) * sizeof (WCHAR), &ds);
+    errPtr = Tcl_NewStringObj(Tcl_DStringValue(&ds), Tcl_DStringLength(&ds));
+    Tcl_DStringFree(&ds);
 #else
     errPtr = Tcl_NewStringObj(lpBuffer, (int)strlen(lpBuffer));
 #endif /* _UNICODE */
 
     if (lpBuffer != sBuffer) {

Index: win/tkWinKey.c
==================================================================
--- win/tkWinKey.c
+++ win/tkWinKey.c
@@ -19,11 +19,12 @@
  * the alternative, in which we walked a list of keycodes looking for a match.
  * Since this lookup is performed for every Windows keypress event, it seems
  * like a worthwhile improvement to use the table.
  */
 
-#define MAX_KEYCODE 145 /* VK_SCROLL is the last entry in our table below */
+#define MAX_KEYCODE 179 /* VK_MEDIA_PLAY_PAUSE is the last entry in our table below */
+/* cf. https://msdn.microsoft.com/en-us/library/windows/desktop/dd375731(v=vs.85).aspx */
 
 static const KeySym keymap[] = {
     NoSymbol, NoSymbol, NoSymbol, XK_Cancel, NoSymbol,
     NoSymbol, NoSymbol, NoSymbol, XK_BackSpace, XK_Tab,
     NoSymbol, NoSymbol, XK_Clear, XK_Return, NoSymbol,
@@ -51,11 +52,17 @@
     XK_F9, XK_F10, XK_F11, XK_F12, XK_F13,
     XK_F14, XK_F15, XK_F16, XK_F17, XK_F18,
     XK_F19, XK_F20, XK_F21, XK_F22, XK_F23,
     XK_F24, NoSymbol, NoSymbol, NoSymbol, NoSymbol,
     NoSymbol, NoSymbol, NoSymbol, NoSymbol, XK_Num_Lock,
-    XK_Scroll_Lock
+    XK_Scroll_Lock, NoSymbol, NoSymbol, NoSymbol, NoSymbol,
+    NoSymbol, NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*150 0x96*/
+    NoSymbol, NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*155 0x9b*/
+    NoSymbol, NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*160 0xa0*/
+    NoSymbol, NoSymbol, NoSymbol, NoSymbol, NoSymbol, /*165 0xa5*/
+    NoSymbol, NoSymbol, NoSymbol, XK_XF86AudioMute, XK_XF86AudioLowerVolume, /*170 0xaa*/
+    XK_XF86AudioRaiseVolume, XK_XF86AudioNext, XK_XF86AudioPrev, XK_XF86AudioStop, XK_XF86AudioPlay  /*175 0xaf*/
 };
 
 /*
  * Prototypes for local functions defined in this file:
  */
@@ -86,52 +93,27 @@
     XEvent *eventPtr,		/* X keyboard event. */
     Tcl_DString *dsPtr)		/* Uninitialized or empty string to hold
 				 * result. */
 {
     XKeyEvent *keyEv = &eventPtr->xkey;
+    char buf[6];
+    int len;
 
     Tcl_DStringInit(dsPtr);
     if (keyEv->send_event == -1) {
 	if (keyEv->nbytes > 0) {
 	    Tcl_ExternalToUtfDString(TkWinGetKeyInputEncoding(),
 		    keyEv->trans_chars, keyEv->nbytes, dsPtr);
 	}
-    } else if (keyEv->send_event == -2) {
-	/*
-	 * Special case for win2000 multi-lingal IME input. xkey.trans_chars[]
-	 * already contains a UNICODE char.
-	 */
-
-	int unichar;
-	char buf[XMaxTransChars];
-	int len;
-
-	unichar = keyEv->trans_chars[1] & 0xff;
-	unichar <<= 8;
-	unichar |= keyEv->trans_chars[0] & 0xff;
-
-	len = Tcl_UniCharToUtf((Tcl_UniChar) unichar, buf);
-
-	Tcl_DStringAppend(dsPtr, buf, len);
     } else if (keyEv->send_event == -3) {
 
-	char buf[XMaxTransChars];
-	int len;
-
 	/*
-	 * Special case for WM_UNICHAR.
+	 * Special case for WM_UNICHAR and win2000 multi-lingal IME input
 	 */
 
-	len = Tcl_UniCharToUtf(keyEv->keycode, buf);
-	if ((keyEv->keycode <= 0xffff) || (len == XMaxTransChars)) {
-	    Tcl_DStringAppend(dsPtr, buf, len);
-	} else {
-	    Tcl_UniCharToUtf(((keyEv->keycode - 0x10000) >> 10) | 0xd800, buf);
-	    Tcl_DStringAppend(dsPtr, buf, 3);
-	    Tcl_UniCharToUtf(((keyEv->keycode - 0x10000) & 0x3ff) | 0xdc00, buf);
-	    Tcl_DStringAppend(dsPtr, buf, 3);
-	}
+	len = TkUniCharToUtf(keyEv->keycode, buf);
+	Tcl_DStringAppend(dsPtr, buf, len);
     } else {
 	/*
 	 * This is an event generated from generic code. It has no nchars or
 	 * trans_chars members.
 	 */
@@ -138,13 +120,10 @@
 
 	KeySym keysym = KeycodeToKeysym(keyEv->keycode, keyEv->state, 0);
 
 	if (((keysym != NoSymbol) && (keysym > 0) && (keysym < 256))
 		|| (keysym == XK_Return) || (keysym == XK_Tab)) {
-	    char buf[XMaxTransChars];
-	    int len;
-
 	    len = Tcl_UniCharToUtf((Tcl_UniChar) (keysym & 255), buf);
 	    Tcl_DStringAppend(dsPtr, buf, len);
 	}
     }
     return Tcl_DStringValue(dsPtr);
@@ -205,22 +184,22 @@
     int state,
     int noascii)
 {
     BYTE keys[256];
     int result, deadkey, shift;
-    char buf[4];
+    TCHAR buf[4];
     unsigned int scancode = MapVirtualKey(keycode, 0);
 
     /*
-     * Do not run keycodes of lock keys through ToAscii(). One of ToAscii()'s
+     * Do not run keycodes of lock keys through ToUnicode(). One of ToUnicode()'s
      * side effects is to handle the lights on the keyboard, and we don't want
      * to mess that up.
      */
 
     if (noascii || keycode == VK_CAPITAL || keycode == VK_SCROLL ||
 	    keycode == VK_NUMLOCK) {
-	goto skipToAscii;
+	goto skipToUnicode;
     }
 
     /*
      * Use MapVirtualKey() to detect some dead keys.
      */
@@ -257,28 +236,28 @@
     }
     if (state & Mod1Mask) {
 	keys[VK_NUMLOCK] = 1;
     }
 
-    result = ToAscii(keycode, scancode, keys, (LPWORD) buf, 0);
+    result = ToUnicode(keycode, scancode, keys, buf, 4, 0);
 
     if (result < 0) {
 	/*
 	 * Win95/98: This was a dead char, which is now remembered by the
-	 * keyboard. Call ToAscii() again to forget it.
+	 * keyboard. Call ToUnicode() again to forget it.
 	 * WinNT: This was a dead char, overwriting any previously remembered
-	 * key. Calling ToAscii() again does not affect anything.
+	 * key. Calling ToUnicode() again does not affect anything.
 	 */
 
-	ToAscii(keycode, scancode, keys, (LPWORD) buf, 0);
+	ToUnicode(keycode, scancode, keys, buf, 4, 0);
 	return XK_Multi_key;
     }
 
     if (result == 2) {
 	/*
 	 * This was a dead char, and there were one previously remembered by
-	 * the keyboard. Call ToAscii() again with proper parameters to
+	 * the keyboard. Call ToUnicode() again with proper parameters to
 	 * restore it.
 	 *
 	 * Get information about the old char
 	 */
 
@@ -299,48 +278,48 @@
 	    keys[VK_CONTROL] = 0x80;
 	}
 	if (shift & 4) {
 	    keys[VK_MENU] = 0x80;
 	}
-	ToAscii(deadkey, scancode, keys, (LPWORD) buf, 0);
+	ToUnicode(deadkey, scancode, keys, buf, 4, 0);
 	return XK_Multi_key;
     }
 
     /*
-     * Keycode mapped to a valid Latin-1 character. Since the keysyms for
-     * alphanumeric characters map onto Latin-1, we just return it.
+     * Keycode mapped to a valid Unicode character. Since the keysyms for
+     * alphanumeric characters map onto Unicode, we just return it.
      *
      * We treat 0x7F as a special case mostly for backwards compatibility. In
      * versions of Tk<=8.2, Control-Backspace returned "XK_BackSpace" as the X
      * Keysym. This was due to the fact that we did not initialize the keys
-     * array properly when we passed it to ToAscii, above. We had previously
+     * array properly when we passed it to ToUnicode, above. We had previously
      * not been setting the state bit for the Control key. When we fixed that,
      * we found that Control-Backspace on Windows is interpreted as ASCII-127
      * (0x7F), which corresponds to the Delete key.
      *
      * Upon discovering this, we realized we had two choices: return XK_Delete
      * or return XK_BackSpace. If we returned XK_Delete, that could be
-     * considered "more correct" (although the correctness would be dependant
-     * on whether you believe that ToAscii is doing the right thing in that
+     * considered "more correct" (although the correctness would be dependent
+     * on whether you believe that ToUnicode is doing the right thing in that
      * case); however, this would break backwards compatibility, and worse, it
      * would limit application programmers; they would effectively be unable
      * to bind to <Control-Backspace> on Windows. We therefore chose instead
      * to return XK_BackSpace (handled here by letting the code "fall-through"
      * to the return statement below, which works because the keycode for this
      * event is VK_BACKSPACE, and the keymap table maps that keycode to
      * XK_BackSpace).
      */
 
-    if (result == 1 && UCHAR(buf[0]) >= 0x20 && UCHAR(buf[0]) != 0x7F) {
-	return (KeySym) UCHAR(buf[0]);
+    if (result == 1 && buf[0] >= 0x20 && buf[0] != 0x7F) {
+	return (KeySym) buf[0];
     }
 
     /*
      * Keycode is a non-alphanumeric key, so we have to do the lookup.
      */
 
-  skipToAscii:
+  skipToUnicode:
     if (keycode > MAX_KEYCODE) {
 	return NoSymbol;
     }
     switch (keycode) {
 	/*
@@ -591,11 +570,11 @@
 	    eventPtr->xkey.keycode = i;
 	    return;
 	}
     }
     if (keySym >= 0x20) {
-	result = VkKeyScan((char) keySym);
+	result = VkKeyScan((TCHAR) keySym);
 	if (result != -1) {
 	    shift = result >> 8;
 	    if (shift & 1)
 		eventPtr->xkey.state |= ShiftMask;
 	    if (shift & 2)
@@ -644,11 +623,11 @@
 	if (keymap[i] == keysym) {
 	    return ((KeyCode) i);
 	}
     }
     if (keysym >= 0x20) {
-	result = VkKeyScan((char) keysym);
+	result = VkKeyScan((TCHAR) keysym);
 	if (result != -1) {
 	    return (KeyCode) (result & 0xff);
 	}
     }
 

Index: win/tkWinMenu.c
==================================================================
--- win/tkWinMenu.c
+++ win/tkWinMenu.c
@@ -898,11 +898,11 @@
     LPARAM lParam)
 {
     LRESULT lResult;
 
     if (!TkWinHandleMenuEvent(&hwnd, &message, &wParam, &lParam, &lResult)) {
-	lResult = DefWindowProcA(hwnd, message, wParam, lParam);
+	lResult = DefWindowProc(hwnd, message, wParam, lParam);
     }
     return lResult;
 }
 
 /*
@@ -997,11 +997,11 @@
 	if (lResult || (GetCapture() != hwnd)) {
 	    break;
 	}
 
     default:
-	lResult = DefWindowProcA(hwnd, message, wParam, lParam);
+	lResult = DefWindowProc(hwnd, message, wParam, lParam);
 	break;
     }
     return lResult;
 }
 
@@ -1480,10 +1480,19 @@
 	int borderWidth;
 
 	Tk_GetPixelsFromObj(menuPtr->interp, menuPtr->tkwin,
 		menuPtr->borderWidthPtr, &borderWidth);
 	*widthPtr = indicatorDimensions[1] - borderWidth;
+
+        /*
+         * Quite dubious about the above (why would borderWidth play a role?)
+         * and about how indicatorDimensions[1] is obtained in SetDefaults().
+         * At least don't let the result be negative!
+         */
+        if (*widthPtr < 0) {
+            *widthPtr = 0;
+        }
     }
 }
 
 /*
  *----------------------------------------------------------------------
@@ -1838,11 +1847,11 @@
     int x,			/* left edge */
     int y,			/* top edge */
     int width,			/* Width of menu entry */
     int height,			/* Height of menu entry */
     int drawArrow)		/* For cascade menus, whether of not to draw
-				 * the arraw. I cannot figure out Windows'
+				 * the arrow. I cannot figure out Windows'
 				 * algorithm for where to draw this. */
 {
     COLORREF oldFgColor;
     COLORREF oldBgColor;
     RECT rect;
@@ -2034,37 +2043,37 @@
     keySym = i;
 
     if (eventPtr->type == KeyPress) {
 	switch (keySym) {
 	case XK_Alt_L:
-	    scanCode = MapVirtualKeyA(VK_LMENU, 0);
-	    CallWindowProcA(DefWindowProcA, Tk_GetHWND(Tk_WindowId(tkwin)),
+	    scanCode = MapVirtualKey(VK_LMENU, 0);
+	    CallWindowProc(DefWindowProc, Tk_GetHWND(Tk_WindowId(tkwin)),
 		    WM_SYSKEYDOWN, VK_MENU,
 		    (int) (scanCode << 16) | (1 << 29));
 	    break;
 	case XK_Alt_R:
-	    scanCode = MapVirtualKeyA(VK_RMENU, 0);
-	    CallWindowProcA(DefWindowProcA, Tk_GetHWND(Tk_WindowId(tkwin)),
+	    scanCode = MapVirtualKey(VK_RMENU, 0);
+	    CallWindowProc(DefWindowProc, Tk_GetHWND(Tk_WindowId(tkwin)),
 		    WM_SYSKEYDOWN, VK_MENU,
 		    (int) (scanCode << 16) | (1 << 29) | (1 << 24));
 	    break;
 	case XK_F10:
-	    scanCode = MapVirtualKeyA(VK_F10, 0);
-	    CallWindowProcA(DefWindowProcA, Tk_GetHWND(Tk_WindowId(tkwin)),
+	    scanCode = MapVirtualKey(VK_F10, 0);
+	    CallWindowProc(DefWindowProc, Tk_GetHWND(Tk_WindowId(tkwin)),
 		    WM_SYSKEYDOWN, VK_F10, (int) (scanCode << 16));
 	    break;
 	default:
 	    virtualKey = XKeysymToKeycode(winPtr->display, keySym);
-	    scanCode = MapVirtualKeyA(virtualKey, 0);
+	    scanCode = MapVirtualKey(virtualKey, 0);
 	    if (0 != scanCode) {
 		XKeyEvent xkey = eventPtr->xkey;
-		CallWindowProcA(DefWindowProcA, Tk_GetHWND(Tk_WindowId(tkwin)),
+		CallWindowProc(DefWindowProc, Tk_GetHWND(Tk_WindowId(tkwin)),
 			WM_SYSKEYDOWN, virtualKey,
 			(int) ((scanCode << 16) | (1 << 29)));
 		if (xkey.nbytes > 0) {
 		    for (i = 0; i < xkey.nbytes; i++) {
-			CallWindowProcA(DefWindowProcA,
+			CallWindowProc(DefWindowProc,
 				Tk_GetHWND(Tk_WindowId(tkwin)), WM_SYSCHAR,
 				xkey.trans_chars[i],
 				(int) ((scanCode << 16) | (1 << 29)));
 		    }
 		}
@@ -2071,32 +2080,32 @@
 	    }
 	}
     } else if (eventPtr->type == KeyRelease) {
 	switch (keySym) {
 	case XK_Alt_L:
-	    scanCode = MapVirtualKeyA(VK_LMENU, 0);
-	    CallWindowProcA(DefWindowProcA, Tk_GetHWND(Tk_WindowId(tkwin)),
+	    scanCode = MapVirtualKey(VK_LMENU, 0);
+	    CallWindowProc(DefWindowProc, Tk_GetHWND(Tk_WindowId(tkwin)),
 		    WM_SYSKEYUP, VK_MENU, (int) (scanCode << 16)
 		    | (1 << 29) | (1 << 30) | (1 << 31));
 	    break;
 	case XK_Alt_R:
-	    scanCode = MapVirtualKeyA(VK_RMENU, 0);
-	    CallWindowProcA(DefWindowProcA, Tk_GetHWND(Tk_WindowId(tkwin)),
+	    scanCode = MapVirtualKey(VK_RMENU, 0);
+	    CallWindowProc(DefWindowProc, Tk_GetHWND(Tk_WindowId(tkwin)),
 		    WM_SYSKEYUP, VK_MENU, (int) (scanCode << 16) | (1 << 24)
-		    | (0x111 << 29) | (1 << 30) | (1 << 31));
+		    | (1 << 29) | (1 << 30) | (1 << 31));
 	    break;
 	case XK_F10:
-	    scanCode = MapVirtualKeyA(VK_F10, 0);
-	    CallWindowProcA(DefWindowProcA, Tk_GetHWND(Tk_WindowId(tkwin)),
+	    scanCode = MapVirtualKey(VK_F10, 0);
+	    CallWindowProc(DefWindowProc, Tk_GetHWND(Tk_WindowId(tkwin)),
 		    WM_SYSKEYUP, VK_F10,
 		    (int) (scanCode << 16) | (1 << 30) | (1 << 31));
 	    break;
 	default:
 	    virtualKey = XKeysymToKeycode(winPtr->display, keySym);
-	    scanCode = MapVirtualKeyA(virtualKey, 0);
+	    scanCode = MapVirtualKey(virtualKey, 0);
 	    if (0 != scanCode) {
-		CallWindowProcA(DefWindowProcA, Tk_GetHWND(Tk_WindowId(tkwin)),
+		CallWindowProc(DefWindowProc, Tk_GetHWND(Tk_WindowId(tkwin)),
 			WM_SYSKEYUP, virtualKey, (int) ((scanCode << 16)
 			| (1 << 29) | (1 << 30) | (1 << 31)));
 	    }
 	}
     }
@@ -2426,11 +2435,11 @@
 
     points[0].x = x;
     points[0].y = y + height/2;
     points[1].y = points[0].y;
     segmentWidth = 6;
-    maxX = width - 1;
+    maxX = x + width - 1;
     border = Tk_Get3DBorderFromObj(menuPtr->tkwin, menuPtr->borderPtr);
 
     while (points[0].x < maxX) {
 	points[1].x = points[0].x + segmentWidth;
 	if (points[1].x > maxX) {
@@ -2498,11 +2507,11 @@
     int width,			/* Width of the entry rectangle */
     int height,			/* Height of the current rectangle */
     int strictMotif,		/* Boolean flag */
     int drawingParameters)	/* Whether or not to draw the cascade arrow
 				 * for cascade items and accelerator
-				 * cues. Only applies to Windows. */
+				 * cues. */
 {
     GC gc, indicatorGC;
     TkMenu *menuPtr = mePtr->menuPtr;
     Tk_3DBorder bgBorder, activeBorder;
     const Tk_FontMetrics *fmPtr;
@@ -2788,14 +2797,30 @@
     int width,			/* width of rectangle to draw */
     int height)			/* height of rectangle to draw */
 {
     if (mePtr->state == ENTRY_ACTIVE
 		|| (mePtr->entryFlags & ENTRY_PLATFORM_FLAG1)!=0 ) {
+	int relief;
+	int activeBorderWidth;
+
 	bgBorder = activeBorder;
+
+	if ((menuPtr->menuType == MENUBAR)
+		&& ((menuPtr->postedCascade == NULL)
+		|| (menuPtr->postedCascade != mePtr))) {
+	    relief = TK_RELIEF_FLAT;
+	} else {
+	    Tk_GetReliefFromObj(NULL, menuPtr->activeReliefPtr, &relief);
+	}
+	Tk_GetPixelsFromObj(NULL, menuPtr->tkwin,
+		menuPtr->activeBorderWidthPtr, &activeBorderWidth);
+	Tk_Fill3DRectangle(menuPtr->tkwin, d, bgBorder, x, y, width, height,
+		activeBorderWidth, relief);
+    } else {
+        Tk_Fill3DRectangle(menuPtr->tkwin, d, bgBorder, x, y, width, height, 0,
+                TK_RELIEF_FLAT);
     }
-    Tk_Fill3DRectangle(menuPtr->tkwin, d, bgBorder, x, y, width, height, 0,
-	    TK_RELIEF_FLAT);
 }
 
 /*
  *--------------------------------------------------------------
  *
@@ -2872,11 +2897,11 @@
 			+ accelWidth + 2 * activeBorderWidth;
 		menuPtr->entries[j]->x = x;
 		menuPtr->entries[j]->entryFlags &= ~ENTRY_LAST_COLUMN;
 	    }
 	    x += indicatorSpace + labelWidth + accelWidth
-		    + 2 * borderWidth;
+		    + 2 * activeBorderWidth;
 	    indicatorSpace = labelWidth = accelWidth = 0;
 	    lastColumnBreak = i;
 	    y = borderWidth;
 	}
 
@@ -2942,12 +2967,12 @@
 	menuPtr->entries[j]->width = indicatorSpace + labelWidth
 		+ accelWidth + 2 * activeBorderWidth;
 	menuPtr->entries[j]->x = x;
 	menuPtr->entries[j]->entryFlags |= ENTRY_LAST_COLUMN;
     }
-    windowWidth = x + indicatorSpace + labelWidth + accelWidth + accelSpace
-	    + 2 * activeBorderWidth + 2 * borderWidth;
+    windowWidth = x + indicatorSpace + labelWidth + accelWidth
+	    + 2 * activeBorderWidth + borderWidth;
 
 
     windowHeight += borderWidth;
 
     /*
@@ -3197,20 +3222,15 @@
     char sizeString[TCL_INTEGER_SPACE];
     char faceName[LF_FACESIZE];
     HDC scratchDC;
     int bold = 0;
     int italic = 0;
-    TEXTMETRICA tm;
+    TEXTMETRIC tm;
     int pointSize;
     HFONT menuFont;
     /* See: [Bug #3239768] tk8.4.19 (and later) WIN32 menu font support */
-    struct {
-        NONCLIENTMETRICS metrics;
-#if (WINVER < 0x0600)
-        int padding;
-#endif
-    } nc;
+    NONCLIENTMETRICS metrics;
     OSVERSIONINFOW os;
 
     /*
      * Set all of the default options. The loop will terminate when we run out
      * of options via a break statement.
@@ -3225,23 +3245,23 @@
     if (!firstTime) {
 	Tcl_DStringFree(&menuFontDString);
     }
     Tcl_DStringInit(&menuFontDString);
 
-    nc.metrics.cbSize = sizeof(nc);
+    metrics.cbSize = sizeof(metrics);
 
     os.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW);
     GetVersionExW(&os);
     if (os.dwMajorVersion < 6) {
-	nc.metrics.cbSize -= sizeof(int);
+	metrics.cbSize -= sizeof(int);
     }
 
-    SystemParametersInfo(SPI_GETNONCLIENTMETRICS, nc.metrics.cbSize,
-	    &nc.metrics, 0);
-    menuFont = CreateFontIndirect(&nc.metrics.lfMenuFont);
+    SystemParametersInfo(SPI_GETNONCLIENTMETRICS, metrics.cbSize,
+	    &metrics, 0);
+    menuFont = CreateFontIndirect(&metrics.lfMenuFont);
     SelectObject(scratchDC, menuFont);
-    GetTextMetricsA(scratchDC, &tm);
+    GetTextMetrics(scratchDC, &tm);
     GetTextFaceA(scratchDC, LF_FACESIZE, faceName);
     pointSize = MulDiv(tm.tmHeight - tm.tmInternalLeading,
 	    72, GetDeviceCaps(scratchDC, LOGPIXELSY));
     if (tm.tmWeight >= 700) {
 	bold = 1;
@@ -3279,10 +3299,11 @@
      * appropriate margins. Since this is fairly hairy, we do it here to save
      * time when traversing large sets of menu items.
      *
      * The code below was given to me by Microsoft over the phone. It is the
      * only way to ensure menu items line up, and is not documented.
+     * How strange the calculation of indicatorDimensions[1] is...!
      */
 
     indicatorDimensions[0] = GetSystemMetrics(SM_CYMENUCHECK);
     indicatorDimensions[1] = ((GetSystemMetrics(SM_CXFIXEDFRAME) +
 	    GetSystemMetrics(SM_CXBORDER)
@@ -3293,13 +3314,11 @@
      * Accelerators used to be always underlines until Win2K when a system
      * parameter was introduced to hide them unless Alt is pressed.
      */
 
     showMenuAccelerators = TRUE;
-    if (TkWinGetPlatformId() == VER_PLATFORM_WIN32_NT) {
-	SystemParametersInfoA(SPI_GETKEYBOARDCUES, 0, &showMenuAccelerators, 0);
-    }
+    SystemParametersInfo(SPI_GETKEYBOARDCUES, 0, &showMenuAccelerators, 0);
 }
 
 /*
  *----------------------------------------------------------------------
  *

Index: win/tkWinPixmap.c
==================================================================
--- win/tkWinPixmap.c
+++ win/tkWinPixmap.c
@@ -98,17 +98,17 @@
 
 	if (newTwdPtr->bitmap.handle == NULL && !repeatError) {
 	    LPVOID lpMsgBuf;
 
 	    repeatError = 1;
-	    if (FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER |
+	    if (FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
 		    FORMAT_MESSAGE_FROM_SYSTEM|FORMAT_MESSAGE_IGNORE_INSERTS,
 		    NULL, GetLastError(),
 		    MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-		    (LPSTR) &lpMsgBuf, 0, NULL)) {
-		MessageBoxA(NULL, (LPCSTR) lpMsgBuf,
-			"Tk_GetPixmap: Error from CreateDIBSection",
+		    (LPTSTR)&lpMsgBuf, 0, NULL)) {
+		MessageBox(NULL, (LPTSTR) lpMsgBuf,
+			TEXT("Tk_GetPixmap: Error from CreateDIBSection"),
 			MB_OK | MB_ICONINFORMATION);
 		LocalFree(lpMsgBuf);
 	    }
 	}
     }

Index: win/tkWinPort.h
==================================================================
--- win/tkWinPort.h
+++ win/tkWinPort.h
@@ -19,10 +19,11 @@
  * The following sets of #includes and #ifdefs are required to get Tcl to
  * compile under the windows compilers.
  *---------------------------------------------------------------------------
  */
 
+#include <stdio.h>
 #include <wchar.h>
 #include <io.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <fcntl.h>

Index: win/tkWinSend.c
==================================================================
--- win/tkWinSend.c
+++ win/tkWinSend.c
@@ -250,12 +250,18 @@
 			if (wcsncmp(olestr, oleszStub,
 				wcslen(oleszStub)) == 0) {
 			    LPOLESTR p = olestr + wcslen(oleszStub);
 
 			    if (*p) {
+				Tcl_DString ds;
+
+				Tcl_WinTCharToUtf(p + 1, -1, &ds);
 				result = Tcl_ListObjAppendElement(interp,
-					objList, Tcl_NewUnicodeObj(p + 1, -1));
+					objList,
+					Tcl_NewStringObj(Tcl_DStringValue(&ds),
+						Tcl_DStringLength(&ds)));
+				Tcl_DStringFree(&ds);
 			    }
 			}
 
 			hr = CoGetMalloc(1, &pMalloc);
 			if (SUCCEEDED(hr)) {
@@ -611,12 +617,11 @@
 
     if (SUCCEEDED(hr)) {
 	LPMONIKER pmkItem = NULL;
 	Tcl_DString dString;
 
-	Tcl_DStringInit(&dString);
-	Tcl_UtfToUniCharDString(name, -1, &dString);
+	Tcl_WinUtfToTChar(name, -1, &dString);
 	hr = CreateFileMoniker((LPOLESTR)Tcl_DStringValue(&dString), &pmkItem);
 	Tcl_DStringFree(&dString);
 	if (SUCCEEDED(hr)) {
 	    hr = pmkClass->lpVtbl->ComposeWith(pmkClass, pmkItem, FALSE, ppmk);
 	    pmkItem->lpVtbl->Release(pmkItem);
@@ -738,10 +743,12 @@
     EXCEPINFO ei;
     UINT uiErr = 0;
     HRESULT hr = S_OK, ehr = S_OK;
     Tcl_Obj *cmd = NULL;
     DISPID dispid;
+    Tcl_DString ds;
+    const char *src;
 
     cmd = Tcl_ConcatObj(objc, objv);
 
     /*
      * Setup the arguments for the COM method call.
@@ -751,11 +758,14 @@
     VariantInit(&vResult);
     memset(&dp, 0, sizeof(dp));
     memset(&ei, 0, sizeof(ei));
 
     vCmd.vt = VT_BSTR;
-    vCmd.bstrVal = SysAllocString(Tcl_GetUnicode(cmd));
+    src = Tcl_GetString(cmd);
+    Tcl_WinUtfToTChar(src, cmd->length, &ds);
+    vCmd.bstrVal = SysAllocString((WCHAR *) Tcl_DStringValue(&ds));
+    Tcl_DStringFree(&ds);
 
     dp.cArgs = 1;
     dp.rgvarg = &vCmd;
 
     /*
@@ -772,11 +782,13 @@
      * Convert the result into a string and place in the interps result.
      */
 
     ehr = VariantChangeType(&vResult, &vResult, 0, VT_BSTR);
     if (SUCCEEDED(ehr)) {
-	Tcl_SetObjResult(interp, Tcl_NewUnicodeObj(vResult.bstrVal, -1));
+	Tcl_WinTCharToUtf(vResult.bstrVal, (int) SysStringLen(vResult.bstrVal) *
+		sizeof (WCHAR), &ds);
+	Tcl_DStringResult(interp, &ds);
     }
 
     /*
      * Errors are returned as dispatch exceptions. If an error code was
      * returned then we decode the exception and setup the Tcl error
@@ -783,12 +795,15 @@
      * variables.
      */
 
     if (hr == DISP_E_EXCEPTION && ei.bstrSource != NULL) {
 	Tcl_Obj *opError, *opErrorCode, *opErrorInfo;
-
-	opError = Tcl_NewUnicodeObj(ei.bstrSource, -1);
+	Tcl_WinTCharToUtf(ei.bstrSource, (int) SysStringLen(ei.bstrSource) *
+		sizeof (WCHAR), &ds);
+	opError = Tcl_NewStringObj(Tcl_DStringValue(&ds),
+		Tcl_DStringLength(&ds));
+	Tcl_DStringFree(&ds);
 	Tcl_ListObjIndex(interp, opError, 0, &opErrorCode);
 	Tcl_SetObjErrorCode(interp, opErrorCode);
 	Tcl_ListObjIndex(interp, opError, 1, &opErrorInfo);
 	Tcl_AppendObjToErrorInfo(interp, opErrorInfo);
     }
@@ -831,10 +846,12 @@
 {
     Tcl_Obj *opError, *opErrorInfo, *opErrorCode;
     ICreateErrorInfo *pCEI;
     IErrorInfo *pEI, **ppEI = &pEI;
     HRESULT hr;
+    Tcl_DString ds;
+    const char *src;
 
     if (!pExcepInfo) {
 	return;
     }
 
@@ -849,12 +866,20 @@
     opErrorCode = Tcl_DuplicateObj(opErrorCode);
     Tcl_IncrRefCount(opErrorCode);
     Tcl_ListObjAppendElement(interp, opErrorCode, opErrorInfo);
     /* TODO: Handle failure to append */
 
-    pExcepInfo->bstrDescription = SysAllocString(Tcl_GetUnicode(opError));
-    pExcepInfo->bstrSource = SysAllocString(Tcl_GetUnicode(opErrorCode));
+    src = Tcl_GetString(opError);
+    Tcl_WinUtfToTChar(src, opError->length, &ds);
+    pExcepInfo->bstrDescription =
+	    SysAllocString((WCHAR *) Tcl_DStringValue(&ds));
+    Tcl_DStringFree(&ds);
+    src = Tcl_GetString(opErrorCode);
+    Tcl_WinUtfToTChar(src, opErrorCode->length, &ds);
+    pExcepInfo->bstrSource =
+	    SysAllocString((WCHAR *) Tcl_DStringValue(&ds));
+    Tcl_DStringFree(&ds);
     Tcl_DecrRefCount(opErrorCode);
     pExcepInfo->scode = E_FAIL;
 
     hr = CreateErrorInfo(&pCEI);
     if (!SUCCEEDED(hr)) {

Index: win/tkWinSendCom.c
==================================================================
--- win/tkWinSendCom.c
+++ win/tkWinSendCom.c
@@ -368,10 +368,11 @@
     EXCEPINFO *pExcepInfo,
     UINT *puArgErr)
 {
     HRESULT hr = S_OK;
     VARIANT vCmd;
+    Tcl_DString ds;
 
     VariantInit(&vCmd);
 
     hr = VariantChangeType(&vCmd, &Cmd, 0, VT_BSTR);
     if (FAILED(hr)) {
@@ -380,13 +381,17 @@
 	TkWinSend_SetExcepInfo(obj->interp, pExcepInfo);
 	hr = DISP_E_EXCEPTION;
     }
 
     if (SUCCEEDED(hr) && obj->interp) {
-	Tcl_Obj *scriptPtr = Tcl_NewUnicodeObj(vCmd.bstrVal,
-		(int) SysStringLen(vCmd.bstrVal));
+	Tcl_Obj *scriptPtr;
 
+	Tcl_WinTCharToUtf(vCmd.bstrVal, (int) SysStringLen(vCmd.bstrVal) *
+		sizeof (WCHAR), &ds);
+	scriptPtr =
+		Tcl_NewStringObj(Tcl_DStringValue(&ds), Tcl_DStringLength(&ds));
+	Tcl_DStringFree(&ds);
 	TkWinSend_QueueCommand(obj->interp, scriptPtr);
     }
 
     VariantClear(&vCmd);
     return hr;
@@ -422,10 +427,11 @@
     HRESULT hr = S_OK;
     int result = TCL_OK;
     VARIANT v;
     register Tcl_Interp *interp = obj->interp;
     Tcl_Obj *scriptPtr;
+    Tcl_DString ds;
 
     if (interp == NULL) {
 	return S_OK;
     }
     VariantInit(&v);
@@ -432,21 +438,30 @@
     hr = VariantChangeType(&v, &vCmd, 0, VT_BSTR);
     if (!SUCCEEDED(hr)) {
 	return hr;
     }
 
-    scriptPtr = Tcl_NewUnicodeObj(v.bstrVal, (int) SysStringLen(v.bstrVal));
+    Tcl_WinTCharToUtf(v.bstrVal, (int) SysStringLen(v.bstrVal) *
+	    sizeof (WCHAR), &ds);
+    scriptPtr = Tcl_NewStringObj(Tcl_DStringValue(&ds), Tcl_DStringLength(&ds));
+    Tcl_DStringFree(&ds);
     Tcl_Preserve(interp);
     Tcl_IncrRefCount(scriptPtr);
     result = Tcl_EvalObjEx(interp, scriptPtr,
 	    TCL_EVAL_DIRECT | TCL_EVAL_GLOBAL);
     Tcl_DecrRefCount(scriptPtr);
     if (pvResult != NULL) {
+	Tcl_Obj *obj;
+	const char *src;
+
 	VariantInit(pvResult);
 	pvResult->vt = VT_BSTR;
-	pvResult->bstrVal = SysAllocString(Tcl_GetUnicode(
-		Tcl_GetObjResult(interp)));
+	obj = Tcl_GetObjResult(interp);
+	src = Tcl_GetString(obj);
+	Tcl_WinUtfToTChar(src, obj->length, &ds);
+	pvResult->bstrVal = SysAllocString((WCHAR *) Tcl_DStringValue(&ds));
+	Tcl_DStringFree(&ds);
     }
     if (result == TCL_ERROR) {
 	hr = DISP_E_EXCEPTION;
 	TkWinSend_SetExcepInfo(interp, pExcepInfo);
     }

Index: win/tkWinTest.c
==================================================================
--- win/tkWinTest.c
+++ win/tkWinTest.c
@@ -481,11 +481,11 @@
     if (hwnd == NULL) {
 	Tcl_SetObjResult(interp, Tcl_NewStringObj("failed to find window: ", -1));
 	AppendSystemError(interp, GetLastError());
 	r = TCL_ERROR;
     } else {
-        Tcl_SetObjResult(interp, Tcl_NewLongObj(PTR2INT(hwnd)));
+        Tcl_SetObjResult(interp, Tcl_NewWideIntObj(PTR2INT(hwnd)));
     }
 
     Tcl_DStringFree(&titleString);
     Tcl_DStringFree(&classString);
     return r;
@@ -497,11 +497,11 @@
     HWND hwnd,
     LPARAM lParam)
 {
     Tcl_Obj *listObj = (Tcl_Obj *) lParam;
 
-    Tcl_ListObjAppendElement(NULL, listObj, Tcl_NewLongObj(PTR2INT(hwnd)));
+    Tcl_ListObjAppendElement(NULL, listObj, Tcl_NewWideIntObj(PTR2INT(hwnd)));
     return TRUE;
 }
 
 static int
 TestgetwindowinfoObjCmd(
@@ -508,25 +508,26 @@
     ClientData clientData,
     Tcl_Interp *interp,
     int objc,
     Tcl_Obj *const objv[])
 {
-    long hwnd;
+    Tcl_WideInt hwnd;
     Tcl_Obj *dictObj = NULL, *classObj = NULL, *textObj = NULL;
     Tcl_Obj *childrenObj = NULL;
     TCHAR buf[512];
     int cch, cchBuf = 256;
+    Tcl_DString ds;
 
     if (objc != 2) {
 	Tcl_WrongNumArgs(interp, 1, objv, "hwnd");
 	return TCL_ERROR;
     }
 
-    if (Tcl_GetLongFromObj(interp, objv[1], &hwnd) != TCL_OK)
+    if (Tcl_GetWideIntFromObj(interp, objv[1], &hwnd) != TCL_OK)
 	return TCL_ERROR;
 
-    cch = GetClassName(INT2PTR(hwnd), buf, cchBuf);
+    cch = GetClassName((HWND)(size_t)hwnd, buf, cchBuf);
     if (cch == 0) {
     	Tcl_SetObjResult(interp, Tcl_NewStringObj("failed to get class name: ", -1));
     	AppendSystemError(interp, GetLastError());
     	return TCL_ERROR;
     } else {
@@ -537,21 +538,23 @@
     }
 
     dictObj = Tcl_NewDictObj();
     Tcl_DictObjPut(interp, dictObj, Tcl_NewStringObj("class", 5), classObj);
     Tcl_DictObjPut(interp, dictObj, Tcl_NewStringObj("id", 2),
-	Tcl_NewLongObj(GetWindowLongA(INT2PTR(hwnd), GWL_ID)));
+	Tcl_NewWideIntObj(GetWindowLongPtr((HWND)(size_t)hwnd, GWL_ID)));
 
-    cch = GetWindowText(INT2PTR(hwnd), (LPTSTR)buf, cchBuf);
-    textObj = Tcl_NewUnicodeObj((LPCWSTR)buf, cch);
+    cch = GetWindowText((HWND)(size_t)hwnd, (LPTSTR)buf, cchBuf);
+    Tcl_WinTCharToUtf(buf, cch * sizeof (WCHAR), &ds);
+    textObj = Tcl_NewStringObj(Tcl_DStringValue(&ds), Tcl_DStringLength(&ds));
+    Tcl_DStringFree(&ds);
 
     Tcl_DictObjPut(interp, dictObj, Tcl_NewStringObj("text", 4), textObj);
     Tcl_DictObjPut(interp, dictObj, Tcl_NewStringObj("parent", 6),
-	Tcl_NewLongObj(PTR2INT(GetParent((INT2PTR(hwnd))))));
+	Tcl_NewWideIntObj(PTR2INT(GetParent((HWND)(size_t)hwnd))));
 
     childrenObj = Tcl_NewListObj(0, NULL);
-    EnumChildWindows(INT2PTR(hwnd), EnumChildrenProc, (LPARAM)childrenObj);
+    EnumChildWindows((HWND)(size_t)hwnd, EnumChildrenProc, (LPARAM)childrenObj);
     Tcl_DictObjPut(interp, dictObj, Tcl_NewStringObj("children", -1), childrenObj);
 
     Tcl_SetObjResult(interp, dictObj);
     return TCL_OK;
 }

Index: win/tkWinWindow.c
==================================================================
--- win/tkWinWindow.c
+++ win/tkWinWindow.c
@@ -588,11 +588,11 @@
 }
 
 /*
  *----------------------------------------------------------------------
  *
- * XRaiseWindow --
+ * XRaiseWindow, XLowerWindow --
  *
  *	Change the stacking order of a window.
  *
  * Results:
  *	None.
@@ -612,10 +612,22 @@
 
     display->request++;
     SetWindowPos(window, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
     return Success;
 }
+
+int
+XLowerWindow(
+    Display *display,
+    Window w)
+{
+    HWND window = Tk_GetHWND(w);
+
+    display->request++;
+    SetWindowPos(window, HWND_BOTTOM, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
+    return Success;
+}
 
 /*
  *----------------------------------------------------------------------
  *
  * XConfigureWindow --
@@ -747,10 +759,37 @@
     if (valueMask & CWCursor) {
 	XDefineCursor(display, w, attributes->cursor);
     }
     return Success;
 }
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * XReparentWindow --
+ *
+ *	TODO: currently placeholder to satisfy Xlib stubs.
+ *
+ * Results:
+ *	None.
+ *
+ * Side effects:
+ *	TODO.
+ *
+ *----------------------------------------------------------------------
+ */
+
+int
+XReparentWindow(
+    Display *display,
+    Window w,
+    Window parent,
+    int x,
+    int y)
+{
+    return BadWindow;
+}
 
 /*
  *----------------------------------------------------------------------
  *
  * TkWinSetWindowPos --

Index: win/tkWinWm.c
==================================================================
--- win/tkWinWm.c
+++ win/tkWinWm.c
@@ -64,11 +64,11 @@
 				 * needs of the actual command. THIS MUST BE
 				 * THE LAST FIELD OF THE STRUCTURE. */
 } ProtocolHandler;
 
 #define HANDLER_SIZE(cmdLength) \
-    ((unsigned) ((Tk_Offset(ProtocolHandler, command) + 1) + cmdLength))
+    (Tk_Offset(ProtocolHandler, command) + 1 + cmdLength)
 
 /*
  * Helper type passed via lParam to TkWmStackorderToplevelEnumProc
  */
 
@@ -3726,11 +3726,11 @@
     }
     hwnd = wmPtr->wrapper;
     if (hwnd == NULL) {
 	hwnd = Tk_GetHWND(Tk_WindowId((Tk_Window) winPtr));
     }
-    Tcl_SetObjResult(interp, Tcl_ObjPrintf("0x%x", PTR2INT(hwnd)));
+    Tcl_SetObjResult(interp, Tcl_ObjPrintf("0x%" TCL_Z_MODIFIER "x", (size_t)PTR2INT(hwnd)));
     return TCL_OK;
 }
 
 /*
  *----------------------------------------------------------------------

Index: win/tkWinX.c
==================================================================
--- win/tkWinX.c
+++ win/tkWinX.c
@@ -11,20 +11,10 @@
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
 
 #include "tkWinInt.h"
 
-/*
- * The w32api 1.1 package (included in Mingw 1.1) does not define _WIN32_IE by
- * default. Define it here to gain access to the InitCommonControlsEx API in
- * commctrl.h.
- */
-
-#ifndef _WIN32_IE
-#define _WIN32_IE 0x0550 /* IE 5.5 */
-#endif
-
 #include <commctrl.h>
 #ifdef _MSC_VER
 #   pragma comment (lib, "comctl32.lib")
 #   pragma comment (lib, "advapi32.lib")
 #endif
@@ -59,11 +49,10 @@
 
 static const char winScreenName[] = ":0"; /* Default name of windows display. */
 static HINSTANCE tkInstance = NULL;	/* Application instance handle. */
 static int childClassInitialized;	/* Registered child class? */
 static WNDCLASS childClass;		/* Window class for child windows. */
-static int tkPlatformId = 0;		/* version of Windows platform */
 static int tkWinTheme = 0;		/* See TkWinGetPlatformTheme */
 static Tcl_Encoding keyInputEncoding = NULL;
 					/* The current character encoding for
 					 * keyboard input */
 static int keyInputCharset = -1;	/* The Win32 CHARSET for the keyboard
@@ -80,10 +69,12 @@
 typedef struct ThreadSpecificData {
     TkDisplay *winDisplay;	/* TkDisplay structure that represents Windows
 				 * screen. */
     int updatingClipboard;	/* If 1, we are updating the clipboard. */
     int surrogateBuffer;	/* Buffer for first of surrogate pair. */
+    DWORD wheelTickPrev;	/* For high resolution wheels. */
+    short wheelAcc;		/* For high resolution wheels. */
 } ThreadSpecificData;
 static Tcl_ThreadDataKey dataKey;
 
 /*
  * Forward declarations of functions used in this file.
@@ -90,11 +81,11 @@
  */
 
 static void		GenerateXEvent(HWND hwnd, UINT message,
 			    WPARAM wParam, LPARAM lParam);
 static unsigned int	GetState(UINT message, WPARAM wParam, LPARAM lParam);
-static void 		GetTranslatedKey(XKeyEvent *xkey);
+static void 		GetTranslatedKey(XKeyEvent *xkey, UINT type);
 static void		UpdateInputLanguage(int charset);
 static int		HandleIMEComposition(HWND hwnd, LPARAM lParam);
 
 /*
  *----------------------------------------------------------------------
@@ -123,20 +114,17 @@
 {
     static char buffer[32]; /* Empty string means not initialized yet. */
     OSVERSIONINFOW os;
 
     if (!buffer[0]) {
-	HANDLE handle = LoadLibraryW(L"NTDLL");
+	HANDLE handle = GetModuleHandle(TEXT("NTDLL"));
 	int(__stdcall *getversion)(void *) =
 		(int(__stdcall *)(void *))GetProcAddress(handle, "RtlGetVersion");
 	os.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW);
 	if (!getversion || getversion(&os)) {
 	    GetVersionExW(&os);
 	}
-	if (handle) {
-	    FreeLibrary(handle);
-	}
 	/* Write the first character last, preventing multi-thread issues. */
 	sprintf(buffer+1, "indows %d.%d %d %s", (int)os.dwMajorVersion,
 		(int)os.dwMinorVersion, (int)os.dwBuildNumber,
 #ifdef _WIN64
 		"Win64"
@@ -316,46 +304,38 @@
 }
 
 /*
  *----------------------------------------------------------------------
  *
- * TkWinGetPlatformId --
+ * TkWinGetPlatformTheme --
  *
- *	Determines whether running under NT, 95, or Win32s, to allow runtime
- *	conditional code. Win32s is no longer supported.
+ *	Return the Windows drawing style we should be using.
  *
  * Results:
  *	The return value is one of:
- *		VER_PLATFORM_WIN32s	   Win32s on Windows 3.1 (not supported)
- *		VER_PLATFORM_WIN32_WINDOWS Win32 on Windows 95, 98, ME (not supported)
- *		VER_PLATFORM_WIN32_NT	Win32 on Windows XP, Vista, Windows 7, Windows 8
- *		VER_PLATFORM_WIN32_CE	Win32 on Windows CE
- *
- * Side effects:
- *	None.
+ *	    TK_THEME_WIN_CLASSIC	95/98/NT or XP in classic mode
+ *	    TK_THEME_WIN_XP		XP not in classic mode
  *
  *----------------------------------------------------------------------
  */
 
 int
-TkWinGetPlatformId(void)
+TkWinGetPlatformTheme(void)
 {
-    if (tkPlatformId == 0) {
+    if (tkWinTheme == 0) {
 	OSVERSIONINFOW os;
 
 	os.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW);
 	GetVersionExW(&os);
-	tkPlatformId = os.dwPlatformId;
 
 	/*
 	 * Set tkWinTheme to be TK_THEME_WIN_XP or TK_THEME_WIN_CLASSIC. The
 	 * TK_THEME_WIN_CLASSIC could be set even when running under XP if the
 	 * windows classic theme was selected.
 	 */
 
-	if ((os.dwPlatformId == VER_PLATFORM_WIN32_NT) &&
-		(os.dwMajorVersion == 5 && os.dwMinorVersion == 1)) {
+	if ((os.dwMajorVersion == 5 && os.dwMinorVersion == 1)) {
 	    HKEY hKey;
 	    LPCTSTR szSubKey = TEXT("Control Panel\\Appearance");
 	    LPCTSTR szCurrent = TEXT("Current");
 	    DWORD dwSize = 200;
 	    char pBuffer[200];
@@ -375,37 +355,10 @@
 	    }
 	} else {
 	    tkWinTheme = TK_THEME_WIN_CLASSIC;
 	}
     }
-    return tkPlatformId;
-}
-
-/*
- *----------------------------------------------------------------------
- *
- * TkWinGetPlatformTheme --
- *
- *	Return the Windows drawing style we should be using.
- *
- * Results:
- *	The return value is one of:
- *	    TK_THEME_WIN_CLASSIC	95/98/NT or XP in classic mode
- *	    TK_THEME_WIN_XP		XP not in classic mode
- *
- * Side effects:
- *	Could invoke TkWinGetPlatformId.
- *
- *----------------------------------------------------------------------
- */
-
-int
-TkWinGetPlatformTheme(void)
-{
-    if (tkPlatformId == 0) {
-	TkWinGetPlatformId();
-    }
     return tkWinTheme;
 }
 
 /*
  *----------------------------------------------------------------------
@@ -609,10 +562,12 @@
 
     tsdPtr->winDisplay = ckalloc(sizeof(TkDisplay));
     ZeroMemory(tsdPtr->winDisplay, sizeof(TkDisplay));
     tsdPtr->winDisplay->display = display;
     tsdPtr->updatingClipboard = FALSE;
+    tsdPtr->wheelTickPrev = GetTickCount();
+    tsdPtr->wheelAcc = 0;
 
     return tsdPtr->winDisplay;
 }
 
 /*
@@ -653,11 +608,11 @@
     if (display->screens != NULL) {
 	if (display->screens->root_visual != NULL) {
 	    ckfree(display->screens->root_visual);
 	}
 	if (display->screens->root != None) {
-	    ckfree(display->screens->root);
+	    ckfree((char *)display->screens->root);
 	}
 	if (display->screens->cmap != None) {
 	    XFreeColormap(display, display->screens->cmap);
 	}
 	ckfree(display->screens);
@@ -687,23 +642,10 @@
 void
 TkClipCleanup(
     TkDisplay *dispPtr)		/* Display associated with clipboard. */
 {
     if (dispPtr->clipWindow != NULL) {
-	/*
-	 * Force the clipboard to be rendered if we are the clipboard owner.
-	 */
-
-	HWND hwnd = Tk_GetHWND(Tk_WindowId(dispPtr->clipWindow));
-
-	if (GetClipboardOwner() == hwnd) {
-	    OpenClipboard(hwnd);
-	    EmptyClipboard();
-	    TkWinClipboardRender(dispPtr, CF_TEXT);
-	    CloseClipboard();
-	}
-
 	Tk_DeleteSelHandler(dispPtr->clipWindow, dispPtr->clipboardAtom,
 		dispPtr->applicationAtom);
 	Tk_DeleteSelHandler(dispPtr->clipWindow, dispPtr->clipboardAtom,
 		dispPtr->windowAtom);
 
@@ -875,10 +817,27 @@
 	if (winPtr) {
 	    TkWinClipboardRender(winPtr->dispPtr, wParam);
 	}
 	return 1;
     }
+
+    case WM_RENDERALLFORMATS: {
+        TkWindow *winPtr = (TkWindow *) Tk_HWNDToWindow(hwnd);
+
+        if (winPtr && OpenClipboard(hwnd)) {
+            /*
+             * Make sure that nobody had taken ownership of the clipboard
+             * before we opened it.
+             */
+
+            if (GetClipboardOwner() == hwnd) {
+                TkWinClipboardRender(winPtr->dispPtr, CF_TEXT);
+            }
+            CloseClipboard();
+        }
+        return 1;
+    }
 
     case WM_COMMAND:
     case WM_NOTIFY:
     case WM_VSCROLL:
     case WM_HSCROLL: {
@@ -1128,11 +1087,27 @@
 	/*
 	 * Now set up event specific fields.
 	 */
 
 	switch (message) {
-	case WM_MOUSEWHEEL:
+	case WM_MOUSEWHEEL: {
+	    /*
+	     * Support for high resolution wheels.
+	     */
+
+	    DWORD wheelTick = GetTickCount();
+
+	    if (wheelTick - tsdPtr->wheelTickPrev < 1500) {
+		tsdPtr->wheelAcc += (short) HIWORD(wParam);
+	    } else {
+		tsdPtr->wheelAcc = (short) HIWORD(wParam);
+	    }
+	    tsdPtr->wheelTickPrev = wheelTick;
+	    if (abs(tsdPtr->wheelAcc) < WHEEL_DELTA) {
+		return;
+	    }
+
 	    /*
 	     * We have invented a new X event type to handle this event. It
 	     * still uses the KeyPress struct. However, the keycode field has
 	     * been overloaded to hold the zDelta of the wheel. Set nbytes to
 	     * 0 to prevent conversion of the keycode to a keysym in
@@ -1140,12 +1115,14 @@
 	     */
 
 	    event.type = MouseWheelEvent;
 	    event.xany.send_event = -1;
 	    event.xkey.nbytes = 0;
-	    event.xkey.keycode = (short) HIWORD(wParam);
+	    event.xkey.keycode = tsdPtr->wheelAcc / WHEEL_DELTA * WHEEL_DELTA;
+	    tsdPtr->wheelAcc = tsdPtr->wheelAcc % WHEEL_DELTA;
 	    break;
+	}
 	case WM_SYSKEYDOWN:
 	case WM_KEYDOWN:
 	    /*
 	     * Check for translated characters in the event queue. Setting
 	     * xany.send_event to -1 indicates to the Windows implementation
@@ -1155,11 +1132,12 @@
 	     */
 
 	    event.type = KeyPress;
 	    event.xany.send_event = -1;
 	    event.xkey.keycode = wParam;
-	    GetTranslatedKey(&event.xkey);
+	    GetTranslatedKey(&event.xkey, (message == WM_KEYDOWN) ? WM_CHAR :
+	            WM_SYSCHAR);
 	    break;
 
 	case WM_SYSKEYUP:
 	case WM_KEYUP:
 	    /*
@@ -1227,13 +1205,14 @@
 		event.xkey.trans_chars[0] = (char) wParam;
 
 		if (IsDBCSLeadByte((BYTE) wParam)) {
 		    MSG msg;
 
-		    if ((PeekMessage(&msg, NULL, 0, 0, PM_NOREMOVE) != 0)
+		    if ((PeekMessage(&msg, NULL, WM_CHAR, WM_CHAR,
+		            PM_NOREMOVE) != 0)
 			    && (msg.message == WM_CHAR)) {
-			GetMessage(&msg, NULL, 0, 0);
+			GetMessage(&msg, NULL, WM_CHAR, WM_CHAR);
 			event.xkey.nbytes = 2;
 			event.xkey.trans_chars[1] = (char) msg.wParam;
 		   }
 		}
 	    }
@@ -1275,11 +1254,11 @@
  *----------------------------------------------------------------------
  *
  * GetState --
  *
  *	This function constructs a state mask for the mouse buttons and
- *	modifier keys as they were before the event occured.
+ *	modifier keys as they were before the event occurred.
  *
  * Results:
  *	Returns a composite value of all the modifier and button state flags
  *	that were set at the time the event occurred.
  *
@@ -1368,23 +1347,24 @@
  *----------------------------------------------------------------------
  */
 
 static void
 GetTranslatedKey(
-    XKeyEvent *xkey)
+    XKeyEvent *xkey,
+    UINT type)
 {
     MSG msg;
 
     xkey->nbytes = 0;
 
     while ((xkey->nbytes < XMaxTransChars)
-	    && PeekMessageA(&msg, NULL, 0, 0, PM_NOREMOVE)) {
-	if ((msg.message != WM_CHAR) && (msg.message != WM_SYSCHAR)) {
+	    && (PeekMessageA(&msg, NULL, type, type, PM_NOREMOVE) != 0)) {
+	if (msg.message != type) {
 	    break;
 	}
 
-	GetMessageA(&msg, NULL, 0, 0);
+	GetMessageA(&msg, NULL, type, type);
 
 	/*
 	 * If this is a normal character message, we may need to strip off the
 	 * Alt modifier (e.g. Alt-digits). Note that we don't want to do this
 	 * for system messages, because those were presumably generated as an
@@ -1521,11 +1501,11 @@
 /*
  *----------------------------------------------------------------------
  *
  * HandleIMEComposition --
  *
- *	This function works around a definciency in some versions of Windows
+ *	This function works around a deficiency in some versions of Windows
  *	2000 to make it possible to entry multi-lingual characters under all
  *	versions of Windows 2000.
  *
  *	When an Input Method Editor (IME) is ready to send input characters to
  *	an application, it sends a WM_IME_COMPOSITION message with the
@@ -1551,10 +1531,11 @@
     HWND hwnd,			/* Window receiving the message. */
     LPARAM lParam)		/* Flags for the WM_IME_COMPOSITION message */
 {
     HIMC hIMC;
     int n;
+    int high = 0;
 
     if ((lParam & GCS_RESULTSTR) == 0) {
 	/*
 	 * Composition is not finished yet.
 	 */
@@ -1568,22 +1549,22 @@
     }
 
     n = ImmGetCompositionString(hIMC, GCS_RESULTSTR, NULL, 0);
 
     if (n > 0) {
-	char *buff = ckalloc(n);
+	WCHAR *buff = (WCHAR *) ckalloc(n);
 	TkWindow *winPtr;
 	XEvent event;
 	int i;
 
-	n = ImmGetCompositionString(hIMC, GCS_RESULTSTR, buff, (unsigned) n);
+	n = ImmGetCompositionString(hIMC, GCS_RESULTSTR, buff, (unsigned) n) / 2;
 
 	/*
 	 * Set up the fields pertinent to key event.
 	 *
-	 * We set send_event to the special value of -2, so that TkpGetString
-	 * in tkWinKey.c knows that trans_chars[] already contains a UNICODE
+	 * We set send_event to the special value of -3, so that TkpGetString
+	 * in tkWinKey.c knows that keycode already contains a UNICODE
 	 * char and there's no need to do encoding conversion.
 	 *
 	 * Note that the event *must* be zeroed out first; Tk plays cunning
 	 * games with the overalls structure. [Bug 2992129]
 	 */
@@ -1590,30 +1571,35 @@
 
 	winPtr = (TkWindow *) Tk_HWNDToWindow(hwnd);
 
 	memset(&event, 0, sizeof(XEvent));
 	event.xkey.serial = winPtr->display->request++;
-	event.xkey.send_event = -2;
+	event.xkey.send_event = -3;
 	event.xkey.display = winPtr->display;
 	event.xkey.window = winPtr->window;
 	event.xkey.root = RootWindow(winPtr->display, winPtr->screenNum);
 	event.xkey.subwindow = None;
 	event.xkey.state = TkWinGetModifierState();
 	event.xkey.time = TkpGetMS();
 	event.xkey.same_screen = True;
-	event.xkey.keycode = 0;
-	event.xkey.nbytes = 2;
 
 	for (i=0; i<n; ) {
 	    /*
 	     * Simulate a pair of KeyPress and KeyRelease events for each
 	     * UNICODE character in the composition.
 	     */
 
-	    event.xkey.trans_chars[0] = (char) buff[i++];
-	    event.xkey.trans_chars[1] = (char) buff[i++];
+	    event.xkey.keycode = buff[i++];
 
+	    if ((event.xkey.keycode & 0xfc00) == 0xd800) {
+		high = ((event.xkey.keycode & 0x3ff) << 10) + 0x10000;
+		break;
+	    } else if (high && (event.xkey.keycode & 0xfc00) == 0xdc00) {
+		event.xkey.keycode &= 0x3ff;
+		event.xkey.keycode += high;
+		high = 0;
+	    }
 	    event.type = KeyPress;
 	    Tk_QueueWindowEvent(&event, TCL_QUEUE_TAIL);
 
 	    event.type = KeyRelease;
 	    Tk_QueueWindowEvent(&event, TCL_QUEUE_TAIL);
@@ -1622,34 +1608,10 @@
 	ckfree(buff);
     }
     ImmReleaseContext(hwnd, hIMC);
     return 1;
 }
-
-/*
- *----------------------------------------------------------------------
- *
- * Tk_FreeXId --
- *
- *	This interface is not needed under Windows.
- *
- * Results:
- *	None.
- *
- * Side effects:
- *	None.
- *
- *----------------------------------------------------------------------
- */
-
-void
-Tk_FreeXId(
-    Display *display,
-    XID xid)
-{
-    /* Do nothing */
-}
 
 /*
  *----------------------------------------------------------------------
  *
  * TkWinResendEvent --

Index: win/ttkWinMonitor.c
==================================================================
--- win/ttkWinMonitor.c
+++ win/ttkWinMonitor.c
@@ -120,16 +120,19 @@
 	RegisterSystemColors(interp);
 	break;
 
     case WM_THEMECHANGED:
 	/*
-	 * Reset the application theme to 'xpnative' if present,
-	 * which will in turn fall back to 'winnative' if XP theming
-	 * is disabled.
+         * Reset the application theme.
+         * On windows, it is possible to sign in as a second user, change
+         * the theme to 'winnative' (by setting the ui to 'best performance'),
+         * which is a machine-wide change, and then sign back on to the original user.
+         * Ttk_UseTheme needs to be executed again in order to process the fallback
+         * from vista/xpnative to winnative.
 	 */
 
-	theme = Ttk_GetTheme(interp, "xpnative");
+	theme = Ttk_GetCurrentTheme(interp);
 	if (theme) {
 	    Ttk_UseTheme(interp, theme);
 	    /* @@@ What to do about errors here? */
 	}
 	break;

Index: win/ttkWinXPTheme.c
==================================================================
--- win/ttkWinXPTheme.c
+++ win/ttkWinXPTheme.c
@@ -13,28 +13,24 @@
  *
  * <URL: http://msdn.microsoft.com/library/en-us/
  *  	shellcc/platform/commctls/userex/refentry.asp >
  */
 
+#include <tkWinInt.h>
 #ifndef HAVE_UXTHEME_H
 /* Stub for platforms that lack the XP theme API headers: */
-#include <tkWinInt.h>
 int TtkXPTheme_Init(Tcl_Interp *interp, HWND hwnd) { return TCL_OK; }
 #else
 
-#define WINVER 0x0501	/* Requires Windows XP APIs */
-
 #include <windows.h>
 #include <uxtheme.h>
 #if defined(HAVE_VSSYM32_H) || _MSC_VER > 1500
 #   include <vssym32.h>
 #else
 #   include <tmschema.h>
 #endif
 
-#include <tkWinInt.h>
-
 #include "ttk/ttkTheme.h"
 
 typedef HTHEME  (STDAPICALLTYPE OpenThemeDataProc)(HWND hwnd,
 		 LPCWSTR pszClassList);
 typedef HRESULT (STDAPICALLTYPE CloseThemeDataProc)(HTHEME hTheme);
@@ -206,10 +202,12 @@
 /*
  * Radiobuttons:
  */
 static Ttk_StateTable radiobutton_statemap[] =
 {
+{RBS_UNCHECKEDDISABLED,	TTK_STATE_ALTERNATE|TTK_STATE_DISABLED, 0},
+{RBS_UNCHECKEDNORMAL,	TTK_STATE_ALTERNATE, 0},
 {RBS_CHECKEDDISABLED,	TTK_STATE_SELECTED|TTK_STATE_DISABLED, 0},
 {RBS_CHECKEDPRESSED,	TTK_STATE_SELECTED|TTK_STATE_PRESSED, 0},
 {RBS_CHECKEDHOT,	TTK_STATE_SELECTED|TTK_STATE_ACTIVE, 0},
 {RBS_CHECKEDNORMAL,	TTK_STATE_SELECTED, 0},
 {RBS_UNCHECKEDDISABLED,	TTK_STATE_DISABLED, 0},
@@ -428,12 +426,12 @@
 static void DestroyElementData(void *clientData)
 {
     ElementData *elementData = clientData;
     if (elementData->info->flags & HEAP_ELEMENT) {
 	ckfree(elementData->info->statemap);
-	ckfree(elementData->info->className);
-	ckfree(elementData->info->elementName);
+	ckfree((char *)elementData->info->className);
+	ckfree((char *)elementData->info->elementName);
 	ckfree(elementData->info);
     }
     ckfree(clientData);
 }
 
@@ -1108,11 +1106,11 @@
     int length = 0;
     char *name;
     LPWSTR wname;
     Ttk_ElementSpec *elementSpec = &GenericElementSpec;
 
-    static const char *optionStrings[] =
+    static const char *const optionStrings[] =
 	{ "-padding","-width","-height","-margins", "-syssize",
 	  "-halfheight", "-halfwidth", NULL };
     enum { O_PADDING, O_WIDTH, O_HEIGHT, O_MARGINS, O_SYSSIZE,
 	   O_HALFHEIGHT, O_HALFWIDTH };
 

Index: win/winMain.c
==================================================================
--- win/winMain.c
+++ win/winMain.c
@@ -143,10 +143,13 @@
 	}
     }
 
 #ifdef TK_LOCAL_MAIN_HOOK
     TK_LOCAL_MAIN_HOOK(&argc, &argv);
+#elif defined(UNICODE) && ((TCL_MAJOR_VERSION > 8) || (TCL_MINOR_VERSION > 6))
+    /* This doesn't work on Windows without UNICODE, neither does it work with Tcl 8.6 */
+    TclZipfs_AppHook(&argc, &argv);
 #endif
 
     Tk_Main(argc, argv, TK_LOCAL_APPINIT);
     return 0;			/* Needed only to prevent compiler warning. */
 }

Index: xlib/X11/Xlib.h
==================================================================
--- xlib/X11/Xlib.h
+++ xlib/X11/Xlib.h
@@ -43,17 +43,10 @@
 #ifdef X_NOT_STDC_ENV
 #define X_WCHAR
 #endif
 #endif
 
-#ifndef X_WCHAR
-#include <stddef.h>
-#else
-/* replace this with #include or typedef appropriate for your system */
-typedef unsigned long wchar_t;
-#endif
-
 typedef char *XPointer;
 
 #define Bool int
 #if defined(MAC_OSX_TK)
 /* Use define rather than typedef, since may need to undefine this later */
@@ -201,10 +194,13 @@
 	int c_class;		/* C++ class of screen (monochrome, etc.) */
 #else
 	int class;		/* class of screen (monochrome, etc.) */
 #endif
 	unsigned long red_mask, green_mask, blue_mask;	/* mask values */
+#if defined(MAC_OSX_TK)
+        unsigned long alpha_mask;
+#endif
 	int bits_per_rgb;	/* log base 2 of distinct color values */
 	int map_entries;	/* color map entries */
 } Visual;
 
 /*
@@ -330,10 +326,11 @@
     unsigned long green_mask;
     unsigned long blue_mask;
     XPointer obdata;		/* hook for the object routines to hang on */
 #if defined(MAC_OSX_TK)
     int pixelpower;		/* n such that pixels are 2^n x 2^n blocks*/
+    unsigned long alpha_mask;
 #endif
     struct funcs {		/* image manipulation routines */
 	struct _XImage *(*create_image)();
 #if NeedFunctionPrototypes
 	int (*destroy_image)        (struct _XImage *);
@@ -539,11 +536,11 @@
 	int type;		/* of event */
 	unsigned long serial;	/* # of last request processed by server */
 	Bool send_event;	/* true if this came from a SendEvent request */
 	Display *display;	/* Display the event was read from */
 	Window window;	        /* "event" window it is reported relative to */
-	Window root;	        /* root window that the event occured on */
+	Window root;	        /* root window that the event occurred on */
 	Window subwindow;	/* child window */
 	Time time;		/* milliseconds */
 	int x, y;		/* pointer x, y coordinates in event window */
 	int x_root, y_root;	/* coordinates relative to root */
 	unsigned int state;	/* key or button mask */
@@ -560,11 +557,11 @@
 	int type;		/* of event */
 	unsigned long serial;	/* # of last request processed by server */
 	Bool send_event;	/* true if this came from a SendEvent request */
 	Display *display;	/* Display the event was read from */
 	Window window;	        /* "event" window it is reported relative to */
-	Window root;	        /* root window that the event occured on */
+	Window root;	        /* root window that the event occurred on */
 	Window subwindow;	/* child window */
 	Time time;		/* milliseconds */
 	int x, y;		/* pointer x, y coordinates in event window */
 	int x_root, y_root;	/* coordinates relative to root */
 	unsigned int state;	/* key or button mask */
@@ -578,11 +575,11 @@
 	int type;		/* of event */
 	unsigned long serial;	/* # of last request processed by server */
 	Bool send_event;	/* true if this came from a SendEvent request */
 	Display *display;	/* Display the event was read from */
 	Window window;	        /* "event" window reported relative to */
-	Window root;	        /* root window that the event occured on */
+	Window root;	        /* root window that the event occurred on */
 	Window subwindow;	/* child window */
 	Time time;		/* milliseconds */
 	int x, y;		/* pointer x, y coordinates in event window */
 	int x_root, y_root;	/* coordinates relative to root */
 	unsigned int state;	/* key or button mask */
@@ -595,11 +592,11 @@
 	int type;		/* of event */
 	unsigned long serial;	/* # of last request processed by server */
 	Bool send_event;	/* true if this came from a SendEvent request */
 	Display *display;	/* Display the event was read from */
 	Window window;	        /* "event" window reported relative to */
-	Window root;	        /* root window that the event occured on */
+	Window root;	        /* root window that the event occurred on */
 	Window subwindow;	/* child window */
 	Time time;		/* milliseconds */
 	int x, y;		/* pointer x, y coordinates in event window */
 	int x_root, y_root;	/* coordinates relative to root */
 	int mode;		/* NotifyNormal, NotifyGrab, NotifyUngrab */
@@ -1047,17 +1044,10 @@
     int             nchars;
     int             delta;
     XFontSet        font_set;
 } XmbTextItem;
 
-typedef struct {
-    wchar_t        *chars;
-    int             nchars;
-    int             delta;
-    XFontSet        font_set;
-} XwcTextItem;
-
 typedef void (*XIMProc)();
 
 typedef struct _XIM *XIM;
 typedef struct _XIC *XIC;
 
@@ -1137,11 +1127,10 @@
     unsigned short length;
     XIMFeedback *feedback;
     Bool encoding_is_wchar;
     union {
 	char *multi_byte;
-	wchar_t *wide_char;
     } string;
 } XIMText;
 
 typedef struct _XIMPreeditDrawCallbackStruct {
     int caret;		/* Cursor offset within pre-edit string */

Index: xlib/X11/Xutil.h
==================================================================
--- xlib/X11/Xutil.h
+++ xlib/X11/Xutil.h
@@ -533,34 +533,18 @@
     int			/* class */,
     XVisualInfo*	/* vinfo_return */
 #endif
 );
 
-extern void XOffsetRegion(
+extern int XOffsetRegion(
 #if NeedFunctionPrototypes
     Region		/* r */,
     int			/* dx */,
     int			/* dy */
 #endif
 );
 
-extern Bool XPointInRegion(
-#if NeedFunctionPrototypes
-    Region		/* r */,
-    int			/* x */,
-    int			/* y */
-#endif
-);
-
-extern Region XPolygonRegion(
-#if NeedFunctionPrototypes
-    XPoint*		/* points */,
-    int			/* n */,
-    int			/* fill_rule */
-#endif
-);
-
 extern int XRectInRegion(
 #if NeedFunctionPrototypes
     Region		/* r */,
     int			/* x */,
     int			/* y */,
@@ -762,26 +746,10 @@
     XICCEncodingStyle	/* style */,
     XTextProperty*	/* text_prop_return */
 #endif
 );
 
-extern int XwcTextListToTextProperty(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    wchar_t**		/* list */,
-    int			/* count */,
-    XICCEncodingStyle	/* style */,
-    XTextProperty*	/* text_prop_return */
-#endif
-);
-
-extern void XwcFreeStringList(
-#if NeedFunctionPrototypes
-    wchar_t**		/* list */
-#endif
-);
-
 extern Status XTextPropertyToStringList(
 #if NeedFunctionPrototypes
     XTextProperty*	/* text_prop */,
     char***		/* list_return */,
     int*		/* count_return */
@@ -795,28 +763,19 @@
     char***		/* list_return */,
     int*		/* count_return */
 #endif
 );
 
-extern int XwcTextPropertyToTextList(
-#if NeedFunctionPrototypes
-    Display*		/* display */,
-    XTextProperty*	/* text_prop */,
-    wchar_t***		/* list_return */,
-    int*		/* count_return */
-#endif
-);
-
 extern void XUnionRectWithRegion(
 #if NeedFunctionPrototypes
     XRectangle*		/* rectangle */,
     Region		/* src_region */,
     Region		/* dest_region_return */
 #endif
 );
 
-extern void XUnionRegion(
+extern int XUnionRegion(
 #if NeedFunctionPrototypes
     Region		/* sra */,
     Region		/* srb */,
     Region		/* dr_return */
 #endif

Index: xlib/X11/keysymdef.h
==================================================================
--- xlib/X11/keysymdef.h
+++ xlib/X11/keysymdef.h
@@ -1165,5 +1165,17 @@
 #define XK_hebrew_taw                                  0xcfa
 #define XK_hebrew_taf                                  0xcfa  /* deprecated */
 #define XK_Hebrew_switch        0xFF7E  /* Alias for mode_switch */
 #endif /* XK_HEBREW */
 
+/* Multimedia keys, defined same as on Linux
+ * /usr/include/pkg/libxkbcommon/xkbcommon/xkbcommon-keysyms.h
+ */
+
+#define XK_XF86AudioLowerVolume	0x1008FF11   /* Volume control down        */
+#define XK_XF86AudioMute	0x1008FF12   /* Mute sound from the system */
+#define XK_XF86AudioRaiseVolume	0x1008FF13   /* Volume control up          */
+#define XK_XF86AudioPlay	0x1008FF14   /* Start playing of audio >   */
+#define XK_XF86AudioStop	0x1008FF15   /* Stop playing audio         */
+#define XK_XF86AudioPrev	0x1008FF16   /* Previous track             */
+#define XK_XF86AudioNext	0x1008FF17   /* Next track                 */
+

Index: xlib/xcolors.c
==================================================================
--- xlib/xcolors.c
+++ xlib/xcolors.c
@@ -342,10 +342,20 @@
     XColor *colorPtr)
 {
     if (spec[0] == '#') {
 	char *p;
 	Tcl_WideInt value = parseHex64bit(++spec, &p);
+
+	/*
+	 * If *p does not point to the end of the string, there were invalid
+	 * digits in the spec. Ergo, it is not a valid color string.
+	 * (Bug f0188aca9e)
+	 */
+
+	if (*p != '\0') {
+	    return 0;
+	}
 
 	switch ((int)(p-spec)) {
 	case 3:
 	    colorPtr->red = US(((value >> 8) & 0xf) * 0x1111);
 	    colorPtr->green = US(((value >> 4) & 0xf) * 0x1111);

Index: xlib/xgc.c
==================================================================
--- xlib/xgc.c
+++ xlib/xgc.c
@@ -82,11 +82,11 @@
 #ifdef MAC_OSX_TK
 	if (((TkpClipMask*) gc->clip_mask)->type == TKP_CLIP_REGION) {
 	    TkpReleaseRegion(((TkpClipMask*) gc->clip_mask)->value.region);
 	}
 #endif
-	ckfree(gc->clip_mask);
+	ckfree((char *) gc->clip_mask);
 	gc->clip_mask = None;
     }
 }
 
 /*
@@ -518,47 +518,51 @@
     int length)
 {
 }
 #endif
 
-void
+int
 XDrawPoint(
     Display *display,
     Drawable d,
     GC gc,
     int x,
     int y)
 {
-    XDrawLine(display, d, gc, x, y, x, y);
+    return XDrawLine(display, d, gc, x, y, x, y);
 }
 
-void
+int
 XDrawPoints(
     Display *display,
     Drawable d,
     GC gc,
     XPoint *points,
     int npoints,
     int mode)
 {
-    int i;
+    int res = Success;
 
-    for (i=0; i<npoints; i++) {
-	XDrawLine(display, d, gc,
-		points[i].x, points[i].y, points[i].x, points[i].y);
+    while (npoints-- > 0) {
+	res = XDrawLine(display, d, gc,
+		points[0].x, points[0].y, points[0].x, points[0].y);
+	if (res != Success) break;
+	++points;
     }
+    return res;
 }
 
 #if !defined(MAC_OSX_TK)
-void
+int
 XDrawSegments(
     Display *display,
     Drawable d,
     GC gc,
     XSegment *segments,
     int nsegments)
 {
+    return BadDrawable;
 }
 #endif
 
 #if 0
 char *

Index: xlib/xutil.c
==================================================================
--- xlib/xutil.c
+++ xlib/xutil.c
@@ -7,13 +7,12 @@
  *
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
 
-#include <stdlib.h>
-#include <tk.h>
-
+#include "tkInt.h"
+#include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/Xatom.h>
 
 /*
  *----------------------------------------------------------------------