瀏覽代碼

compiler: when explicit codepage modeswitch is installed and compiler has no codepage map for the DefaultSystemCodepage use default compiler codepage

git-svn-id: trunk@21223 -
paul 13 年之前
父節點
當前提交
aad9294c27
共有 1 個文件被更改,包括 3 次插入1 次删除
  1. 3 1
      compiler/scanner.pas

+ 3 - 1
compiler/scanner.pas

@@ -348,10 +348,12 @@ implementation
         if m_systemcodepage in current_settings.modeswitches then
           begin
             current_settings.sourcecodepage:=DefaultSystemCodePage;
+            if not cpavailable(current_settings.sourcecodepage) then
+              current_settings.sourcecodepage:=default_settings.sourcecodepage;
             include(current_settings.moduleswitches,cs_explicit_codepage);
             if changeinit then
             begin
-              init_settings.sourcecodepage:=DefaultSystemCodePage;
+              init_settings.sourcecodepage:=current_settings.sourcecodepage;
               include(init_settings.moduleswitches,cs_explicit_codepage);
             end;
           end