From e07b10f1a79f05875a092a57edd405f0e23f7345 Mon Sep 17 00:00:00 2001
From: Kevin Walzer <kw@codebykevin.com>
Date: Sat, 9 Jan 2016 03:03:29 +0000
Subject: Additional fixes for memory leaks, window flickering on OS X 10.11;
 thanks to Marc Culler for patch

---
 macosx/tkMacOSXInit.c        |  9 ++++++---
 macosx/tkMacOSXWindowEvent.c | 10 ++++++----
 macosx/tkMacOSXWm.c          |  2 ++
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c
index cb97f47..26eb3f5 100644
--- a/macosx/tkMacOSXInit.c
+++ b/macosx/tkMacOSXInit.c
@@ -72,11 +72,13 @@ static void keyboardChanged(CFNotificationCenterRef center, void *observer, CFSt
 	_mainPool = [NSAutoreleasePool new];
     }
 }
+
 #ifdef TK_MAC_DEBUG_NOTIFICATIONS
 - (void)_postedNotification:(NSNotification *)notification {
     TKLog(@"-[%@(%p) %s] %@", [self class], self, _cmd, notification);
 }
 #endif
+
 - (void)_setupApplicationNotifications {
     NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
 #define observe(n, s) [nc addObserver:self selector:@selector(s) name:(n) object:nil]
@@ -91,18 +93,19 @@ static void keyboardChanged(CFNotificationCenterRef center, void *observer, CFSt
     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 = nil;
+    _mainPool = [NSAutoreleasePool new];
     [NSApp setPoolProtected:NO];
     _defaultMainMenu = nil;
-    NSAutoreleasePool *pool = [NSAutoreleasePool new];
     [self _setupMenus];
     [self setDelegate:self];
 #ifdef TK_MAC_DEBUG_NOTIFICATIONS
@@ -111,8 +114,8 @@ static void keyboardChanged(CFNotificationCenterRef center, void *observer, CFSt
 #endif
     [self _setupWindowNotifications];
     [self _setupApplicationNotifications];
-    [pool drain];
 }
+
 - (NSString *)tkFrameworkImagePath:(NSString*)image {
     NSString *path = nil;
     NSAutoreleasePool *pool = [NSAutoreleasePool new];
diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c
index 91cc348..fce3801 100644
--- a/macosx/tkMacOSXWindowEvent.c
+++ b/macosx/tkMacOSXWindowEvent.c
@@ -165,6 +165,10 @@ extern BOOL opaqueTag;
 
     if (winPtr) {
 	TkGenWMDestroyEvent((Tk_Window) winPtr);
+	if (_windowWithMouse == w) {
+	    _windowWithMouse = nil;
+	    [w release];
+	}
     }
 
     /*
@@ -862,12 +866,9 @@ ConfigureRestrictProc(
 	
 	/*
 	 * Try to prevent flickers and flashes.
-	 *
-	 * This stops the flickers, but on OSX 10.11 flashes still occur when
-	 * the width of the window is 16, 32, 48, 64, 80, 96, 112, 256, 512,
-	 * 768, ...
 	 */
 	[w disableFlushWindow];
+	NSDisableScreenUpdates();
 	
 	/* Disable Tk drawing until the window has been completely configured.*/
 	TkMacOSXSetDrawingEnabled(winPtr, 0);
@@ -891,6 +892,7 @@ ConfigureRestrictProc(
 	while (Tk_DoOneEvent(TK_ALL_EVENTS|TK_DONT_WAIT)) {}
 	[w enableFlushWindow];
 	[w flushWindowIfNeeded];
+	NSEnableScreenUpdates();
 	[NSApp setPoolProtected:NO];
     }
 }
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index 50cac20..5df72f0 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -907,6 +907,8 @@ TkWmDeadWindow(
 		[front makeKeyAndOrderFront:NSApp];
 	    }
 	}
+	[NSApp _resetAutoreleasePool];
+
 #if DEBUG_ZOMBIES > 0
 	fprintf(stderr, "================= Pool dump ===================\n");
 	[NSAutoreleasePool showPools];
-- 
cgit v0.12


From 1495c801841af36629d7d985074d43ddc31f62fe Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sat, 9 Jan 2016 22:30:01 +0000
Subject: (cherry-pick) Fix [1927212]: MouseWheel unbound for non-aqua
 scrollbars. Thanks to Francois Vogel for the actual work

---
 library/scrlbar.tcl  |  7 +++++++
 tests/scrollbar.test | 30 ++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+)

diff --git a/library/scrlbar.tcl b/library/scrlbar.tcl
index 4b25325..43ce4ae 100644
--- a/library/scrlbar.tcl
+++ b/library/scrlbar.tcl
@@ -141,6 +141,13 @@ if {[tk windowingsystem] eq "aqua"} {
     bind Scrollbar <Shift-Option-MouseWheel> {
         tk::ScrollByUnits %W h [expr {-10 * (%D)}]
     }
+} else {
+    bind Scrollbar <MouseWheel> {
+	tk::ScrollByUnits %W v [expr {- (%D /120 ) * 4}]
+    }
+    bind Scrollbar <Shift-MouseWheel> {
+	tk::ScrollByUnits %W h [expr {- (%D /120 ) * 4}]
+    }
 }
 # tk::ScrollButtonDown --
 # This procedure is invoked when a button is pressed in a scrollbar.
diff --git a/tests/scrollbar.test b/tests/scrollbar.test
index 5d4334f..35f48bd 100644
--- a/tests/scrollbar.test
+++ b/tests/scrollbar.test
@@ -632,6 +632,36 @@ test scrollbar-9.1 {scrollbar widget vs hidden commands} {
     list [winfo children .] [interp hidden]
 } [list {} $l]
 
+test scrollbar-10.1 {<MouseWheel> event on scrollbar} -constraints {win|unix} -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 -120
+    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 {
+    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 -120
+    after 200 {set eventprocessed 1} ; vwait eventprocessed
+    .t index @0,0
+} -cleanup {
+    destroy .t .s
+} -result {1.4}
+
 catch {destroy .s}
 catch {destroy .t}
 
-- 
cgit v0.12


From 651d6089bd63522c1a689dabead4ed1c6c4a5f17 Mon Sep 17 00:00:00 2001
From: Kevin Walzer <kw@codebykevin.com>
Date: Mon, 11 Jan 2016 00:28:14 +0000
Subject: Fix for 63c3542c06, messageboxes in Tk-Cocoa; thanks to Marc Culler
 for patch

---
 macosx/tkMacOSXDialog.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/macosx/tkMacOSXDialog.c b/macosx/tkMacOSXDialog.c
