diff options
| -rw-r--r-- | iconvdata/big5.c | 6 | ||||
| -rw-r--r-- | localedata/ChangeLog | 2 | ||||
| -rw-r--r-- | localedata/locales/ja_JP | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/iconvdata/big5.c b/iconvdata/big5.c index af2fa787f1..9cf5a5f6f4 100644 --- a/iconvdata/big5.c +++ b/iconvdata/big5.c @@ -29,7 +29,7 @@ /* Table for Big5 to UCS conversion. This is generated from the BIG5 charmap, using the following command: - egrep "/x../x.." BIG5 | egrep -v "^%" | segA.pl > segA + egrep "/x../x.." BIG5 | egrep -v "^%" | segA.pl > segA where segA.pl script is: @@ -3790,7 +3790,7 @@ static const char from_ucs4_tab1[256][2] = /* 0xf5 */ "\x00\x00", "\x00\x00", "\xa1\xd2" }; -/* In the following are generated from the BIG5 charmap, using the +/* In the following are generated from the BIG5 charmap, using the following commands: --------------------------------------------------------------------- @@ -8628,7 +8628,7 @@ static const char from_ucs4_tab15[][2] = ch = big5_to_ucs[idx]; \ \ /* Is this character defined? */ \ - if (__builtin_expect (ch, 1) == 0 && *inptr != '\0') \ + if (__builtin_expect (ch, 1) == 0) \ { \ /* This is an illegal character. */ \ if (! ignore_errors_p ()) \ diff --git a/localedata/ChangeLog b/localedata/ChangeLog index 515fa44b0d..297ee2adcc 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,5 +1,7 @@ 2000-08-29 Ulrich Drepper <drepper@redhat.com> + * locales/ja_JP: Add yesstr and nostr information. + * charmaps/GB18030: Add entries from GBK not present here. * SUPPORTED: Add zh_TW.EUC-JP and zh_CN.GB18030. diff --git a/localedata/locales/ja_JP b/localedata/locales/ja_JP index ad3fa5df84..a96f043997 100644 --- a/localedata/locales/ja_JP +++ b/localedata/locales/ja_JP @@ -18502,6 +18502,8 @@ END LC_COLLATE LC_MESSAGES yesexpr "<U005E><U005B><U0079><U0059><UFF59><UFF39><U005D>" noexpr "<U005E><U005B><U006E><U004E><UFF4E><UFF2E><U005D>" +yesstr "<U306F><U3044>" +nostr "<U3044><U3044><U3048>" END LC_MESSAGES |