From be3a29538266c07c2c4805144dd6f1b31eb4b06e Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 29 Sep 2016 12:40:28 +0000
Subject: remove unintended failing test-case, added in previous commit

---
 tests/entry.test | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/tests/entry.test b/tests/entry.test
index 1be1d2d..d27ffb5 100644
--- a/tests/entry.test
+++ b/tests/entry.test
@@ -2920,11 +2920,6 @@ test entry-16.4 {EntryVisibleRange procedure} -body {
 } -cleanup {
     destroy .e
 } -result {0.000000 1.000000}
-test entry-16.5 {Unicode handling in entry widget} -body {
-    entry .e -show abc
-} -cleanup {
-    destroy .e
-} -result {0.000000 1.000000}
 
 
 test entry-17.1 {EntryUpdateScrollbar procedure} -body {
-- 
cgit v0.12


From 296b6203712e0a79f4e8facc83cb5518adb8b292 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Fri, 30 Sep 2016 07:34:36 +0000
Subject: Fix UNIX build, and eliminate possible warning in Makefile

---
 generic/tkFont.c | 13 ++++++++-----
 win/Makefile.in  |  1 +
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/generic/tkFont.c b/generic/tkFont.c
index 51b2fce..bec8807 100644
--- a/generic/tkFont.c
+++ b/generic/tkFont.c
@@ -13,7 +13,6 @@
 
 #include "tkInt.h"
 #include "tkFont.h"
-#include <windows.h>
 
 /*
  * The following structure is used to keep track of all the fonts that exist
@@ -1716,11 +1715,15 @@ Tk_PostscriptFontName(
 		upper = 1;
 	    }
 	    src += TkUtfToUniChar(src, &ch);
-	    if (upper) {
-		ch = Tcl_UniCharToUpper(ch);
-		upper = 0;
+	    if (ch <= 0xffff) {
+		if (upper) {
+		    ch = Tcl_UniCharToUpper(ch);
+		    upper = 0;
+		} else {
+		    ch = Tcl_UniCharToLower(ch);
+		}
 	    } else {
-		ch = Tcl_UniCharToLower(ch);
+		upper = 0;
 	    }
 	    dest += TkUniCharToUtf(ch, dest);
 	}
diff --git a/win/Makefile.in b/win/Makefile.in
index cc90b71..7e48213 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -27,6 +27,7 @@ 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
-- 
cgit v0.12