index eebff3c..4ceb010 100644
--- a/macosx/tkMacOSXDialog.c
+++ b/macosx/tkMacOSXDialog.c
@@ -1013,7 +1013,8 @@ Tk_MessageBoxObjCmd(
     NSArray *buttons;
     NSAlert *alert = [NSAlert new];
     NSInteger modalReturnCode = 1;
-
+    BOOL parentIsKey = NO;
+    
     iconIndex = ICON_INFO;
     typeIndex = TYPE_OK;
     for (i = 1; i < objc; i += 2) {
@@ -1139,6 +1140,7 @@ Tk_MessageBoxObjCmd(
     callbackInfo->typeIndex = typeIndex;
     parent = TkMacOSXDrawableWindow(((TkWindow *) tkwin)->window);
     if (haveParentOption && parent && ![parent attachedSheet]) {
+	parentIsKey = [parent isKeyWindow];
 #if MAC_OS_X_VERSION_MIN_REQUIRED > 1090
  	[alert beginSheetModalForWindow:parent
 	       completionHandler:^(NSModalResponse returnCode)
@@ -1161,6 +1163,9 @@ Tk_MessageBoxObjCmd(
     result = (modalReturnCode >= NSAlertFirstButtonReturn) ? TCL_OK : TCL_ERROR;
  end:
     [alert release];
+    if (parentIsKey) {
+	[parent makeKeyWindow];
+    }
     return result;
 }
 
-- 
cgit v0.12


From 44cda04c842ee384d0e830bbb247787ee0819fee Mon Sep 17 00:00:00 2001
From: Kevin Walzer <kw@codebykevin.com>
Date: Mon, 11 Jan 2016 00:45:56 +0000
Subject: Additional tweaks for dialog

---
 macosx/tkMacOSXDialog.c | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/macosx/tkMacOSXDialog.c b/macosx/tkMacOSXDialog.c
index 4ceb010..6af6b33 100644
--- a/macosx/tkMacOSXDialog.c
+++ b/macosx/tkMacOSXDialog.c
@@ -398,6 +398,7 @@ Tk_GetOpenFileObjCmd(
 
     TkInitFileFilters(&fl);
     for (i = 1; i < objc; i += 2) {
+    BOOL parentIsKey = NO;
 	if (Tcl_GetIndexFromObjStruct(interp, objv[i], openOptionStrings,
 		sizeof(char *), "option", TCL_EXACT, &index) != TCL_OK) {
 	    goto end;
@@ -513,6 +514,7 @@ Tk_GetOpenFileObjCmd(
 #if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
 	[panel beginSheetForDirectory:directory
 	       file:filename
+	    parentIsKey = [parent isKeyWindow];
 	       types:fileTypes
 	       modalForWindow:parent
 	       modalDelegate:NSApp
@@ -544,6 +546,9 @@ Tk_GetOpenFileObjCmd(
     if (typeVariablePtr && result == TCL_OK) {
 	/*
 	 * The -typevariable option is not really supported.
+    if (parentIsKey) {
+	[parent makeKeyWindow];
+    }
 	 */
 
 	Tcl_SetVar2(interp, Tcl_GetString(typeVariablePtr), NULL,
@@ -596,6 +601,7 @@ Tk_GetSaveFileObjCmd(
 
     TkInitFileFilters(&fl);
     for (i = 1; i < objc; i += 2) {
+    BOOL parentIsKey = NO;
 	if (Tcl_GetIndexFromObjStruct(interp, objv[i], saveOptionStrings,
 		sizeof(char *), "option", TCL_EXACT, &index) != TCL_OK) {
 	    goto end;
@@ -712,6 +718,7 @@ Tk_GetSaveFileObjCmd(
 #if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
 	[panel beginSheetForDirectory:directory
 	       file:filename
+       parentIsKey = [parent isKeyWindow];
 	       modalForWindow:parent
 	       modalDelegate:NSApp
 	       didEndSelector:
@@ -737,7 +744,9 @@ Tk_GetSaveFileObjCmd(
 		contextInfo:callbackInfo];
     }
     result = (modalReturnCode != modalError) ? TCL_OK : TCL_ERROR;
-
+    if (parentIsKey) {
+	[parent makeKeyWindow];
+    }
   end:
     TkFreeFileFilters(&fl);
     return result;
@@ -780,6 +789,7 @@ Tk_ChooseDirectoryObjCmd(
     NSWindow *parent;
     NSOpenPanel *panel = [NSOpenPanel openPanel];
     NSInteger modalReturnCode = modalError;
+    BOOL parentIsKey = NO;
 
     for (i = 1; i < objc; i += 2) {
 	if (Tcl_GetIndexFromObjStruct(interp, objv[i], chooseOptionStrings,
@@ -847,6 +857,7 @@ Tk_ChooseDirectoryObjCmd(
     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
@@ -874,7 +885,9 @@ Tk_ChooseDirectoryObjCmd(
 		contextInfo:callbackInfo];
     }
     result = (modalReturnCode != modalError) ? TCL_OK : TCL_ERROR;
-
+    if (parentIsKey) {
+	[parent makeKeyWindow];
+    }
   end:
     return result;
 }
-- 
cgit v0.12


From bbcec99c56690c05359f41e55c6dd7f3461c9aee Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 12 Jan 2016 09:55:10 +0000
Subject: (cherry-pick) Fix [2049429]: Some options aren't picked up from the
 options database.

---
 doc/SetOptions.3        | 50 +++++++++++++++++++++++++++++--------------------
 generic/tkEntry.c       | 25 ++++++++++++-------------
 generic/tkListbox.c     | 11 +++++------
 generic/tkText.c        |  8 ++++----
 generic/tkTextTag.c     |  8 ++++----
 generic/ttk/ttkButton.c |  4 ++--
 macosx/README           |  2 +-
 macosx/tkMacOSXDialog.c |  2 +-
 8 files changed, 59 insertions(+), 51 deletions(-)

diff --git a/doc/SetOptions.3 b/doc/SetOptions.3
index 028467a..f12a00f 100644
--- a/doc/SetOptions.3
+++ b/doc/SetOptions.3
@@ -129,19 +129,21 @@ option table is no longer needed \fBTk_DeleteOptionTable\fR should be
 called to free all of its resources.  All of the option tables
 for a Tcl interpreter are freed automatically if the interpreter is deleted.
 .PP
-\fBTk_InitOptions\fR is invoked when a new widget is created to set
-the default values for all of the widget's configuration options.
-\fBTk_InitOptions\fR is passed a token for an option table (\fIoptionTable\fR)
-and a pointer to a widget record (\fIrecordPtr\fR), which is the C
-structure that holds information about this widget. \fBTk_InitOptions\fR
-uses the information in the option table to
-choose an appropriate default for each option, then it stores the default
-value directly into the widget record, overwriting any information that
-was already present in the widget record.  \fBTk_InitOptions\fR normally
-returns \fBTCL_OK\fR.  If an error occurred while setting the default values
-(e.g., because a default value was erroneous) then \fBTCL_ERROR\fR is returned
-and an error message is left in \fIinterp\fR's result if \fIinterp\fR
-is not NULL.
+\fBTk_InitOptions\fR is invoked when a new widget is created to set the
+default values for all of the widget's configuration options that do not
+have \fBTK_OPTION_DONT_SET_DEFAULT\fR set in their \fIflags\fR field.
+\fBTk_InitOptions\fR is passed a token for an option table
+(\fIoptionTable\fR) and a pointer to a widget record (\fIrecordPtr\fR),
+which is the C structure that holds information about this widget.
+\fBTk_InitOptions\fR uses the information in the option table to choose an
+appropriate default for each option, except those having
+\fBTK_OPTION_DONT_SET_DEFAULT\fR set, then it stores the default value
+directly into the widget record, overwriting any information that was
+already present in the widget record.  \fBTk_InitOptions\fR normally
+returns \fBTCL_OK\fR.  If an error occurred while setting the default
+values (e.g., because a default value was erroneous) then \fBTCL_ERROR\fR
+is returned and an error message is left in \fIinterp\fR's result if
+\fIinterp\fR is not NULL.
 .PP
 \fBTk_SetOptions\fR is invoked to modify configuration options based
 on information specified in a Tcl command.  The command might be one that
@@ -306,19 +308,27 @@ given by \fIinternalOffset\fR.  For example, if the option's type is
 value is not stored in that form.  At least one of the offsets must be
 greater than or equal to zero.
 .PP
-The \fIflags\fR field consists of one or more bits ORed together.  At
-present only a single flag is supported: \fBTK_OPTION_NULL_OK\fR.  If
-this bit is set for an option then an empty string will be accepted as
-the value for the option and the resulting internal form will be a
-NULL pointer, a zero value, or \fBNone\fR, depending on the type of
-the option.  If the flag is not set then empty strings will result
-in errors.
+The \fIflags\fR field consists of one or more bits ORed together. The
+following flags are supported:
+.TP
+\fBTK_OPTION_NULL_OK\fR
+If this bit is set for an option then an empty string will be accepted as
+the value for the option and the resulting internal form will be a NULL
+pointer, a zero value, or \fBNone\fR, depending on the type of the option.
+If the flag is not set then empty strings will result in errors.
 \fBTK_OPTION_NULL_OK\fR is typically used to allow a
 feature to be turned off entirely, e.g. set a cursor value to
 \fBNone\fR so that a window simply inherits its parent's cursor.
 Not all option types support the \fBTK_OPTION_NULL_OK\fR
 flag; for those that do, there is an explicit indication of that fact
 in the descriptions below.
+.TP
+\fBTK_OPTION_DONT_SET_DEFAULT\fR
+If this bit is set for an option then no default value will be set in
+\fBTk_InitOptions\fR for this option. Neither the option database, nor any
+system default value, nor \fIoptionTable\fR are used to give a default
+value to this option. Instead it is assumed that the caller has already
+supplied a default value in the widget code.
 .PP
 The \fItype\fR field of each Tk_OptionSpec structure determines
 how to parse the value of that configuration option. The
diff --git a/generic/tkEntry.c b/generic/tkEntry.c
index 338652b..9f43f90 100644
--- a/generic/tkEntry.c
+++ b/generic/tkEntry.c
@@ -133,7 +133,7 @@ static const Tk_OptionSpec entryOptSpec[] = {
 	0, (ClientData) DEF_ENTRY_SELECT_BD_MONO, 0},
     {TK_OPTION_COLOR, "-selectforeground", "selectForeground", "Background",
 	DEF_ENTRY_SELECT_FG_COLOR, -1, Tk_Offset(Entry, selFgColorPtr),
-	TK_CONFIG_NULL_OK, (ClientData) DEF_ENTRY_SELECT_FG_MONO, 0},
+	TK_OPTION_NULL_OK, (ClientData) DEF_ENTRY_SELECT_FG_MONO, 0},
     {TK_OPTION_STRING, "-show", "show", "Show",
 	DEF_ENTRY_SHOW, -1, Tk_Offset(Entry, showChar),
 	TK_OPTION_NULL_OK, 0, 0},
@@ -279,23 +279,23 @@ static const Tk_OptionSpec sbOptSpec[] = {
 	0, (ClientData) DEF_ENTRY_SELECT_BD_MONO, 0},
     {TK_OPTION_COLOR, "-selectforeground", "selectForeground", "Background",
 	DEF_ENTRY_SELECT_FG_COLOR, -1, Tk_Offset(Entry, selFgColorPtr),
-	TK_CONFIG_NULL_OK, (ClientData) DEF_ENTRY_SELECT_FG_MONO, 0},
+	TK_OPTION_NULL_OK, (ClientData) DEF_ENTRY_SELECT_FG_MONO, 0},
     {TK_OPTION_STRING_TABLE, "-state", "state", "State",
 	DEF_ENTRY_STATE, -1, Tk_Offset(Entry, state),
 	0, (ClientData) stateStrings, 0},
     {TK_OPTION_STRING, "-takefocus", "takeFocus", "TakeFocus",
 	DEF_ENTRY_TAKE_FOCUS, -1, Tk_Offset(Entry, takeFocus),
-	TK_CONFIG_NULL_OK, 0, 0},
+	TK_OPTION_NULL_OK, 0, 0},
     {TK_OPTION_STRING, "-textvariable", "textVariable", "Variable",
 	DEF_ENTRY_TEXT_VARIABLE, -1, Tk_Offset(Entry, textVarName),
-	TK_CONFIG_NULL_OK, 0, 0},
+	TK_OPTION_NULL_OK, 0, 0},
     {TK_OPTION_DOUBLE, "-to", "to", "To",
 	DEF_SPINBOX_TO, -1, Tk_Offset(Spinbox, toValue), 0, 0, 0},
     {TK_OPTION_STRING_TABLE, "-validate", "validate", "Validate",
 	DEF_ENTRY_VALIDATE, -1, Tk_Offset(Entry, validate),
 	0, (ClientData) validateStrings, 0},
     {TK_OPTION_STRING, "-validatecommand", "validateCommand","ValidateCommand",
-	NULL, -1, Tk_Offset(Entry, validateCmd), TK_CONFIG_NULL_OK, 0, 0},
+	NULL, -1, Tk_Offset(Entry, validateCmd), TK_OPTION_NULL_OK, 0, 0},
     {TK_OPTION_STRING, "-values", "values", "Values",
 	DEF_SPINBOX_VALUES, -1, Tk_Offset(Spinbox, valueStr),
 	TK_OPTION_NULL_OK, 0, 0},
@@ -307,7 +307,7 @@ static const Tk_OptionSpec sbOptSpec[] = {
 	DEF_SPINBOX_WRAP, -1, Tk_Offset(Spinbox, wrap), 0, 0, 0},
     {TK_OPTION_STRING, "-xscrollcommand", "xScrollCommand", "ScrollCommand",
 	DEF_ENTRY_SCROLL_COMMAND, -1, Tk_Offset(Entry, scrollCmd),
-	TK_CONFIG_NULL_OK, 0, 0},
+	TK_OPTION_NULL_OK, 0, 0},
     {TK_OPTION_END, NULL, NULL, NULL, NULL, 0, -1, 0, 0, 0}
 };
 
@@ -390,7 +390,7 @@ static const char *selElementNames[] = {
  */
 
 static int		ConfigureEntry(Tcl_Interp *interp, Entry *entryPtr,
-			    int objc, Tcl_Obj *const objv[], int flags);
+			    int objc, Tcl_Obj *const objv[]);
 static int		DeleteChars(Entry *entryPtr, int index, int count);
 static void		DestroyEntry(char *memPtr);
 static void		DisplayEntry(ClientData clientData);
@@ -553,7 +553,7 @@ Tk_EntryObjCmd(
 
     if ((Tk_InitOptions(interp, (char *) entryPtr, optionTable, tkwin)
 	    != TCL_OK) ||
-	    (ConfigureEntry(interp, entryPtr, objc-2, objv+2, 0) != TCL_OK)) {
+	    (ConfigureEntry(interp, entryPtr, objc-2, objv+2) != TCL_OK)) {
 	Tk_DestroyWindow(entryPtr->tkwin);
 	return TCL_ERROR;
     }
@@ -658,7 +658,7 @@ EntryWidgetObjCmd(
 		Tcl_SetObjResult(interp, objPtr);
 	    }
 	} else {
-	    result = ConfigureEntry(interp, entryPtr, objc-2, objv+2, 0);
+	    result = ConfigureEntry(interp, entryPtr, objc-2, objv+2);
 	}
 	break;
 
@@ -1086,8 +1086,7 @@ ConfigureEntry(
     Entry *entryPtr,		/* Information about widget; may or may not
 				 * already have values for some fields. */
     int objc,			/* Number of valid entries in argv. */
-    Tcl_Obj *const objv[],	/* Argument objects. */
-    int flags)			/* Flags to pass to Tk_ConfigureWidget. */
+    Tcl_Obj *const objv[])	/* Argument objects. */
 {
     Tk_SavedOptions savedOptions;
     Tk_3DBorder border;
@@ -3637,7 +3636,7 @@ Tk_SpinboxObjCmd(
 	Tk_DestroyWindow(entryPtr->tkwin);
 	return TCL_ERROR;
     }
-    if (ConfigureEntry(interp, entryPtr, objc-2, objv+2, 0) != TCL_OK) {
+    if (ConfigureEntry(interp, entryPtr, objc-2, objv+2) != TCL_OK) {
 	goto error;
     }
 
@@ -3747,7 +3746,7 @@ SpinboxWidgetObjCmd(
 		Tcl_SetObjResult(interp, objPtr);
 	    }
 	} else {
-	    result = ConfigureEntry(interp, entryPtr, objc-2, objv+2, 0);
+	    result = ConfigureEntry(interp, entryPtr, objc-2, objv+2);
 	}
 	break;
 
diff --git a/generic/tkListbox.c b/generic/tkListbox.c
index ff72596..86fb671 100644
--- a/generic/tkListbox.c
+++ b/generic/tkListbox.c
@@ -278,7 +278,7 @@ static const Tk_OptionSpec optionSpecs[] = {
 	 Tk_Offset(Listbox, selBorderWidth), 0, 0, 0},
     {TK_OPTION_COLOR, "-selectforeground", "selectForeground", "Background",
 	 DEF_LISTBOX_SELECT_FG_COLOR, -1, Tk_Offset(Listbox, selFgColorPtr),
-	 TK_CONFIG_NULL_OK, (ClientData) DEF_LISTBOX_SELECT_FG_MONO, 0},
+	 TK_OPTION_NULL_OK, (ClientData) DEF_LISTBOX_SELECT_FG_MONO, 0},
     {TK_OPTION_STRING, "-selectmode", "selectMode", "SelectMode",
 	 DEF_LISTBOX_SELECT_MODE, -1, Tk_Offset(Listbox, selectMode),
 	 TK_OPTION_NULL_OK, 0, 0},
@@ -379,7 +379,7 @@ enum indices {
 static void		ChangeListboxOffset(Listbox *listPtr, int offset);
 static void		ChangeListboxView(Listbox *listPtr, int index);
 static int		ConfigureListbox(Tcl_Interp *interp, Listbox *listPtr,
-			    int objc, Tcl_Obj *const objv[], int flags);
+			    int objc, Tcl_Obj *const objv[]);
 static int		ConfigureListboxItem(Tcl_Interp *interp,
 			    Listbox *listPtr, ItemAttr *attrs, int objc,
 			    Tcl_Obj *const objv[], int index);
@@ -564,7 +564,7 @@ Tk_ListboxObjCmd(
 	return TCL_ERROR;
     }
 
-    if (ConfigureListbox(interp, listPtr, objc-2, objv+2, 0) != TCL_OK) {
+    if (ConfigureListbox(interp, listPtr, objc-2, objv+2) != TCL_OK) {
 	Tk_DestroyWindow(listPtr->tkwin);
 	return TCL_ERROR;
     }
@@ -700,7 +700,7 @@ ListboxWidgetObjCmd(
 		result = TCL_OK;
 	    }
 	} else {
-	    result = ConfigureListbox(interp, listPtr, objc-2, objv+2, 0);
+	    result = ConfigureListbox(interp, listPtr, objc-2, objv+2);
 	}
 	break;
     }
@@ -1544,8 +1544,7 @@ ConfigureListbox(
     register Listbox *listPtr,	/* Information about widget; may or may not
 				 * already have values for some fields. */
     int objc,			/* Number of valid entries in argv. */
-    Tcl_Obj *const objv[],	/* Arguments. */
-    int flags)			/* Flags to pass to Tk_ConfigureWidget. */
+    Tcl_Obj *const objv[])	/* Arguments. */
 {
     Tk_SavedOptions savedOptions;
     Tcl_Obj *oldListObj = NULL;
diff --git a/generic/tkText.c b/generic/tkText.c
index 6e982b0..341ec0f 100644
--- a/generic/tkText.c
+++ b/generic/tkText.c
@@ -197,18 +197,18 @@ static const Tk_OptionSpec optionSpecs[] = {
 	TK_OPTION_NULL_OK, (ClientData) DEF_TEXT_SELECT_BD_MONO, 0},
     {TK_OPTION_COLOR, "-selectforeground", "selectForeground", "Background",
 	DEF_TEXT_SELECT_FG_COLOR, -1, Tk_Offset(TkText, selFgColorPtr),
-	TK_CONFIG_NULL_OK, (ClientData) DEF_TEXT_SELECT_FG_MONO, 0},
+	TK_OPTION_NULL_OK, (ClientData) DEF_TEXT_SELECT_FG_MONO, 0},
     {TK_OPTION_BOOLEAN, "-setgrid", "setGrid", "SetGrid",
 	DEF_TEXT_SET_GRID, -1, Tk_Offset(TkText, setGrid), 0, 0, 0},
     {TK_OPTION_PIXELS, "-spacing1", "spacing1", "Spacing",
 	DEF_TEXT_SPACING1, -1, Tk_Offset(TkText, spacing1),
-	TK_OPTION_DONT_SET_DEFAULT, 0 , TK_TEXT_LINE_GEOMETRY },
+	0, 0 , TK_TEXT_LINE_GEOMETRY },
     {TK_OPTION_PIXELS, "-spacing2", "spacing2", "Spacing",
 	DEF_TEXT_SPACING2, -1, Tk_Offset(TkText, spacing2),
-	TK_OPTION_DONT_SET_DEFAULT, 0 , TK_TEXT_LINE_GEOMETRY },
+	0, 0 , TK_TEXT_LINE_GEOMETRY },
     {TK_OPTION_PIXELS, "-spacing3", "spacing3", "Spacing",
 	DEF_TEXT_SPACING3, -1, Tk_Offset(TkText, spacing3),
-	TK_OPTION_DONT_SET_DEFAULT, 0 , TK_TEXT_LINE_GEOMETRY },
+	0, 0 , TK_TEXT_LINE_GEOMETRY },
     {TK_OPTION_CUSTOM, "-startline", NULL, NULL,
 	 NULL, -1, Tk_Offset(TkText, start), TK_OPTION_NULL_OK,
 	 (ClientData) &lineOption, TK_TEXT_LINE_RANGE},
diff --git a/generic/tkTextTag.c b/generic/tkTextTag.c
index dad03bf..a310dd7 100644
--- a/generic/tkTextTag.c
+++ b/generic/tkTextTag.c
@@ -44,11 +44,11 @@ static const Tk_OptionSpec tagOptionSpecs[] = {
     {TK_OPTION_BITMAP, "-bgstipple", NULL, NULL,
 	NULL, -1, Tk_Offset(TkTextTag, bgStipple), TK_OPTION_NULL_OK, 0, 0},
     {TK_OPTION_PIXELS, "-borderwidth", NULL, NULL,
-	"0", Tk_Offset(TkTextTag, borderWidthPtr), Tk_Offset(TkTextTag, borderWidth),
-	TK_OPTION_DONT_SET_DEFAULT|TK_OPTION_NULL_OK, 0, 0},
+	NULL, Tk_Offset(TkTextTag, borderWidthPtr), Tk_Offset(TkTextTag, borderWidth),
+	TK_OPTION_NULL_OK|TK_OPTION_DONT_SET_DEFAULT, 0, 0},
     {TK_OPTION_STRING, "-elide", NULL, NULL,
-	"0", -1, Tk_Offset(TkTextTag, elideString),
-	TK_OPTION_DONT_SET_DEFAULT|TK_OPTION_NULL_OK, 0, 0},
+	NULL, -1, Tk_Offset(TkTextTag, elideString),
+	TK_OPTION_NULL_OK|TK_OPTION_DONT_SET_DEFAULT, 0, 0},
     {TK_OPTION_BITMAP, "-fgstipple", NULL, NULL,
 	NULL, -1, Tk_Offset(TkTextTag, fgStipple), TK_OPTION_NULL_OK, 0, 0},
     {TK_OPTION_FONT, "-font", NULL, NULL,
diff --git a/generic/ttk/ttkButton.c b/generic/ttk/ttkButton.c
index 2954184..bc44f25 100644
--- a/generic/ttk/ttkButton.c
+++ b/generic/ttk/ttkButton.c
@@ -413,8 +413,8 @@ typedef struct
 static Tk_OptionSpec CheckbuttonOptionSpecs[] =
 {
     {TK_OPTION_STRING, "-variable", "variable", "Variable",
-	"", Tk_Offset(Checkbutton, checkbutton.variableObj), -1,
-	TK_OPTION_DONT_SET_DEFAULT,0,0},
+	NULL, Tk_Offset(Checkbutton, checkbutton.variableObj), -1,
+	TK_OPTION_NULL_OK,0,0},
     {TK_OPTION_STRING, "-onvalue", "onValue", "OnValue",
 	"1", Tk_Offset(Checkbutton, checkbutton.onValueObj), -1,
 	0,0,0},
diff --git a/macosx/README b/macosx/README
index 7b17fb8..8940ee6 100644
--- a/macosx/README
+++ b/macosx/README
@@ -399,7 +399,7 @@ The main program in a typical OSX application looks like this (see *)
     }
 
 The run method implements the event loop for the application.  There
-are three key steps in the run method.  First it calls 
+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
diff --git a/macosx/tkMacOSXDialog.c b/macosx/tkMacOSXDialog.c
index 6af6b33..67f17be 100644
--- a/macosx/tkMacOSXDialog.c
+++ b/macosx/tkMacOSXDialog.c
@@ -1027,7 +1027,7 @@ Tk_MessageBoxObjCmd(
     NSAlert *alert = [NSAlert new];
     NSInteger modalReturnCode = 1;
     BOOL parentIsKey = NO;
-    
+
     iconIndex = ICON_INFO;
     typeIndex = TYPE_OK;
     for (i = 1; i < objc; i += 2) {
-- 
cgit v0.12


From 567e654b82f4cd34d86fa80a81c35250bc1392d9 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Sat, 23 Jan 2016 18:55:15 +0000
Subject: Repair failure to compile on OSX/Cocoa.

---
 macosx/tkMacOSXDialog.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/macosx/tkMacOSXDialog.c b/macosx/tkMacOSXDialog.c
index 67f17be..0f7ef3a 100644
--- a/macosx/tkMacOSXDialog.c
+++ b/macosx/tkMacOSXDialog.c
@@ -395,10 +395,12 @@ Tk_GetOpenFileObjCmd(
     NSMutableArray *fileTypes = nil;
     NSOpenPanel *panel = [NSOpenPanel openPanel];
     NSInteger modalReturnCode = modalError;
+#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
+    BOOL parentIsKey = NO;
+#endif
 
     TkInitFileFilters(&fl);
     for (i = 1; i < objc; i += 2) {
-    BOOL parentIsKey = NO;
 	if (Tcl_GetIndexFromObjStruct(interp, objv[i], openOptionStrings,
 		sizeof(char *), "option", TCL_EXACT, &index) != TCL_OK) {
 	    goto end;
@@ -598,10 +600,11 @@ Tk_GetSaveFileObjCmd(
     NSMutableArray *fileTypes = nil;
     NSSavePanel *panel = [NSSavePanel savePanel];
     NSInteger modalReturnCode = modalError;
+    BOOL parentIsKey = NO;
 
     TkInitFileFilters(&fl);
     for (i = 1; i < objc; i += 2) {
-    BOOL parentIsKey = NO;
+	parentIsKey = NO;
 	if (Tcl_GetIndexFromObjStruct(interp, objv[i], saveOptionStrings,
 		sizeof(char *), "option", TCL_EXACT, &index) != TCL_OK) {
 	    goto end;
-- 
cgit v0.12


From aafc31a89b188a589cc256a1f62bb80b2f053a2b Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Sat, 23 Jan 2016 19:00:19 +0000
Subject: Remove cross-test disruption.

---
 tests/font.test | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/font.test b/tests/font.test
index 9ed24dc..2defb29 100644
--- a/tests/font.test
+++ b/tests/font.test
@@ -1162,6 +1162,7 @@ test font-33.1 {Tk_TextWidth procedure} {
 
 test font-34.1 {ConfigAttributesObj procedure: arguments} {
     # (Tcl_GetIndexFromObj() != TCL_OK)
+    set x {}
     setup
     list [catch {font create xyz -xyz} msg] $msg
 } {1 {bad option "-xyz": must be -family, -size, -weight, -slant, -underline, or -overstrike}}
-- 
cgit v0.12


From 61276a830613eb1ed26aa90b4572e80b0caa64f3 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sat, 23 Jan 2016 19:41:53 +0000
Subject: Better repair of parentIsKey (backported from Tk 8.6). Problem was
 introduced in (apparently ill-merged) commit [3f634e02ece26dff]

---
 macosx/tkMacOSXDialog.c | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/macosx/tkMacOSXDialog.c b/macosx/tkMacOSXDialog.c
index 0f7ef3a..84fef94 100644
--- a/macosx/tkMacOSXDialog.c
+++ b/macosx/tkMacOSXDialog.c
@@ -190,6 +190,7 @@ static NSURL *getFileURL(NSString *directory, NSString *filename) {
 	    Tcl_Obj **objv, **tmpv;
 	    int objc, result = Tcl_ListObjGetElements(callbackInfo->interp,
 		    callbackInfo->cmdObj, &objc, &objv);
+
 	    if (result == TCL_OK && objc) {
 		tmpv = (Tcl_Obj **) ckalloc(sizeof(Tcl_Obj *) * (objc + 2));
 		memcpy(tmpv, objv, sizeof(Tcl_Obj *) * objc);
@@ -212,18 +213,22 @@ static NSURL *getFileURL(NSString *directory, NSString *filename) {
 	ckfree((char *)callbackInfo);
     }
 }
-- (void)tkAlertDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode
-	contextInfo:(void *)contextInfo {
+
+- (void) tkAlertDidEnd: (NSAlert *) alert returnCode: (NSInteger) returnCode
+	contextInfo: (void *) contextInfo
+{
     AlertCallbackInfo *callbackInfo = contextInfo;
 
     if (returnCode >= NSAlertFirstButtonReturn) {
 	Tcl_Obj *resultObj = Tcl_NewStringObj(alertButtonStrings[
 		alertNativeButtonIndexAndTypeToButtonIndex[callbackInfo->
 		typeIndex][returnCode - NSAlertFirstButtonReturn]], -1);
+
 	if (callbackInfo->cmdObj) {
 	    Tcl_Obj **objv, **tmpv;
 	    int objc, result = Tcl_ListObjGetElements(callbackInfo->interp,
 		    callbackInfo->cmdObj, &objc, &objv);
+
 	    if (result == TCL_OK && objc) {
 		tmpv = (Tcl_Obj **) ckalloc(sizeof(Tcl_Obj *) * (objc + 2));
 		memcpy(tmpv, objv, sizeof(Tcl_Obj *) * objc);
@@ -395,9 +400,7 @@ Tk_GetOpenFileObjCmd(
     NSMutableArray *fileTypes = nil;
     NSOpenPanel *panel = [NSOpenPanel openPanel];
     NSInteger modalReturnCode = modalError;
-#if MAC_OS_X_VERSION_MIN_REQUIRED < 1060
     BOOL parentIsKey = NO;
-#endif
 
     TkInitFileFilters(&fl);
     for (i = 1; i < objc; i += 2) {
@@ -513,10 +516,10 @@ Tk_GetOpenFileObjCmd(
     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
-	    parentIsKey = [parent isKeyWindow];
 	       types:fileTypes
 	       modalForWindow:parent
 	       modalDelegate:NSApp
@@ -545,12 +548,12 @@ Tk_GetOpenFileObjCmd(
 		contextInfo:callbackInfo];
     }
     result = (modalReturnCode != modalError) ? TCL_OK : TCL_ERROR;
-    if (typeVariablePtr && result == TCL_OK) {
-	/*
-	 * The -typevariable option is not really supported.
     if (parentIsKey) {
 	[parent makeKeyWindow];
     }
+    if (typeVariablePtr && result == TCL_OK) {
+	/*
+	 * The -typevariable option is not really supported.
 	 */
 
 	Tcl_SetVar2(interp, Tcl_GetString(typeVariablePtr), NULL,
@@ -604,7 +607,6 @@ Tk_GetSaveFileObjCmd(
 
     TkInitFileFilters(&fl);
     for (i = 1; i < objc; i += 2) {
-	parentIsKey = NO;
 	if (Tcl_GetIndexFromObjStruct(interp, objv[i], saveOptionStrings,
 		sizeof(char *), "option", TCL_EXACT, &index) != TCL_OK) {
 	    goto end;
@@ -718,10 +720,10 @@ Tk_GetSaveFileObjCmd(
     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
-       parentIsKey = [parent isKeyWindow];
 	       modalForWindow:parent
 	       modalDelegate:NSApp
 	       didEndSelector:
@@ -1177,7 +1179,7 @@ Tk_MessageBoxObjCmd(
 		contextInfo:callbackInfo];
     }
     result = (modalReturnCode >= NSAlertFirstButtonReturn) ? TCL_OK : TCL_ERROR;
- end:
+  end:
     [alert release];
     if (parentIsKey) {
 	[parent makeKeyWindow];
-- 
cgit v0.12


From 3000865931e61dd77e966d0af27b4c86dcdbfaad Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sat, 23 Jan 2016 19:46:08 +0000
Subject: (cherry-pick): Fixed bug [9e606527af] - && instead of & used in
 generic/tkOption.c

---
 generic/tkOption.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generic/tkOption.c b/generic/tkOption.c
index bff799b..17989f8 100644
--- a/generic/tkOption.c
+++ b/generic/tkOption.c
@@ -559,7 +559,7 @@ Tk_GetOption(
 		count	-= levelPtr[-1].bases[currentStack];
 	    }
 
-	    if (currentStack && CLASS) {
+	    if (currentStack & CLASS) {
 		nodeId = winClassId;
 	    } else {
 		nodeId = winNameId;
-- 
cgit v0.12


From 7385219f157994efd45b0d32fd66f3ead06ea469 Mon Sep 17 00:00:00 2001
From: Kevin Walzer <kw@codebykevin.com>
Date: Sun, 24 Jan 2016 19:19:51 +0000
Subject: Crash in Mac test suite no longer triggered after patch from Marc
 Culler

---
 macosx/tkMacOSXNotify.c | 1 -
 macosx/tkMacOSXWm.c     | 2 --
 2 files changed, 3 deletions(-)

diff --git a/macosx/tkMacOSXNotify.c b/macosx/tkMacOSXNotify.c
index 0737d74..fa359f0 100644
--- a/macosx/tkMacOSXNotify.c
+++ b/macosx/tkMacOSXNotify.c
@@ -274,7 +274,6 @@ TkMacOSXEventsCheckProc(
 						 inMode:GetRunLoopMode(modalSession)
 						dequeue:YES];
 	    if (currentEvent) {
-		[NSApp _resetAutoreleasePool];
 		/* Generate Xevents. */
 		int oldServiceMode = Tcl_SetServiceMode(TCL_SERVICE_ALL);
 		NSEvent *processedEvent = [NSApp tkProcessEvent:currentEvent];
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index 5df72f0..114980f 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -24,8 +24,6 @@
 
 #define DEBUG_ZOMBIES 0
 
-#define DEBUG_ZOMBIES 0
-
 /*
 #ifdef TK_MAC_DEBUG
 #define TK_MAC_DEBUG_WINDOWS
-- 
cgit v0.12


From ac9442c6d07c589501a97b710d1608b1bb68a7dc Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Sun, 24 Jan 2016 20:12:55 +0000
Subject: Fix (minor) memory leak (backported from Tk 8.6). Some efficientcy
 improvements (backported from 8.6 too). No change of functionality

---
 macosx/tkMacOSXWm.c | 80 +++++++++++++++++++++--------------------------------
 1 file changed, 32 insertions(+), 48 deletions(-)

diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c
index 114980f..be7bf47 100644
--- a/macosx/tkMacOSXWm.c
+++ b/macosx/tkMacOSXWm.c
@@ -911,9 +911,9 @@ TkWmDeadWindow(
 	fprintf(stderr, "================= Pool dump ===================\n");
 	[NSAutoreleasePool showPools];
 #endif
+    }
     ckfree((char *)wmPtr);
     winPtr->wmInfoPtr = NULL;
-    }
 }
 
 /*
@@ -5112,7 +5112,7 @@ TkUnsupported1ObjCmd(
     };
     Tk_Window tkwin = clientData;
     TkWindow *winPtr;
-    int index;
+    int index, i;
 
     if (objc < 3) {
 	Tcl_WrongNumArgs(interp, 1, objv, "option window ?arg ...?");
@@ -5121,56 +5121,40 @@ TkUnsupported1ObjCmd(
 
 
     /* Iterate through objc/objv to set correct background color and toggle opacity of window. */
-    int i;
     for (i= 0; i < objc; i++) {
-
-    	if (Tcl_StringMatch(Tcl_GetString(objv[i]), "*black*") == 1) {
-    	    colorName = [NSColor blackColor];  // use #000000 in Tk scripts to match
-    	}
-    	if (Tcl_StringMatch(Tcl_GetString(objv[i]), "*dark*") == 1) {
+    	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
-    	}
-    	if (Tcl_StringMatch(Tcl_GetString(objv[i]), "*light*") == 1) {
+    	} 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]), "*white*") == 1) {
-    	    colorName = [NSColor whiteColor]; //use #ffffff in Tk scripts to match
-    	}
-    	if (Tcl_StringMatch(Tcl_GetString(objv[i]), "gray*") == 1) {
-    	    colorName = [NSColor grayColor]; //use  #7f7f7f in Tk scripts to match
-    	}
-    	if (Tcl_StringMatch(Tcl_GetString(objv[i]), "*red*") == 1) {
-    	    colorName = [NSColor redColor]; //use #ff0000 in Tk scripts to match
-    	}
-    	if (Tcl_StringMatch(Tcl_GetString(objv[i]), "*green*") == 1) {
-    	    colorName = [NSColor greenColor]; //use #00ff00 in Tk scripts to match
-    	}
-    	if (Tcl_StringMatch(Tcl_GetString(objv[i]), "*blue*") == 1) {
-    	    colorName = [NSColor blueColor]; //use #0000ff in Tk scripts to match
-    	}
-    	if (Tcl_StringMatch(Tcl_GetString(objv[i]), "*cyan*") == 1) {
-    	    colorName = [NSColor cyanColor]; //use  #00ffff in Tk scripts to match
-    	}
-    	if (Tcl_StringMatch(Tcl_GetString(objv[i]), "*yellow*") == 1) {
-    	    colorName = [NSColor yellowColor]; //use  #ffff00 in Tk scripts to match
-    	}
-    	if (Tcl_StringMatch(Tcl_GetString(objv[i]), "*magenta*") == 1) {
-    	    colorName = [NSColor magentaColor]; //use #ff00ff in Tk scripts to match
-    	}
-    	if (Tcl_StringMatch(Tcl_GetString(objv[i]), "*orange*") == 1) {
-    	    colorName = [NSColor orangeColor]; //use  #ff8000 in Tk scripts to match
-    	}
-    	if (Tcl_StringMatch(Tcl_GetString(objv[i]), "*purple*") == 1) {
-    	    colorName = [NSColor purpleColor]; //use  #800080 in Tk scripts to match
-    	}
-    	if  (Tcl_StringMatch(Tcl_GetString(objv[i]), "*brown*") == 1){
-    	    colorName = [NSColor brownColor]; //use #996633 in Tk scripts to match
-    	}
-    	if  (Tcl_StringMatch(Tcl_GetString(objv[i]), "*clear*") == 1) {
-    	    colorName = [NSColor clearColor]; //use systemTransparent in Tk scripts to match
-    	}
-    	if (Tcl_StringMatch(Tcl_GetString(objv[i]), "*opacity*") == 1) {
-    	    opaqueTag=YES;
+    	if (Tcl_StringMatch(Tcl_GetString(objv[i]), "*opacity*")) {
+    	    opaqueTag = YES;
     	}
     }
 
-- 
cgit v0.12


From 48ef3bc66f0806a4b54f4abb9888a5fc53e78d33 Mon Sep 17 00:00:00 2001
From: jenglish <jenglish@flightlab.com>
Date: Mon, 25 Jan 2016 20:39:31 +0000
Subject: NotebookAddCommand: fix off-by-one error counting objc/objv when
 readding an already-managed window with arguments.

Bug reported on tcl-core by Sam Bromley (22 Jan 2016)
---
 generic/ttk/ttkNotebook.c |  2 +-
 tests/ttk/notebook.test   | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/generic/ttk/ttkNotebook.c b/generic/ttk/ttkNotebook.c
index 551f4a6..dd757cb 100644
--- a/generic/ttk/ttkNotebook.c
+++ b/generic/ttk/ttkNotebook.c
@@ -902,7 +902,7 @@ static int NotebookAddCommand(
     if (tab->state == TAB_STATE_HIDDEN) {
 	tab->state = TAB_STATE_NORMAL;
     }
-    if (ConfigureTab(interp, nb, tab, slaveWindow, objc-4,objv+4) != TCL_OK) {
+    if (ConfigureTab(interp, nb, tab, slaveWindow, objc-3,objv+3) != TCL_OK) {
 	return TCL_ERROR;
     }
 
diff --git a/tests/ttk/notebook.test b/tests/ttk/notebook.test
index cdce020..3a2a6ff 100644
--- a/tests/ttk/notebook.test
+++ b/tests/ttk/notebook.test
@@ -468,6 +468,27 @@ test notebook-1817596-3 "insert/configure" -body {
 
 } -result [list [list .nb.l2 .nb.l0 .nb.l1] L2 L0 L1] -cleanup { destroy .nb }
 
+test notebook-readd-1 "add same widget twice" -body {
+    pack [ttk::notebook .nb]
+    .nb add [ttk::button .nb.b1] -text "Button"
+    .nb add .nb.b1
+    .nb tabs
+} -result [list .nb.b1] -cleanup { destroy .nb }
+
+test notebook-readd-2 "add same widget twice, with options" -body {
+    pack [ttk::notebook .nb]
+    .nb add [ttk::button .nb.b1] -text "Tab label"
+    .nb add .nb.b1 -text "Changed tab label"
+    .nb tabs
+} -result [list .nb.b1] -cleanup { destroy .nb }
+
+test notebook-readd-3 "insert same widget twice, with options" -body {
+    pack [ttk::notebook .nb]
+    .nb insert end [ttk::button .nb.b1] -text "Tab label"
+    .nb insert end .nb.b1 -text "Changed tab label"
+    .nb tabs
+} -result [list .nb.b1] -cleanup { destroy .nb }
+
 
 # See #1343984
 test notebook-1343984-1 "don't autoselect on destroy - setup" -body {
-- 
cgit v0.12


From c3777ebd3a31648fc5427b9536d2e304e9cbcf77 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Fri, 29 Jan 2016 07:11:54 +0000
Subject: Fixed test entry-6.12: merge from 8.5 didn't see that $fixed does not
 exist in trunk version of entry.test. Thanks to emiliano for the report.

---
 tests/entry.test | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/entry.test b/tests/entry.test
index 9c30b00..4f09450 100644
--- a/tests/entry.test
+++ b/tests/entry.test
@@ -1074,7 +1074,7 @@ test entry-3.42 {EntryWidgetCmd procedure, "scan" widget command} -setup {
 } -body {
     .e scan a
 } -cleanup {
-    destroy .e
+    destroy .efixed
 } -returnCodes error -result {wrong # args: should be ".e scan mark|dragto x"}
 test entry-3.43 {EntryWidgetCmd procedure, "scan" widget command} -setup {
     entry .e
@@ -1896,12 +1896,12 @@ test entry-6.12 {EntryComputeGeometry procedure} -constraints {
     fonts
 } -setup {
     catch {destroy .e}
-    entry .e -font $fixed -bd 2 -relief raised -width 20
+    entry .e -font {Courier -12} -bd 2 -relief raised -width 20
     pack .e
 } -body {
     .e insert end "012\t456\t"
     update
-    list [.e index @81] [.e index @82] [.e index @116] [.e index @117]
+    list [.e index @80] [.e index @81] [.e index @115] [.e index @116]
 } -cleanup {
     destroy .e
 } -result {6 7 7 8}
-- 
cgit v0.12


From b5e22a7b7e4fd964d34f9d16aa7802fe7322636c Mon Sep 17 00:00:00 2001
From: Kevin Walzer <kw@codebykevin.com>
Date: Sun, 31 Jan 2016 00:53:25 +0000
Subject: Fix build errors on i386 for Cocoa; thanks to Marc Culler for patch

---
 macosx/tkMacOSXButton.c  | 4 ++--
 macosx/tkMacOSXInit.c    | 2 --
 macosx/tkMacOSXPrivate.h | 4 ++++
 macosx/ttkMacOSXTheme.c  | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/macosx/tkMacOSXButton.c b/macosx/tkMacOSXButton.c
index 59d394e..ebbcf09 100644
--- a/macosx/tkMacOSXButton.c
+++ b/macosx/tkMacOSXButton.c
@@ -289,10 +289,10 @@ TkpComputeButtonGeometry(
     if ( butPtr->indicatorOn ) {
       switch (butPtr->type) {
       case TYPE_RADIO_BUTTON:
-	GetThemeMetric(kThemeMetricRadioButtonWidth, &butPtr->indicatorDiameter);
+	GetThemeMetric(kThemeMetricRadioButtonWidth, (SInt32 *)&butPtr->indicatorDiameter);
 	  break;
       case TYPE_CHECK_BUTTON:
-	GetThemeMetric(kThemeMetricCheckBoxWidth, &butPtr->indicatorDiameter);
+	GetThemeMetric(kThemeMetricCheckBoxWidth, (SInt32 *)&butPtr->indicatorDiameter);
 	  break;
       default:
 	break;
diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c
index b965a38..33a60f2 100644
--- a/macosx/tkMacOSXInit.c
+++ b/macosx/tkMacOSXInit.c
@@ -57,9 +57,7 @@ static void keyboardChanged(CFNotificationCenterRef center, void *observer, CFSt
 @end
 
 @implementation TKApplication
-#ifndef __clang__
 @synthesize poolProtected = _poolProtected;
-#endif
 @end
 
 @implementation TKApplication(TKInit)
diff --git a/macosx/tkMacOSXPrivate.h b/macosx/tkMacOSXPrivate.h
index 2a411f6..65d60ce 100644
--- a/macosx/tkMacOSXPrivate.h
+++ b/macosx/tkMacOSXPrivate.h
@@ -276,6 +276,10 @@ VISIBILITY_HIDDEN
     NSArray *_defaultHelpMenuItems;
     NSWindow *_windowWithMouse;
     NSAutoreleasePool *_mainPool;
+#ifdef __i386__
+    /* The Objective C runtime used on i386 requires this. */
+    BOOL _poolProtected;
+#endif
 }
 @property BOOL poolProtected;
 @end
diff --git a/macosx/ttkMacOSXTheme.c b/macosx/ttkMacOSXTheme.c
index 4753a40..f9611c5 100644
--- a/macosx/ttkMacOSXTheme.c
+++ b/macosx/ttkMacOSXTheme.c
@@ -298,7 +298,7 @@ static void TabElementSize(
     void *clientData, void *elementRecord, Tk_Window tkwin,
     int *widthPtr, int *heightPtr, Ttk_Padding *paddingPtr)
 {
-    *heightPtr = GetThemeMetric(kThemeMetricLargeTabHeight, heightPtr);
+    GetThemeMetric(kThemeMetricLargeTabHeight, (SInt32 *)heightPtr);
     *paddingPtr = Ttk_MakePadding(0, 0, 0, 2);
 
 }
-- 
cgit v0.12


From 312ef46823e21b861e68eeb0073936e15177c0f7 Mon Sep 17 00:00:00 2001
From: Kevin Walzer <kw@codebykevin.com>
Date: Sun, 31 Jan 2016 00:54:18 +0000
Subject: Fix build errors on i386 for Cocoa; thanks to Marc Culler for patch

---
 macosx/tkMacOSXButton.c  | 4 ++--
 macosx/tkMacOSXInit.c    | 2 --
 macosx/tkMacOSXPrivate.h | 3 +++
 macosx/ttkMacOSXTheme.c  | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/macosx/tkMacOSXButton.c b/macosx/tkMacOSXButton.c
index adb78c6..35f4ab5 100644
--- a/macosx/tkMacOSXButton.c
+++ b/macosx/tkMacOSXButton.c
@@ -289,10 +289,10 @@ TkpComputeButtonGeometry(
     if ( butPtr->indicatorOn ) {
       switch (butPtr->type) {
       case TYPE_RADIO_BUTTON:
-	GetThemeMetric(kThemeMetricRadioButtonWidth, &butPtr->indicatorDiameter);
+	GetThemeMetric(kThemeMetricRadioButtonWidth, (SInt32 *)&butPtr->indicatorDiameter);
 	  break;
       case TYPE_CHECK_BUTTON:
-	GetThemeMetric(kThemeMetricCheckBoxWidth, &butPtr->indicatorDiameter);
+	GetThemeMetric(kThemeMetricCheckBoxWidth, (SInt32 *)&butPtr->indicatorDiameter);
 	  break;
       default:
 	break;
diff --git a/macosx/tkMacOSXInit.c b/macosx/tkMacOSXInit.c
index 26eb3f5..8e353b4 100644
--- a/macosx/tkMacOSXInit.c
+++ b/macosx/tkMacOSXInit.c
@@ -59,9 +59,7 @@ static void keyboardChanged(CFNotificationCenterRef center, void *observer, CFSt
 @end
 
 @implementation TKApplication
-#ifndef __clang__
 @synthesize poolProtected = _poolProtected;
-#endif
 @end
 
 @implementation TKApplication(TKInit)
diff --git a/macosx/tkMacOSXPrivate.h b/macosx/tkMacOSXPrivate.h
index e635020..d892f4e 100644
--- a/macosx/tkMacOSXPrivate.h
+++ b/macosx/tkMacOSXPrivate.h
@@ -274,6 +274,9 @@ VISIBILITY_HIDDEN
     NSArray *_defaultHelpMenuItems;
     NSWindow *_windowWithMouse;
     NSAutoreleasePool *_mainPool;
+#ifdef __i386__
+    BOOL _poolProtected;
+#endif
 }
 @property BOOL poolProtected;
 @end
diff --git a/macosx/ttkMacOSXTheme.c b/macosx/ttkMacOSXTheme.c
index 87ec4c2..1997370 100644
--- a/macosx/ttkMacOSXTheme.c
+++ b/macosx/ttkMacOSXTheme.c
@@ -299,7 +299,7 @@ static void TabElementSize(
     void *clientData, void *elementRecord, Tk_Window tkwin,
     int *widthPtr, int *heightPtr, Ttk_Padding *paddingPtr)
 {
-     *heightPtr = GetThemeMetric(kThemeMetricLargeTabHeight, heightPtr);
+    GetThemeMetric(kThemeMetricLargeTabHeight, (SInt32 *)heightPtr);
      *paddingPtr = Ttk_MakePadding(0, 0, 0, 2);
 
 }
-- 
cgit v0.12


From a5b54a7f07e68d3223a0b945b7e7e0da345633ed Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 2 Feb 2016 22:16:08 +0000
Subject: Re-implement tkoption readfile using Tcl_ReadChars

---
 generic/tkOption.c | 40 ++++++++--------------------------------
 tests/option.file3 |  2 +-
 2 files changed, 9 insertions(+), 33 deletions(-)

diff --git a/generic/tkOption.c b/generic/tkOption.c
index 680c9db..24e7fb3 100644
--- a/generic/tkOption.c
+++ b/generic/tkOption.c
@@ -1080,10 +1080,10 @@ ReadOptionFile(
 				 * TK_MAX_PRIO. */
 {
     const char *realName;
-    char *buffer;
+    Tcl_Obj *buffer;
     int result, bufferSize;
     Tcl_Channel chan;
-    Tcl_DString newName, optString;
+    Tcl_DString newName;
 
     /*
      * Prevent file system access in a safe interpreter.
@@ -1108,24 +1108,10 @@ ReadOptionFile(
 	return TCL_ERROR;
     }
 
-    /*
-     * Compute size of file by seeking to the end of the file. This will
-     * overallocate if we are performing CRLF translation.
-     */
-
-    bufferSize = (int) Tcl_Seek(chan, (Tcl_WideInt) 0, SEEK_END);
-    Tcl_Seek(chan, (Tcl_WideInt) 0, SEEK_SET);
-
-    if (bufferSize < 0) {
-	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-		"error seeking to end of file \"%s\": %s",
-		fileName, Tcl_PosixError(interp)));
-	Tcl_Close(NULL, chan);
-	return TCL_ERROR;
-    }
-
-    buffer = ckalloc(bufferSize + 1);
-    bufferSize = Tcl_Read(chan, buffer, bufferSize);
+    buffer = Tcl_NewObj();
+    Tcl_IncrRefCount(buffer);
+    Tcl_SetChannelOption(NULL, chan, "-encoding", "utf-8");
+    bufferSize = Tcl_ReadChars(chan, buffer, -1, 0);
     if (bufferSize < 0) {
 	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
 		"error reading file \"%s\": %s",
@@ -1134,18 +1120,8 @@ ReadOptionFile(
 	return TCL_ERROR;
     }
     Tcl_Close(NULL, chan);
-    buffer[bufferSize] = 0;
-    if ((bufferSize>2) && !memcmp(buffer, "\357\273\277", 3)) {
-	/* File starts with UTF-8 BOM */
-	result = AddFromString(interp, tkwin, buffer+3, priority);
-    } else {
-	Tcl_DStringInit(&optString);
-	Tcl_ExternalToUtfDString(NULL, buffer, bufferSize, &optString);
-	result = AddFromString(interp, tkwin, Tcl_DStringValue(&optString),
-		priority);
-	Tcl_DStringFree(&optString);
-    }
-    ckfree(buffer);
+    result = AddFromString(interp, tkwin, Tcl_GetString(buffer), priority);
+    Tcl_DecrRefCount(buffer);
     return result;
 }
 
diff --git a/tests/option.file3 b/tests/option.file3
index 87f41ae..146cfd9 100755
--- a/tests/option.file3
+++ b/tests/option.file3
@@ -1,4 +1,4 @@
-! This file is a sample option (resource) database used to test
+! This file is a sample option (resource) database used to test
 ! Tk's option-handling capabilities.
 
 ! Comment line \
-- 
cgit v0.12


From 098b03f8f4259f1767486350c21f5b7e11a6e06b Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 3 Feb 2016 08:45:48 +0000
Subject: Backout [477949] for Tk 8.5, after discussion in TclCore mailing
 list: option readfile cannot use multibytes. Ticket [0a3d799a]

To clarify a bit, what we discovered was that [[option readfile]]
as found in all Tk releases up to and including 8.5.18 is already
able to read in the whole BMP, so long as the file is stored in
the encoding utf-8.  The classic ASCII subset is fine.  utf-8 is fine.
Other encodings are at best non-portable.

What [477949] did was to add support for files stored in
[[encoding system]] but at the expense of breaking the
support for the files stored in utf-8.  Not the right outcome
for a patch release.
---
 generic/tkOption.c | 13 ++-----------
 tests/option.file3 | 18 ------------------
 tests/option.test  | 11 ++++-------
 3 files changed, 6 insertions(+), 36 deletions(-)
 delete mode 100755 tests/option.file3

diff --git a/generic/tkOption.c b/generic/tkOption.c
index 17989f8..95b140d 100644
--- a/generic/tkOption.c
+++ b/generic/tkOption.c
@@ -1086,7 +1086,7 @@ ReadOptionFile(
     char *buffer;
     int result, bufferSize;
     Tcl_Channel chan;
-    Tcl_DString newName, optString;
+    Tcl_DString newName;
 
     /*
      * Prevent file system access in a safe interpreter.
@@ -1136,16 +1136,7 @@ ReadOptionFile(
     }
     Tcl_Close(NULL, chan);
     buffer[bufferSize] = 0;
-    if ((bufferSize>2) && !memcmp(buffer, "\357\273\277", 3)) {
-	/* File starts with UTF-8 BOM */
-	result = AddFromString(interp, tkwin, buffer+3, priority);
-    } else {
-	Tcl_DStringInit(&optString);
-	Tcl_ExternalToUtfDString(NULL, buffer, bufferSize, &optString);
-	result = AddFromString(interp, tkwin, Tcl_DStringValue(&optString),
-		priority);
-	Tcl_DStringFree(&optString);
-    }
+    result = AddFromString(interp, tkwin, buffer, priority);
     ckfree(buffer);
     return result;
 }
diff --git a/tests/option.file3 b/tests/option.file3
deleted file mode 100755
index 87f41ae..0000000
--- a/tests/option.file3
+++ /dev/null
@@ -1,18 +0,0 @@
-! This file is a sample option (resource) database used to test
-! Tk's option-handling capabilities.
-
-! Comment line \
-  with a backslash-newline sequence embedded in it.
-
-*x1: 	blue
-	 tktest.x2		: green
-*\
-x3 \
-  : pur\
-ple
-*x 4:	brówn
-# More comments, this time delimited by hash-marks.
-	# Comment-line with space.
-*x6:	  
-*x9: \ \	\\\101\n
-# comment line as last line of file.
diff --git a/tests/option.test b/tests/option.test
index 4668771..1bfcb7c 100644
--- a/tests/option.test
+++ b/tests/option.test
@@ -187,7 +187,6 @@ test option-14.12 {error conditions} {
 
 set option1 [file join [testsDirectory] option.file1]
 set option2 [file join [testsDirectory] option.file2]
-set option3 [file join [testsDirectory] option.file3]
 
 test option-15.1 {database files} {
     list [catch {option read non-existent} msg] $msg
@@ -208,18 +207,16 @@ test option-15.9 {database files} {option get . x3 color} burgundy
 test option-15.10 {database files} {
     list [catch {option read $option2} msg] $msg
 } {1 {missing colon on line 2}}
-option read $option3
-test option-15.11 {database files} {option get . {x 4} color} br\xf3wn
 
 test option-16.1 {ReadOptionFile} {
-    set option4 [makeFile {} option.file3]
-    set file [open $option4 w]
+    set option3 [makeFile {} option.file3]
+    set file [open $option3 w]
     fconfigure $file -translation crlf
     puts $file "*x7: true\n*x8: false"
     close $file
-    option read $option4 userDefault
+    option read $option3 userDefault
     set result [list [option get . x7 color] [option get . x8 color]]
-    removeFile $option4
+    removeFile $option3
     set result
 } {true false}
 
-- 
cgit v0.12


From e1d015ea1d6d8301149fa627ec1abf6b487d99c3 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 3 Feb 2016 09:14:37 +0000
Subject: Added documentation, please review!

---
 doc/option.n | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/option.n b/doc/option.n
index 8699c0d..8f29d3a 100644
--- a/doc/option.n
+++ b/doc/option.n
@@ -59,6 +59,11 @@ options specified in that file to the option database.  If \fIpriority\fR
 is specified, it indicates the priority level at which to enter the
 options;  \fIpriority\fR defaults to \fBinteractive\fR.
 .PP
+The file is read through a channel which is in "utf-8" encoding,
+invalid byte sequences are automatically converted to valid
+ones. This means that encodings like ISO 8859-1 or cp1282 with
+high probablility will work as well, but this is not guaranteed.
+.PP
 The \fIpriority\fR arguments to the \fBoption\fR command are
 normally specified symbolically using one of the following values:
 .TP
-- 
cgit v0.12


From 3b67157554ddf66b9d0fafeda1944869ed881b13 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Wed, 3 Feb 2016 09:20:12 +0000
Subject: Document that [encoding system] has no effect on option readfile

---
 doc/option.n | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/doc/option.n b/doc/option.n
index 8f29d3a..2763d64 100644
--- a/doc/option.n
+++ b/doc/option.n
@@ -60,9 +60,10 @@ is specified, it indicates the priority level at which to enter the
 options;  \fIpriority\fR defaults to \fBinteractive\fR.
 .PP
 The file is read through a channel which is in "utf-8" encoding,
-invalid byte sequences are automatically converted to valid
-ones. This means that encodings like ISO 8859-1 or cp1282 with
-high probablility will work as well, but this is not guaranteed.
+invalid byte sequences are automatically converted to valid ones.
+This means that encodings like ISO 8859-1 or cp1252 with high
+probability will work as well, but this cannot be guaranteed.
+This cannot be changed, setting the [encoding system] has no effect.
 .PP
 The \fIpriority\fR arguments to the \fBoption\fR command are
 normally specified symbolically using one of the following values:
-- 
cgit v0.12


From 6dddb4fc012c00ae1c5465fcf5225fa618a6994c Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Thu, 4 Feb 2016 17:49:39 +0000
Subject: [06c1433906] Possible fix for text widget crashes.

---
 generic/tkTextDisp.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c
index 133a7d7..10f6414 100644
--- a/generic/tkTextDisp.c
+++ b/generic/tkTextDisp.c
@@ -4699,6 +4699,11 @@ TextChanged(
         }
     }
 
+    while ((lastPtr != NULL)
+	    && (lastPtr->index.linePtr == index2Ptr->linePtr)) {
+	lastPtr = lastPtr->nextPtr;
+    }
+
     /*
      * Delete all the DLines from firstPtr up to but not including lastPtr.
      */
-- 
cgit v0.12


From 4b766d1f24378289437bc45e7405f68a48053915 Mon Sep 17 00:00:00 2001
From: dgp <dgp@users.sourceforge.net>
Date: Fri, 5 Feb 2016 19:30:32 +0000
Subject: Fix crashing test case, textDisp-8.13

---
 generic/tkTextDisp.c | 5 +++++
 tests/textDisp.test  | 9 +++++++++
 2 files changed, 14 insertions(+)

diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c
index 18b373f..f2e760b 100644
--- a/generic/tkTextDisp.c
+++ b/generic/tkTextDisp.c
@@ -4765,6 +4765,11 @@ TextChanged(
         }
     }
 
+    while ((lastPtr != NULL)
+	    && (lastPtr->index.linePtr == index2Ptr->linePtr)) {
+	lastPtr = lastPtr->nextPtr;
+    }
+
     /*
      * Delete all the DLines from firstPtr up to but not including lastPtr.
      */
diff --git a/tests/textDisp.test b/tests/textDisp.test
index caba769..f5fbd3d 100644
--- a/tests/textDisp.test
+++ b/tests/textDisp.test
@@ -1192,6 +1192,15 @@ test textDisp-8.12 {TkTextChanged, moving the insert cursor redraws only past an
     # cursor is in since this display line was just unlinked in (a).
 } {{8.0 9.0} {8.0 12.0} {8.0 12.0} {3.0 8.0} {2.0 3.0}}
 
+test textDisp-8.13 {TkTextChanged, [06c1433906]} {
+    .t delete 1.0 end
+    .t insert 1.0 \nLine1\nLine2\n
+    update
+    .t insert 3.0 ""
+    .t delete 1.0 2.0
+    update idletasks
+} {}
+
 test textDisp-9.1 {TkTextRedrawTag} {
     .t configure -wrap char
     .t delete 1.0 end
-- 
cgit v0.12


From e5ea273dc4f32113d02d0ede8742e214ad6ea37b Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sun, 7 Feb 2016 13:29:51 +0000
Subject: Hopefully a better fix for [06c1433906] - Text widget crash

---
 generic/tkTextDisp.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c
index 10f6414..fe69f28 100644
--- a/generic/tkTextDisp.c
+++ b/generic/tkTextDisp.c
@@ -4683,6 +4683,9 @@ TextChanged(
          */
 
         lastPtr = FindDLine(textPtr, dInfoPtr->dLinePtr, &rounded);
+        if ((lastPtr != NULL) && (TkTextIndexCmp(&lastPtr->index, &rounded) < 0)) {
+            lastPtr = lastPtr->nextPtr;
+        }
 
         /*
          * At least one display line is supposed to change. This makes the
@@ -4699,11 +4702,6 @@ TextChanged(
         }
     }
 
-    while ((lastPtr != NULL)
-	    && (lastPtr->index.linePtr == index2Ptr->linePtr)) {
-	lastPtr = lastPtr->nextPtr;
-    }
-
     /*
      * Delete all the DLines from firstPtr up to but not including lastPtr.
      */
-- 
cgit v0.12


From 0253e18f4273fb5354b29beca73e4835ec02058f Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sun, 7 Feb 2016 13:34:02 +0000
Subject: Cherrypicked the new test textDisp-8.13 from core-8-5-branch. This
 test (and all the other tests) pass.

---
 tests/textDisp.test | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tests/textDisp.test b/tests/textDisp.test
index ac3aee0..532caf4 100644
--- a/tests/textDisp.test
+++ b/tests/textDisp.test
@@ -1191,6 +1191,14 @@ test textDisp-8.12 {TkTextChanged, moving the insert cursor redraws only past an
     # because during (b) findDLine cannot return the display line the
     # cursor is in since this display line was just unlinked in (a).
 } {{8.0 9.0} {8.0 12.0} {8.0 12.0} {3.0 8.0} {2.0 3.0}}
+test textDisp-8.13 {TkTextChanged, used to crash, see [06c1433906]} {
+    .t delete 1.0 end
+    .t insert 1.0 \nLine1\nLine2\n
+    update
+    .t insert 3.0 ""
+    .t delete 1.0 2.0
+    update idletasks
+} {}
 
 test textDisp-9.1 {TkTextRedrawTag} {
     .t configure -wrap char
-- 
cgit v0.12


From ecb4e238565152c913a65d2eb5d8ad782793b474 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Sun, 7 Feb 2016 19:21:04 +0000
Subject: while is better than if because it deals with wrapped lines then.

---
 generic/tkTextDisp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c
index fe69f28..91642f9 100644
--- a/generic/tkTextDisp.c
+++ b/generic/tkTextDisp.c
@@ -4683,7 +4683,7 @@ TextChanged(
          */
 
         lastPtr = FindDLine(textPtr, dInfoPtr->dLinePtr, &rounded);
-        if ((lastPtr != NULL) && (TkTextIndexCmp(&lastPtr->index, &rounded) < 0)) {
+        while ((lastPtr != NULL) && (TkTextIndexCmp(&lastPtr->index, &rounded) < 0)) {
             lastPtr = lastPtr->nextPtr;
         }
 
-- 
cgit v0.12


From 6fcac7ae49122cfb95054e673f24cd82835d4116 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Mon, 8 Feb 2016 19:42:54 +0000
Subject: Reverted [311ef109] and [1847c858] because they are no longer needed
 to fix bug [2f78c7c5ea]. The corresponding test textDisp-9.14 still passes.

---
 generic/tkTextDisp.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c
index 91642f9..c5ad36b 100644
--- a/generic/tkTextDisp.c
+++ b/generic/tkTextDisp.c
@@ -4806,16 +4806,9 @@ TextRedrawTag(
 
     /*
      * Round up the starting position if it's before the first line visible on
-     * the screen (we only care about what's on the screen). Beware that the
-     * display info structure might need update, for instance if we arrived
-     * here from an 'after idle' script removing tags in a range whose
-     * display lines (and dInfo) were partially invalidated by a previous
-     * delete operation in the text widget.
+     * the screen (we only care about what's on the screen).
      */
 
-    if (dInfoPtr->flags & DINFO_OUT_OF_DATE) {
-	UpdateDisplayInfo(textPtr);
-    }
     dlPtr = dInfoPtr->dLinePtr;
     if (dlPtr == NULL) {
 	return;
-- 
cgit v0.12


From 47fa51915781b8ceb0ad65f72b06b6d4814dbde7 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Mon, 8 Feb 2016 20:13:20 +0000
Subject: More comments in FindDLine, with slightly optimized code to achieve
 the same functionality.

---
 generic/tkTextDisp.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c
index c5ad36b..d45ac73 100644
--- a/generic/tkTextDisp.c
+++ b/generic/tkTextDisp.c
@@ -6618,17 +6618,25 @@ FindDLine(
             /*
              * We're past the last display line, either because the desired
              * index lies past the visible text, or because the desired index
-             * is on the last display line showing the last logical line.
+             * is on the last display line.
              */
             indexPtr2 = dlPtrPrev->index;
             TkTextIndexForwBytes(textPtr, &indexPtr2, dlPtrPrev->byteCount,
                     &indexPtr2);
             if (TkTextIndexCmp(&indexPtr2,indexPtr) > 0) {
+                /*
+                 * The desired index is on the last display line.
+                 * --> return this display line.
+                 */
                 dlPtr = dlPtrPrev;
-                break;
             } else {
-                return NULL;
+                /*
+                 * The desired index is past the visible text. There is no
+                 * display line displaying something at the desired index
+                 * --> return NULL.
+                 */
             }
+            break;
         }
         if (TkTextIndexCmp(&dlPtr->index,indexPtr) > 0) {
             dlPtr = dlPtrPrev;
-- 
cgit v0.12


From afd2fa759f72c2936c5fcec0449acbaaaa93f989 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Mon, 8 Feb 2016 20:15:40 +0000
Subject: Renumbered lines to avoid wrong interpretation of the test.

---
 tests/textDisp.test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/textDisp.test b/tests/textDisp.test
index 532caf4..6aa3721 100644
--- a/tests/textDisp.test
+++ b/tests/textDisp.test
@@ -1193,7 +1193,7 @@ test textDisp-8.12 {TkTextChanged, moving the insert cursor redraws only past an
 } {{8.0 9.0} {8.0 12.0} {8.0 12.0} {3.0 8.0} {2.0 3.0}}
 test textDisp-8.13 {TkTextChanged, used to crash, see [06c1433906]} {
     .t delete 1.0 end
-    .t insert 1.0 \nLine1\nLine2\n
+    .t insert 1.0 \nLine2\nLine3\n
     update
     .t insert 3.0 ""
     .t delete 1.0 2.0
-- 
cgit v0.12


From d00d37bf4da1bd2c0ac1548af910aea41a4e1289 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Mon, 8 Feb 2016 21:13:57 +0000
Subject: Made FindDLine fully match its header description.

---
 generic/tkTextDisp.c | 33 ++++++++++++++++++++++++++++++---
 tests/textDisp.test  | 11 +----------
 2 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c
index d45ac73..4d41134 100644
--- a/generic/tkTextDisp.c
+++ b/generic/tkTextDisp.c
@@ -6590,6 +6590,7 @@ FindDLine(
     CONST TkTextIndex *indexPtr)/* Index of desired character. */
 {
     DLine *dlPtrPrev;
+    TkTextIndex indexPtr2;
 
     if (dlPtr == NULL) {
 	return NULL;
@@ -6614,7 +6615,6 @@ FindDLine(
         dlPtrPrev = dlPtr;
         dlPtr = dlPtr->nextPtr;
         if (dlPtr == NULL) {
-            TkTextIndex indexPtr2;
             /*
              * We're past the last display line, either because the desired
              * index lies past the visible text, or because the desired index
@@ -6632,14 +6632,41 @@ FindDLine(
             } else {
                 /*
                  * The desired index is past the visible text. There is no
-                 * display line displaying something at the desired index
+                 * display line displaying something at the desired index.
                  * --> return NULL.
                  */
             }
             break;
         }
         if (TkTextIndexCmp(&dlPtr->index,indexPtr) > 0) {
-            dlPtr = dlPtrPrev;
+            /*
+             * If we're here then we would normally expect that:
+             *   dlPtrPrev->index  <=  indexPtr  <  dlPtr->index
+             * i.e. we have found the searched display line being dlPtr.
+             * However it is possible that some DLines were unlinked
+             * previously, leading to a situation where going through
+             * the list of display lines skips display lines that did
+             * exist just a moment ago.
+             */
+            indexPtr2 = dlPtrPrev->index;
+            TkTextIndexForwBytes(textPtr, &indexPtr2, dlPtrPrev->byteCount,
+                    &indexPtr2);
+            if (TkTextIndexCmp(&indexPtr2,indexPtr) > 0) {
+                /*
+                 * Confirmed:
+                 *   dlPtrPrev->index  <=  indexPtr  <  dlPtr->index
+                 * --> return dlPtrPrev.
+                 */
+                dlPtr = dlPtrPrev;
+            } else {
+                /*
+                 * The last (rightmost) index shown by dlPtrPrev is still
+                 * before the desired index. This may be because there was
+                 * previously a display line between dlPtrPrev and dlPtr
+                 * and this display line has been unlinked.
+                 * --> return dlPtr.
+                 */
+            }
             break;
         }
     }
diff --git a/tests/textDisp.test b/tests/textDisp.test
index 6aa3721..885c940 100644
--- a/tests/textDisp.test
+++ b/tests/textDisp.test
@@ -1181,16 +1181,7 @@ test textDisp-8.12 {TkTextChanged, moving the insert cursor redraws only past an
     .t mark set insert 3.8        ; # within the same line
     update
     lappend res $tk_textRedraw
-    # This last one is tricky: correct result really is {2.0 3.0} when
-    # calling .t mark set insert, two calls to TkTextChanged are done:
-    # (a) to redraw the line of the past position of the cursor
-    # (b) to redraw the line of the new position of the cursor
-    # During (a) the display line showing the cursor gets unlinked,
-    # which leads TkTextChanged in (b) to schedule a redraw starting
-    # one line _before_ the line containing the insert cursor. This is
-    # because during (b) findDLine cannot return the display line the
-    # cursor is in since this display line was just unlinked in (a).
-} {{8.0 9.0} {8.0 12.0} {8.0 12.0} {3.0 8.0} {2.0 3.0}}
+} {{8.0 9.0} {8.0 12.0} {8.0 12.0} {3.0 8.0} {3.0 4.0}}
 test textDisp-8.13 {TkTextChanged, used to crash, see [06c1433906]} {
     .t delete 1.0 end
     .t insert 1.0 \nLine2\nLine3\n
-- 
cgit v0.12


From 961c4a400fecbd654b8b744a5de3f006ceb22d58 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Mon, 8 Feb 2016 21:39:52 +0000
Subject: With the real fix in FindDLine ([717e12ee]) there is no need anymore
 of the emergency patch [c3c09f82].

---
 generic/tkTextDisp.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c
index 4d41134..44d451a 100644
--- a/generic/tkTextDisp.c
+++ b/generic/tkTextDisp.c
@@ -4683,9 +4683,6 @@ TextChanged(
          */
 
         lastPtr = FindDLine(textPtr, dInfoPtr->dLinePtr, &rounded);
-        while ((lastPtr != NULL) && (TkTextIndexCmp(&lastPtr->index, &rounded) < 0)) {
-            lastPtr = lastPtr->nextPtr;
-        }
 
         /*
          * At least one display line is supposed to change. This makes the
-- 
cgit v0.12


From 4cf679d27cf1beb50d5806e6173a8071821aff95 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Mon, 8 Feb 2016 21:45:03 +0000
Subject: Corrected indentation + added an explanatory comment.

---
 generic/tkTextDisp.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c
index 07623c4..960f11a 100644
--- a/generic/tkTextDisp.c
+++ b/generic/tkTextDisp.c
@@ -5243,7 +5243,10 @@ TkTextSetYView(
 
                     dInfoPtr->newTopPixelOffset = 0;
                     goto scheduleUpdate;
-	            }
+                }
+                /*
+                 * The line is already on screen, with no need to scroll.
+                 */
                 return;
             }
         }
-- 
cgit v0.12


From 199e45b764bee51a9aacbced3e5ac9828b731d3f Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 9 Feb 2016 09:23:17 +0000
Subject: Fix [62a5ba7474]: tk 'make install' fails on Mac OS 10.11

---
 macosx/GNUmakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/macosx/GNUmakefile b/macosx/GNUmakefile
index 02240ed..24e1f77 100644
--- a/macosx/GNUmakefile
+++ b/macosx/GNUmakefile
@@ -116,7 +116,7 @@ TCL_FRAMEWORK_DIR	:= ${TCL_BUILD_DIR}/..
 MAKE_VARS		:=
 else
 TCL_DIR			:= ${TCL_FRAMEWORK_DIR}/Tcl.framework
-TCL_EXE			:= ${TCLSH_DIR}/tclsh${TCL_VERSION}
+TCL_EXE			:= ${TCLSH_DIR}/bin/tclsh${TCL_VERSION}
 MAKE_VARS		:= TCL_EXE
 export DYLD_FRAMEWORK_PATH := ${TCL_FRAMEWORK_DIR}
 endif
-- 
cgit v0.12


From 8f151700b10bf8811876305e284738707d4ad237 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 9 Feb 2016 09:48:23 +0000
Subject: Slightly more logical fix for [62a5ba7474]: tk 'make install' fails
 on Mac OS 10.11, which doesn't change the meaning of TCLSH_DIR

---
 macosx/GNUmakefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/macosx/GNUmakefile b/macosx/GNUmakefile
index 24e1f77..d0bab1a 100644
--- a/macosx/GNUmakefile
+++ b/macosx/GNUmakefile
@@ -35,7 +35,7 @@ MANDIR			?= ${PREFIX}/man
 TCL_BUILD_DIR		?= ${BUILD_DIR}/tcl/${BUILD_STYLE}
 # location of installed tcl, only used if tcl in TCL_BUILD_DIR can't be found
 TCL_FRAMEWORK_DIR	?= /Library/Frameworks
-TCLSH_DIR		?= ${PREFIX}
+TCLSH_DIR		?= ${PREFIX}/bin
 
 # set to non-empty value to install manpages in addition to html help:
 INSTALL_MANPAGES	?=
@@ -116,7 +116,7 @@ TCL_FRAMEWORK_DIR	:= ${TCL_BUILD_DIR}/..
 MAKE_VARS		:=
 else
 TCL_DIR			:= ${TCL_FRAMEWORK_DIR}/Tcl.framework
-TCL_EXE			:= ${TCLSH_DIR}/bin/tclsh${TCL_VERSION}
+TCL_EXE			:= ${TCLSH_DIR}/tclsh${TCL_VERSION}
 MAKE_VARS		:= TCL_EXE
 export DYLD_FRAMEWORK_PATH := ${TCL_FRAMEWORK_DIR}
 endif
-- 
cgit v0.12