From 1f476341f4bf1b32eb51866503a71fa335f073db Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Sun, 30 Sep 2018 09:37:31 +1000
Subject: Backport: Synchronize definition and documentation.

Backport of changeset 7102:927e7d62e917.
---
 doc/ScintillaDoc.html   | 6 +++---
 include/Scintilla.iface | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/ScintillaDoc.html b/doc/ScintillaDoc.html
index 19de81032..29cba5cef 100644
--- a/doc/ScintillaDoc.html
+++ b/doc/ScintillaDoc.html
@@ -1534,7 +1534,7 @@ struct Sci_TextToFind {
      <a class="message" href="#SCI_ALLOCATELINECHARACTERINDEX">SCI_ALLOCATELINECHARACTERINDEX(int lineCharacterIndex)</a><br />
      <a class="message" href="#SCI_RELEASELINECHARACTERINDEX">SCI_RELEASELINECHARACTERINDEX(int lineCharacterIndex)</a><br />
      <a class="message" href="#SCI_LINEFROMINDEXPOSITION">SCI_LINEFROMINDEXPOSITION(int pos, int lineCharacterIndex) &rarr; int</a><br />
-     <a class="message" href="#SCI_INDEXPOSITIONFROMLINE">SCI_INDEXPOSITIONFROMLINE(int line, int lineCharacterIndex) &rarr; int</a><br />
+     <a class="message" href="#SCI_INDEXPOSITIONFROMLINE">SCI_INDEXPOSITIONFROMLINE(int line, int lineCharacterIndex) &rarr; position</a><br />
     </code>
 
     <p><b id="SCI_POSITIONRELATIVE">SCI_POSITIONRELATIVE(int pos, int relative) &rarr; position</b><br />
@@ -1546,7 +1546,7 @@ struct Sci_TextToFind {
     <p><b id="SCI_COUNTCHARACTERS">SCI_COUNTCHARACTERS(int start, int end) &rarr; int</b><br />
      Returns the number of whole characters between two positions.</p>
 
-    <p><b id="SCI_POSITIONRELATIVECODEUNITS">SCI_POSITIONRELATIVECODEUNITS(int pos, int relative) &rarr; int</b><br />
+    <p><b id="SCI_POSITIONRELATIVECODEUNITS">SCI_POSITIONRELATIVECODEUNITS(int pos, int relative) &rarr; position</b><br />
     <b id="SCI_COUNTCODEUNITS">SCI_COUNTCODEUNITS(int start, int end) &rarr; int</b><br />
      These are the UTF-16 versions of <code>SCI_POSITIONRELATIVE</code> and <code>SCI_COUNTCHARACTERS</code>
      working in terms of UTF-16 code units.</p>
@@ -1566,7 +1566,7 @@ struct Sci_TextToFind {
      Only one index of each type is created for a document at a time.</p>
 
     <p><b id="SCI_LINEFROMINDEXPOSITION">SCI_LINEFROMINDEXPOSITION(int pos, int lineCharacterIndex) &rarr; int</b><br />
-    <b id="SCI_INDEXPOSITIONFROMLINE">SCI_INDEXPOSITIONFROMLINE(int line, int lineCharacterIndex) &rarr; int</b><br />
+    <b id="SCI_INDEXPOSITIONFROMLINE">SCI_INDEXPOSITIONFROMLINE(int line, int lineCharacterIndex) &rarr; position</b><br />
      The document line of a particular character or code unit may be found by calling <code>SCI_LINEFROMINDEXPOSITION</code> with one of
      <code>SC_LINECHARACTERINDEX_UTF32(1)</code> or <code>SC_LINECHARACTERINDEX_UTF16(2)</code>.
      The inverse action, finds the starting position of a document line either in characters or code units from the document start by calling
diff --git a/include/Scintilla.iface b/include/Scintilla.iface
index 4dc08d4e1..a966d6bf4 100644
--- a/include/Scintilla.iface
+++ b/include/Scintilla.iface
@@ -4957,7 +4957,7 @@ fun void AllocateLineCharacterIndex=2711(int lineCharacterIndex,)
 fun void ReleaseLineCharacterIndex=2712(int lineCharacterIndex,)
 
 # Retrieve the document line containing a position measured in index units.
-fun int LineFromIndexPosition=2713(position posUTF32, int lineCharacterIndex)
+fun int LineFromIndexPosition=2713(position pos, int lineCharacterIndex)
 
 # Retrieve the position measured in index units at the start of a document line.
 fun position IndexPositionFromLine=2714(int line, int lineCharacterIndex)
-- 
cgit v1.2.3