paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-18 05:00:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

--- Merging r32202 into '.':

Browse Source 
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 -
This commit is contained in:
joost 2015-11-06 20:13:22 +00:00
parent 7460d4d61f
commit f2e27b2585
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -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

2
compiler/widestr.pas
View File

@ -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
tests/webtbs/tw28934.pp Normal file
View File

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