From 687cd7a0e91208e97bd198cf13f416b0937dd6c3 Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Sun, 2 Feb 2014 18:09:44 +1100
Subject: Added wrap mode SC_WRAP_WHITESPACE which only wraps on whitespace,
 not on style changes. From Robert Gieseke.

---
 doc/ScintillaDoc.html     | 11 ++++++-----
 doc/ScintillaHistory.html |  5 +++++
 2 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'doc')

diff --git a/doc/ScintillaDoc.html b/doc/ScintillaDoc.html
index 781695a14..306df840a 100644
--- a/doc/ScintillaDoc.html
+++ b/doc/ScintillaDoc.html
@@ -5625,11 +5625,12 @@ sptr_t CallScintilla(unsigned int iMessage, uptr_t wParam, sptr_t lParam){
     <p><b id="SCI_SETWRAPMODE">SCI_SETWRAPMODE(int wrapMode)</b><br />
      <b id="SCI_GETWRAPMODE">SCI_GETWRAPMODE</b><br />
      Set wrapMode to <code>SC_WRAP_WORD</code> (1) to enable wrapping
-     on word boundaries, <code>SC_WRAP_CHAR</code> (2) to enable wrapping
-     between any characters, and to <code>SC_WRAP_NONE</code> (0) to disable line
-     wrapping. <code>SC_WRAP_CHAR</code> is preferred to
-     <code>SC_WRAP_WORD</code> for Asian languages where there is no white space
-     between words.</p>
+     on word or style boundaries, <code>SC_WRAP_CHAR</code> (2) to enable wrapping
+     between any characters, <code>SC_WRAP_WHITESPACE</code> (3) to enable
+     wrapping on whitespace, and <code>SC_WRAP_NONE</code> (0) to disable line
+     wrapping. <code>SC_WRAP_CHAR</code> is preferred for Asian languages where
+     there is no white space between words.
+    </p>
 
 
     <p><b id="SCI_SETWRAPVISUALFLAGS">SCI_SETWRAPVISUALFLAGS(int wrapVisualFlags)</b><br />
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 72aad759a..43b4b8327 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -440,6 +440,8 @@
 	<td>felix</td>
 	<td>Christian Walther</td>
 	<td>Ebben</td>
+      </tr><tr>
+	<td>Robert Gieseke</td>
     </tr>
     </table>
     <p>
@@ -459,6 +461,9 @@
 	Released 16 March 2014.
 	</li>
 	<li>
+	Added wrap mode SC_WRAP_WHITESPACE which only wraps on whitespace, not on style changes.
+	</li>
+	<li>
 	Fix bug on Windows when resizing autocompletion list with only short strings caused the list to move.
 	</li>
     </ul>
-- 
cgit v1.2.3