diff options
author | Andy Wingo <wingo@pobox.com> | 2012-02-23 14:10:22 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2012-02-23 14:10:22 +0100 |
commit | 9d15db65ffd49fd8fda77dcb6b70c3c930ae5153 (patch) | |
tree | 3fa57da41d8f2629649c82428ad828f5f3147d2e /lib/localcharset.c | |
parent | 3c65e3fda512cda13de244e853afd0fa0e7b5962 (diff) | |
parent | a2e946f1ef83cd1fd8c87412cc49f6c6d1e0ac61 (diff) | |
download | guile-9d15db65ffd49fd8fda77dcb6b70c3c930ae5153.tar.gz |
Merge remote-tracking branch 'local-2.0/stable-2.0'
Conflicts:
module/language/tree-il/analyze.scm
Diffstat (limited to 'lib/localcharset.c')
-rw-r--r-- | lib/localcharset.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/localcharset.c b/lib/localcharset.c index 47a6e5d5b..2c06328cb 100644 --- a/lib/localcharset.c +++ b/lib/localcharset.c @@ -589,9 +589,8 @@ environ_locale_charset (void) strcpy (buf, "ASCII"); return buf; } - - /* Resolve through the charset.alias file. */ - codeset = locale; + else + codeset = ""; } else codeset = ""; @@ -611,7 +610,8 @@ environ_locale_charset (void) the empty string as denoting "the locale's character encoding", thus GNU libiconv would call this function a second time. */ if (codeset[0] == '\0') - codeset = "ASCII"; + /* Default to Latin-1, for backward compatibility with Guile 1.8. */ + codeset = "ISO-8859-1"; return codeset; } |