Backport: The default encoding is now UTF-8.

Backport of changeset 6320:8d56eaef4f0a.

3 files changed, 13 insertions, 10 deletions

diff --git a/doc/ScintillaDoc.html b/doc/ScintillaDoc.html
index 2a8f26b15..e28cffaaf 100644
--- a/doc/ScintillaDoc.html
+++ b/doc/ScintillaDoc.html
@@ -3685,14 +3685,15 @@ struct Sci_TextToFind {
 
     <p><b id="SCI_SETCODEPAGE">SCI_SETCODEPAGE(int codePage)</b><br />
      <b id="SCI_GETCODEPAGE">SCI_GETCODEPAGE &rarr; int</b><br />
-     Scintilla has some support for Japanese, Chinese and Korean DBCS. Use this message with
+     Scintilla supports UTF-8, Japanese, Chinese and Korean DBCS along with single byte encodings like Latin-1.
+     UTF-8 (<code>SC_CP_UTF8</code>) is the default. Use this message with
     <code class="parameter">codePage</code> set to the code page number to set Scintilla to use code page information
-    to ensure double byte characters are treated as one character rather than two. This also stops
-    the caret from moving between the two bytes in a double byte character.
-    Do not use this message to choose between different single byte character sets: it doesn't do that.
+    to ensure multiple byte characters are treated as one character rather than multiple. This also stops
+    the caret from moving between the bytes in a multi-byte character.
+    Do not use this message to choose between different single byte character sets - use
+    <a class="seealso" href="#SCI_STYLESETCHARACTERSET">SCI_STYLESETCHARACTERSET</a>.
     Call with
-    <code class="parameter">codePage</code> set to zero to disable DBCS support. The default is
-    <code>SCI_SETCODEPAGE(0)</code>.</p>
+    <code class="parameter">codePage</code> set to zero to disable multi-byte support.</p>
 
     <p>Code page <code>SC_CP_UTF8</code> (65001) sets Scintilla into Unicode mode with the document
     treated as a sequence of characters expressed in UTF-8. The text is converted to the platform's
@@ -3701,9 +3702,8 @@ struct Sci_TextToFind {
     horizontal space, such as Thai, will mostly work but there are some issues where the characters
     are drawn separately leading to visual glitches. Bi-directional text is not supported. </p>
 
-    <p>Code page can be set to 932 (Japanese Shift-JIS), 936 (Simplified Chinese GBK),
-    949 (Korean Unified Hangul Code), 950 (Traditional Chinese Big5), or 1361 (Korean Johab)
-    although these may require installation of language specific support.</p>
+    <p>Code page can be set to 65001 (UTF-8), 932 (Japanese Shift-JIS), 936 (Simplified Chinese GBK),
+    949 (Korean Unified Hangul Code), 950 (Traditional Chinese Big5), or 1361 (Korean Johab).</p>
 
     <p><b id="SCI_SETIMEINTERACTION">SCI_SETIMEINTERACTION(int imeInteraction)</b><br />
      <b id="SCI_GETIMEINTERACTION">SCI_GETIMEINTERACTION &rarr; int</b><br />
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index ed6a6d674..ffbfd4beb 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -533,6 +533,9 @@
 	Support dropped for GTK+ versions before 2.24.
 	</li>
 	<li>
+	The default encoding in Scintilla is UTF-8.
+	</li>
+	<li>
 	An SCN_AUTOCSELECTIONCHANGE notification is sent when items are highlighted in an autocompletion or user list.
 	</li>
 	<li>
diff --git a/src/Document.cxx b/src/Document.cxx
index 3beba76e9..d7018eebd 100644
--- a/src/Document.cxx
+++ b/src/Document.cxx
@@ -101,7 +101,7 @@ Document::Document() {
 #else
 	eolMode = SC_EOL_LF;
 #endif
-	dbcsCodePage = 0;
+	dbcsCodePage = SC_CP_UTF8;
 	lineEndBitSet = SC_LINE_END_TYPE_DEFAULT;
 	endStyled = 0;
 	styleClock = 0;