changeset: 5403:db326b8fe982 user: Aidan Kehoe <kehoea(a)parhasard.net&gt; date: Sun Jan 23 12:47:02 2011 +0000 files: src/ChangeLog src/file-coding.c src/intl-win32.c src/profile.c src/unicode.c description: Use Ben's recently-introduced listu (), where appropriate. 2011-01-23 Aidan Kehoe <kehoea(a)parhasard.net&gt; * file-coding.c (complex_vars_of_file_coding): * intl-win32.c (complex_vars_of_intl_win32): * profile.c (Fget_profiling_info): * unicode.c (complex_vars_of_unicode): Replace various awkward calls to nconc2 () with list6 () with analogous calls to Ben's relatively-recently introduced listu (), constructing a list from an arbitrary number of C arguments. diff -r 2a54dfbe434f -r db326b8fe982 src/ChangeLog --- a/src/ChangeLog Sat Jan 22 23:29:25 2011 +0000 +++ b/src/ChangeLog Sun Jan 23 12:47:02 2011 +0000 ＠＠ -1,3 +1,13 ＠＠ +2011-01-23 Aidan Kehoe <kehoea(a)parhasard.net&gt; + + * file-coding.c (complex_vars_of_file_coding): + * intl-win32.c (complex_vars_of_intl_win32): + * profile.c (Fget_profiling_info): + * unicode.c (complex_vars_of_unicode): + Replace various awkward calls to nconc2 () with list6 () with + analogous calls to Ben's relatively-recently introduced listu (), + constructing a list from an arbitrary number of C arguments. + 2011-01-18 Mike Sperber <mike(a)xemacs.org&gt; * s/freebsd.h: Zap. Not really needed anymore, and it has unclear diff -r 2a54dfbe434f -r db326b8fe982 src/file-coding.c --- a/src/file-coding.c Sat Jan 22 23:29:25 2011 +0000 +++ b/src/file-coding.c Sun Jan 23 12:47:02 2011 +0000 ＠＠ -4817,142 +4817,143 ＠＠ Fmake_coding_system_internal (Qconvert_eol_cr, Qconvert_eol, build_defer_string ("Convert CR to LF"), - nconc2 (list6 (Qdocumentation, - build_defer_string ( + listu (Qdocumentation, + build_defer_string ( "Converts CR (used to mark the end of a line on Macintosh systems) to LF\n" "(used internally and under Unix to mark the end of a line)."), - Qmnemonic, build_ascstring ("CR->LF"), - Qsubtype, Qcr), - /* VERY IMPORTANT! Tell make-coding-system not to generate + Qmnemonic, build_ascstring ("CR->LF"), + Qsubtype, Qcr, + /* VERY IMPORTANT! Tell make-coding-system not to generate + subsidiaries -- it needs the coding systems we're creating + to do so! */ + Qeol_type, Qlf, + Qsafe_charsets, Qt, + Qunbound)); + Fmake_coding_system_internal + (Qconvert_eol_lf, Qconvert_eol, + build_defer_string ("Convert LF to LF (do nothing)"), + listu (Qdocumentation, + build_defer_string ("Do nothing."), + Qmnemonic, build_ascstring ("LF->LF"), + Qsubtype, Qlf, + /* VERY IMPORTANT! Tell make-coding-system not to generate subsidiaries -- it needs the coding systems we're creating to do so! */ - list4 (Qeol_type, Qlf, - Qsafe_charsets, Qt))); - - Fmake_coding_system_internal - (Qconvert_eol_lf, Qconvert_eol, - build_defer_string ("Convert LF to LF (do nothing)"), - nconc2 (list6 (Qdocumentation, - build_defer_string ( -"Do nothing."), - Qmnemonic, build_ascstring ("LF->LF"), - Qsubtype, Qlf), - /* VERY IMPORTANT! Tell make-coding-system not to generate - subsidiaries -- it needs the coding systems we're creating - to do so! */ - list4 (Qeol_type, Qlf, - Qsafe_charsets, Qt))); + Qeol_type, Qlf, + Qsafe_charsets, Qt, + Qunbound)); Fmake_coding_system_internal (Qconvert_eol_crlf, Qconvert_eol, build_defer_string ("Convert CRLF to LF"), - nconc2 (list6 (Qdocumentation, - build_defer_string ( + listu (Qdocumentation, + build_defer_string ( "Converts CR+LF (used to mark the end of a line on Macintosh systems) to LF\n" "(used internally and under Unix to mark the end of a line)."), - Qmnemonic, build_ascstring ("CRLF->LF"), - Qsubtype, Qcrlf), - - /* VERY IMPORTANT! Tell make-coding-system not to generate - subsidiaries -- it needs the coding systems we're creating - to do so! */ - list4 (Qeol_type, Qlf, - Qsafe_charsets, Qt))); + Qmnemonic, build_ascstring ("CRLF->LF"), + Qsubtype, Qcrlf, + /* VERY IMPORTANT! Tell make-coding-system not to generate + subsidiaries -- it needs the coding systems we're creating + to do so! */ + Qeol_type, Qlf, + Qsafe_charsets, Qt, + Qunbound)); Fmake_coding_system_internal (Qconvert_eol_autodetect, Qconvert_eol, build_defer_string ("Autodetect EOL type"), - nconc2 (list6 (Qdocumentation, - build_defer_string ( -"Autodetect the end-of-line type."), - Qmnemonic, build_ascstring ("Auto-EOL"), - Qsubtype, Qnil), - /* VERY IMPORTANT! Tell make-coding-system not to generate - subsidiaries -- it needs the coding systems we're creating - to do so! */ - list4 (Qeol_type, Qlf, - Qsafe_charsets, Qt))); + listu (Qdocumentation, + build_defer_string ("Autodetect the end-of-line type."), + Qmnemonic, build_ascstring ("Auto-EOL"), + Qsubtype, Qnil, + /* VERY IMPORTANT! Tell make-coding-system not to generate + subsidiaries -- it needs the coding systems we're creating + to do so! */ + Qeol_type, Qlf, + Qsafe_charsets, Qt, + Qunbound)); Fmake_coding_system_internal (Qundecided, Qundecided, build_defer_string ("Undecided (auto-detect)"), - nconc2 (list4 (Qdocumentation, - build_defer_string - ("Automatically detects the correct encoding."), - Qmnemonic, build_ascstring ("Auto")), - list6 (Qdo_eol, Qt, Qdo_coding, Qt, - /* We do EOL detection ourselves so we don't need to be - wrapped in an EOL detector. (It doesn't actually hurt, - though, I don't think.) */ - Qeol_type, Qlf))); + listu (Qdocumentation, + build_defer_string ("Automatically detects the correct encoding."), + Qmnemonic, build_ascstring ("Auto"), + Qdo_eol, Qt, Qdo_coding, Qt, + /* We do EOL detection ourselves so we don't need to be + wrapped in an EOL detector. (It doesn't actually hurt, + though, I don't think.) */ + Qeol_type, Qlf, + Qunbound)); Fmake_coding_system_internal (intern ("undecided-dos"), Qundecided, build_defer_string ("Undecided (auto-detect) (CRLF)"), - nconc2 (list4 (Qdocumentation, - build_defer_string - ("Automatically detects the correct encoding; EOL type of CRLF forced."), - Qmnemonic, build_ascstring ("Auto")), - list4 (Qdo_coding, Qt, - Qeol_type, Qcrlf))); + listu (Qdocumentation, + build_defer_string + ("Automatically detects the correct encoding; EOL type of CRLF forced."), + Qmnemonic, build_ascstring ("Auto"), + Qdo_coding, Qt, + Qeol_type, Qcrlf, + Qunbound)); Fmake_coding_system_internal (intern ("undecided-unix"), Qundecided, build_defer_string ("Undecided (auto-detect) (LF)"), - nconc2 (list4 (Qdocumentation, - build_defer_string - ("Automatically detects the correct encoding; EOL type of LF forced."), - Qmnemonic, build_ascstring ("Auto")), - list4 (Qdo_coding, Qt, - Qeol_type, Qlf))); + listu (Qdocumentation, + build_defer_string + ("Automatically detects the correct encoding; EOL type of LF forced."), + Qmnemonic, build_ascstring ("Auto"), + Qdo_coding, Qt, + Qeol_type, Qlf, + Qunbound));; Fmake_coding_system_internal (intern ("undecided-mac"), Qundecided, build_defer_string ("Undecided (auto-detect) (CR)"), - nconc2 (list4 (Qdocumentation, - build_defer_string - ("Automatically detects the correct encoding; EOL type of CR forced."), - Qmnemonic, build_ascstring ("Auto")), - list4 (Qdo_coding, Qt, - Qeol_type, Qcr))); + listu (Qdocumentation, + build_defer_string + ("Automatically detects the correct encoding; EOL type of CR forced."), + Qmnemonic, build_ascstring ("Auto"), + Qdo_coding, Qt, + Qeol_type, Qcr, + Qunbound)); /* Need to create this here or we're really screwed. */ Fmake_coding_system_internal (Qraw_text, Qno_conversion, build_defer_string ("Raw Text"), - nconc2 (list4 (Qdocumentation, - build_defer_string ("Raw text converts only line-break " - "codes, and acts otherwise like " - "`binary'."), - Qmnemonic, build_ascstring ("Raw")), -#ifdef MULE - list2 (Qsafe_charsets, list3 (Vcharset_ascii, Vcharset_control_1, - Vcharset_latin_iso8859_1)))); - -#else - Qnil)); -#endif + listu (Qdocumentation, + build_defer_string ("Raw text converts only line-break " + "codes, and acts otherwise like " + "`binary'."), + Qmnemonic, build_ascstring ("Raw"), +#ifdef MULE + Qsafe_charsets, list3 (Vcharset_ascii, Vcharset_control_1, + Vcharset_latin_iso8859_1), + +#endif + Qunbound)); + Fmake_coding_system_internal (Qbinary, Qno_conversion, build_defer_string ("Binary"), - nconc2 (list6 (Qdocumentation, - build_defer_string ( + listu (Qdocumentation, + build_defer_string ( "This coding system is as close as it comes to doing no conversion.\n" "On input, each byte is converted directly into the character\n" "with the corresponding code -- i.e. from the `ascii', `control-1',\n" "or `latin-1' character sets. On output, these characters are\n" "converted back to the corresponding bytes, and other characters\n" "are converted to the default character, i.e. `~'."), - Qeol_type, Qlf, - Qmnemonic, build_ascstring ("Binary")), -#ifdef MULE - list2 (Qsafe_charsets, list3 (Vcharset_ascii, Vcharset_control_1, - Vcharset_latin_iso8859_1)))); - -#else - Qnil)); -#endif + Qeol_type, Qlf, + Qmnemonic, build_ascstring ("Binary"), +#ifdef MULE + Qsafe_charsets, list3 (Vcharset_ascii, Vcharset_control_1, + Vcharset_latin_iso8859_1), +#endif + Qunbound)); /* Formerly aliased to raw-text! Completely bogus and not even the same as FSF Emacs. */ diff -r 2a54dfbe434f -r db326b8fe982 src/intl-win32.c --- a/src/intl-win32.c Sat Jan 22 23:29:25 2011 +0000 +++ b/src/intl-win32.c Sun Jan 23 12:47:02 2011 +0000 ＠＠ -2358,14 +2358,15 ＠＠ Fmake_coding_system_internal (Qmswindows_unicode, Qunicode, build_defer_string ("MS Windows Unicode"), - nconc2 (list4 (Qdocumentation, - build_defer_string ( + listu (Qdocumentation, + build_defer_string ( "Converts to the Unicode encoding for Windows API calls.\n" "This encoding is equivalent to standard UTF16, little-endian." ), - Qmnemonic, build_ascstring ("MSW-U")), - list4 (Qunicode_type, Qutf_16, - Qlittle_endian, Qt))); + Qmnemonic, build_ascstring ("MSW-U"), + Qunicode_type, Qutf_16, + Qlittle_endian, Qt, + Qunbound)); #ifdef MULE /* Just temporarily. This will get fixed in mule-msw-init.el. */ diff -r 2a54dfbe434f -r db326b8fe982 src/profile.c --- a/src/profile.c Sat Jan 22 23:29:25 2011 +0000 +++ b/src/profile.c Sun Jan 23 12:47:02 2011 +0000 ＠＠ -542,15 +542,16 ＠＠ unbind_to (count); } - retv = nconc2 (list6 (Qtiming, closure.timing, Qtotal_timing, - copy_hash_table_or_blank (Vtotal_timing_profile_table), - Qcall_count, - copy_hash_table_or_blank (Vcall_count_profile_table)), - list4 (Qgc_usage, - copy_hash_table_or_blank (Vgc_usage_profile_table), - Qtotal_gc_usage, - copy_hash_table_or_blank (Vtotal_gc_usage_profile_table - ))); + retv = listu (Qtiming, closure.timing, + Qtotal_timing, + copy_hash_table_or_blank (Vtotal_timing_profile_table), + Qcall_count, + copy_hash_table_or_blank (Vcall_count_profile_table), + Qgc_usage, + copy_hash_table_or_blank (Vgc_usage_profile_table), + Qtotal_gc_usage, + copy_hash_table_or_blank (Vtotal_gc_usage_profile_table), + Qunbound); unbind_to (depth); return retv; } diff -r 2a54dfbe434f -r db326b8fe982 src/unicode.c --- a/src/unicode.c Sat Jan 22 23:29:25 2011 +0000 +++ b/src/unicode.c Sun Jan 23 12:47:02 2011 +0000 ＠＠ -3294,8 +3294,8 ＠＠ Fmake_coding_system_internal (Qutf_8, Qunicode, build_defer_string ("UTF-8"), - nconc2 (list4 (Qdocumentation, - build_defer_string ( + listu (Qdocumentation, + build_defer_string ( "UTF-8 Unicode encoding -- ASCII-compatible 8-bit variable-width encoding\n" "sharing the following principles with the Mule-internal encoding:\n" "\n" ＠＠ -3317,6 +3317,7 ＠＠ " -- Given only the leading byte, you know how many following bytes\n" " are present.\n" ), - Qmnemonic, build_ascstring ("UTF8")), - list2 (Qunicode_type, Qutf_8))); + Qmnemonic, build_ascstring ("UTF8"), + Qunicode_type, Qutf_8, + Qunbound)); } _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://lists.xemacs.org/mailman/listinfo/xemacs-patches