aboutsummaryrefslogtreecommitdiffstats
path: root/src/coding.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/coding.c')
-rw-r--r--src/coding.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/coding.c b/src/coding.c
index e35cb5ddc09..5b067b9dd2f 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -6068,7 +6068,7 @@ set_conversion_work_buffer (multibyte)
6068 /* As we are already in the work buffer, we must generate a new 6068 /* As we are already in the work buffer, we must generate a new
6069 buffer for the work. */ 6069 buffer for the work. */
6070 Lisp_Object name; 6070 Lisp_Object name;
6071 6071
6072 name = Fgenerate_new_buffer_name (Vcode_conversion_workbuf_name, Qnil); 6072 name = Fgenerate_new_buffer_name (Vcode_conversion_workbuf_name, Qnil);
6073 buffer = buffer_to_kill = Fget_buffer_create (name); 6073 buffer = buffer_to_kill = Fget_buffer_create (name);
6074 buf = XBUFFER (buffer); 6074 buf = XBUFFER (buffer);
@@ -6591,8 +6591,7 @@ The value of this property should be a vector of length 5. */)
6591 } 6591 }
6592 if (!NILP (Fcoding_system_p (coding_system))) 6592 if (!NILP (Fcoding_system_p (coding_system)))
6593 return coding_system; 6593 return coding_system;
6594 while (1) 6594 xsignal1 (Qcoding_system_error, coding_system);
6595 Fsignal (Qcoding_system_error, Fcons (coding_system, Qnil));
6596} 6595}
6597 6596
6598Lisp_Object 6597Lisp_Object
@@ -7631,11 +7630,13 @@ This function is internal use only. */)
7631 Lisp_Object safe_chars, slot; 7630 Lisp_Object safe_chars, slot;
7632 7631
7633 if (NILP (Fcheck_coding_system (coding_system))) 7632 if (NILP (Fcheck_coding_system (coding_system)))
7634 Fsignal (Qcoding_system_error, Fcons (coding_system, Qnil)); 7633 xsignal1 (Qcoding_system_error, coding_system);
7634
7635 safe_chars = coding_safe_chars (coding_system); 7635 safe_chars = coding_safe_chars (coding_system);
7636 if (! EQ (safe_chars, Qt) && ! CHAR_TABLE_P (safe_chars)) 7636 if (! EQ (safe_chars, Qt) && ! CHAR_TABLE_P (safe_chars))
7637 error ("No valid safe-chars property for %s", 7637 error ("No valid safe-chars property for %s",
7638 SDATA (SYMBOL_NAME (coding_system))); 7638 SDATA (SYMBOL_NAME (coding_system)));
7639
7639 if (EQ (safe_chars, Qt)) 7640 if (EQ (safe_chars, Qt))
7640 { 7641 {
7641 if (NILP (Fmemq (coding_system, XCAR (Vcoding_system_safe_chars)))) 7642 if (NILP (Fmemq (coding_system, XCAR (Vcoding_system_safe_chars))))