[Emacs-diffs] Changes to emacs/src/coding.c

[Kenichi Handa]

Index: emacs/src/coding.c
diff -c emacs/src/coding.c:1.244 emacs/src/coding.c:1.245
*** emacs/src/coding.c:1.244    Sat May 11 17:32:52 2002
--- emacs/src/coding.c  Mon May 20 04:05:15 2002
***************
*** 6170,6176 ****
  {
    Lisp_Object val;
    if (SYMBOLP (default_coding_system))
!     XSETSTRING (default_coding_system, XSYMBOL (default_coding_system)->name);
    val = Fcompleting_read (prompt, Vcoding_system_alist, Qnil,
                          Qt, Qnil, Qcoding_system_history,
                          default_coding_system, Qnil);
--- 6170,6176 ----
  {
    Lisp_Object val;
    if (SYMBOLP (default_coding_system))
!     default_coding_system = SYMBOL_NAME (default_coding_system);
    val = Fcompleting_read (prompt, Vcoding_system_alist, Qnil,
                          Qt, Qnil, Qcoding_system_history,
                          default_coding_system, Qnil);
***************
*** 6506,6512 ****
      return make_number (to - from);
  
    if (setup_coding_system (Fcheck_coding_system (coding_system), &coding) < 0)
!     error ("Invalid coding system: %s", XSYMBOL (coding_system)->name->data);
  
    coding.mode |= CODING_MODE_LAST_BLOCK;
    coding.src_multibyte = coding.dst_multibyte
--- 6506,6512 ----
      return make_number (to - from);
  
    if (setup_coding_system (Fcheck_coding_system (coding_system), &coding) < 0)
!     error ("Invalid coding system: %s", XSTRING (SYMBOL_NAME 
(coding_system))->data);
  
    coding.mode |= CODING_MODE_LAST_BLOCK;
    coding.src_multibyte = coding.dst_multibyte
***************
*** 6561,6567 ****
      return (NILP (nocopy) ? Fcopy_sequence (string) : string);
  
    if (setup_coding_system (Fcheck_coding_system (coding_system), &coding) < 0)
!     error ("Invalid coding system: %s", XSYMBOL (coding_system)->name->data);
  
    coding.mode |= CODING_MODE_LAST_BLOCK;
    string = (encodep
--- 6561,6567 ----
      return (NILP (nocopy) ? Fcopy_sequence (string) : string);
  
    if (setup_coding_system (Fcheck_coding_system (coding_system), &coding) < 0)
!     error ("Invalid coding system: %s", XSTRING (SYMBOL_NAME 
(coding_system))->data);
  
    coding.mode |= CODING_MODE_LAST_BLOCK;
    string = (encodep
***************
*** 6620,6626 ****
      return string;
  
    if (setup_coding_system (Fcheck_coding_system (coding_system), &coding) < 0)
!     error ("Invalid coding system: %s", XSYMBOL (coding_system)->name->data);
  
    coding.composing = COMPOSITION_DISABLED;
    coding.mode |= CODING_MODE_LAST_BLOCK;
--- 6620,6626 ----
      return string;
  
    if (setup_coding_system (Fcheck_coding_system (coding_system), &coding) < 0)
!     error ("Invalid coding system: %s", XSTRING (SYMBOL_NAME 
(coding_system))->data);
  
    coding.composing = COMPOSITION_DISABLED;
    coding.mode |= CODING_MODE_LAST_BLOCK;
***************
*** 6865,6871 ****
      error ("Invalid first argument");
    if (nargs < 1 + XINT (target_idx))
      error ("Too few arguments for operation: %s",
!          XSYMBOL (operation)->name->data);
    target = args[XINT (target_idx) + 1];
    if (!(STRINGP (target)
        || (EQ (operation, Qopen_network_stream) && INTEGERP (target))))
--- 6865,6871 ----
      error ("Invalid first argument");
    if (nargs < 1 + XINT (target_idx))
      error ("Too few arguments for operation: %s",
!          XSTRING (SYMBOL_NAME (operation))->data);
    target = args[XINT (target_idx) + 1];
    if (!(STRINGP (target)
        || (EQ (operation, Qopen_network_stream) && INTEGERP (target))))