From 4dd26486a8997a2706c8c9369c4a17706c33e114 Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Thu, 11 Feb 2016 13:09:34 +0000
Subject: Fix crash in TkFinalize() if Tk_Init() is never called. Suggested by
 Brian Griffin.

---
 generic/tkEvent.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/generic/tkEvent.c b/generic/tkEvent.c
index bcc6d98..95aeda1 100644
--- a/generic/tkEvent.c
+++ b/generic/tkEvent.c
@@ -2039,6 +2039,12 @@ TkFinalize(
 {
     ExitHandler *exitPtr;
 
+#if defined(_WIN32) && !defined(STATIC_BUILD)
+    if (!tclStubsPtr) {
+	return;
+    }
+#endif
+
     Tcl_DeleteExitHandler(TkFinalize, NULL);
 
     Tcl_MutexLock(&exitMutex);
-- 
cgit v0.12


From 2c864a03e860d3d1b46385e52f6fb648b9f7edb2 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Thu, 11 Feb 2016 13:58:42 +0000
Subject: Repair visual test for bevels, inadvertently broken in [6a93101279]

---
 tests/bevel.tcl | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/bevel.tcl b/tests/bevel.tcl
index 531def0..4af60f3 100644
--- a/tests/bevel.tcl
+++ b/tests/bevel.tcl
@@ -147,14 +147,12 @@ set ind [.t.t index end]
  xxxx} {} SSSSS sol100 {xxxx
  x} {} SSSSSSSSSSSSSSSSSS sol100 {x
  xxx} {} SSSSSSSSS sol100 xxxx {}
-}
 
 .t.t insert end "\n\nA thinner border is continuous"
 .t.t insert end {
  xxxx} {} SSSSS sol12 {xxxx
  x} {} SSSSSSSSSSSSSSSSSS sol12 {x
  xxx} {} SSSSSSSSS sol12 xxxx {}
-}
 
 .t.t tag add big $ind end
 
-- 
cgit v0.12


From 365dd709b8625b7b08f347f0c0122612c454b618 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Thu, 11 Feb 2016 20:06:29 +0000
Subject: Fixed error in comment

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

diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c
index 7969091..1eea37d 100644
--- a/generic/tkTextDisp.c
+++ b/generic/tkTextDisp.c
@@ -1640,7 +1640,7 @@ LayoutDLine(
      * Make one more pass over the line to recompute various things like its
      * height, length, and total number of bytes. Also modify the x-locations
      * of chunks to reflect justification. If we're not wrapping, I'm not sure
-     * what is the best way to handle left and center justification: should
+     * what is the best way to handle right and center justification: should
      * the total length, for purposes of justification, be (a) the window
      * width, (b) the length of the longest line in the window, or (c) the
      * length of the longest line in the text? (c) isn't available, (b) seems
-- 
cgit v0.12