diff options
| author | Serg Stetsuk <unknown> | 2015-08-16 10:20:44 +1000 |
|---|---|---|
| committer | Serg Stetsuk <unknown> | 2015-08-16 10:20:44 +1000 |
| commit | d7c11303d5eb4ae755b44c0bee911996b983ca6f (patch) | |
| tree | 23c0c12ff5dc63bfd0f05d1beac1c886a32aacfe | |
| parent | b8c77c7f9e2322a1f32a49a3a6cf59d5dee04042 (diff) | |
| download | scintilla-mirror-d7c11303d5eb4ae755b44c0bee911996b983ca6f.tar.gz | |
On GTK+, support code page 866 with SC_CHARSET_OEM866.
| -rw-r--r-- | doc/ScintillaDoc.html | 2 | ||||
| -rw-r--r-- | doc/ScintillaHistory.html | 5 | ||||
| -rw-r--r-- | gtk/PlatGTK.cxx | 2 | ||||
| -rw-r--r-- | include/Scintilla.h | 1 | ||||
| -rw-r--r-- | include/Scintilla.iface | 1 |
5 files changed, 10 insertions, 1 deletions
diff --git a/doc/ScintillaDoc.html b/doc/ScintillaDoc.html index c24f52d78..2bfcff27c 100644 --- a/doc/ScintillaDoc.html +++ b/doc/ScintillaDoc.html @@ -2694,7 +2694,7 @@ struct Sci_TextToFind { <code>SC_CHARSET_TURKISH</code>, and <code>SC_CHARSET_VIETNAMESE</code>.</p> <p>The character sets supported on GTK+ are:<br /> - <code>SC_CHARSET_ANSI</code>, <code>SC_CHARSET_CYRILLIC</code> (code page 1251), + <code>SC_CHARSET_ANSI</code>, <code>SC_CHARSET_OEM866</code> (code page 866), <code>SC_CHARSET_CYRILLIC</code> (code page 1251), <code>SC_CHARSET_EASTEUROPE</code>, <code>SC_CHARSET_GB2312</code>, <code>SC_CHARSET_HANGUL</code>, <code>SC_CHARSET_RUSSIAN</code> (KOI8-R), <code>SC_CHARSET_SHIFTJIS</code>, and diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index 61a6a3c36..40cf4e898 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -473,6 +473,7 @@ </tr><tr> <td>Jiří Techet</td> <td>Jonathan Hunt</td> + <td>Serg Stetsuk</td> </tr> </table> <p> @@ -492,6 +493,10 @@ Released 3 August 2015. </li> <li> + On GTK+, SC_CHARSET_OEM866 added to allow editing Russian files encoded in code page 866. + <a href="http://sourceforge.net/p/scintilla/feature-requests/1019/">Feature #1019.</a> + </li> + <li> CoffeeScript lexer adds lexical class for instance properties and fixes some cases of regex highlighting. <a href="http://sourceforge.net/p/scintilla/bugs/1749/">Bug #1749</a>. </li> diff --git a/gtk/PlatGTK.cxx b/gtk/PlatGTK.cxx index 91f35a189..d6bbd955a 100644 --- a/gtk/PlatGTK.cxx +++ b/gtk/PlatGTK.cxx @@ -459,6 +459,8 @@ const char *CharacterSetID(int characterSet) { return "ASCII"; case SC_CHARSET_RUSSIAN: return "KOI8-R"; + case SC_CHARSET_OEM866: + return "CP866"; case SC_CHARSET_CYRILLIC: return "CP1251"; case SC_CHARSET_SHIFTJIS: diff --git a/include/Scintilla.h b/include/Scintilla.h index 4db2e0dde..b5e3e9bc0 100644 --- a/include/Scintilla.h +++ b/include/Scintilla.h @@ -196,6 +196,7 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam, #define SC_CHARSET_MAC 77 #define SC_CHARSET_OEM 255 #define SC_CHARSET_RUSSIAN 204 +#define SC_CHARSET_OEM866 866 #define SC_CHARSET_CYRILLIC 1251 #define SC_CHARSET_SHIFTJIS 128 #define SC_CHARSET_SYMBOL 2 diff --git a/include/Scintilla.iface b/include/Scintilla.iface index 9d83372aa..99ac27597 100644 --- a/include/Scintilla.iface +++ b/include/Scintilla.iface @@ -417,6 +417,7 @@ val SC_CHARSET_HANGUL=129 val SC_CHARSET_MAC=77 val SC_CHARSET_OEM=255 val SC_CHARSET_RUSSIAN=204 +val SC_CHARSET_OEM866=866 val SC_CHARSET_CYRILLIC=1251 val SC_CHARSET_SHIFTJIS=128 val SC_CHARSET_SYMBOL=2 |