annotate etc/xemacs-icon.xpm @ 4885:6772ce4d982b

Fix hash tables, #'member*, #'assoc*, #'eql compiler macros if bignums lisp/ChangeLog addition: 2010-01-24 Aidan Kehoe <kehoea@parhasard.net> Correct the semantics of #'member*, #'eql, #'assoc* in the presence of bignums; change the integerp byte code to fixnump semantics. * bytecomp.el (fixnump, integerp, byte-compile-integerp): Change the integerp byte code to fixnump; add a byte-compile method to integerp using fixnump and numberp and avoiding a funcall most of the time, since in the non-core contexts where integerp is used, it's mostly distinguishing between fixnums and things that are not numbers at all. * byte-optimize.el (side-effect-free-fns, byte-after-unbind-ops) (byte-compile-side-effect-and-error-free-ops): Replace the integerp bytecode with fixnump; add fixnump to the side-effect-free-fns. Add the other extended number type predicates to the list in passing. * obsolete.el (floatp-safe): Mark this as obsolete. * cl.el (eql): Go into more detail in the docstring here. Don't bother checking whether both arguments are numbers; one is enough, #'equal will fail correctly if they have distinct types. (subst): Replace a call to #'integerp (deciding whether to use #'memq or not) with one to #'fixnump. Delete most-positive-fixnum, most-negative-fixnum from this file; they're now always in C, so they can't be modified from Lisp. * cl-seq.el (member*, assoc*, rassoc*): Correct these functions in the presence of bignums. * cl-macs.el (cl-make-type-test): The type test for a fixnum is now fixnump. Ditch floatp-safe, use floatp instead. (eql): Correct this compiler macro in the presence of bignums. (assoc*): Correct this compiler macro in the presence of bignums. * simple.el (undo): Change #'integerp to #'fixnump here, since we use #'delq with the same value as ELT a few lines down. src/ChangeLog addition: 2010-01-24 Aidan Kehoe <kehoea@parhasard.net> Fix problems with #'eql, extended number types, and the hash table implementation; change the Bintegerp bytecode to fixnump semantics even on bignum builds, since #'integerp can have a fast implementation in terms of #'fixnump for most of its extant uses, but not vice-versa. * lisp.h: Always #include number.h; we want the macros provided in it, even if the various number types are not available. * number.h (NON_FIXNUM_NUMBER_P): New macro, giving 1 when its argument is of non-immediate number type. Equivalent to FLOATP if WITH_NUMBER_TYPES is not defined. * elhash.c (lisp_object_eql_equal, lisp_object_eql_hash): Use NON_FIXNUM_NUMBER_P in these functions, instead of FLOATP, giving more correct behaviour in the presence of the extended number types. * bytecode.c (Bfixnump, execute_optimized_program): Rename Bintegerp to Bfixnump; change its semantics to reflect the new name on builds with bignum support. * data.c (Ffixnump, Fintegerp, syms_of_data, vars_of_data): Always make #'fixnump available, even on non-BIGNUM builds; always implement #'integerp in this file, even on BIGNUM builds. Move most-positive-fixnum, most-negative-fixnum here from number.c, so they are Lisp constants even on builds without number types, and attempts to change or bind them error. Use the NUMBERP and INTEGERP macros even on builds without extended number types. * data.c (fixnum_char_or_marker_to_int): Rename this function from integer_char_or_marker_to_int, to better reflect the arguments it accepts. * number.c (Fevenp, Foddp, syms_of_number): Never provide #'integerp in this file. Remove #'oddp, #'evenp; their implementations are overridden by those in cl.el. * number.c (vars_of_number): most-positive-fixnum, most-negative-fixnum are no longer here. man/ChangeLog addition: 2010-01-23 Aidan Kehoe <kehoea@parhasard.net> Generally: be careful to say fixnum, not integer, when talking about fixed-precision integral types. I'm sure I've missed instances, both here and in the docstrings, but this is a decent start. * lispref/text.texi (Columns): Document where only fixnums, not integers generally, are accepted. (Registers): Remove some ancient char-int confoundance here. * lispref/strings.texi (Creating Strings, Creating Strings): Be more exact in describing where fixnums but not integers in general are accepted. (Creating Strings): Use a more contemporary example to illustrate how concat deals with lists including integers about #xFF. Delete some obsolete documentation on same. (Char Table Types): Document that only fixnums are accepted as values in syntax tables. * lispref/searching.texi (String Search, Search and Replace): Be exact in describing where fixnums but not integers in general are accepted. * lispref/range-tables.texi (Range Tables): Be exact in describing them; only fixnums are accepted to describe ranges. * lispref/os.texi (Killing XEmacs, User Identification) (Time of Day, Time Conversion): Be more exact about using fixnum where only fixed-precision integers are accepted. * lispref/objects.texi (Integer Type): Be more exact (and up-to-date) about the possible values for integers. Cross-reference to documentation of the bignum extension. (Equality Predicates): (Range Table Type): (Array Type): Use fixnum, not integer, to describe a fixed-precision integer. (Syntax Table Type): Correct some English syntax here. * lispref/numbers.texi (Numbers): Change the phrasing here to use fixnum to mean the fixed-precision integers normal in emacs. Document that our terminology deviates from that of Common Lisp, and that we're working on it. (Compatibility Issues): Reiterate the Common Lisp versus Emacs Lisp compatibility issues. (Comparison of Numbers, Arithmetic Operations): * lispref/commands.texi (Command Loop Info, Working With Events): * lispref/buffers.texi (Modification Time): Be more exact in describing where fixnums but not integers in general are accepted.
author Aidan Kehoe <kehoea@parhasard.net>
date Sun, 24 Jan 2010 15:21:27 +0000
parents 47ca978d6c75
children 7910031dd78a
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
1 /* XPM */
920
47ca978d6c75 [xemacs-hg @ 2002-07-14 14:23:43 by adrian]
adrian
parents: 428
diff changeset
2 static char *XEmacs48_xpm[] = {
428
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
3 /* width height ncolors chars_per_pixel */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
4 "48 48 12 1",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
5 /* colors */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
6 "a c #ADADADADADAD m white",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
7 "b c #737373737373 m black",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
8 "c c #636363636363 m black",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
9 "d c #424242424242 m black",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
10 " c #DEDEDEDEDEDE m white s BgColor",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
11 "g c #FFFF00000000 m black",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
12 "h c #949494949494 m black",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
13 "i c #636363636363 m black",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
14 "j c #FFFFFFFFFFFF m white",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
15 "k c #FFFFFFFF0000 m white",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
16 "l c #DEDEDEDEDEDE m white",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
17 "m c #BDBDBDBDBDBD m white",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
18 /* pixels */
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
19 "jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjc",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
20 "j mc",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
21 "j mc",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
22 "j mc",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
23 "j cccccccccccccccccccccccccccccccci mc",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
24 "j cjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjji mc",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
25 "j cjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjia mc",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
26 "j cjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjia mc",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
27 "j cjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjia mc",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
28 "j cjjjjjjjmmmiibiibmmbbmmjjjjjjjjjia mc",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
29 "j cjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjia mc",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
30 "j jjjjjjd cjjjjjjdjjjjjjjjjjjjdjjjjjjjjjjjia mc",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
31 "j jgggggd cjgggggdjjggggggggggdiibmmjjjjjjia mc",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
32 "j jggggd cjggggdjjjggggggggggdjjjjjjjjjjjia mc",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
33 "j jgggggdjgggggdaajggggggggggdaaajjjjjjjjia mc",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
34 "j jggggdjggggdaaajgggggddddddaaabbibbmjjia mc",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
35 "j jggggggggggdaakjgggggdkkkkakkkkkkkkkjjia mc",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
36 "j jggggggggdaaakjgggggdjjjjjkkkkkkkkkjjia mc",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
37 "j jggggggggdaaakjggggggggggdaaammkkkkjjia mc",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
38 "j jggggggdaaaakjggggggggggdkkkkkkkkkjjia mc",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
39 "j jggggggggdaaakjggggggggggdkkkkkkkkkjjia mc",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
40 "j jggggggggdaalljgggggddddddaaibbbmmjjjia mc",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
41 "j jggggggggggdaaljgggggdaaaaaaaajjjjjjjjia mc",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
42 "j jggggddggggdaaljgggggdjjjjjaaajjjjjjjjia mc",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
43 "j jgggggdjgggggdaajggggggggggdaaammmjjjjjia mc",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
44 "j jggggdaajggggdaajggggggggggdjjjjjjjjjjjia mc",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
45 "j jgggggdaajgggggdajggggggggggdiiibbbbbijjia mc",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
46 "j dddddddaadddddddaddddddddddddaaajjjjjjjjia mc",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
47 "j aaaaacjjjaaaaaajjaaiiiiaaiiibbbbbijjia mc",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
48 "j aaaaacjjjaaaaaajjaaaaaaaaaaajjjjjjjjia mc",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
49 "j cjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjia mc",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
50 "j cjjjjjjjjjjjjiimbbbimmbmmjjjjjjia mc",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
51 "j cjjjjhghjjjjjjjjjjjjjjjjjjjjjjjia mc",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
52 "j cjjjhggghjjjjjjjjjjjjjjjjjjjjjjia mc",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
53 "j cjjjgggggmbbbmmibbbmjjjjjjjjjjjia mc",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
54 "j cjjjhggghjjjjjjjjjjjjjjjjjjjjjjia mc",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
55 "j cjjjjhghjjjjjjjjjjjjjjjjjjjjjjjia mc",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
56 "j cjjjjjjjjjjjjjjmbbimaabbbmjjjjjia mc",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
57 "j cjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjia mc",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
58 "j cjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjia mc",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
59 "j cjjjjjjjjjjjjjjjjjjjjjibbbmmmjjia mc",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
60 "j cjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjia mc",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
61 "j cjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjia mc",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
62 "j iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiia mc",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
63 "j aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa mc",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
64 "j mc",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
65 "jmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmc",
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
66 "cccccccccccccccccccccccccccccccccccccccccccccccc"
3ecd8885ac67 Import from CVS: tag r21-2-22
cvs
parents:
diff changeset
67 };