rtoss - Diff between revs 125 and 146

Subversion Repositories:
Rev:
Show entire file - Ignore whitespace
Rev 125 Rev 146
Line 683... Line 683...
683         mrus_ = Min(Max(0, mrus_), 20); 683         mrus_ = Min(Max(0, mrus_), 20);
684 684
685         // V‹Kƒtƒ@ƒCƒ‹ŠÖŒW 685         // V‹Kƒtƒ@ƒCƒ‹ŠÖŒW
686         newfileCharset_ = ini_.GetInt( TEXT("NewfileCharset"), charSets_.defaultCs() ); 686         newfileCharset_ = ini_.GetInt( TEXT("NewfileCharset"), charSets_.defaultCs() );
687         if(newfileCharset_ == -1) newfileCharset_ = 1252; // 1.07.4 bugfix 687         if(newfileCharset_ == -1) newfileCharset_ = 1252; // 1.07.4 bugfix
-   688         if(!::IsValidCodePage(newfileCharset_)) newfileCharset_ = ::GetACP();
688         newfileDoctype_ = ini_.GetStr( TEXT("NewfileDoctype"), String() ); 689         newfileDoctype_ = ini_.GetStr( TEXT("NewfileDoctype"), String() );
689         newfileLB_      = (lbcode) ini_.GetInt( TEXT("NewfileLB"), CRLF ); 690         newfileLB_      = (lbcode) ini_.GetInt( TEXT("NewfileLB"), CRLF );
690 691
691         // •¶‘ƒ^ƒCƒvƒŠƒXƒg‚Ì‚O”ԈȊO‚̃NƒŠƒA 692         // •¶‘ƒ^ƒCƒvƒŠƒXƒg‚Ì‚O”ԈȊO‚̃NƒŠƒA
692         dtList_.DelAfter( ++dtList_.begin() ); 693         dtList_.DelAfter( ++dtList_.begin() );