diff options
author | Andy Wingo <wingo@pobox.com> | 2012-06-22 13:18:02 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2012-06-22 13:18:02 +0200 |
commit | 0dd7c5407599b65a1a3da4b9bd8feccc715b51f7 (patch) | |
tree | 7e54c75087c5ea3f876bcb54cc49c70ec87ae0b5 /libguile/strings.c | |
parent | 747747ee06ac64c224b91e8f64f810a1159c1675 (diff) | |
parent | 2874f66017b7bfae256e85af84689d00ecc418ab (diff) | |
download | guile-0dd7c5407599b65a1a3da4b9bd8feccc715b51f7.tar.gz |
Merge remote-tracking branch 'origin/stable-2.0'
Conflicts:
libguile/deprecated.c
libguile/ports.c
libguile/ports.h
libguile/strports.c
test-suite/tests/cse.test
Diffstat (limited to 'libguile/strings.c')
-rw-r--r-- | libguile/strings.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libguile/strings.c b/libguile/strings.c index bc715e0c1..7c5550fb3 100644 --- a/libguile/strings.c +++ b/libguile/strings.c @@ -1578,7 +1578,7 @@ SCM scm_from_locale_stringn (const char *str, size_t len) { return scm_from_stringn (str, len, locale_charset (), - scm_i_get_conversion_strategy (SCM_BOOL_F)); + scm_i_default_port_conversion_handler ()); } SCM @@ -1877,9 +1877,9 @@ scm_to_locale_string (SCM str) char * scm_to_locale_stringn (SCM str, size_t *lenp) { - return scm_to_stringn (str, lenp, + return scm_to_stringn (str, lenp, locale_charset (), - scm_i_get_conversion_strategy (SCM_BOOL_F)); + scm_i_default_port_conversion_handler ()); } char * |