xemacs-beta: src/mule-coding.c comparison

comparison src/mule-coding.c @ 207:e45d5e7c476e r20-4b2

Import from CVS: tag r20-4b2

author	cvs
date	Mon, 13 Aug 2007 10:03:52 +0200
parents	acd284d43ca1
children	41ff10fd062f

comparison

equal deleted inserted replaced

-:d3e9274cbc4e
+:e45d5e7c476e
 DEFUN ("make-coding-system", Fmake_coding_system, 2, 4, 0, /*
 Register symbol NAME as a coding system.
 TYPE describes the conversion method used and should be one of
-nil or 'automatic-conversion
+nil or 'undecided
 Automatic conversion.  XEmacs attempts to detect the coding system
 used in the file.
 'no-conversion
 No conversion.  Use this for binary files and such.  On output,
 graphic characters that are not in ASCII or Latin-1 will be
 Lisp_Object rest, key, value;
 enum coding_system_type ty;
 int need_to_setup_eol_systems = 1;
 /* Convert type to constant */
-if (NILP (type) || EQ (type, Qautomatic_conversion))
+if (NILP (type) || EQ (type, Qundecided))
 { ty = CODESYS_AUTODETECT; }
 else if (EQ (type, Qshift_jis))     { ty = CODESYS_SHIFT_JIS; }
 else if (EQ (type, Qiso2022))       { ty = CODESYS_ISO2022; }
 else if (EQ (type, Qbig5))          { ty = CODESYS_BIG5; }
 else if (EQ (type, Qccl))           { ty = CODESYS_CCL; }
 */
 (coding_system))
 {
 switch (XCODING_SYSTEM_TYPE (Fget_coding_system (coding_system)))
 {
-case CODESYS_AUTODETECT:	return Qautomatic_conversion;
+case CODESYS_AUTODETECT:	return Qundecided;
 case CODESYS_SHIFT_JIS:	return Qshift_jis;
 case CODESYS_ISO2022:	return Qiso2022;
 case CODESYS_BIG5:		return Qbig5;
 case CODESYS_CCL:		return Qccl;
 case CODESYS_NO_CONVERSION:	return Qno_conversion;
 default:
 abort ();
 }
 return Qnil; /* not reached */
+}
+Lisp_Object coding_system_charset (coding_system, gnum)
+{
+Lisp_Object cs
+= XCODING_SYSTEM_ISO2022_INITIAL_CHARSET (coding_system, gnum);
+if (CHARSETP(cs)){
+return XCHARSET_NAME(cs);
+}
+else {
+return Qnil;
+}
+}
+DEFUN ("coding-system-charset", Fcoding_system_charset, 2, 2, 0, /*
+Return initial charset of CODING-SYSTEM designated to GNUM.
+GNUM allows 0 .. 3.
+*/
+(coding_system, gnum))
+{
+coding_system = Fget_coding_system (coding_system);
+CHECK_INT (gnum);
+return coding_system_charset(coding_system, XINT (gnum));
 }
 DEFUN ("coding-system-property", Fcoding_system_property, 2, 2, 0, /*
 Return the PROP property of CODING-SYSTEM.
 */
 return XCODING_SYSTEM_POST_READ_CONVERSION (coding_system);
 else if (EQ (prop, Qpre_write_conversion))
 return XCODING_SYSTEM_PRE_WRITE_CONVERSION (coding_system);
 else if (type == CODESYS_ISO2022)
 {
-#define INITIAL_CHARSET(charset_num) \
+if (EQ (prop, Qcharset_g0))
-(XCHARSET_NAME (XCODING_SYSTEM_ISO2022_INITIAL_CHARSET \
+	return coding_system_charset (coding_system, 0);
-		  (coding_system, charset_num)))
+else if (EQ (prop, Qcharset_g1))
+	return coding_system_charset (coding_system, 1);
-if      (EQ (prop, Qcharset_g0)) return INITIAL_CHARSET (0);
+else if (EQ (prop, Qcharset_g2))
-else if (EQ (prop, Qcharset_g1)) return INITIAL_CHARSET (1);
+	return coding_system_charset (coding_system, 2);
-else if (EQ (prop, Qcharset_g2)) return INITIAL_CHARSET (2);
+else if (EQ (prop, Qcharset_g3))
-else if (EQ (prop, Qcharset_g3)) return INITIAL_CHARSET (3);
+	return coding_system_charset (coding_system, 3);
 #define FORCE_CHARSET(charset_num) \
 (XCODING_SYSTEM_ISO2022_FORCE_CHARSET_ON_OUTPUT \
 (coding_system, charset_num) ? Qt : Qnil)
 case  7: /* bell */
 case  8: /* backspace */
 case 11: /* vertical tab */
 case 12: /* form feed */
 case 26: /* MS-DOS C-z junk */
+case 31: /* '^_' -- for info */
 return 1;
 default:
 return 0;
 }
 }
 Lstream_rewind (stream);
 }
 DEFUN ("detect-coding-region", Fdetect_coding_region, 2, 3, 0, /*
 Detect coding system of the text in the region between START and END.
-Returned value is a list of possible coding systems ordered by
+Returned a list of possible coding systems ordered by priority.
-priority.  If only ASCII characters are found, it returns
+If only ASCII characters are found, it returns 'undecided or one of
-'automatic-conversion or one of its subsidiary coding systems
+its subsidiary coding systems according to a detected end-of-line
-according to a detected end-of-line type.  Optional arg BUFFER
+type.  Optional arg BUFFER defaults to the current buffer.
-defaults to the current buffer.
 */
 (start, end, buffer))
 {
 Lisp_Object val = Qnil;
 struct buffer *buf = decode_buffer (buffer, 0);
 if (detect_coding_type (&decst, random_buffer, nread, 0))
 	break;
 }
 if (decst.mask == ~0)
-val = subsidiary_coding_system (Fget_coding_system (Qautomatic_conversion),
+val = subsidiary_coding_system (Fget_coding_system (Qundecided),
 				    decst.eol_type);
 else
 {
 int i;
 	    case  7: /* bell */
 	    case  8: /* backspace */
 	    case 11: /* vertical tab */
 	    case 12: /* form feed */
 	    case 26: /* MS-DOS C-z junk */
+	    case 31: /* '^_' -- for info */
 	      goto label_continue_loop;
 	    default:
 	      break;
 	    }
 DEFSUBR (Fcopy_coding_system);
 DEFSUBR (Fsubsidiary_coding_system);
 DEFSUBR (Fcoding_system_type);
 DEFSUBR (Fcoding_system_doc_string);
+DEFSUBR (Fcoding_system_charset);
 DEFSUBR (Fcoding_system_property);
 DEFSUBR (Fcoding_category_list);
 DEFSUBR (Fset_coding_priority_list);
 DEFSUBR (Fcoding_priority_list);

Mercurial > hg > xemacs-beta

comparison src/mule-coding.c @ 207:e45d5e7c476e r20-4b2