merge r19075 from cpstrnew branch by paul:

compiler: partly revert r17434 because of a test regression. Also this is delphi compatible (although delphi does not know a {$codepage} directive)

git-svn-id: trunk@19127 -

compiler/scanner.pas

@@ -4171,19 +4171,6 @@ In case not, the value returned can be arbitrary.
                       break;
                    end;
                  until false;
-                 //------------------
-                 { convert existing string to an utf-8 string }
-                 if (not iswidestring) and 
-                    (current_settings.sourcecodepage<>default_settings.sourcecodepage) then
-                   begin
-                     if len>0 then
-                       ascii2unicode(@cstringpattern[1],len,patternw)
-                     else
-                       ascii2unicode(nil,len,patternw);
-                     iswidestring:=true;
-                     len:=0;
-                   end;                  
-                 //-------------------
                  { strings with length 1 become const chars }
                  if iswidestring then
                    begin