[svn:parrot] r48090 - branches/gsoc_nfg/src/string

[darbelo at svn.parrot.org]

Author: darbelo
Date: Wed Jul 14 23:07:33 2010
New Revision: 48090
URL: https://trac.parrot.org/parrot/changeset/48090

Log:
Fix a typo in the encoding promotion logic for concatenations.

Modified:
   branches/gsoc_nfg/src/string/api.c

Modified: branches/gsoc_nfg/src/string/api.c
==============================================================================
--- branches/gsoc_nfg/src/string/api.c	Wed Jul 14 22:54:11 2010	(r48089)
+++ branches/gsoc_nfg/src/string/api.c	Wed Jul 14 23:07:33 2010	(r48090)
@@ -462,7 +462,7 @@
             enc = Parrot_ucs4_encoding_ptr;
         else if (a->encoding == Parrot_nfg_encoding_ptr
             || b->encoding == Parrot_nfg_encoding_ptr)
-            enc = Parrot_ucs4_encoding_ptr;
+            enc = Parrot_nfg_encoding_ptr;
         else if (a->encoding == Parrot_utf16_encoding_ptr
             ||  b->encoding == Parrot_utf16_encoding_ptr
             ||  a->encoding == Parrot_ucs2_encoding_ptr