Mercurial > hg > octave-lojdl > gnulib-hg
changeset 6534:fdcb5e98f8fa
Update from GNU gettext.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Tue, 10 Jan 2006 13:52:11 +0000 |
| parents | 6bc4290ca85f |
| children | f0b048cba3a9 |
| files | lib/ChangeLog lib/localcharset.c |
| diffstat | 2 files changed, 16 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,7 @@ +2006-01-10 Bruno Haible <bruno@clisp.org> + + * localcharset.c: Update from GNU gettext. + 2006-01-09 Paul Eggert <eggert@cs.ucla.edu> Sync from coreutils.
--- a/lib/localcharset.c +++ b/lib/localcharset.c @@ -1,6 +1,6 @@ /* Determine a canonical name for the current locale's character encoding. - Copyright (C) 2000-2004 Free Software Foundation, Inc. + Copyright (C) 2000-2006 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -106,7 +106,7 @@ /* Return a pointer to the contents of the charset.alias file. */ static const char * -get_charset_aliases () +get_charset_aliases (void) { const char *cp; @@ -248,6 +248,7 @@ "CP1361" "\0" "JOHAB" "\0" "CP20127" "\0" "ASCII" "\0" "CP20866" "\0" "KOI8-R" "\0" + "CP20936" "\0" "GB2312" "\0" "CP21866" "\0" "KOI8-RU" "\0" "CP28591" "\0" "ISO-8859-1" "\0" "CP28592" "\0" "ISO-8859-2" "\0" @@ -258,7 +259,14 @@ "CP28597" "\0" "ISO-8859-7" "\0" "CP28598" "\0" "ISO-8859-8" "\0" "CP28599" "\0" "ISO-8859-9" "\0" - "CP28605" "\0" "ISO-8859-15" "\0"; + "CP28605" "\0" "ISO-8859-15" "\0" + "CP38598" "\0" "ISO-8859-8" "\0" + "CP51932" "\0" "EUC-JP" "\0" + "CP51936" "\0" "GB2312" "\0" + "CP51949" "\0" "EUC-KR" "\0" + "CP51950" "\0" "EUC-TW" "\0" + "CP54936" "\0" "GB18030" "\0" + "CP65001" "\0" "UTF-8" "\0"; # endif #endif @@ -278,7 +286,7 @@ STATIC #endif const char * -locale_charset () +locale_charset (void) { const char *codeset; const char *aliases;