merge trunk

FossilOrigin-Name: f18cbdb44a489641bb0fc7f6e5c5889347e6bc6c

3 files changed, 7 insertions, 3 deletions

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);
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
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