فهرست منبع

--- Merging r32202 into '.':
A tests/webtbs/tw28934.pp
C compiler/widestr.pas
--- Recording mergeinfo for merge of r32202 into '.':
U .
Summary of conflicts:
Text conflicts: 1
Summary of conflicts:
Text conflicts: 1

# revisions: 32202

git-svn-id: branches/fixes_3_0@32260 -

joost 9 سال پیش
والد
کامیت
f2e27b2585
3فایلهای تغییر یافته به همراه16 افزوده شده و 1 حذف شده
  1. 1 0
      .gitattributes
  2. 1 1
      compiler/widestr.pas
  3. 14 0
      tests/webtbs/tw28934.pp

+ 1 - 0
.gitattributes

@@ -14296,6 +14296,7 @@ tests/webtbs/tw2885.pp svneol=native#text/plain
 tests/webtbs/tw2886.pp svneol=native#text/plain
 tests/webtbs/tw2891.pp svneol=native#text/plain
 tests/webtbs/tw2892.pp svneol=native#text/plain
+tests/webtbs/tw28934.pp svneol=native#text/plain
 tests/webtbs/tw2897.pp svneol=native#text/plain
 tests/webtbs/tw2899.pp svneol=native#text/plain
 tests/webtbs/tw2904.pp svneol=native#text/plain

+ 1 - 1
compiler/widestr.pas

@@ -349,7 +349,7 @@ unit widestr;
         p : punicodemap;
       begin
         Result:=0;
-        p:=getmap(s);
+        p:=getmap(lower(s));
         if (p<>nil) then
           Result:=p^.cp;
       end;

+ 14 - 0
tests/webtbs/tw28934.pp

@@ -0,0 +1,14 @@
+{ %norun }
+{ %opt=-FcCP1252 }
+
+program project1;
+
+Type
+  WideArray = array [0..3] of Widechar;
+
+var
+  Test: WideArray;
+
+begin
+  Test := 'hmmm';
+end.