lexlua: Deprecated `lexer.fold_line_comments()` in favor of `lexer.fold_consecutive_lines()`.

Also use `lexer.fold_line_groups` for option that enables this folding, avoiding
name clash that plagued the previous option.
Added "import" folding for Java.

2 files changed, 21 insertions, 14 deletions

diff --git a/doc/LPegLexer.html b/doc/LPegLexer.html
index 2926ae13b..569b76925 100644
--- a/doc/LPegLexer.html
+++ b/doc/LPegLexer.html
@@ -1606,14 +1606,14 @@ operator    30
     </ul>
 
 
-    <p><a id="lexer.fold_line_comments"></a></p>
+    <p><a id="lexer.fold_line_groups"></a></p>
 
-    <h3><code>lexer.fold_line_comments</code> (boolean)</h3>
+    <h3><code>lexer.fold_line_groups</code> (boolean)</h3>
 
-    <p>Whether or not to fold multiple, consecutive line comments and only show
-      the top-level comment.
+    <p>Whether or not to fold multiple, consecutive line groups (such as line
+      comments or import statements) and only show the top line.
       This option is disabled by default.
-      This is an alias for <code>lexer.property['fold.line.comments'] = '1|0'</code>.</p>
+      This is an alias for <code>lexer.property['fold.line.groups'] = '1|0'</code>.</p>
 
     <p><a id="lexer.fold_on_zero_sum_lines"></a></p>
 
@@ -1928,27 +1928,26 @@ operator    30
     </ul>
 
 
-    <p><a id="lexer.fold_line_comments"></a></p>
+    <p><a id="lexer.fold_consecutive_lines"></a></p>
 
-    <h3><code>lexer.fold_line_comments</code> (prefix)</h3>
+    <h3><code>lexer.fold_consecutive_lines</code> (prefix)</h3>
 
-    <p>Returns a fold function (to be passed to <code>lexer.add_fold_point()</code>) that folds
-    consecutive line comments that start with string <em>prefix</em>.</p>
+    <p>Returns for <code>lexer.add_fold_point()</code> the parameters needed to fold
+    consecutive lines that start with string <em>prefix</em>.</p>
 
     <p>Parameters:</p>
 
     <ul>
-    <li><code>prefix</code>: The prefix string defining a line comment.</li>
+    <li><code>prefix</code>: The prefix string (e.g. a line comment).</li>
     </ul>
 
 
     <p>Usage:</p>
 
     <ul>
-    <li><code>lex:add_fold_point(lexer.COMMENT, '--',
-    lexer.fold_line_comments('--'))</code></li>
-    <li><code>lex:add_fold_point(lexer.COMMENT, '//',
-    lexer.fold_line_comments('//'))</code></li>
+    <li><code>lex:add_fold_point(lexer.COMMENT, lexer.fold_consecutive_lines('--'))</code></li>
+    <li><code>lex:add_fold_point(lexer.COMMENT, lexer.fold_consecutive_lines('//'))</code></li>
+    <li><code>lex:add_fold_point(lexer.KEYWORD, lexer.fold_consecutive_lines('import'))</code></li>
     </ul>
 
 
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 026a37c3d..8d090f5fa 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -603,6 +603,10 @@
 	<a href="https://sourceforge.net/p/scintilla/feature-requests/1361/">Feature #1361</a>.
 	</li>
 	<li>
+	The curses platform's <code>scintilla_get_clipboard()</code> now returns a
+	copy of clipboard text directly.
+	</li>
+	<li>
 	Fix translucent rectangle drawing on Qt. When drawing a translucent selection, there were edge
 	artifacts as the calls used were drawing outlines over fill areas. Make bottom and right borders on
 	INDIC_ROUNDBOX be same intensity as top and left.
@@ -650,6 +654,10 @@
 	The Lua LPeg lexer for C now highlights C99 <code>bool</code>, <code>true</code>, and <code>false</code>.
 	</li>
 	<li>
+	Fixed crashes in Lua LPeg lexer when "lexer.lua" cannot be found, and when
+	attempting to set styles for non-existant tokens.
+	</li>
+	<li>
 	Fixed bug with GTK on recent Linux distributions where underscores were invisible.
 	<a href="https://sourceforge.net/p/scintilla/bugs/2173/">Bug #2173</a>.
 	</li>