Mercurial > hg > xemacs-beta
annotate etc/xemacs-icon.xpm @ 5803:b79e1e02bf01
Preserve extent information in the command builder code.
src/ChangeLog addition:
2014-07-14 Aidan Kehoe <kehoea@parhasard.net>
* event-stream.c:
* event-stream.c (mark_command_builder):
* event-stream.c (finalize_command_builder): Removed.
* event-stream.c (allocate_command_builder):
* event-stream.c (free_command_builder): Removed. Use
free_normal_lisp_object() instead.
* event-stream.c (echo_key_event):
* event-stream.c (regenerate_echo_keys_from_this_command_keys):
Detach all extents here.
* event-stream.c (maybe_echo_keys):
* event-stream.c (reset_key_echo):
* event-stream.c (execute_help_form):
* event-stream.c (Fnext_event):
* event-stream.c (command_builder_find_leaf_no_jit_binding):
* event-stream.c (command_builder_find_leaf):
* event-stream.c (lookup_command_event):
* events.h (struct command_builder):
Move the command builder's echo_buf to being a Lisp string rather
than a malloced Ibyte array. This allows passing through extent
information, which was previously dropped. It also simplifies the
allocation and release code for the command builder.
Rename echo_buf_index to echo_buf_fill_pointer, better reflecting
its function.
Don't rely on zero-termination (something not particularly
compatible with Lisp-level code) when showing a substring of
echo_buf that differs from that designated by
echo_buf_fill_pointer, keep a separate counter instead and use
that.
* minibuf.c:
* minibuf.c (echo_area_append):
Use the new START and END keyword arguments to #'append-message,
rather than consing a new string for basically every #'next-event
prompt displayed.
test/ChangeLog addition:
2014-07-14 Aidan Kehoe <kehoea@parhasard.net>
* automated/extent-tests.el:
Check that extent information is passed through to the echo area
correctly with #'next-event's PROMPT argument.
lisp/ChangeLog addition:
2014-07-14 Aidan Kehoe <kehoea@parhasard.net>
* simple.el (raw-append-message):
Use #'write-sequence in this, take its START and END keyword
arguments, so our callers don't have to cons as much.
* simple.el (append-message):
Pass through START and END here.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Mon, 14 Jul 2014 13:42:42 +0100 |
parents | 7910031dd78a |
children |
rev | line source |
---|---|
428 | 1 /* XPM */ |
5413
7910031dd78a
Add explicit GPLv3 or later to xpm and xbm graphics.
Mats Lidell <matsl@xemacs.org>
parents:
920
diff
changeset
|
2 |
7910031dd78a
Add explicit GPLv3 or later to xpm and xbm graphics.
Mats Lidell <matsl@xemacs.org>
parents:
920
diff
changeset
|
3 /* This file is part of XEmacs. |
7910031dd78a
Add explicit GPLv3 or later to xpm and xbm graphics.
Mats Lidell <matsl@xemacs.org>
parents:
920
diff
changeset
|
4 |
7910031dd78a
Add explicit GPLv3 or later to xpm and xbm graphics.
Mats Lidell <matsl@xemacs.org>
parents:
920
diff
changeset
|
5 XEmacs is free software: you can redistribute it and/or modify it |
7910031dd78a
Add explicit GPLv3 or later to xpm and xbm graphics.
Mats Lidell <matsl@xemacs.org>
parents:
920
diff
changeset
|
6 under the terms of the GNU General Public License as published by the |
7910031dd78a
Add explicit GPLv3 or later to xpm and xbm graphics.
Mats Lidell <matsl@xemacs.org>
parents:
920
diff
changeset
|
7 Free Software Foundation, either version 3 of the License, or (at your |
7910031dd78a
Add explicit GPLv3 or later to xpm and xbm graphics.
Mats Lidell <matsl@xemacs.org>
parents:
920
diff
changeset
|
8 option) any later version. |
7910031dd78a
Add explicit GPLv3 or later to xpm and xbm graphics.
Mats Lidell <matsl@xemacs.org>
parents:
920
diff
changeset
|
9 |
7910031dd78a
Add explicit GPLv3 or later to xpm and xbm graphics.
Mats Lidell <matsl@xemacs.org>
parents:
920
diff
changeset
|
10 XEmacs is distributed in the hope that it will be useful, but WITHOUT |
7910031dd78a
Add explicit GPLv3 or later to xpm and xbm graphics.
Mats Lidell <matsl@xemacs.org>
parents:
920
diff
changeset
|
11 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
7910031dd78a
Add explicit GPLv3 or later to xpm and xbm graphics.
Mats Lidell <matsl@xemacs.org>
parents:
920
diff
changeset
|
12 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
7910031dd78a
Add explicit GPLv3 or later to xpm and xbm graphics.
Mats Lidell <matsl@xemacs.org>
parents:
920
diff
changeset
|
13 for more details. |
7910031dd78a
Add explicit GPLv3 or later to xpm and xbm graphics.
Mats Lidell <matsl@xemacs.org>
parents:
920
diff
changeset
|
14 |
7910031dd78a
Add explicit GPLv3 or later to xpm and xbm graphics.
Mats Lidell <matsl@xemacs.org>
parents:
920
diff
changeset
|
15 You should have received a copy of the GNU General Public License |
7910031dd78a
Add explicit GPLv3 or later to xpm and xbm graphics.
Mats Lidell <matsl@xemacs.org>
parents:
920
diff
changeset
|
16 along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */ |
7910031dd78a
Add explicit GPLv3 or later to xpm and xbm graphics.
Mats Lidell <matsl@xemacs.org>
parents:
920
diff
changeset
|
17 |
920 | 18 static char *XEmacs48_xpm[] = { |
428 | 19 /* width height ncolors chars_per_pixel */ |
20 "48 48 12 1", | |
21 /* colors */ | |
22 "a c #ADADADADADAD m white", | |
23 "b c #737373737373 m black", | |
24 "c c #636363636363 m black", | |
25 "d c #424242424242 m black", | |
26 " c #DEDEDEDEDEDE m white s BgColor", | |
27 "g c #FFFF00000000 m black", | |
28 "h c #949494949494 m black", | |
29 "i c #636363636363 m black", | |
30 "j c #FFFFFFFFFFFF m white", | |
31 "k c #FFFFFFFF0000 m white", | |
32 "l c #DEDEDEDEDEDE m white", | |
33 "m c #BDBDBDBDBDBD m white", | |
34 /* pixels */ | |
35 "jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjc", | |
36 "j mc", | |
37 "j mc", | |
38 "j mc", | |
39 "j cccccccccccccccccccccccccccccccci mc", | |
40 "j cjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjji mc", | |
41 "j cjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjia mc", | |
42 "j cjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjia mc", | |
43 "j cjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjia mc", | |
44 "j cjjjjjjjmmmiibiibmmbbmmjjjjjjjjjia mc", | |
45 "j cjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjia mc", | |
46 "j jjjjjjd cjjjjjjdjjjjjjjjjjjjdjjjjjjjjjjjia mc", | |
47 "j jgggggd cjgggggdjjggggggggggdiibmmjjjjjjia mc", | |
48 "j jggggd cjggggdjjjggggggggggdjjjjjjjjjjjia mc", | |
49 "j jgggggdjgggggdaajggggggggggdaaajjjjjjjjia mc", | |
50 "j jggggdjggggdaaajgggggddddddaaabbibbmjjia mc", | |
51 "j jggggggggggdaakjgggggdkkkkakkkkkkkkkjjia mc", | |
52 "j jggggggggdaaakjgggggdjjjjjkkkkkkkkkjjia mc", | |
53 "j jggggggggdaaakjggggggggggdaaammkkkkjjia mc", | |
54 "j jggggggdaaaakjggggggggggdkkkkkkkkkjjia mc", | |
55 "j jggggggggdaaakjggggggggggdkkkkkkkkkjjia mc", | |
56 "j jggggggggdaalljgggggddddddaaibbbmmjjjia mc", | |
57 "j jggggggggggdaaljgggggdaaaaaaaajjjjjjjjia mc", | |
58 "j jggggddggggdaaljgggggdjjjjjaaajjjjjjjjia mc", | |
59 "j jgggggdjgggggdaajggggggggggdaaammmjjjjjia mc", | |
60 "j jggggdaajggggdaajggggggggggdjjjjjjjjjjjia mc", | |
61 "j jgggggdaajgggggdajggggggggggdiiibbbbbijjia mc", | |
62 "j dddddddaadddddddaddddddddddddaaajjjjjjjjia mc", | |
63 "j aaaaacjjjaaaaaajjaaiiiiaaiiibbbbbijjia mc", | |
64 "j aaaaacjjjaaaaaajjaaaaaaaaaaajjjjjjjjia mc", | |
65 "j cjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjia mc", | |
66 "j cjjjjjjjjjjjjiimbbbimmbmmjjjjjjia mc", | |
67 "j cjjjjhghjjjjjjjjjjjjjjjjjjjjjjjia mc", | |
68 "j cjjjhggghjjjjjjjjjjjjjjjjjjjjjjia mc", | |
69 "j cjjjgggggmbbbmmibbbmjjjjjjjjjjjia mc", | |
70 "j cjjjhggghjjjjjjjjjjjjjjjjjjjjjjia mc", | |
71 "j cjjjjhghjjjjjjjjjjjjjjjjjjjjjjjia mc", | |
72 "j cjjjjjjjjjjjjjjmbbimaabbbmjjjjjia mc", | |
73 "j cjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjia mc", | |
74 "j cjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjia mc", | |
75 "j cjjjjjjjjjjjjjjjjjjjjjibbbmmmjjia mc", | |
76 "j cjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjia mc", | |
77 "j cjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjia mc", | |
78 "j iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiia mc", | |
79 "j aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa mc", | |
80 "j mc", | |
81 "jmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmc", | |
82 "cccccccccccccccccccccccccccccccccccccccccccccccc" | |
83 }; |