# HG changeset patch
# User yoshiki
# Date 990697998 0
# Node ID e9162e1ea20023d0de465d12bcd6e2261b8becf1
# Parent  001628b7a5b329269a93bb5e4df5c74624937b2e
[xemacs-hg @ 2001-05-24 09:53:05 by yoshiki]
Fix build on Linux with MULE.
* mule-ccl.c (Qccl_error): New error
* mule-ccl.c (syms_of_mule_ccl): Initialize Qccl_error.
* mule-charset.c (Fmake_charset): Call signal_error.

diff -r 001628b7a5b3 -r e9162e1ea200 src/ChangeLog
--- a/src/ChangeLog	Thu May 24 09:37:30 2001 +0000
+++ b/src/ChangeLog	Thu May 24 09:53:18 2001 +0000
@@ -1,3 +1,9 @@
+2001-05-24  Yoshiki Hayashi  <yoshiki@xemacs.org>
+
+	* mule-ccl.c (Qccl_error): New error
+	* mule-ccl.c (syms_of_mule_ccl): Initialize Qccl_error.
+	* mule-charset.c (Fmake_charset): Call signal_error.
+
 2001-05-24  Yoshiki Hayashi  <yoshiki@xemacs.org>
 
 	* buffer.c (Qtext_conversion_error): Moved from file-coding.c
diff -r 001628b7a5b3 -r e9162e1ea200 src/mule-ccl.c
--- a/src/mule-ccl.c	Thu May 24 09:37:30 2001 +0000
+++ b/src/mule-ccl.c	Thu May 24 09:53:18 2001 +0000
@@ -41,6 +41,8 @@
 
 #endif /* not emacs */
 
+Lisp_Object Qccl_error;
+
 /* This contains all code conversion map available to CCL.  */
 Lisp_Object Vcode_conversion_map_vector;
 
@@ -2228,6 +2230,8 @@
 void
 syms_of_mule_ccl (void)
 {
+  DEFERROR_STANDARD (Qccl_error, Qconversion_error);
+
   DEFSUBR (Fccl_program_p);
   DEFSUBR (Fccl_execute);
   DEFSUBR (Fccl_execute_on_string);
diff -r 001628b7a5b3 -r e9162e1ea200 src/mule-charset.c
--- a/src/mule-charset.c	Thu May 24 09:37:30 2001 +0000
+++ b/src/mule-charset.c	Thu May 24 09:53:18 2001 +0000
@@ -784,8 +784,10 @@
 
   if (!NILP (CHARSET_BY_ATTRIBUTES (type, final, CHARSET_LEFT_TO_RIGHT)) ||
       !NILP (CHARSET_BY_ATTRIBUTES (type, final, CHARSET_RIGHT_TO_LEFT)))
-    error
-      ("Character set already defined for this DIMENSION/CHARS/FINAL combo");
+    signal_error
+      (Qerror,
+       "Character set already defined for this DIMENSION/CHARS/FINAL combo",
+       Qunbound);
 
   id = get_unallocated_leading_byte (dimension);