changeset 29139:c1c227f62493

(update_charset_table): Accept nil in LONG_NAME and DESCRIPTION. (syms_of_charset): Avoid building same strings.
author Kenichi Handa <handa@m17n.org>
date Wed, 24 May 2000 03:17:37 +0000
parents 2fcbbbccfc19
children 8b1187982aa6
files src/charset.c
diffstat 1 files changed, 10 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/charset.c	Wed May 24 01:04:43 2000 +0000
+++ b/src/charset.c	Wed May 24 03:17:37 2000 +0000
@@ -467,6 +467,11 @@
     CHARSET_TABLE_ENTRY (charset)
       = Fmake_vector (make_number (CHARSET_MAX_IDX), Qnil);
 
+  if (NILP (long_name))
+    long_name = short_name;
+  if (NILP (description))
+    description = long_name;
+
   /* Get byte length of multibyte form, base leading-code, and
      extended leading-code of the charset.  See the comment under the
      title "GENERAL NOTE on CHARACTER SET (CHARSET)" in charset.h.  */
@@ -1631,7 +1636,7 @@
 			make_number ('B'),
 			make_number (0),
 			build_string ("ASCII"),
-			build_string ("ASCII"),
+			Qnil,	/* same as above */
 			build_string ("ASCII (ISO646 IRV)"));
   CHARSET_SYMBOL (CHARSET_ASCII) = Qascii;
   Fput (Qascii, Qcharset, CHARSET_TABLE_ENTRY (CHARSET_ASCII));
@@ -1643,8 +1648,8 @@
 			make_number (-1),
 			make_number (-1),
 			build_string ("8-bit control code (0x80..0x9F)"),
-			build_string ("8-bit control code (0x80..0x9F)"),
-			build_string ("8-bit control code (0x80..0x9F)"));
+			Qnil,	/* same as above */
+			Qnil);	/* same as above */
   CHARSET_SYMBOL (CHARSET_8_BIT_CONTROL) = Qeight_bit_control;
   Fput (Qeight_bit_control, Qcharset,
 	CHARSET_TABLE_ENTRY (CHARSET_8_BIT_CONTROL));
@@ -1655,9 +1660,9 @@
 			make_number (0),
 			make_number (-1),
 			make_number (-1),
-			build_string ("8-bit graphic char"),
 			build_string ("8-bit graphic char (0xA0..0xFF)"),
-			build_string ("8-bit graphic char (0xA0..0xFF)"));
+			Qnil,	/* same as above */
+			Qnil);	/* same as above */
   CHARSET_SYMBOL (CHARSET_8_BIT_GRAPHIC) = Qeight_bit_graphic;
   Fput (Qeight_bit_graphic, Qcharset,
 	CHARSET_TABLE_ENTRY (CHARSET_8_BIT_GRAPHIC));