Mercurial > hg > xemacs-beta

comparison src/mule-coding.c @ 4959:bd169a24a554

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Ben Wing <ben@xemacs.org>
date Thu, 28 Jan 2010 04:27:30 -0600
parents 19a72041c5ed
children 0d4c9d0f6a8d
comparison
equal deleted inserted replaced
4893:99f2102552d7 4959:bd169a24a554
2926 iso2022_print (Lisp_Object cs, Lisp_Object printcharfun, 2926 iso2022_print (Lisp_Object cs, Lisp_Object printcharfun,
2927 int UNUSED (escapeflag)) 2927 int UNUSED (escapeflag))
2928 { 2928 {
2929 int i; 2929 int i;
2930 2930
2931 write_c_string (printcharfun, "("); 2931 write_ascstring (printcharfun, "(");
2932 for (i = 0; i < 4; i++) 2932 for (i = 0; i < 4; i++)
2933 { 2933 {
2934 Lisp_Object charset = coding_system_charset (cs, i); 2934 Lisp_Object charset = coding_system_charset (cs, i);
2935 if (i > 0) 2935 if (i > 0)
2936 write_c_string (printcharfun, ", "); 2936 write_ascstring (printcharfun, ", ");
2937 write_fmt_string (printcharfun, "g%d=", i); 2937 write_fmt_string (printcharfun, "g%d=", i);
2938 print_internal (CHARSETP (charset) ? XCHARSET_NAME (charset) : charset, printcharfun, 0); 2938 print_internal (CHARSETP (charset) ? XCHARSET_NAME (charset) : charset, printcharfun, 0);
2939 if (XCODING_SYSTEM_ISO2022_FORCE_CHARSET_ON_OUTPUT (cs, i)) 2939 if (XCODING_SYSTEM_ISO2022_FORCE_CHARSET_ON_OUTPUT (cs, i))
2940 write_c_string (printcharfun, "(force)"); 2940 write_ascstring (printcharfun, "(force)");
2941 } 2941 }
2942 2942
2943 #define FROB(prop) \ 2943 #define FROB(prop) \
2944 if (!NILP (iso2022_getprop (cs, prop))) \ 2944 if (!NILP (iso2022_getprop (cs, prop))) \
2945 { \ 2945 { \
2967 (XCODING_SYSTEM_ISO2022_OUTPUT_CONV (cs), 1); 2967 (XCODING_SYSTEM_ISO2022_OUTPUT_CONV (cs), 1);
2968 if (!NILP (val)) 2968 if (!NILP (val))
2969 { 2969 {
2970 write_fmt_string_lisp (printcharfun, ", output-charset-conversion=%s", 1, val); 2970 write_fmt_string_lisp (printcharfun, ", output-charset-conversion=%s", 1, val);
2971 } 2971 }
2972 write_c_string (printcharfun, ")"); 2972 write_ascstring (printcharfun, ")");
2973 } 2973 }
2974 } 2974 }
2975 2975
2976 2976
2977 /************************************************************************/ 2977 /************************************************************************/
3738 XCODING_SYSTEM_FIXED_WIDTH_INVALID_AND_QUERY_SKIP_CHARS 3738 XCODING_SYSTEM_FIXED_WIDTH_INVALID_AND_QUERY_SKIP_CHARS
3739 (codesys) : 3739 (codesys) :
3740 XCODING_SYSTEM_FIXED_WIDTH_QUERY_SKIP_CHARS(codesys)), 3740 XCODING_SYSTEM_FIXED_WIDTH_QUERY_SKIP_CHARS(codesys)),
3741 XCODING_SYSTEM_FIXED_WIDTH_QUERY_SKIP_CHARS(codesys), 3741 XCODING_SYSTEM_FIXED_WIDTH_QUERY_SKIP_CHARS(codesys),
3742 (flags & QUERY_METHOD_IGNORE_INVALID_SEQUENCES ? 3742 (flags & QUERY_METHOD_IGNORE_INVALID_SEQUENCES ?
3743 build_string("") : 3743 build_ascstring("") :
3744 XCODING_SYSTEM_FIXED_WIDTH_INVALID_SEQUENCES_SKIP_CHARS (codesys)), 3744 XCODING_SYSTEM_FIXED_WIDTH_INVALID_SEQUENCES_SKIP_CHARS (codesys)),
3745 fastmap, (int)(sizeof (fastmap))); 3745 fastmap, (int)(sizeof (fastmap)));
3746 3746
3747 if (flags & QUERY_METHOD_HIGHLIGHT && 3747 if (flags & QUERY_METHOD_HIGHLIGHT &&
3748 /* If we're being called really early, live without highlights getting 3748 /* If we're being called really early, live without highlights getting
3799 assert (previous_failed_reason == query_coding_invalid_sequence 3799 assert (previous_failed_reason == query_coding_invalid_sequence
3800 || previous_failed_reason == query_coding_unencodable); 3800 || previous_failed_reason == query_coding_unencodable);
3801 3801
3802 if (flags & QUERY_METHOD_ERRORP) 3802 if (flags & QUERY_METHOD_ERRORP)
3803 { 3803 {
3804 DECLARE_EISTRING (error_details); 3804 signal_error_2
3805 3805 (Qtext_conversion_error,
3806 eicpy_ascii (error_details, "Cannot encode "); 3806 "Cannot encode using coding system",
3807 eicat_lstr (error_details, 3807 make_string_from_buffer (buf, fail_range_start,
3808 make_string_from_buffer (buf, fail_range_start, 3808 pos - fail_range_start),
3809 pos - fail_range_start)); 3809 XCODING_SYSTEM_NAME (codesys));
3810 eicat_ascii (error_details, " using coding system");
3811
3812 signal_error (Qtext_conversion_error,
3813 (const CIbyte *)(eidata (error_details)),
3814 XCODING_SYSTEM_NAME (codesys));
3815 } 3810 }
3816 3811
3817 if (NILP (result)) 3812 if (NILP (result))
3818 { 3813 {
3819 result = Fmake_range_table (Qstart_closed_end_open); 3814 result = Fmake_range_table (Qstart_closed_end_open);