From 7e5e59feb587c619644e9859de6be008de32597d Mon Sep 17 00:00:00 2001 From: Don Ho Date: Mon, 10 Dec 2012 23:46:17 +0000 Subject: [PATCH] [CHANGE_BEHAVIOUR] Change document default value from ANSI to UTF8 w/o BOM. [WALK_AROUND] Enable Word-completion under CJK environment for unicode document. git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@994 f5eea248-9336-0410-98b8-ebc06183d4e3 --- PowerEditor/src/Parameters.h | 2 +- PowerEditor/src/ScitillaComponent/AutoCompletion.cpp | 8 ++++++++ PowerEditor/src/config.model.xml | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/PowerEditor/src/Parameters.h b/PowerEditor/src/Parameters.h index 7d8585773..145139391 100644 --- a/PowerEditor/src/Parameters.h +++ b/PowerEditor/src/Parameters.h @@ -503,7 +503,7 @@ struct NewDocDefaultSettings bool _openAnsiAsUtf8; LangType _lang; int _codepage; // -1 when not using - NewDocDefaultSettings():_format(WIN_FORMAT), _encoding(uni8Bit), _openAnsiAsUtf8(false), _lang(L_TEXT), _codepage(-1){}; + NewDocDefaultSettings():_format(WIN_FORMAT), _encoding(uniCookie), _openAnsiAsUtf8(true), _lang(L_TEXT), _codepage(-1){}; }; struct LangMenuItem { diff --git a/PowerEditor/src/ScitillaComponent/AutoCompletion.cpp b/PowerEditor/src/ScitillaComponent/AutoCompletion.cpp index 516d4a810..c170b50f2 100644 --- a/PowerEditor/src/ScitillaComponent/AutoCompletion.cpp +++ b/PowerEditor/src/ScitillaComponent/AutoCompletion.cpp @@ -190,8 +190,16 @@ void AutoCompletion::update(int character) { if (nppGUI._autocStatus == nppGUI.autoc_word) { + // Walk around - to avoid the crash under Chinese Windows7 ANSI doc mode if (!_pEditView->isCJK()) + { showWordComplete(false); + } + else + { + if ((_pEditView->getCurrentBuffer())->getUnicodeMode() != uni8Bit) + showWordComplete(false); + } } else if (nppGUI._autocStatus == nppGUI.autoc_func) showAutoComplete(); diff --git a/PowerEditor/src/config.model.xml b/PowerEditor/src/config.model.xml index 33341ac69..6a66064a0 100644 --- a/PowerEditor/src/config.model.xml +++ b/PowerEditor/src/config.model.xml @@ -37,7 +37,7 @@ 1 -> L_PHP ... (see source file) --> - +