From bdd66570ca882bb027ef91bd6cd6a9e15728d974 Mon Sep 17 00:00:00 2001
From: nyamatongwe <devnull@localhost>
Date: Wed, 27 Oct 2010 10:44:38 +1100
Subject: Fix for bug #3063822 for bash here docs starting with <<-

---
 doc/ScintillaHistory.html | 4 ++++
 lexers/LexBash.cxx        | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 768301c69..e1863d1a1 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -427,6 +427,10 @@
 	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3073481&group_id=2439">Bug #3073481.</a>
 	</li>
 	<li>
+	Bash lexer bug fixed for here docs starting with &lt;&lt;-.
+	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3063822&group_id=2439">Bug #3063822.</a>
+	</li>
+	<li>
 	C++ lexer bug fixed for // comments that are continued onto a second line by a \.
 	<a href="https://sourceforge.net/tracker/?func=detail&atid=102439&aid=3066031&group_id=2439">Bug #3066031.</a>
 	</li>
diff --git a/lexers/LexBash.cxx b/lexers/LexBash.cxx
index 7c06bdebb..1c844a6fd 100644
--- a/lexers/LexBash.cxx
+++ b/lexers/LexBash.cxx
@@ -407,8 +407,8 @@ static void ColouriseBashDoc(unsigned int startPos, int length, int initStyle,
 					if (s[strlen(s) - 1] == '\r')
 						s[strlen(s) - 1] = '\0';
 					if (strcmp(HereDoc.Delimiter, s) == 0) {
-						if ((prefixws > 0 && HereDoc.Indent) ||	// indentation rule
-							(prefixws == 0 && !HereDoc.Indent)) {
+						if ((prefixws == 0) ||	// indentation rule
+							(prefixws > 0 && HereDoc.Indent)) {
 							sc.SetState(SCE_SH_DEFAULT);
 							break;
 						}
-- 
cgit v1.2.3