From cebe1d64e750ee7f6f53406380436936bdd43fe0 Mon Sep 17 00:00:00 2001
From: Chinh Nguyen <unknown>
Date: Thu, 8 Dec 2016 10:41:53 +1100
Subject: Bug [#1891]. Fix crash on view destruction with macOS 10.12.2.

---
 cocoa/ScintillaView.mm    | 1 +
 doc/ScintillaHistory.html | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/cocoa/ScintillaView.mm b/cocoa/ScintillaView.mm
index ab0c4375b..cdb71ae55 100644
--- a/cocoa/ScintillaView.mm
+++ b/cocoa/ScintillaView.mm
@@ -1545,6 +1545,7 @@ sourceOperationMaskForDraggingContext: (NSDraggingContext) context
   delete mBackend;
   mBackend = NULL;
   mContent.owner = nil;
+  [marginView setClientView:nil];
   [scrollView removeFromSuperview];
   [marginView release];
   [super dealloc];
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 1e06a9983..47cf8e7b1 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -532,6 +532,10 @@
 	For Qt 5, define QT_WS_MAC or QT_WS_X11 on those platforms.
 	<a href="http://sourceforge.net/p/scintilla/bugs/1887/">Bug #1887</a>.
 	</li>
+	<li>
+	For Cocoa, fix crash on view destruction with macOS 10.12.2.
+	<a href="http://sourceforge.net/p/scintilla/bugs/1891/">Bug #1891</a>.
+	</li>
     </ul>
     <h3>
        <a href="http://www.scintilla.org/scite371.zip">Release 3.7.1</a>
-- 
cgit v1.2.3