diff options
| author | joost <joost@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2015-11-06 20:13:22 +0000 |
|---|---|---|
| committer | joost <joost@3ad0048d-3df7-0310-abae-a5850022a9f2> | 2015-11-06 20:13:22 +0000 |
| commit | caddfddc821f775e76d83b54bddd5426233a3d0e (patch) | |
| tree | 3d03295bc18bdefc0ab2b432491acdcf94043929 | |
| parent | 7af326de54f6f1d0529b20b498746249ceb3e98b (diff) | |
| download | fpc-caddfddc821f775e76d83b54bddd5426233a3d0e.tar.gz | |
--- 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: http://svn.freepascal.org/svn/fpc/branches/fixes_3_0@32260 3ad0048d-3df7-0310-abae-a5850022a9f2
| -rw-r--r-- | compiler/widestr.pas | 2 | ||||
| -rw-r--r-- | tests/webtbs/tw28934.pp | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/compiler/widestr.pas b/compiler/widestr.pas index e6550ae2ea..95ce58470c 100644 --- a/compiler/widestr.pas +++ b/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; diff --git a/tests/webtbs/tw28934.pp b/tests/webtbs/tw28934.pp new file mode 100644 index 0000000000..493c36710c --- /dev/null +++ b/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. |