From 3468e74bd70723987dc83ec3623b6839be3a1557 Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Wed, 19 Oct 2016 12:27:52 +1100
Subject: Margin click to select line now clears rectangular and additional
 selections.

---
 doc/ScintillaHistory.html | 3 +++
 src/Editor.cxx            | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 982d7ca1c..ea02b5a4b 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -523,6 +523,9 @@
 	Released 16 October 2016.
 	</li>
 	<li>
+	Margin click to select line now clears rectangular and additional selections.
+	</li>
+	<li>
 	A potential bug on GTK+ fixed where asynchronous clipboard could be delivered after its
 	target Scintilla instance was destroyed.
 	</li>
diff --git a/src/Editor.cxx b/src/Editor.cxx
index 9fcd01fbb..4733ae296 100644
--- a/src/Editor.cxx
+++ b/src/Editor.cxx
@@ -4498,6 +4498,9 @@ void Editor::ButtonDownWithModifiers(Point pt, unsigned int curTime, int modifie
 		}
 	} else {	// Single click
 		if (inSelMargin) {
+			if (sel.IsRectangular() || (sel.Count() > 1)) {
+				sel.Clear();
+			}
 			sel.selType = Selection::selStream;
 			if (!shift) {
 				// Single click in margin: select whole line or only subline if word wrap is enabled
-- 
cgit v1.2.3