Backport: Feature [feature-requests:#1297] Updated Scintilla.h from Scintilla.iface.

Adds *_NONE and INDICATOR_* enumeration values.
Moves old INDIC?_MASK to deprecated section.

Backport of changeset 7593:5b74284d6970.

2 files changed, 41 insertions, 11 deletions

diff --git a/doc/ScintillaDoc.html b/doc/ScintillaDoc.html
index 83dd14a07..1bfb98368 100644
--- a/doc/ScintillaDoc.html
+++ b/doc/ScintillaDoc.html
@@ -116,7 +116,7 @@
 
     <h1>Scintilla Documentation</h1>
 
-    <p>Last edited 18 June 2019 NH</p>
+    <p>Last edited 22 June 2019 NH</p>
 
     <p>There is <a class="jump" href="Design.html">an overview of the internal design of
     Scintilla</a>.<br />
@@ -788,6 +788,12 @@ struct Sci_TextRange {
     <table class="standard" summary="Search flags">
       <tbody>
         <tr>
+          <td><code>SCFIND_NONE</code></td>
+
+          <td>Default setting is case-insensitive literal match.</td>
+        </tr>
+
+        <tr>
           <td><code>SCFIND_MATCHCASE</code></td>
 
           <td>A match only occurs with text that matches the case of the search string.</td>
@@ -1198,7 +1204,8 @@ struct Sci_TextToFind {
      and <code>SCI_ENDUNDOACTION</code>.</p>
 
      <p>The flags argument can be <code>UNDO_MAY_COALESCE</code> (1) if the container action may be
-     coalesced along with any insertion and deletion actions into a single compound action, otherwise 0.
+     coalesced along with any insertion and deletion actions into a single compound action, otherwise
+     <code>UNDO_NONE</code> (0).
      Coalescing treats coalescible container actions as transparent so will still only group together insertions that
      look like typing or deletions that look like multiple uses of the Backspace or Delete keys.
      </p>
@@ -4328,11 +4335,16 @@ struct Sci_TextToFind {
     They may also be invisible when used to track pieces of content for the application as <code>INDIC_HIDDEN</code>.</p>
 
     <p>The <code>SCI_INDIC*</code> messages allow you to get and set the visual appearance of the
-    indicators. They all use an <code class="parameter">indicator</code> argument in the range 0 to INDIC_MAX(35)
+    indicators. They all use an <code class="parameter">indicator</code> argument in the range 0 to INDICATOR_MAX(35)
     to set the indicator to style. To prevent interference the set of indicators is divided up into a range for use
     by lexers (0..7) a range for use by containers
-    (8=<code>INDIC_CONTAINER</code> .. 31=<code>INDIC_IME-1</code>)
-    and a range for IME indicators (32=<code>INDIC_IME</code> .. 35=<code>INDIC_IME_MAX</code>).</p>
+    (8=<code>INDICATOR_CONTAINER</code> .. 31=<code>INDICATOR_IME-1</code>)
+    and a range for IME indicators (32=<code>INDICATOR_IME</code> .. 35=<code>INDICATOR_IME_MAX</code>).</p>
+
+    <p>The <code>INDICATOR_*</code> values used for dividing up indicators
+    were previously <code>INDIC_CONTAINER</code>, <code>INDIC_IME</code>,
+    <code>INDIC_IME_MAX</code>, and <code>INDIC_MAX</code>
+    but these were confused with indicator styles so the new names should be used.</p>
 
     <p>Indicators are stored in a format similar to run length encoding which is efficient in both
     speed and storage for sparse information.</p>
@@ -7570,6 +7582,16 @@ href="#SCI_POSITIONFROMLINE">SCI_POSITIONFROMLINE</a>(lineNumber);
 
       <tbody valign="top">
         <tr>
+          <td align="left"><code>SC_MOD_NONE</code></td>
+
+          <td align="right">0x00</td>
+
+          <td>Base value with no fields valid. Will not occur but is useful in tests.</td>
+
+          <td><code></code></td>
+        </tr>
+
+        <tr>
           <td align="left"><code>SC_MOD_INSERTTEXT</code></td>
 
           <td align="right">0x01</td>
diff --git a/include/Scintilla.h b/include/Scintilla.h
index b4b4f2e7e..288002dd1 100644
--- a/include/Scintilla.h
+++ b/include/Scintilla.h
@@ -293,14 +293,14 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
 #define INDIC_POINTCHARACTER 19
 #define INDIC_GRADIENT 20
 #define INDIC_GRADIENTCENTRE 21
+#define INDIC_CONTAINER 8
 #define INDIC_IME 32
 #define INDIC_IME_MAX 35
-#define INDIC_MAX 35
-#define INDIC_CONTAINER 8
-#define INDIC0_MASK 0x20
-#define INDIC1_MASK 0x40
-#define INDIC2_MASK 0x80
-#define INDICS_MASK 0xE0
+#define INDICATOR_MAX 35
+#define INDICATOR_CONTAINER 8
+#define INDICATOR_IME 32
+#define INDICATOR_IME_MAX 35
+#define INDICATOR_MAX 35
 #define SCI_INDICSETSTYLE 2080
 #define SCI_INDICGETSTYLE 2081
 #define SCI_INDICSETFORE 2082
@@ -399,6 +399,7 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
 #define SC_PRINT_SCREENCOLOURS 5
 #define SCI_SETPRINTCOLOURMODE 2148
 #define SCI_GETPRINTCOLOURMODE 2149
+#define SCFIND_NONE 0x0
 #define SCFIND_WHOLEWORD 0x2
 #define SCFIND_MATCHCASE 0x4
 #define SCFIND_WORDSTART 0x00100000
@@ -896,6 +897,7 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
 #define SCI_ANNOTATIONGETSTYLEOFFSET 2551
 #define SCI_RELEASEALLEXTENDEDSTYLES 2552
 #define SCI_ALLOCATEEXTENDEDSTYLES 2553
+#define UNDO_NONE 0
 #define UNDO_MAY_COALESCE 1
 #define SCI_ADDUNDOACTION 2560
 #define SCI_CHARPOSITIONFROMPOINT 2561
@@ -1028,6 +1030,7 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
 #define SCI_NAMEOFSTYLE 4030
 #define SCI_TAGSOFSTYLE 4031
 #define SCI_DESCRIPTIONOFSTYLE 4032
+#define SC_MOD_NONE 0x0
 #define SC_MOD_INSERTTEXT 0x1
 #define SC_MOD_DELETETEXT 0x2
 #define SC_MOD_CHANGESTYLE 0x4
@@ -1243,6 +1246,11 @@ struct SCNotification {
 #define SCI_GETSTYLEBITS 2091
 #define SCI_GETSTYLEBITSNEEDED 4011
 
+#define INDIC0_MASK 0x20
+#define INDIC1_MASK 0x40
+#define INDIC2_MASK 0x80
+#define INDICS_MASK 0xE0
+
 #endif
 
 #endif