[COMMIT] Use Ben's recently-introduced listu (), where appropriate.
14 years, 1 month
Aidan Kehoe
APPROVE COMMIT
NOTE: This patch has been committed.
# HG changeset patch
# User Aidan Kehoe <kehoea(a)parhasard.net>
# Date 1295786822 0
# Node ID db326b8fe982a75108885e02eb035e6eadb8768e
# Parent 2a54dfbe434f68d9c7bb26be74723287ab456905
Use Ben's recently-introduced listu (), where appropriate.
2011-01-23 Aidan Kehoe <kehoea(a)parhasard.net>
* 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>
+
+ * 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>
* 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));
}
--
“Apart from the nine-banded armadillo, man is the only natural host of
Mycobacterium leprae, although it can be grown in the footpads of mice.”
-- Kumar & Clark, Clinical Medicine, summarising improbable leprosy research
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
commit: Use Ben's recently-introduced listu (), where appropriate.
14 years, 1 month
Aidan Kehoe
changeset: 5345:db326b8fe982
tag: tip
user: Aidan Kehoe <kehoea(a)parhasard.net>
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>
* 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>
+
+ * 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>
* 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
[COMMIT] Don't quote keywords, they've been self-quoting for well over a decade.
14 years, 1 month
Aidan Kehoe
APPROVE COMMIT
NOTE: This patch has been committed.
# HG changeset patch
# User Aidan Kehoe <kehoea(a)parhasard.net>
# Date 1295738965 0
# Node ID 2a54dfbe434f68d9c7bb26be74723287ab456905
# Parent 34ab0e66aaca12152a9e6460f17007eafc0a6687
Don't quote keywords, they've been self-quoting for well over a decade.
2011-01-22 Aidan Kehoe <kehoea(a)parhasard.net>
* bytecomp.el (byte-compile-setq, byte-compile-set):
Remove kludge allowing keywords' values to be set, all the code
that does that is gone.
* cl-compat.el (elt-satisfies-test-p):
* faces.el (set-face-parent):
* faces.el (face-doc-string):
* gtk-font-menu.el:
* gtk-font-menu.el (gtk-reset-device-font-menus):
* msw-font-menu.el:
* msw-font-menu.el (mswindows-reset-device-font-menus):
* package-get.el (package-get-installedp):
* select.el (select-convert-from-image-data):
* sound.el:
* sound.el (load-sound-file):
* x-font-menu.el (x-reset-device-font-menus-core):
Don't quote keywords, they're self-quoting, and the
win from backward-compatibility is sufficiently small now that the
style problem overrides it.
diff -r 34ab0e66aaca -r 2a54dfbe434f lisp/ChangeLog
--- a/lisp/ChangeLog Sat Jan 22 17:21:22 2011 +0000
+++ b/lisp/ChangeLog Sat Jan 22 23:29:25 2011 +0000
@@ -1,3 +1,25 @@
+2011-01-22 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * bytecomp.el (byte-compile-setq, byte-compile-set):
+ Remove kludge allowing keywords' values to be set, all the code
+ that does that is gone.
+
+ * cl-compat.el (elt-satisfies-test-p):
+ * faces.el (set-face-parent):
+ * faces.el (face-doc-string):
+ * gtk-font-menu.el:
+ * gtk-font-menu.el (gtk-reset-device-font-menus):
+ * msw-font-menu.el:
+ * msw-font-menu.el (mswindows-reset-device-font-menus):
+ * package-get.el (package-get-installedp):
+ * select.el (select-convert-from-image-data):
+ * sound.el:
+ * sound.el (load-sound-file):
+ * x-font-menu.el (x-reset-device-font-menus-core):
+ Don't quote keywords, they're self-quoting, and the
+ win from backward-compatibility is sufficiently small now that the
+ style problem overrides it.
+
2011-01-22 Aidan Kehoe <kehoea(a)parhasard.net>
* cl-macs.el (block, return-from): Require that NAME be a symbol
diff -r 34ab0e66aaca -r 2a54dfbe434f lisp/bytecomp.el
--- a/lisp/bytecomp.el Sat Jan 22 17:21:22 2011 +0000
+++ b/lisp/bytecomp.el Sat Jan 22 23:29:25 2011 +0000
@@ -3729,13 +3729,10 @@
;; Odd number of args? Let `set' get the error.
(byte-compile-form `(set ',var) for-effect)
(setq val (pop args))
- (if (keywordp var)
- ;; (setq :foo ':foo) compatibility kludge
- (byte-compile-form `(set ',var ,val) (if args t for-effect))
- (byte-compile-form val)
- (unless (or args for-effect)
- (byte-compile-out 'byte-dup 0))
- (byte-compile-variable-ref 'byte-varset var))))))
+ (byte-compile-form val)
+ (unless (or args for-effect)
+ (byte-compile-out 'byte-dup 0))
+ (byte-compile-variable-ref 'byte-varset var)))))
(setq for-effect nil))
(defun byte-compile-set (form)
@@ -3745,11 +3742,10 @@
(let ((symform (nth 1 form))
(valform (nth 2 form))
sym)
- (if (and (= (length form) 3)
- (= (safe-length symform) 2)
+ (if (and (eql (length form) 3)
+ (eql (safe-length symform) 2)
(eq (car symform) 'quote)
- (symbolp (setq sym (car (cdr symform))))
- (not (byte-compile-constant-symbol-p sym)))
+ (symbolp (setq sym (car (cdr symform)))))
(byte-compile-setq `(setq ,sym ,valform))
(byte-compile-two-args form))))
diff -r 34ab0e66aaca -r 2a54dfbe434f lisp/cl-compat.el
--- a/lisp/cl-compat.el Sat Jan 22 17:21:22 2011 +0000
+++ b/lisp/cl-compat.el Sat Jan 22 23:29:25 2011 +0000
@@ -75,9 +75,9 @@
(assq key klist))
(defun elt-satisfies-test-p (item elt klist)
- (let ((test-not (cdr (assq ':test-not klist)))
- (test (cdr (assq ':test klist)))
- (key (cdr (assq ':key klist))))
+ (let ((test-not (cdr (assq :test-not klist)))
+ (test (cdr (assq :test klist)))
+ (key (cdr (assq :key klist))))
(if key (setq elt (funcall key elt)))
(if test-not (not (funcall test-not item elt))
(funcall (or test 'eql) item elt))))
diff -r 34ab0e66aaca -r 2a54dfbe434f lisp/faces.el
--- a/lisp/faces.el Sat Jan 22 17:21:22 2011 +0000
+++ b/lisp/faces.el Sat Jan 22 23:29:25 2011 +0000
@@ -418,7 +418,7 @@
how-to-add))
(set-difference built-in-face-specifiers
'(display-table background-pixmap inherit)))
- (set-face-background-pixmap face (vector 'inherit ':face parent)
+ (set-face-background-pixmap face (vector 'inherit :face parent)
locale tag-set how-to-add)
nil)
diff -r 34ab0e66aaca -r 2a54dfbe434f lisp/gtk-font-menu.el
--- a/lisp/gtk-font-menu.el Sat Jan 22 17:21:22 2011 +0000
+++ b/lisp/gtk-font-menu.el Sat Jan 22 23:29:25 2011 +0000
@@ -168,19 +168,19 @@
(mapcar (lambda (x)
(vector x
(list 'font-menu-set-font x nil nil)
- ':style 'radio ':active nil ':selected nil))
+ :style 'radio :active nil :selected nil))
families)
(mapcar (lambda (x)
(vector (if (/= 0 (% x 10))
(number-to-string (/ x 10.0))
(number-to-string (/ x 10)))
(list 'font-menu-set-font nil nil x)
- ':style 'radio ':active nil ':selected nil))
+ :style 'radio :active nil :selected nil))
sizes)
(mapcar (lambda (x)
(vector x
(list 'font-menu-set-font nil x nil)
- ':style 'radio ':active nil ':selected nil))
+ :style 'radio :active nil :selected nil))
weights)))
(cdr dev-cache)))
diff -r 34ab0e66aaca -r 2a54dfbe434f lisp/msw-font-menu.el
--- a/lisp/msw-font-menu.el Sat Jan 22 17:21:22 2011 +0000
+++ b/lisp/msw-font-menu.el Sat Jan 22 23:29:25 2011 +0000
@@ -140,17 +140,17 @@
(mapcar (lambda (x)
(vector x
(list 'font-menu-set-font x nil nil)
- ':style 'radio ':active nil ':selected nil))
+ :style 'radio :active nil :selected nil))
families)
(mapcar (lambda (x)
(vector (int-to-string x)
(list 'font-menu-set-font nil nil x)
- ':style 'radio ':active nil ':selected nil))
+ :style 'radio :active nil :selected nil))
sizes)
(mapcar (lambda (x)
(vector x
(list 'font-menu-set-font nil x nil)
- ':style 'radio ':active nil ':selected nil))
+ :style 'radio :active nil :selected nil))
weights)))
(cdr dev-cache)))
diff -r 34ab0e66aaca -r 2a54dfbe434f lisp/package-get.el
--- a/lisp/package-get.el Sat Jan 22 17:21:22 2011 +0000
+++ b/lisp/package-get.el Sat Jan 22 23:29:25 2011 +0000
@@ -1240,7 +1240,7 @@
;; Use packages-package-list which contains name and version
(equal (plist-get
(package-get-info-find-package packages-package-list
- package) ':version)
+ package) :version)
(if (floatp version)
version
(string-to-number version))))
diff -r 34ab0e66aaca -r 2a54dfbe434f lisp/select.el
--- a/lisp/select.el Sat Jan 22 17:21:22 2011 +0000
+++ b/lisp/select.el Sat Jan 22 23:29:25 2011 +0000
@@ -767,7 +767,7 @@
corresponding to that data as an end-glyph extent property of that space. "
(let* ((str (make-string 1 ?\ ))
(extent (make-extent 0 1 str))
- (glyph (make-glyph (vector image-type ':data value))))
+ (glyph (make-glyph (vector image-type :data value))))
(when glyph
(set-extent-property extent 'invisible t)
(set-extent-property extent 'start-open t)
diff -r 34ab0e66aaca -r 2a54dfbe434f lisp/sound.el
--- a/lisp/sound.el Sat Jan 22 17:21:22 2011 +0000
+++ b/lisp/sound.el Sat Jan 22 23:29:25 2011 +0000
@@ -181,8 +181,8 @@
(setq sound-alist (cons
(nconc (list sound-name)
(if (and volume (not (eq 0 volume)))
- (list ':volume volume))
- (list ':sound data))
+ (list :volume volume))
+ (list :sound data))
sound-alist)))
sound-name)
diff -r 34ab0e66aaca -r 2a54dfbe434f lisp/x-font-menu.el
--- a/lisp/x-font-menu.el Sat Jan 22 17:21:22 2011 +0000
+++ b/lisp/x-font-menu.el Sat Jan 22 23:29:25 2011 +0000
@@ -253,21 +253,21 @@
(vector
cache
(mapcar (lambda (x)
- (vector x
+ (vector x
(list 'font-menu-set-font x nil nil)
- ':style 'radio ':active nil ':selected nil))
+ :style 'radio :active nil :selected nil))
families)
(mapcar (lambda (x)
(vector (if (/= 0 (% x 10))
(number-to-string (/ x 10.0))
(number-to-string (/ x 10)))
(list 'font-menu-set-font nil nil x)
- ':style 'radio ':active nil ':selected nil))
+ :style 'radio :active nil :selected nil))
sizes)
(mapcar (lambda (x)
(vector x
(list 'font-menu-set-font nil x nil)
- ':style 'radio ':active nil ':selected nil))
+ :style 'radio :active nil :selected nil))
weights)))
(cdr dev-cache)))
--
“Apart from the nine-banded armadillo, man is the only natural host of
Mycobacterium leprae, although it can be grown in the footpads of mice.”
-- Kumar & Clark, Clinical Medicine, summarising improbable leprosy research
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
commit: Don't quote keywords, they've been self-quoting for well over a decade.
14 years, 1 month
Aidan Kehoe
changeset: 5344:2a54dfbe434f
tag: tip
user: Aidan Kehoe <kehoea(a)parhasard.net>
date: Sat Jan 22 23:29:25 2011 +0000
files: lisp/ChangeLog lisp/bytecomp.el lisp/cl-compat.el lisp/faces.el lisp/gtk-font-menu.el lisp/msw-font-menu.el lisp/package-get.el lisp/select.el lisp/sound.el lisp/x-font-menu.el
description:
Don't quote keywords, they've been self-quoting for well over a decade.
2011-01-22 Aidan Kehoe <kehoea(a)parhasard.net>
* bytecomp.el (byte-compile-setq, byte-compile-set):
Remove kludge allowing keywords' values to be set, all the code
that does that is gone.
* cl-compat.el (elt-satisfies-test-p):
* faces.el (set-face-parent):
* faces.el (face-doc-string):
* gtk-font-menu.el:
* gtk-font-menu.el (gtk-reset-device-font-menus):
* msw-font-menu.el:
* msw-font-menu.el (mswindows-reset-device-font-menus):
* package-get.el (package-get-installedp):
* select.el (select-convert-from-image-data):
* sound.el:
* sound.el (load-sound-file):
* x-font-menu.el (x-reset-device-font-menus-core):
Don't quote keywords, they're self-quoting, and the
win from backward-compatibility is sufficiently small now that the
style problem overrides it.
diff -r 34ab0e66aaca -r 2a54dfbe434f lisp/ChangeLog
--- a/lisp/ChangeLog Sat Jan 22 17:21:22 2011 +0000
+++ b/lisp/ChangeLog Sat Jan 22 23:29:25 2011 +0000
@@ -1,3 +1,25 @@
+2011-01-22 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * bytecomp.el (byte-compile-setq, byte-compile-set):
+ Remove kludge allowing keywords' values to be set, all the code
+ that does that is gone.
+
+ * cl-compat.el (elt-satisfies-test-p):
+ * faces.el (set-face-parent):
+ * faces.el (face-doc-string):
+ * gtk-font-menu.el:
+ * gtk-font-menu.el (gtk-reset-device-font-menus):
+ * msw-font-menu.el:
+ * msw-font-menu.el (mswindows-reset-device-font-menus):
+ * package-get.el (package-get-installedp):
+ * select.el (select-convert-from-image-data):
+ * sound.el:
+ * sound.el (load-sound-file):
+ * x-font-menu.el (x-reset-device-font-menus-core):
+ Don't quote keywords, they're self-quoting, and the
+ win from backward-compatibility is sufficiently small now that the
+ style problem overrides it.
+
2011-01-22 Aidan Kehoe <kehoea(a)parhasard.net>
* cl-macs.el (block, return-from): Require that NAME be a symbol
diff -r 34ab0e66aaca -r 2a54dfbe434f lisp/bytecomp.el
--- a/lisp/bytecomp.el Sat Jan 22 17:21:22 2011 +0000
+++ b/lisp/bytecomp.el Sat Jan 22 23:29:25 2011 +0000
@@ -3729,13 +3729,10 @@
;; Odd number of args? Let `set' get the error.
(byte-compile-form `(set ',var) for-effect)
(setq val (pop args))
- (if (keywordp var)
- ;; (setq :foo ':foo) compatibility kludge
- (byte-compile-form `(set ',var ,val) (if args t for-effect))
- (byte-compile-form val)
- (unless (or args for-effect)
- (byte-compile-out 'byte-dup 0))
- (byte-compile-variable-ref 'byte-varset var))))))
+ (byte-compile-form val)
+ (unless (or args for-effect)
+ (byte-compile-out 'byte-dup 0))
+ (byte-compile-variable-ref 'byte-varset var)))))
(setq for-effect nil))
(defun byte-compile-set (form)
@@ -3745,11 +3742,10 @@
(let ((symform (nth 1 form))
(valform (nth 2 form))
sym)
- (if (and (= (length form) 3)
- (= (safe-length symform) 2)
+ (if (and (eql (length form) 3)
+ (eql (safe-length symform) 2)
(eq (car symform) 'quote)
- (symbolp (setq sym (car (cdr symform))))
- (not (byte-compile-constant-symbol-p sym)))
+ (symbolp (setq sym (car (cdr symform)))))
(byte-compile-setq `(setq ,sym ,valform))
(byte-compile-two-args form))))
diff -r 34ab0e66aaca -r 2a54dfbe434f lisp/cl-compat.el
--- a/lisp/cl-compat.el Sat Jan 22 17:21:22 2011 +0000
+++ b/lisp/cl-compat.el Sat Jan 22 23:29:25 2011 +0000
@@ -75,9 +75,9 @@
(assq key klist))
(defun elt-satisfies-test-p (item elt klist)
- (let ((test-not (cdr (assq ':test-not klist)))
- (test (cdr (assq ':test klist)))
- (key (cdr (assq ':key klist))))
+ (let ((test-not (cdr (assq :test-not klist)))
+ (test (cdr (assq :test klist)))
+ (key (cdr (assq :key klist))))
(if key (setq elt (funcall key elt)))
(if test-not (not (funcall test-not item elt))
(funcall (or test 'eql) item elt))))
diff -r 34ab0e66aaca -r 2a54dfbe434f lisp/faces.el
--- a/lisp/faces.el Sat Jan 22 17:21:22 2011 +0000
+++ b/lisp/faces.el Sat Jan 22 23:29:25 2011 +0000
@@ -418,7 +418,7 @@
how-to-add))
(set-difference built-in-face-specifiers
'(display-table background-pixmap inherit)))
- (set-face-background-pixmap face (vector 'inherit ':face parent)
+ (set-face-background-pixmap face (vector 'inherit :face parent)
locale tag-set how-to-add)
nil)
diff -r 34ab0e66aaca -r 2a54dfbe434f lisp/gtk-font-menu.el
--- a/lisp/gtk-font-menu.el Sat Jan 22 17:21:22 2011 +0000
+++ b/lisp/gtk-font-menu.el Sat Jan 22 23:29:25 2011 +0000
@@ -168,19 +168,19 @@
(mapcar (lambda (x)
(vector x
(list 'font-menu-set-font x nil nil)
- ':style 'radio ':active nil ':selected nil))
+ :style 'radio :active nil :selected nil))
families)
(mapcar (lambda (x)
(vector (if (/= 0 (% x 10))
(number-to-string (/ x 10.0))
(number-to-string (/ x 10)))
(list 'font-menu-set-font nil nil x)
- ':style 'radio ':active nil ':selected nil))
+ :style 'radio :active nil :selected nil))
sizes)
(mapcar (lambda (x)
(vector x
(list 'font-menu-set-font nil x nil)
- ':style 'radio ':active nil ':selected nil))
+ :style 'radio :active nil :selected nil))
weights)))
(cdr dev-cache)))
diff -r 34ab0e66aaca -r 2a54dfbe434f lisp/msw-font-menu.el
--- a/lisp/msw-font-menu.el Sat Jan 22 17:21:22 2011 +0000
+++ b/lisp/msw-font-menu.el Sat Jan 22 23:29:25 2011 +0000
@@ -140,17 +140,17 @@
(mapcar (lambda (x)
(vector x
(list 'font-menu-set-font x nil nil)
- ':style 'radio ':active nil ':selected nil))
+ :style 'radio :active nil :selected nil))
families)
(mapcar (lambda (x)
(vector (int-to-string x)
(list 'font-menu-set-font nil nil x)
- ':style 'radio ':active nil ':selected nil))
+ :style 'radio :active nil :selected nil))
sizes)
(mapcar (lambda (x)
(vector x
(list 'font-menu-set-font nil x nil)
- ':style 'radio ':active nil ':selected nil))
+ :style 'radio :active nil :selected nil))
weights)))
(cdr dev-cache)))
diff -r 34ab0e66aaca -r 2a54dfbe434f lisp/package-get.el
--- a/lisp/package-get.el Sat Jan 22 17:21:22 2011 +0000
+++ b/lisp/package-get.el Sat Jan 22 23:29:25 2011 +0000
@@ -1240,7 +1240,7 @@
;; Use packages-package-list which contains name and version
(equal (plist-get
(package-get-info-find-package packages-package-list
- package) ':version)
+ package) :version)
(if (floatp version)
version
(string-to-number version))))
diff -r 34ab0e66aaca -r 2a54dfbe434f lisp/select.el
--- a/lisp/select.el Sat Jan 22 17:21:22 2011 +0000
+++ b/lisp/select.el Sat Jan 22 23:29:25 2011 +0000
@@ -767,7 +767,7 @@
corresponding to that data as an end-glyph extent property of that space. "
(let* ((str (make-string 1 ?\ ))
(extent (make-extent 0 1 str))
- (glyph (make-glyph (vector image-type ':data value))))
+ (glyph (make-glyph (vector image-type :data value))))
(when glyph
(set-extent-property extent 'invisible t)
(set-extent-property extent 'start-open t)
diff -r 34ab0e66aaca -r 2a54dfbe434f lisp/sound.el
--- a/lisp/sound.el Sat Jan 22 17:21:22 2011 +0000
+++ b/lisp/sound.el Sat Jan 22 23:29:25 2011 +0000
@@ -181,8 +181,8 @@
(setq sound-alist (cons
(nconc (list sound-name)
(if (and volume (not (eq 0 volume)))
- (list ':volume volume))
- (list ':sound data))
+ (list :volume volume))
+ (list :sound data))
sound-alist)))
sound-name)
diff -r 34ab0e66aaca -r 2a54dfbe434f lisp/x-font-menu.el
--- a/lisp/x-font-menu.el Sat Jan 22 17:21:22 2011 +0000
+++ b/lisp/x-font-menu.el Sat Jan 22 23:29:25 2011 +0000
@@ -253,21 +253,21 @@
(vector
cache
(mapcar (lambda (x)
- (vector x
+ (vector x
(list 'font-menu-set-font x nil nil)
- ':style 'radio ':active nil ':selected nil))
+ :style 'radio :active nil :selected nil))
families)
(mapcar (lambda (x)
(vector (if (/= 0 (% x 10))
(number-to-string (/ x 10.0))
(number-to-string (/ x 10)))
(list 'font-menu-set-font nil nil x)
- ':style 'radio ':active nil ':selected nil))
+ :style 'radio :active nil :selected nil))
sizes)
(mapcar (lambda (x)
(vector x
(list 'font-menu-set-font nil x nil)
- ':style 'radio ':active nil ':selected nil))
+ :style 'radio :active nil :selected nil))
weights)))
(cdr dev-cache)))
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
[COMMIT] Require that NAME be an unquoted symbol, #'block, #'return-from
14 years, 1 month
Aidan Kehoe
APPROVE COMMIT
NOTE: This patch has been committed.
# HG changeset patch
# User Aidan Kehoe <kehoea(a)parhasard.net>
# Date 1295716819 0
# Node ID 174aed57a32a11fad7f98dd1a2c371861dfabd01
# Parent 9dd4559b9e9a51a538fb17bcb72502dec8ff6e64
Require that NAME be an unquoted symbol, #'block, #'return-from
2011-01-22 Aidan Kehoe <kehoea(a)parhasard.net>
* cl-macs.el (block, return-from): Require that NAME be a symbol
in these macros, as always documented in the #'block docstring and
as required by Common Lisp.
* descr-text.el (unidata-initialize-unihan-database):
Correct the use of non-symbols in #'block and #'return-from in
this function.
diff -r 9dd4559b9e9a -r 174aed57a32a lisp/ChangeLog
--- a/lisp/ChangeLog Sat Jan 15 17:24:06 2011 +0000
+++ b/lisp/ChangeLog Sat Jan 22 17:20:19 2011 +0000
@@ -1,3 +1,12 @@
+2011-01-22 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * cl-macs.el (block, return-from): Require that NAME be a symbol
+ in these macros, as always documented in the #'block docstring and
+ as required by Common Lisp.
+ * descr-text.el (unidata-initialize-unihan-database):
+ Correct the use of non-symbols in #'block and #'return-from in
+ this function.
+
2011-01-15 Aidan Kehoe <kehoea(a)parhasard.net>
* cl-extra.el (concatenate): Accept more complicated TYPEs in this
diff -r 9dd4559b9e9a -r 174aed57a32a lisp/cl-macs.el
--- a/lisp/cl-macs.el Sat Jan 15 17:24:06 2011 +0000
+++ b/lisp/cl-macs.el Sat Jan 22 17:20:19 2011 +0000
@@ -745,7 +745,8 @@
called from BODY."
(if (cl-safe-expr-p (cons 'progn body)) (cons 'progn body)
(list 'cl-block-wrapper
- (list* 'catch (list 'quote (intern (format "--cl-block-%s--" name)))
+ (list* 'catch (list 'quote (intern (concat "--cl-block-"
+ (symbol-name name) "--")))
body))))
(defvar cl-active-block-names nil)
@@ -788,7 +789,7 @@
returning RESULT from that form (or nil if RESULT is omitted).
This is compatible with Common Lisp, but note that `defun' and
`defmacro' do not create implicit blocks as they do in Common Lisp."
- (let ((name2 (intern (format "--cl-block-%s--" name))))
+ (let ((name2 (intern (concat "--cl-block-" (symbol-name name) "--"))))
(list 'cl-block-throw (list 'quote name2) result)))
diff -r 9dd4559b9e9a -r 174aed57a32a lisp/descr-text.el
--- a/lisp/descr-text.el Sat Jan 15 17:24:06 2011 +0000
+++ b/lisp/descr-text.el Sat Jan 22 17:20:19 2011 +0000
@@ -598,7 +598,7 @@
(concat message
(make-string
(mod loop-count 44) ?.)))
- (block 'dealing-with-chars
+ (block dealing-with-chars
(when (= buffer-size (- (point-max) (point-min)))
;; If we're in the body of the file, we need to delete the
;; character info for the last character, and set offset-end
@@ -637,13 +637,13 @@
(while t
(when (= (point) (point-max))
;; We're at the end of this part of the file.
- (return-from 'dealing-with-chars))
+ (return-from dealing-with-chars))
(unless (re-search-forward "^\\(U\\+[0-9A-F]\\{4,6\\}\\)\t"
nil t)
;; We're probably in the comments at the start of the
;; file. No need to look for character info.
- (return-from 'dealing-with-chars))
+ (return-from dealing-with-chars))
;; Store where the character started.
(beginning-of-line)
--
“Apart from the nine-banded armadillo, man is the only natural host of
Mycobacterium leprae, although it can be grown in the footpads of mice.”
-- Kumar & Clark, Clinical Medicine, summarising improbable leprosy research
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
commit: Require that NAME be an unquoted symbol, #'block, #'return-from
14 years, 1 month
Aidan Kehoe
changeset: 5342:174aed57a32a
parent: 5340:9dd4559b9e9a
user: Aidan Kehoe <kehoea(a)parhasard.net>
date: Sat Jan 22 17:20:19 2011 +0000
files: lisp/ChangeLog lisp/cl-macs.el lisp/descr-text.el
description:
Require that NAME be an unquoted symbol, #'block, #'return-from
2011-01-22 Aidan Kehoe <kehoea(a)parhasard.net>
* cl-macs.el (block, return-from): Require that NAME be a symbol
in these macros, as always documented in the #'block docstring and
as required by Common Lisp.
* descr-text.el (unidata-initialize-unihan-database):
Correct the use of non-symbols in #'block and #'return-from in
this function.
diff -r 9dd4559b9e9a -r 174aed57a32a lisp/ChangeLog
--- a/lisp/ChangeLog Sat Jan 15 17:24:06 2011 +0000
+++ b/lisp/ChangeLog Sat Jan 22 17:20:19 2011 +0000
@@ -1,3 +1,12 @@
+2011-01-22 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * cl-macs.el (block, return-from): Require that NAME be a symbol
+ in these macros, as always documented in the #'block docstring and
+ as required by Common Lisp.
+ * descr-text.el (unidata-initialize-unihan-database):
+ Correct the use of non-symbols in #'block and #'return-from in
+ this function.
+
2011-01-15 Aidan Kehoe <kehoea(a)parhasard.net>
* cl-extra.el (concatenate): Accept more complicated TYPEs in this
diff -r 9dd4559b9e9a -r 174aed57a32a lisp/cl-macs.el
--- a/lisp/cl-macs.el Sat Jan 15 17:24:06 2011 +0000
+++ b/lisp/cl-macs.el Sat Jan 22 17:20:19 2011 +0000
@@ -745,7 +745,8 @@
called from BODY."
(if (cl-safe-expr-p (cons 'progn body)) (cons 'progn body)
(list 'cl-block-wrapper
- (list* 'catch (list 'quote (intern (format "--cl-block-%s--" name)))
+ (list* 'catch (list 'quote (intern (concat "--cl-block-"
+ (symbol-name name) "--")))
body))))
(defvar cl-active-block-names nil)
@@ -788,7 +789,7 @@
returning RESULT from that form (or nil if RESULT is omitted).
This is compatible with Common Lisp, but note that `defun' and
`defmacro' do not create implicit blocks as they do in Common Lisp."
- (let ((name2 (intern (format "--cl-block-%s--" name))))
+ (let ((name2 (intern (concat "--cl-block-" (symbol-name name) "--"))))
(list 'cl-block-throw (list 'quote name2) result)))
diff -r 9dd4559b9e9a -r 174aed57a32a lisp/descr-text.el
--- a/lisp/descr-text.el Sat Jan 15 17:24:06 2011 +0000
+++ b/lisp/descr-text.el Sat Jan 22 17:20:19 2011 +0000
@@ -598,7 +598,7 @@
(concat message
(make-string
(mod loop-count 44) ?.)))
- (block 'dealing-with-chars
+ (block dealing-with-chars
(when (= buffer-size (- (point-max) (point-min)))
;; If we're in the body of the file, we need to delete the
;; character info for the last character, and set offset-end
@@ -637,13 +637,13 @@
(while t
(when (= (point) (point-max))
;; We're at the end of this part of the file.
- (return-from 'dealing-with-chars))
+ (return-from dealing-with-chars))
(unless (re-search-forward "^\\(U\\+[0-9A-F]\\{4,6\\}\\)\t"
nil t)
;; We're probably in the comments at the start of the
;; file. No need to look for character info.
- (return-from 'dealing-with-chars))
+ (return-from dealing-with-chars))
;; Store where the character started.
(beginning-of-line)
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
Zap freebsd.h
14 years, 1 month
Michael Sperber
To my surprise, XEmacs mostly seems to build without freebsd.h, which we
would like to get rid of because of license issue.
So I suggest zapping freebsd.h (not shown here), and applying the
attached patch. I'll wait until Monday or so before pushing.
2011-01-15 Mike Sperber <mike(a)xemacs.org>
* configure.ac: Zap obsolete test for FreeBSD.
2011-01-15 Mike Sperber <mike(a)xemacs.org>
* fakemail.c: #include <osreldate.h> on FreeBSD, since we no
longer have freebsd.h.
--
Cheers =8-} Mike
Friede, Völkerverständigung und überhaupt blabla
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -1415,7 +1415,6 @@
case "$ac_cv_build" in
*-mach* ) opsys=mach-bsd4-3 ;;
*-sysv5* ) opsys=sco7 ;;
- *-freebsd* ) opsys=freebsd ;;
*-pc-cygwin* ) opsys=cygwin32 ;;
*-pc-mingw* ) opsys=mingw32 ;
test -z "$with_tty" && with_tty="no";;
diff --git a/lib-src/fakemail.c b/lib-src/fakemail.c
--- a/lib-src/fakemail.c
+++ b/lib-src/fakemail.c
@@ -146,6 +146,10 @@
extern char *malloc (), *realloc ();
#endif
+#if defined(__FreeBSD__)
+#include <osreldate.h>
+#endif
+
#if defined(__FreeBSD_version) && __FreeBSD_version >= 400000
#define CURRENT_USER
#endif
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
commit: Zap freebsd.h.
14 years, 1 month
Michael Sperber
changeset: 5341:fde0802ee3e0
tag: tip
user: Mike Sperber <sperber(a)deinprogramm.de>
date: Tue Jan 18 10:01:29 2011 +0100
files: lib-src/ChangeLog lib-src/fakemail.c src/ChangeLog src/s/freebsd.h
description:
Zap freebsd.h.
2011-01-18 Mike Sperber <mike(a)xemacs.org>
* s/freebsd.h: Zap. Not really needed anymore, and it has unclear
license status.
2011-01-15 Mike Sperber <mike(a)xemacs.org>
* fakemail.c: #include <osreldate.h> on FreeBSD, since we no
longer have freebsd.h.
diff -r 9dd4559b9e9a -r fde0802ee3e0 lib-src/ChangeLog
--- a/lib-src/ChangeLog Sat Jan 15 17:24:06 2011 +0000
+++ b/lib-src/ChangeLog Tue Jan 18 10:01:29 2011 +0100
@@ -1,3 +1,8 @@
+2011-01-15 Mike Sperber <mike(a)xemacs.org>
+
+ * fakemail.c: #include <osreldate.h> on FreeBSD, since we no
+ longer have freebsd.h.
+
2010-06-14 Stephen J. Turnbull <stephen(a)xemacs.org>
* gnuserv.c:
diff -r 9dd4559b9e9a -r fde0802ee3e0 lib-src/fakemail.c
--- a/lib-src/fakemail.c Sat Jan 15 17:24:06 2011 +0000
+++ b/lib-src/fakemail.c Tue Jan 18 10:01:29 2011 +0100
@@ -144,6 +144,10 @@
extern FILE *popen ();
extern int fclose (), pclose ();
extern char *malloc (), *realloc ();
+#endif
+
+#if defined(__FreeBSD__)
+#include <osreldate.h>
#endif
#if defined(__FreeBSD_version) && __FreeBSD_version >= 400000
diff -r 9dd4559b9e9a -r fde0802ee3e0 src/ChangeLog
--- a/src/ChangeLog Sat Jan 15 17:24:06 2011 +0000
+++ b/src/ChangeLog Tue Jan 18 10:01:29 2011 +0100
@@ -1,3 +1,8 @@
+2011-01-18 Mike Sperber <mike(a)xemacs.org>
+
+ * s/freebsd.h: Zap. Not really needed anymore, and it has unclear
+ license status.
+
2011-01-15 Aidan Kehoe <kehoea(a)parhasard.net>
* s/usg5-4.h (PTY_NAME_SPRINTF, PTY_TTY_NAME_SPRINTF):
diff -r 9dd4559b9e9a -r fde0802ee3e0 src/s/freebsd.h
--- a/src/s/freebsd.h Sat Jan 15 17:24:06 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,105 +0,0 @@
-/* Synched up with: FSF 19.31. */
-
-/* s/ file for freebsd system. */
-
-/* '__FreeBSD__' is defined by the preprocessor on FreeBSD-1.1 and up.
- Earlier versions do not have shared libraries, so inhibit them.
- You can inhibit them on newer systems if you wish
- by defining NO_SHARED_LIBS. */
-#ifndef __FreeBSD__
-#define NO_SHARED_LIBS
-#endif
-
-/* Get most of the stuff from bsd4.3 */
-#include "bsd4-3.h"
-
-/* For mem-limits.h. */
-#define BSD4_2
-
-/* These aren't needed, since we have getloadavg. */
-#undef KERNEL_FILE
-#undef LDAV_SYMBOL
-
-#define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base)
-
-#define INTERRUPTIBLE_OPEN
-
-#define LIBS_DEBUG
-/* FreeBSD 2.2 or later */
-#ifndef __FreeBSD_version
-#include <osreldate.h>
-#endif
-#if __FreeBSD_version >= 199701 && __FreeBSD_version < 600006
-#define LIBS_SYSTEM "-lutil -lxpg4"
-#else
-#define LIBS_SYSTEM "-lutil"
-#endif
-
-#ifndef NOT_C_CODE
-#ifdef BSD /* fixing BSD define */
-#undef BSD
-#endif
-#include <sys/param.h>
-/* Kludge to work around setlocale(LC_ALL,...) not working after 01/1997 */
-#if __FreeBSD_version >= 199701 && __FreeBSD_version < 226000
-#ifdef HAVE_X_WINDOWS
-#include <X11/Xlocale.h>
-#define setlocale(locale_category, locale_spec) setlocale(LC_CTYPE, locale_spec)
-#endif /* HAVE X */
-#endif /* FreeBSD >= 199701 && < 226000 */
-#endif /* C code */
-
-#define LIBS_TERMCAP "-ltermcap"
-
-#ifdef __ELF__ /* since from 3.0-CURRENT(maybe 19980831 or later) */
-#ifndef NOT_C_CODE
-#include <stddef.h>
-#endif
-#define LD_SWITCH_SYSTEM
-#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o /usr/lib/crtbegin.o
-#define UNEXEC "unexelf.o"
-#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtend.o /usr/lib/crtn.o
-#define LINKER "$(CC) -nostdlib"
-#undef LIB_GCC
-#define LIB_GCC
-
-#else /* not __ELF__ */
-
-#ifndef NO_SHARED_LIBS
-#if 0 /* mrb */
-#define LIB_GCC "-lgcc"
-#define LD_SWITCH_SYSTEM "-dc -dp -e start"
-#define START_FILES "pre-crt0.o /usr/lib/crt0.o"
-#else /* mrb */
-#define ORDINARY_LINK
-#undef LIB_GCC
-#undef LD_SWITCH_SYSTEM
-#undef START_FILES
-#endif /* mrb */
-
-#define HAVE_TEXT_START /* No need to define `start_of_text'. */
-#define UNEXEC "unexfreebsd.o"
-#define RUN_TIME_REMAP
-
-#ifndef N_TRELOFF
-#define N_PAGSIZ(x) __LDPGSZ
-#define N_BSSADDR(x) (N_ALIGN(x, N_DATADDR(x)+x.a_data))
-#define N_TRELOFF(x) N_RELOFF(x)
-#endif
-#else /* NO_SHARED_LIBS */
-#ifdef __FreeBSD__ /* shared libs are available, but the user prefers
- not to use them. */
-#define LD_SWITCH_SYSTEM "-Bstatic"
-#define A_TEXT_OFFSET(x) (sizeof (struct exec))
-#define A_TEXT_SEEK(hdr) (N_TXTOFF(hdr) + A_TEXT_OFFSET(hdr))
-#endif /* __FreeBSD__ */
-#endif /* NO_SHARED_LIBS */
-
-#endif /* not __ELF__ */
-
-/* #define NO_TERMIO */ /* detected in configure */
-#define DECLARE_GETPWUID_WITH_UID_T
-
-/* freebsd uses OXTABS instead of the expected TAB3. */
-#define TABDLY OXTABS
-#define TAB3 OXTABS
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches
[COMMIT] Try again, s/usg5-4.h, this type with qxestrcpy_ascii(), etc.
14 years, 2 months
Aidan Kehoe
APPROVE COMMIT
NOTE: This patch has been committed.
# HG changeset patch
# User Aidan Kehoe <kehoea(a)parhasard.net>
# Date 1295112246 0
# Node ID 9dd4559b9e9a51a538fb17bcb72502dec8ff6e64
# Parent ba62563ec7c707a37b3032a29ac6e3c3d60b85bc
Try again, s/usg5-4.h, this type with qxestrcpy_ascii(), etc.
2011-01-15 Aidan Kehoe <kehoea(a)parhasard.net>
* s/usg5-4.h (PTY_NAME_SPRINTF, PTY_TTY_NAME_SPRINTF):
That didn't work; attempt with qxestrcpy_ascii(),
qxestrncpy_ascii().
diff -r ba62563ec7c7 -r 9dd4559b9e9a src/ChangeLog
--- a/src/ChangeLog Sat Jan 15 15:45:46 2011 +0000
+++ b/src/ChangeLog Sat Jan 15 17:24:06 2011 +0000
@@ -1,3 +1,9 @@
+2011-01-15 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * s/usg5-4.h (PTY_NAME_SPRINTF, PTY_TTY_NAME_SPRINTF):
+ That didn't work; attempt with qxestrcpy_ascii(),
+ qxestrncpy_ascii().
+
2011-01-14 Aidan Kehoe <kehoea(a)parhasard.net>
* s/hpux11.h (PTY_TTY_NAME_SPRINTF, PTY_NAME_SPRINTF):
diff -r ba62563ec7c7 -r 9dd4559b9e9a src/s/usg5-4.h
--- a/src/s/usg5-4.h Sat Jan 15 15:45:46 2011 +0000
+++ b/src/s/usg5-4.h Sat Jan 15 17:24:06 2011 +0000
@@ -124,7 +124,7 @@
/* This sets the name of the master side of the PTY. */
-#define PTY_NAME_SPRINTF qxestrcpy (pty_name, "/dev/ptmx");
+#define PTY_NAME_SPRINTF qxestrcpy_ascii (pty_name, "/dev/ptmx");
/* This sets the name of the slave side of the PTY. On SysVr4,
grantpt(3) forks a subprocess, so keep sigchld_handler() from
@@ -150,7 +150,8 @@
{ close (fd); return -1; } \
if (!(ptyname = ptsname (fd))) \
{ close (fd); return -1; } \
- qxestrncpy (pty_name, ptyname, sizeof (pty_name)); \
+ qxestrncpy_ascii (pty_name, ptyname, \
+ sizeof (pty_name)); \
pty_name[sizeof (pty_name) - 1] = 0; \
}
--
“Apart from the nine-banded armadillo, man is the only natural host of
Mycobacterium leprae, although it can be grown in the footpads of mice.”
-- Kumar & Clark, Clinical Medicine, summarising improbable leprosy research
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-patches