rtoss

Subversion Repositories:
Compare Path: Rev
With Path: Rev
/GreenPad/ @ 145  →  /GreenPad/ @ 146
/GreenPad/ConfigManager.cpp
@@ -685,6 +685,7 @@
// V‹Kƒtƒ@ƒCƒ‹ŠÖŒW
newfileCharset_ = ini_.GetInt( TEXT("NewfileCharset"), charSets_.defaultCs() );
if(newfileCharset_ == -1) newfileCharset_ = 1252; // 1.07.4 bugfix
if(!::IsValidCodePage(newfileCharset_)) newfileCharset_ = ::GetACP();
newfileDoctype_ = ini_.GetStr( TEXT("NewfileDoctype"), String() );
newfileLB_ = (lbcode) ini_.GetInt( TEXT("NewfileLB"), CRLF );
 
/GreenPad/kilib/textfile.cpp
@@ -2426,9 +2426,9 @@
impl_ = new wUTF7( fp_ );
else
#else
if( !::IsValidCodePage(65001) && (cs_==UTF8 || cs_==UTF8N) )
if( (cs_==UTF8 || cs_==UTF8N) && !::IsValidCodePage(65001) )
impl_ = new wUTF8( fp_, cs_ );
else if( !::IsValidCodePage(65000) && cs_==UTF7 )
else if( cs_==UTF7 && !::IsValidCodePage(65000) )
impl_ = new wUTF7( fp_ );
else
#endif