/[emacs]/emacs/src/coding.c
ViewVC logotype

Diff of /emacs/src/coding.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.244 by eliz, Sat May 11 21:32:52 2002 UTC revision 1.245 by raeburn, Mon May 20 08:05:15 2002 UTC
# Line 6170  If the user enters null input, return se Line 6170  If the user enters null input, return se
6170  {  {
6171    Lisp_Object val;    Lisp_Object val;
6172    if (SYMBOLP (default_coding_system))    if (SYMBOLP (default_coding_system))
6173      XSETSTRING (default_coding_system, XSYMBOL (default_coding_system)->name);      default_coding_system = SYMBOL_NAME (default_coding_system);
6174    val = Fcompleting_read (prompt, Vcoding_system_alist, Qnil,    val = Fcompleting_read (prompt, Vcoding_system_alist, Qnil,
6175                            Qt, Qnil, Qcoding_system_history,                            Qt, Qnil, Qcoding_system_history,
6176                            default_coding_system, Qnil);                            default_coding_system, Qnil);
# Line 6506  code_convert_region1 (start, end, coding Line 6506  code_convert_region1 (start, end, coding
6506      return make_number (to - from);      return make_number (to - from);
6507    
6508    if (setup_coding_system (Fcheck_coding_system (coding_system), &coding) < 0)    if (setup_coding_system (Fcheck_coding_system (coding_system), &coding) < 0)
6509      error ("Invalid coding system: %s", XSYMBOL (coding_system)->name->data);      error ("Invalid coding system: %s", XSTRING (SYMBOL_NAME (coding_system))->data);
6510    
6511    coding.mode |= CODING_MODE_LAST_BLOCK;    coding.mode |= CODING_MODE_LAST_BLOCK;
6512    coding.src_multibyte = coding.dst_multibyte    coding.src_multibyte = coding.dst_multibyte
# Line 6561  code_convert_string1 (string, coding_sys Line 6561  code_convert_string1 (string, coding_sys
6561      return (NILP (nocopy) ? Fcopy_sequence (string) : string);      return (NILP (nocopy) ? Fcopy_sequence (string) : string);
6562    
6563    if (setup_coding_system (Fcheck_coding_system (coding_system), &coding) < 0)    if (setup_coding_system (Fcheck_coding_system (coding_system), &coding) < 0)
6564      error ("Invalid coding system: %s", XSYMBOL (coding_system)->name->data);      error ("Invalid coding system: %s", XSTRING (SYMBOL_NAME (coding_system))->data);
6565    
6566    coding.mode |= CODING_MODE_LAST_BLOCK;    coding.mode |= CODING_MODE_LAST_BLOCK;
6567    string = (encodep    string = (encodep
# Line 6620  code_convert_string_norecord (string, co Line 6620  code_convert_string_norecord (string, co
6620      return string;      return string;
6621    
6622    if (setup_coding_system (Fcheck_coding_system (coding_system), &coding) < 0)    if (setup_coding_system (Fcheck_coding_system (coding_system), &coding) < 0)
6623      error ("Invalid coding system: %s", XSYMBOL (coding_system)->name->data);      error ("Invalid coding system: %s", XSTRING (SYMBOL_NAME (coding_system))->data);
6624    
6625    coding.composing = COMPOSITION_DISABLED;    coding.composing = COMPOSITION_DISABLED;
6626    coding.mode |= CODING_MODE_LAST_BLOCK;    coding.mode |= CODING_MODE_LAST_BLOCK;
# Line 6865  usage: (find-operation-coding-system OPE Line 6865  usage: (find-operation-coding-system OPE
6865      error ("Invalid first argument");      error ("Invalid first argument");
6866    if (nargs < 1 + XINT (target_idx))    if (nargs < 1 + XINT (target_idx))
6867      error ("Too few arguments for operation: %s",      error ("Too few arguments for operation: %s",
6868             XSYMBOL (operation)->name->data);             XSTRING (SYMBOL_NAME (operation))->data);
6869    target = args[XINT (target_idx) + 1];    target = args[XINT (target_idx) + 1];
6870    if (!(STRINGP (target)    if (!(STRINGP (target)
6871          || (EQ (operation, Qopen_network_stream) && INTEGERP (target))))          || (EQ (operation, Qopen_network_stream) && INTEGERP (target))))

Legend:
Removed from v.1.244  
changed lines
  Added in v.1.245

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26