Fierelier/notepad-plus-plus-legacy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[BUG_FIXED] Fix Matlab script making Notepad++ crash under Chinese windows issue.

Browse Source 
Signed-off-by: Don HO <don.h@free.fr>

git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@501 f5eea248-9336-0410-98b8-ebc06183d4e3
This commit is contained in:
Don Ho 2009-06-27 00:32:33 +00:00
parent 3fa7bd97ff
commit 736137918e
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
PowerEditor/src/Notepad_plus.cpp
View File

@ -7055,6 +7055,7 @@ LRESULT Notepad_plus::runProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lPa
_invisibleEditView.init(_hInst, hwnd); _invisibleEditView.init(_hInst, hwnd);
_invisibleEditView.execute(SCI_SETUNDOCOLLECTION); _invisibleEditView.execute(SCI_SETUNDOCOLLECTION);
_invisibleEditView.execute(SCI_EMPTYUNDOBUFFER); _invisibleEditView.execute(SCI_EMPTYUNDOBUFFER);
_invisibleEditView.wrap(false); // Make sure no slow down
// Configuration of 2 scintilla views // Configuration of 2 scintilla views
_mainEditView.showMargin(ScintillaEditView::_SC_MARGE_LINENUMBER, svp1._lineNumberMarginShow); _mainEditView.showMargin(ScintillaEditView::_SC_MARGE_LINENUMBER, svp1._lineNumberMarginShow);

9
PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp
View File

@ -1490,12 +1490,13 @@ void ScintillaEditView::bufferUpdated(Buffer * buffer, int mask) {
if (buffer->getUnicodeMode() == uni8Bit) if (buffer->getUnicodeMode() == uni8Bit)
{ //either 0 or CJK codepage { //either 0 or CJK codepage
LangType typeDoc = buffer->getLangType(); LangType typeDoc = buffer->getLangType();
if (isCJK() && (typeDoc != L_CSS || typeDoc != L_CAML || typeDoc != L_ASM || typeDoc != L_MATLAB)) if (isCJK())
{ {
execute(SCI_SETCODEPAGE, _codepage); //you may also want to set charsets here, not yet implemented if (typeDoc == L_CSS || typeDoc == L_CAML || typeDoc == L_ASM || typeDoc == L_MATLAB)
} execute(SCI_SETCODEPAGE, 0); //you may also want to set charsets here, not yet implemented
else else
execute(SCI_SETCODEPAGE, 0); execute(SCI_SETCODEPAGE, _codepage);
}
} }
else //CP UTF8 for all unicode else //CP UTF8 for all unicode
execute(SCI_SETCODEPAGE, SC_CP_UTF8); execute(SCI_SETCODEPAGE, SC_CP_UTF8);