diff options
| author | Kim F. Storm | 2006-07-18 13:26:12 +0000 |
|---|---|---|
| committer | Kim F. Storm | 2006-07-18 13:26:12 +0000 |
| commit | fcad4ec4e9dac00dcdaf4efae85f8a7757a53f64 (patch) | |
| tree | af4deb3dd9fb0fae9e18c441327c04f699fc6ac0 | |
| parent | aaf769f15ad643ec47eb2540f8f970ac1065dd78 (diff) | |
| download | emacs-fcad4ec4e9dac00dcdaf4efae85f8a7757a53f64.tar.gz emacs-fcad4ec4e9dac00dcdaf4efae85f8a7757a53f64.zip | |
(Fcheck_coding_system): Use xsignal1. Remove loop.
(Fdefine_coding_system_internal): Use xsignal1.
| -rw-r--r-- | src/coding.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/coding.c b/src/coding.c index be39ceb7fe6..a3fd8f91284 100644 --- a/src/coding.c +++ b/src/coding.c | |||
| @@ -6072,7 +6072,7 @@ set_conversion_work_buffer (multibyte) | |||
| 6072 | /* As we are already in the work buffer, we must generate a new | 6072 | /* As we are already in the work buffer, we must generate a new |
| 6073 | buffer for the work. */ | 6073 | buffer for the work. */ |
| 6074 | Lisp_Object name; | 6074 | Lisp_Object name; |
| 6075 | 6075 | ||
| 6076 | name = Fgenerate_new_buffer_name (Vcode_conversion_workbuf_name, Qnil); | 6076 | name = Fgenerate_new_buffer_name (Vcode_conversion_workbuf_name, Qnil); |
| 6077 | buffer = buffer_to_kill = Fget_buffer_create (name); | 6077 | buffer = buffer_to_kill = Fget_buffer_create (name); |
| 6078 | buf = XBUFFER (buffer); | 6078 | buf = XBUFFER (buffer); |
| @@ -6595,8 +6595,7 @@ The value of this property should be a vector of length 5. */) | |||
| 6595 | } | 6595 | } |
| 6596 | if (!NILP (Fcoding_system_p (coding_system))) | 6596 | if (!NILP (Fcoding_system_p (coding_system))) |
| 6597 | return coding_system; | 6597 | return coding_system; |
| 6598 | while (1) | 6598 | xsignal1 (Qcoding_system_error, coding_system); |
| 6599 | Fsignal (Qcoding_system_error, Fcons (coding_system, Qnil)); | ||
| 6600 | } | 6599 | } |
| 6601 | 6600 | ||
| 6602 | Lisp_Object | 6601 | Lisp_Object |
| @@ -7623,11 +7622,13 @@ This function is internal use only. */) | |||
| 7623 | Lisp_Object safe_chars, slot; | 7622 | Lisp_Object safe_chars, slot; |
| 7624 | 7623 | ||
| 7625 | if (NILP (Fcheck_coding_system (coding_system))) | 7624 | if (NILP (Fcheck_coding_system (coding_system))) |
| 7626 | Fsignal (Qcoding_system_error, Fcons (coding_system, Qnil)); | 7625 | xsignal1 (Qcoding_system_error, coding_system); |
| 7626 | |||
| 7627 | safe_chars = coding_safe_chars (coding_system); | 7627 | safe_chars = coding_safe_chars (coding_system); |
| 7628 | if (! EQ (safe_chars, Qt) && ! CHAR_TABLE_P (safe_chars)) | 7628 | if (! EQ (safe_chars, Qt) && ! CHAR_TABLE_P (safe_chars)) |
| 7629 | error ("No valid safe-chars property for %s", | 7629 | error ("No valid safe-chars property for %s", |
| 7630 | SDATA (SYMBOL_NAME (coding_system))); | 7630 | SDATA (SYMBOL_NAME (coding_system))); |
| 7631 | |||
| 7631 | if (EQ (safe_chars, Qt)) | 7632 | if (EQ (safe_chars, Qt)) |
| 7632 | { | 7633 | { |
| 7633 | if (NILP (Fmemq (coding_system, XCAR (Vcoding_system_safe_chars)))) | 7634 | if (NILP (Fmemq (coding_system, XCAR (Vcoding_system_safe_chars)))) |