From 9242468fa809c82db6353f1dad4d190d3321a7ac Mon Sep 17 00:00:00 2001
From: John Donoghue <john.donoghue@ieee.org>
Date: Tue, 2 Jan 2018 08:09:54 -0500
Subject: Backport: [Bug #1985] Add 'while' keyword to Matlab lexer keywords
 that start a fold block

* lexers/LexMatlab.cxx
  (CheckKeywordFoldPoint): add check for while keyword

Backport of changeset 6423:0fc72517fb07.
---
 doc/ScintillaHistory.html | 4 ++++
 lexers/LexMatlab.cxx      | 1 +
 2 files changed, 5 insertions(+)

diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 5b63ce841..19b2d4b17 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -574,6 +574,10 @@
 	Django tag inside of a &#123;# #&#125; Django comment does not break highlighting of rest of file
 	</li>
 	<li>
+	The Matlab folder now treats "while" as a fold start.
+	<a href="http://sourceforge.net/p/scintilla/bugs/1985/">Bug #1985</a>.
+	</li>
+	<li>
 	Improve VHDL lexer's handling of character literals and escape characters in strings.
 	</li>
 	<li>
diff --git a/lexers/LexMatlab.cxx b/lexers/LexMatlab.cxx
index 6063623ea..a36a99502 100644
--- a/lexers/LexMatlab.cxx
+++ b/lexers/LexMatlab.cxx
@@ -64,6 +64,7 @@ static int CheckKeywordFoldPoint(char *str) {
 	if (strcmp ("if", str) == 0 ||
 		strcmp ("for", str) == 0 ||
 		strcmp ("switch", str) == 0 ||
+		strcmp ("while", str) == 0 ||
 		strcmp ("try", str) == 0 ||
 		strcmp ("do", str) == 0 ||
 		strcmp ("parfor", str) == 0 ||
-- 
cgit v1.2.3