From 3ba9f505933cc9fb7e8ccf6e0cf04740235c2816 Mon Sep 17 00:00:00 2001 From: mitchell <70453897+667e-11@users.noreply.github.com> Date: Mon, 6 Nov 2017 18:03:57 -0500 Subject: Backported bugfixes and changes from Scintilla 4.0.0 to 4.0.2. --- src/scintilla_backports/6323_8d56eaef4f0a.patch | 69 +++++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 src/scintilla_backports/6323_8d56eaef4f0a.patch (limited to 'src/scintilla_backports/6323_8d56eaef4f0a.patch') diff --git a/src/scintilla_backports/6323_8d56eaef4f0a.patch b/src/scintilla_backports/6323_8d56eaef4f0a.patch new file mode 100644 index 00000000..e8f1a3e4 --- /dev/null +++ b/src/scintilla_backports/6323_8d56eaef4f0a.patch @@ -0,0 +1,69 @@ +# HG changeset patch +# User Neil +# Date 1497838218 -36000 +# Node ID 8d56eaef4f0a8807f083d8a3e0d5f5738d43bd20 +# Parent a3b66b2525e795e352cc02daa3a30d19a3d86e39 +The default encoding is now UTF-8. + +diff -r a3b66b2525e7 -r 8d56eaef4f0a doc/ScintillaDoc.html +--- a/doc/ScintillaDoc.html Sat Jun 17 10:23:38 2017 +1000 ++++ b/doc/ScintillaDoc.html Mon Jun 19 12:10:18 2017 +1000 +@@ -3684,14 +3684,15 @@ + +

SCI_SETCODEPAGE(int codePage)
+ SCI_GETCODEPAGE → int
+- 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 (SC_CP_UTF8) is the default. Use this message with + codePage 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 ++ SCI_STYLESETCHARACTERSET. + Call with +- codePage set to zero to disable DBCS support. The default is +- SCI_SETCODEPAGE(0).

++ codePage set to zero to disable multi-byte support.

+ +

Code page SC_CP_UTF8 (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 +@@ -3700,9 +3701,8 @@ + 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.

+ +-

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.

++

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).

+ +

SCI_SETIMEINTERACTION(int imeInteraction)
+ SCI_GETIMEINTERACTION → int
+diff -r a3b66b2525e7 -r 8d56eaef4f0a doc/ScintillaHistory.html +--- a/doc/ScintillaHistory.html Sat Jun 17 10:23:38 2017 +1000 ++++ b/doc/ScintillaHistory.html Mon Jun 19 12:10:18 2017 +1000 +@@ -536,6 +536,9 @@ + Support dropped for GTK+ versions before 2.24. + +

  • ++ The default encoding in Scintilla is UTF-8. ++
    • ++
  • + An SCN_AUTOCSELECTIONCHANGE notification is sent when items are highlighted in an autocompletion or user list. +
    • +
  • +diff -r a3b66b2525e7 -r 8d56eaef4f0a src/Document.cxx +--- a/src/Document.cxx Sat Jun 17 10:23:38 2017 +1000 ++++ b/src/Document.cxx Mon Jun 19 12:10:18 2017 +1000 +@@ -101,7 +101,7 @@ + #else + eolMode = SC_EOL_LF; + #endif +- dbcsCodePage = 0; ++ dbcsCodePage = SC_CP_UTF8; + lineEndBitSet = SC_LINE_END_TYPE_DEFAULT; + endStyled = 0; + styleClock = 0; -- cgit v1.2.3