changeset 20612:5a0922f8c841

(Fmake_category_set): Don't allow multibyte string. (describe_category): Pass new args to insert_from_string. (describe_category_1): Likewise.
author Richard M. Stallman <rms@gnu.org>
date Fri, 09 Jan 1998 22:59:31 +0000
parents e351676e5044
children e0ed7fc921fa
files src/category.c
diffstat 1 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/category.c	Fri Jan 09 22:58:16 1998 +0000
+++ b/src/category.c	Fri Jan 09 22:59:31 1998 +0000
@@ -63,6 +63,9 @@
   CHECK_STRING (categories, 0);
   val = MAKE_CATEGORY_SET;
 
+  if (STRING_MULTIBYTE (categories))
+    error ("Multibyte string in make-category-set");
+
   len = XSTRING (categories)->size;
   while (--len >= 0)
     {
@@ -486,7 +489,8 @@
     }
 
   mnemonics = Fcategory_set_mnemonics (value);
-  insert_from_string (mnemonics, 0, XSTRING (mnemonics)->size, 0);
+  insert_from_string (mnemonics, 0, 0, XSTRING (mnemonics)->size,
+		      XSTRING (mnemonics)->size_byte, 0);
   insert_string ("\n");
   return;
 }
@@ -519,7 +523,8 @@
 
 	insert_char (i + 32);
 	insert (": ", 2);
-	insert_from_string (elt, 0, XSTRING (elt)->size, 0);
+	insert_from_string (elt, 0, 0, XSTRING (elt)->size,
+			    XSTRING (elt)->size_byte, 0);
 	insert ("\n", 1);
       }
   }