Merge 8.7

4 files changed, 4 insertions, 5 deletions

diff --git a/macosx/README b/macosx/README
index 43f86ad..64be140 100644
--- a/macosx/README
+++ b/macosx/README
@@ -638,7 +638,7 @@ 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
+The Text widget attempts to improve performance 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
@@ -647,7 +647,7 @@ 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
+On unix, the low level scrolling is done by XCopyArea, 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
diff --git a/macosx/tkMacOSXBitmap.c b/macosx/tkMacOSXBitmap.c
index b1fbd17..39fd602 100644
--- a/macosx/tkMacOSXBitmap.c
+++ b/macosx/tkMacOSXBitmap.c
@@ -24,7 +24,7 @@ typedef struct {
 } BuiltInIcon;
 
 /*
- * This array mapps a string name to the supported builtin icons
+ * This array maps a string name to the supported builtin icons
  * on the Macintosh.
  */
 
diff --git a/macosx/tkMacOSXImage.c b/macosx/tkMacOSXImage.c
index adf5d39..3aa3853 100644
--- a/macosx/tkMacOSXImage.c
+++ b/macosx/tkMacOSXImage.c
@@ -419,7 +419,7 @@ XCreateImage(
 	ximage->bitmap_pad = bitmap_pad;
     } else {
 	/*
-	 * Use 16 byte alignment for best Quartz perfomance.
+	 * Use 16 byte alignment for best Quartz performance.
 	 */
 
 	ximage->bitmap_pad = 128;
diff --git a/macosx/tkMacOSXPrivate.h b/macosx/tkMacOSXPrivate.h
index 94b76e0..51901c9 100644
--- a/macosx/tkMacOSXPrivate.h
+++ b/macosx/tkMacOSXPrivate.h
@@ -317,7 +317,6 @@ VISIBILITY_HIDDEN
     NSArray *_defaultApplicationMenuItems, *_defaultWindowsMenuItems;
     NSArray *_defaultHelpMenuItems, *_defaultFileMenuItems;
     NSAutoreleasePool *_mainPool;
-    NSThread *_backgoundLoop;
 }
 @property int poolLock;
 @property int macOSVersion;