aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--localedata/ChangeLog6
-rw-r--r--localedata/locales/ja_JP2
-rw-r--r--localedata/repertoiremaps/mnemonic.ja2
-rw-r--r--wcsmbs/wcsmbsload.c10
5 files changed, 15 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 40e9dc3490..4046f78ddd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
1999-11-22 Ulrich Drepper <drepper@cygnus.com>
+ * wcsmbs/wcsmbsload.c (__wcsmbs_load_conv): Don't use the charset
+ name from the locale name. Only use the value in the LC_CTYPE
+ locale data file.
+
* locale/loadlocale.c (_nl_load_locale): Allow index of entry in
file be equal to file size.
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index d02f77af2e..5959eac315 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,9 @@
+1999-11-22 Ulrich Drepper <drepper@cygnus.com>
+
+ * locales/ja_JP [LC_CTYPE] (cntrl): Add PAD.
+
+ * repertoiremaps/mnemonic.ja: Add DCS and APC definitions.
+
1999-11-20 Ulrich Drepper <drepper@cygnus.com>
* tst-trans.c: New file.
diff --git a/localedata/locales/ja_JP b/localedata/locales/ja_JP
index b16a503abb..18a4c46a14 100644
--- a/localedata/locales/ja_JP
+++ b/localedata/locales/ja_JP
@@ -39,7 +39,7 @@ cntrl <alert>;<backspace>;<tab>;<newline>;<vertical-tab>;/
<form-feed>;<carriage-return>;/
<NUL>;<SOH>;<STX>;<ETX>;<EOT>;<ENQ>;<ACK>;<SO>;<SI>;/
<DLE>;<DC1>;<DC2>;<DC3>;<DC4>;<NAK>;<SYN>;<ETB>;<CAN>;/
- <EM>;<SUB>;<ESC>;<IS4>;<IS3>;<IS2>;<IS1>;<DEL>;<DAP>;/
+ <EM>;<SUB>;<ESC>;<IS4>;<IS3>;<IS2>;<IS1>;<DEL>;<DAP>;<PAD>;/
<PBH>;<HOP>;<BPH>;<NBH>;<IND>;<NEL>;<SSA>;<ESA>;<HTS>;<HTJ>;/
<VTS>;<PLD>;<PLU>;<RI>;<DCS>;<PU1>;<PU2>;<STS>;<CCH>;<MW>;/
<SPA>;<EPA>;<SOS>;<SGCI>;<SCI>;<CSI>;<ST>;<OSC>;<PM>;<APC>
diff --git a/localedata/repertoiremaps/mnemonic.ja b/localedata/repertoiremaps/mnemonic.ja
index f7a631a070..ae24168105 100644
--- a/localedata/repertoiremaps/mnemonic.ja
+++ b/localedata/repertoiremaps/mnemonic.ja
@@ -233,6 +233,7 @@ escape_char /
<S2> <U008E> SINGLE-SHIFT TWO (SS2)
<S3> <U008F> SINGLE-SHIFT THREE (SS3)
<DC> <U0090> DEVICE CONTROL STRING (DCS)
+<DCS> <U0090> DEVICE CONTROL STRING (DCS)
<P1> <U0091> PRIVATE USE ONE (PU1)
<P2> <U0092> PRIVATE USE ONE (PU2)
<TS> <U0093> SET TRANSMIT STATE (STS)
@@ -248,6 +249,7 @@ escape_char /
<OC> <U009D> OPERATING SYSTEM COMMAND (OSC)
<PM> <U009E> PRIVACY MESSAGE (PM)
<AC> <U009F> APPLICATION PROGRAM COMMAND (APC)
+<APC> <U009F> APPLICATION PROGRAM COMMAND (APC)
<NS> <U00A0> NO-BREAK SPACE
<!I> <U00A1> INVERTED EXCLAMATION MARK
<Ct> <U00A2> CENT SIGN
diff --git a/wcsmbs/wcsmbsload.c b/wcsmbs/wcsmbsload.c
index bbac7942a1..26633e0de2 100644
--- a/wcsmbs/wcsmbsload.c
+++ b/wcsmbs/wcsmbsload.c
@@ -194,14 +194,8 @@ __wcsmbs_load_conv (const struct locale_data *new_category)
__gconv_close_transform (__wcsmbs_gconv_fcts.tomb, 1);
__gconv_close_transform (__wcsmbs_gconv_fcts.towc, 1);
- /* Get name of charset of the locale. We first examine
- whether we have a character set mentioned in the locale
- name. If this isn't the case we use the information from
- the locale files. */
- charset_name = extract_charset_name (setlocale (LC_CTYPE, NULL));
- if (charset_name == NULL)
- charset_name =
- new_category->values[_NL_ITEM_INDEX(CODESET)].string;
+ /* Get name of charset of the locale. */
+ charset_name = new_category->values[_NL_ITEM_INDEX(CODESET)].string;
/* Normalize the name and add the slashes necessary for a
complete lookup. */