comparison src/coding.c @ 71972:eaa3c19b94d2

(Fcheck_coding_system): Use xsignal1. Remove loop. (Fdefine_coding_system_internal): Use xsignal1.

71971:a0c56d32ce9f

  if (buf == current_buffer)
    {
      /* As we are already in the work buffer, we must generate a new
	 buffer for the work.  */
      Lisp_Object name;
	
      name = Fgenerate_new_buffer_name (Vcode_conversion_workbuf_name, Qnil);
      buffer = buffer_to_kill = Fget_buffer_create (name);
      buf = XBUFFER (buffer);
    }
  else

      Fput (coding_system, Qcoding_system_define_form, Qnil);
      safe_eval (define_form);
    }
  if (!NILP (Fcoding_system_p (coding_system)))
    return coding_system;
  while (1)
    Fsignal (Qcoding_system_error, Fcons (coding_system, Qnil));
}

Lisp_Object
detect_coding_system (src, src_bytes, highest, multibytep)
     const unsigned char *src;

     Lisp_Object coding_system;
{
  Lisp_Object safe_chars, slot;

  if (NILP (Fcheck_coding_system (coding_system)))
    Fsignal (Qcoding_system_error, Fcons (coding_system, Qnil));
  safe_chars = coding_safe_chars (coding_system);
  if (! EQ (safe_chars, Qt) && ! CHAR_TABLE_P (safe_chars))
    error ("No valid safe-chars property for %s",
	   SDATA (SYMBOL_NAME (coding_system)));
  if (EQ (safe_chars, Qt))
    {
      if (NILP (Fmemq (coding_system, XCAR (Vcoding_system_safe_chars))))
	XSETCAR (Vcoding_system_safe_chars,
		 Fcons (coding_system, XCAR (Vcoding_system_safe_chars)));

71972:eaa3c19b94d2

  if (buf == current_buffer)
    {
      /* As we are already in the work buffer, we must generate a new
	 buffer for the work.  */
      Lisp_Object name;

      name = Fgenerate_new_buffer_name (Vcode_conversion_workbuf_name, Qnil);
      buffer = buffer_to_kill = Fget_buffer_create (name);
      buf = XBUFFER (buffer);
    }
  else

      Fput (coding_system, Qcoding_system_define_form, Qnil);
      safe_eval (define_form);
    }
  if (!NILP (Fcoding_system_p (coding_system)))
    return coding_system;
  xsignal1 (Qcoding_system_error, coding_system);
}

Lisp_Object
detect_coding_system (src, src_bytes, highest, multibytep)
     const unsigned char *src;

     Lisp_Object coding_system;
{
  Lisp_Object safe_chars, slot;

  if (NILP (Fcheck_coding_system (coding_system)))
    xsignal1 (Qcoding_system_error, coding_system);

  safe_chars = coding_safe_chars (coding_system);
  if (! EQ (safe_chars, Qt) && ! CHAR_TABLE_P (safe_chars))
    error ("No valid safe-chars property for %s",
	   SDATA (SYMBOL_NAME (coding_system)));

  if (EQ (safe_chars, Qt))
    {
      if (NILP (Fmemq (coding_system, XCAR (Vcoding_system_safe_chars))))
	XSETCAR (Vcoding_system_safe_chars,
		 Fcons (coding_system, XCAR (Vcoding_system_safe_chars)));