Mercurial > hg > xemacs-beta
changeset 565:e9162e1ea200
[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.
| author | yoshiki |
|---|---|
| date | Thu, 24 May 2001 09:53:18 +0000 |
| parents | 001628b7a5b3 |
| children | e62e90435c57 |
| files | src/ChangeLog src/mule-ccl.c src/mule-charset.c |
| diffstat | 3 files changed, 14 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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);
--- 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);