mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-21 05:00:47 -08:00
Code Issues Projects Releases Wiki Activity

* alloc.c, bytecode.c, ccl.c, coding.c, composite.c, data.c, dosfns.c:

Browse source 
* font.c, image.c, keyboard.c, lread.c, menu.c, minibuf.c, msdos.c:
* print.c, syntax.c, window.c, xmenu.c, xselect.c: Replace direct
access to `contents' member of Lisp_Vector objects with AREF and ASET
where appropriate.
This commit is contained in:
Dmitry Antipov 2012-06-19 20:56:28 +04:00
parent 68f1241189
commit 28be1ada0f
20 changed files with 205 additions and 201 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/ChangeLog
View file

@ -1,3 +1,11 @@
2012-06-19 Dmitry Antipov <dmantipov@yandex.ru>
* alloc.c, bytecode.c, ccl.c, coding.c, composite.c, data.c, dosfns.c:
* font.c, image.c, keyboard.c, lread.c, menu.c, minibuf.c, msdos.c:
* print.c, syntax.c, window.c, xmenu.c, xselect.c: Replace direct
access to `contents' member of Lisp_Vector objects with AREF and ASET
where appropriate.
2012-06-19 Chong Yidong <cyd@gnu.org> 2012-06-19 Chong Yidong <cyd@gnu.org>
* frame.c (delete_frame): When selecting a frame on a different * frame.c (delete_frame): When selecting a frame on a different

2
src/alloc.c
View file

@ -5294,7 +5294,7 @@ Does not copy symbols. Copies strings without text properties. */)
size &= PSEUDOVECTOR_SIZE_MASK; size &= PSEUDOVECTOR_SIZE_MASK;
vec = XVECTOR (make_pure_vector (size)); vec = XVECTOR (make_pure_vector (size));
for (i = 0; i < size; i++) for (i = 0; i < size; i++)
vec->contents[i] = Fpurecopy (XVECTOR (obj)->contents[i]); vec->contents[i] = Fpurecopy (AREF (obj, i));
if (COMPILEDP (obj)) if (COMPILEDP (obj))
{ {
XSETPVECTYPE (vec, PVEC_COMPILED); XSETPVECTYPE (vec, PVEC_COMPILED);

4
src/bytecode.c
View file

@ -1867,8 +1867,8 @@ integer, it is incremented each time that symbol's function is called. */);
{ {
int i = 256; int i = 256;
while (i--) while (i--)
XVECTOR (Vbyte_code_meter)->contents[i] = ASET (Vbyte_code_meter, i,
Fmake_vector (make_number (256), make_number (0)); Fmake_vector (make_number (256), make_number (0)));
} }
#endif #endif
} }

2
src/ccl.c
View file

@ -61,7 +61,7 @@ static Lisp_Object Vccl_program_table;
/* Return a hash table of id number ID. */ /* Return a hash table of id number ID. */
#define GET_HASH_TABLE(id) \ #define GET_HASH_TABLE(id) \
(XHASH_TABLE (XCDR (XVECTOR (Vtranslation_hash_table_vector)->contents[(id)]))) (XHASH_TABLE (XCDR (AREF (Vtranslation_hash_table_vector, (id)))))
/* CCL (Code Conversion Language) is a simple language which has /* CCL (Code Conversion Language) is a simple language which has
operations on one input buffer, one output buffer, and 7 registers. operations on one input buffer, one output buffer, and 7 registers.

6
src/coding.c
View file

@ -3189,7 +3189,7 @@ detect_coding_iso_2022 (struct coding_system *coding,
break; break;
check_extra_latin: check_extra_latin:
if (! VECTORP (Vlatin_extra_code_table) if (! VECTORP (Vlatin_extra_code_table)
|| NILP (XVECTOR (Vlatin_extra_code_table)->contents[c])) || NILP (AREF (Vlatin_extra_code_table, c)))
{ {
rejected = CATEGORY_MASK_ISO; rejected = CATEGORY_MASK_ISO;
break; break;
@ -5464,7 +5464,7 @@ detect_coding_charset (struct coding_system *coding,
if (c < 0xA0 if (c < 0xA0
&& check_latin_extra && check_latin_extra
&& (!VECTORP (Vlatin_extra_code_table) && (!VECTORP (Vlatin_extra_code_table)
|| NILP (XVECTOR (Vlatin_extra_code_table)->contents[c]))) || NILP (AREF (Vlatin_extra_code_table, c))))
break; break;
found = CATEGORY_MASK_CHARSET; found = CATEGORY_MASK_CHARSET;
} }
@ -10560,7 +10560,7 @@ Don't modify this variable directly, but use `set-coding-system-priority'. */);
Vcoding_category_list = Qnil; Vcoding_category_list = Qnil;
for (i = coding_category_max - 1; i >= 0; i--) for (i = coding_category_max - 1; i >= 0; i--)
Vcoding_category_list Vcoding_category_list
= Fcons (XVECTOR (Vcoding_category_table)->contents[i], = Fcons (AREF (Vcoding_category_table, i),
Vcoding_category_list); Vcoding_category_list);
} }

4
src/composite.c
View file

@ -240,13 +240,13 @@ get_composition_id (ptrdiff_t charpos, ptrdiff_t bytepos, ptrdiff_t nchars,
for (i = 0; i < nchars; i++) for (i = 0; i < nchars; i++)
{ {
FETCH_STRING_CHAR_ADVANCE (ch, string, charpos, bytepos); FETCH_STRING_CHAR_ADVANCE (ch, string, charpos, bytepos);
XVECTOR (key)->contents[i] = make_number (ch); ASET (key, i, make_number (ch));
} }
else else
for (i = 0; i < nchars; i++) for (i = 0; i < nchars; i++)
{ {
FETCH_CHAR_ADVANCE (ch, charpos, bytepos); FETCH_CHAR_ADVANCE (ch, charpos, bytepos);
XVECTOR (key)->contents[i] = make_number (ch); ASET (key, i, make_number (ch));
} }
} }
else else

2
src/data.c
View file

@ -2134,7 +2134,7 @@ bool-vector. IDX starts at 0. */)
{ {
if (idxval < 0 || idxval >= ASIZE (array)) if (idxval < 0 || idxval >= ASIZE (array))
args_out_of_range (array, idx); args_out_of_range (array, idx);
XVECTOR (array)->contents[idxval] = newelt; ASET (array, idxval, newelt);
} }
else if (BOOL_VECTOR_P (array)) else if (BOOL_VECTOR_P (array))
{ {

40
src/dosfns.c
View file

@ -65,27 +65,27 @@ REGISTERS should be a vector produced by `make-register' and
if (no < 0 || no > 0xff || ASIZE (registers) != 8) if (no < 0 || no > 0xff || ASIZE (registers) != 8)
return Qnil; return Qnil;
for (i = 0; i < 8; i++) for (i = 0; i < 8; i++)
CHECK_NUMBER (XVECTOR (registers)->contents[i]); CHECK_NUMBER (AREF (registers, i));
inregs.x.ax = (unsigned long) XFASTINT (XVECTOR (registers)->contents[0]); inregs.x.ax = (unsigned long) XFASTINT (AREF (registers, 0));
inregs.x.bx = (unsigned long) XFASTINT (XVECTOR (registers)->contents[1]); inregs.x.bx = (unsigned long) XFASTINT (AREF (registers, 1));
inregs.x.cx = (unsigned long) XFASTINT (XVECTOR (registers)->contents[2]); inregs.x.cx = (unsigned long) XFASTINT (AREF (registers, 2));
inregs.x.dx = (unsigned long) XFASTINT (XVECTOR (registers)->contents[3]); inregs.x.dx = (unsigned long) XFASTINT (AREF (registers, 3));
inregs.x.si = (unsigned long) XFASTINT (XVECTOR (registers)->contents[4]); inregs.x.si = (unsigned long) XFASTINT (AREF (registers, 4));
inregs.x.di = (unsigned long) XFASTINT (XVECTOR (registers)->contents[5]); inregs.x.di = (unsigned long) XFASTINT (AREF (registers, 5));
inregs.x.cflag = (unsigned long) XFASTINT (XVECTOR (registers)->contents[6]); inregs.x.cflag = (unsigned long) XFASTINT (AREF (registers, 6));
inregs.x.flags = (unsigned long) XFASTINT (XVECTOR (registers)->contents[7]); inregs.x.flags = (unsigned long) XFASTINT (AREF (registers, 7));
int86 (no, &inregs, &outregs); int86 (no, &inregs, &outregs);
XVECTOR (registers)->contents[0] = make_number (outregs.x.ax); ASET (registers, 0, make_number (outregs.x.ax));
XVECTOR (registers)->contents[1] = make_number (outregs.x.bx); ASET (registers, 1, make_number (outregs.x.bx));
XVECTOR (registers)->contents[2] = make_number (outregs.x.cx); ASET (registers, 2, make_number (outregs.x.cx));
XVECTOR (registers)->contents[3] = make_number (outregs.x.dx); ASET (registers, 3, make_number (outregs.x.dx));
XVECTOR (registers)->contents[4] = make_number (outregs.x.si); ASET (registers, 4, make_number (outregs.x.si));
XVECTOR (registers)->contents[5] = make_number (outregs.x.di); ASET (registers, 5, make_number (outregs.x.di));
XVECTOR (registers)->contents[6] = make_number (outregs.x.cflag); ASET (registers, 6, make_number (outregs.x.cflag));
XVECTOR (registers)->contents[7] = make_number (outregs.x.flags); ASET (registers, 7, make_number (outregs.x.flags));
return registers; return registers;
} }
@ -109,7 +109,7 @@ Return the updated VECTOR. */)
dosmemget (offs, len, buf); dosmemget (offs, len, buf);
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
XVECTOR (vector)->contents[i] = make_number (buf[i]); ASET (vector, i, make_number (buf[i]));
return vector; return vector;
} }
@ -132,8 +132,8 @@ DEFUN ("msdos-memput", Fdos_memput, Sdos_memput, 2, 2, 0,
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
{ {
CHECK_NUMBER (XVECTOR (vector)->contents[i]); CHECK_NUMBER (AREF (vector, i));
buf[i] = (unsigned char) XFASTINT (XVECTOR (vector)->contents[i]) & 0xFF; buf[i] = (unsigned char) XFASTINT (AREF (vector, i)) & 0xFF;
} }
dosmemput (buf, len, offs); dosmemput (buf, len, offs);

14
src/font.c
View file

@ -4877,13 +4877,13 @@ If the named font is not yet loaded, return nil. */)
font = XFONT_OBJECT (font_object); font = XFONT_OBJECT (font_object);
info = Fmake_vector (make_number (7), Qnil); info = Fmake_vector (make_number (7), Qnil);
XVECTOR (info)->contents[0] = AREF (font_object, FONT_NAME_INDEX); ASET (info, 0, AREF (font_object, FONT_NAME_INDEX));
XVECTOR (info)->contents[1] = AREF (font_object, FONT_FULLNAME_INDEX); ASET (info, 1, AREF (font_object, FONT_FULLNAME_INDEX));
XVECTOR (info)->contents[2] = make_number (font->pixel_size); ASET (info, 2, make_number (font->pixel_size));
XVECTOR (info)->contents[3] = make_number (font->height); ASET (info, 3, make_number (font->height));
XVECTOR (info)->contents[4] = make_number (font->baseline_offset); ASET (info, 4, make_number (font->baseline_offset));
XVECTOR (info)->contents[5] = make_number (font->relative_compose); ASET (info, 5, make_number (font->relative_compose));
XVECTOR (info)->contents[6] = make_number (font->default_ascent); ASET (info, 6, make_number (font->default_ascent));
#if 0 #if 0
/* As font_object is still in FONT_OBJLIST of the entity, we can't /* As font_object is still in FONT_OBJLIST of the entity, we can't

10
src/image.c
View file

@ -2366,7 +2366,7 @@ xbm_image_p (Lisp_Object object)
for one line of the image. */ for one line of the image. */
for (i = 0; i < height; ++i) for (i = 0; i < height; ++i)
{ {
Lisp_Object elt = XVECTOR (data)->contents[i]; Lisp_Object elt = AREF (data, i);
if (STRINGP (elt)) if (STRINGP (elt))
{ {
@ -2939,7 +2939,7 @@ xbm_load (struct frame *f, struct image *img)
p = bits = (char *) alloca (nbytes * img->height); p = bits = (char *) alloca (nbytes * img->height);
for (i = 0; i < img->height; ++i, p += nbytes) for (i = 0; i < img->height; ++i, p += nbytes)
{ {
Lisp_Object line = XVECTOR (data)->contents[i]; Lisp_Object line = AREF (data, i);
if (STRINGP (line)) if (STRINGP (line))
memcpy (p, SDATA (line), nbytes); memcpy (p, SDATA (line), nbytes);
else else
@ -3749,7 +3749,7 @@ xpm_put_color_table_v (Lisp_Object color_table,
int chars_len, int chars_len,
Lisp_Object color) Lisp_Object color)
{ {
XVECTOR (color_table)->contents[*chars_start] = color; ASET (color_table, *chars_start, color);
} }
static Lisp_Object static Lisp_Object
@ -3757,7 +3757,7 @@ xpm_get_color_table_v (Lisp_Object color_table,
const unsigned char *chars_start, const unsigned char *chars_start,
int chars_len) int chars_len)
{ {
return XVECTOR (color_table)->contents[*chars_start]; return AREF (color_table, *chars_start);
} }
static Lisp_Object static Lisp_Object
@ -8503,7 +8503,7 @@ gs_image_p (Lisp_Object object)
if (ASIZE (tem) != 4) if (ASIZE (tem) != 4)
return 0; return 0;
for (i = 0; i < 4; ++i) for (i = 0; i < 4; ++i)
if (!INTEGERP (XVECTOR (tem)->contents[i])) if (!INTEGERP (AREF (tem, i)))
return 0; return 0;
} }
else else

82
src/keyboard.c
View file

@ -625,7 +625,7 @@ echo_now (void)
if (i == this_single_command_key_start) if (i == this_single_command_key_start)
before_command_echo_length = echo_length (); before_command_echo_length = echo_length ();
c = XVECTOR (this_command_keys)->contents[i]; c = AREF (this_command_keys, i);
if (! (EVENT_HAS_PARAMETERS (c) if (! (EVENT_HAS_PARAMETERS (c)
&& EQ (EVENT_HEAD_KIND (EVENT_HEAD (c)), Qmouse_movement))) && EQ (EVENT_HEAD_KIND (EVENT_HEAD (c)), Qmouse_movement)))
echo_char (c); echo_char (c);
@ -4269,7 +4269,7 @@ timer_start_idle (void)
if (!VECTORP (timer) || ASIZE (timer) != 8) if (!VECTORP (timer) || ASIZE (timer) != 8)
continue; continue;
XVECTOR (timer)->contents[0] = Qnil; ASET (timer, 0, Qnil);
} }
} }
@ -6272,7 +6272,7 @@ lispy_modifier_list (int modifiers)
modifier_list = Qnil; modifier_list = Qnil;
for (i = 0; (1<<i) <= modifiers && i < NUM_MOD_NAMES; i++) for (i = 0; (1<<i) <= modifiers && i < NUM_MOD_NAMES; i++)
if (modifiers & (1<<i)) if (modifiers & (1<<i))
modifier_list = Fcons (XVECTOR (modifier_symbols)->contents[i], modifier_list = Fcons (AREF (modifier_symbols, i),
modifier_list); modifier_list);
return modifier_list; return modifier_list;
@ -6503,7 +6503,7 @@ modify_event_symbol (ptrdiff_t symbol_num, int modifiers, Lisp_Object symbol_kin
*symbol_table = Fmake_vector (size, Qnil); *symbol_table = Fmake_vector (size, Qnil);
} }
value = XVECTOR (*symbol_table)->contents[symbol_num]; value = AREF (*symbol_table, symbol_num);
} }
/* Have we already used this symbol before? */ /* Have we already used this symbol before? */
@ -6546,7 +6546,7 @@ modify_event_symbol (ptrdiff_t symbol_num, int modifiers, Lisp_Object symbol_kin
if (CONSP (*symbol_table)) if (CONSP (*symbol_table))
*symbol_table = Fcons (Fcons (symbol_int, value), *symbol_table); *symbol_table = Fcons (Fcons (symbol_int, value), *symbol_table);
else else
XVECTOR (*symbol_table)->contents[symbol_num] = value; ASET (*symbol_table, symbol_num, value);
/* Fill in the cache entries for this symbol; this also /* Fill in the cache entries for this symbol; this also
builds the Qevent_symbol_elements property, which the user builds the Qevent_symbol_elements property, which the user
@ -7553,23 +7553,23 @@ menu_bar_items (Lisp_Object old)
int end = menu_bar_items_index; int end = menu_bar_items_index;
for (i = 0; i < end; i += 4) for (i = 0; i < end; i += 4)
if (EQ (XCAR (tail), XVECTOR (menu_bar_items_vector)->contents[i])) if (EQ (XCAR (tail), AREF (menu_bar_items_vector, i)))
{ {
Lisp_Object tem0, tem1, tem2, tem3; Lisp_Object tem0, tem1, tem2, tem3;
/* Move the item at index I to the end, /* Move the item at index I to the end,
shifting all the others forward. */ shifting all the others forward. */
tem0 = XVECTOR (menu_bar_items_vector)->contents[i + 0]; tem0 = AREF (menu_bar_items_vector, i + 0);
tem1 = XVECTOR (menu_bar_items_vector)->contents[i + 1]; tem1 = AREF (menu_bar_items_vector, i + 1);
tem2 = XVECTOR (menu_bar_items_vector)->contents[i + 2]; tem2 = AREF (menu_bar_items_vector, i + 2);
tem3 = XVECTOR (menu_bar_items_vector)->contents[i + 3]; tem3 = AREF (menu_bar_items_vector, i + 3);
if (end > i + 4) if (end > i + 4)
memmove (&XVECTOR (menu_bar_items_vector)->contents[i], memmove (&AREF (menu_bar_items_vector, i),
&XVECTOR (menu_bar_items_vector)->contents[i + 4], &AREF (menu_bar_items_vector, i + 4),
(end - i - 4) * sizeof (Lisp_Object)); (end - i - 4) * sizeof (Lisp_Object));
XVECTOR (menu_bar_items_vector)->contents[end - 4] = tem0; ASET (menu_bar_items_vector, end - 4, tem0);
XVECTOR (menu_bar_items_vector)->contents[end - 3] = tem1; ASET (menu_bar_items_vector, end - 3, tem1);
XVECTOR (menu_bar_items_vector)->contents[end - 2] = tem2; ASET (menu_bar_items_vector, end - 2, tem2);
XVECTOR (menu_bar_items_vector)->contents[end - 1] = tem3; ASET (menu_bar_items_vector, end - 1, tem3);
break; break;
} }
} }
@ -7581,10 +7581,10 @@ menu_bar_items (Lisp_Object old)
menu_bar_items_vector = menu_bar_items_vector =
larger_vector (menu_bar_items_vector, 4, -1); larger_vector (menu_bar_items_vector, 4, -1);
/* Add this item. */ /* Add this item. */
XVECTOR (menu_bar_items_vector)->contents[i++] = Qnil; ASET (menu_bar_items_vector, i, Qnil), i++;
XVECTOR (menu_bar_items_vector)->contents[i++] = Qnil; ASET (menu_bar_items_vector, i, Qnil), i++;
XVECTOR (menu_bar_items_vector)->contents[i++] = Qnil; ASET (menu_bar_items_vector, i, Qnil), i++;
XVECTOR (menu_bar_items_vector)->contents[i++] = Qnil; ASET (menu_bar_items_vector, i, Qnil), i++;
menu_bar_items_index = i; menu_bar_items_index = i;
} }
@ -7610,11 +7610,11 @@ menu_bar_item (Lisp_Object key, Lisp_Object item, Lisp_Object dummy1, void *dumm
discard any previously made menu bar item. */ discard any previously made menu bar item. */
for (i = 0; i < menu_bar_items_index; i += 4) for (i = 0; i < menu_bar_items_index; i += 4)
if (EQ (key, XVECTOR (menu_bar_items_vector)->contents[i])) if (EQ (key, AREF (menu_bar_items_vector, i)))
{ {
if (menu_bar_items_index > i + 4) if (menu_bar_items_index > i + 4)
memmove (&XVECTOR (menu_bar_items_vector)->contents[i], memmove (&AREF (menu_bar_items_vector, i),
&XVECTOR (menu_bar_items_vector)->contents[i + 4], &AREF (menu_bar_items_vector, i + 4),
(menu_bar_items_index - i - 4) * sizeof (Lisp_Object)); (menu_bar_items_index - i - 4) * sizeof (Lisp_Object));
menu_bar_items_index -= 4; menu_bar_items_index -= 4;
} }
@ -7638,11 +7638,11 @@ menu_bar_item (Lisp_Object key, Lisp_Object item, Lisp_Object dummy1, void *dumm
if (!i) if (!i)
return; return;
item = XVECTOR (item_properties)->contents[ITEM_PROPERTY_DEF]; item = AREF (item_properties, ITEM_PROPERTY_DEF);
/* Find any existing item for this KEY. */ /* Find any existing item for this KEY. */
for (i = 0; i < menu_bar_items_index; i += 4) for (i = 0; i < menu_bar_items_index; i += 4)
if (EQ (key, XVECTOR (menu_bar_items_vector)->contents[i])) if (EQ (key, AREF (menu_bar_items_vector, i)))
break; break;
/* If we did not find this KEY, add it at the end. */ /* If we did not find this KEY, add it at the end. */
@ -7652,22 +7652,22 @@ menu_bar_item (Lisp_Object key, Lisp_Object item, Lisp_Object dummy1, void *dumm
if (i + 4 > ASIZE (menu_bar_items_vector)) if (i + 4 > ASIZE (menu_bar_items_vector))
menu_bar_items_vector = larger_vector (menu_bar_items_vector, 4, -1); menu_bar_items_vector = larger_vector (menu_bar_items_vector, 4, -1);
/* Add this item. */ /* Add this item. */
XVECTOR (menu_bar_items_vector)->contents[i++] = key; ASET (menu_bar_items_vector, i, key), i++;
XVECTOR (menu_bar_items_vector)->contents[i++] ASET (menu_bar_items_vector, i,
= XVECTOR (item_properties)->contents[ITEM_PROPERTY_NAME]; AREF (item_properties, ITEM_PROPERTY_NAME)), i++;
XVECTOR (menu_bar_items_vector)->contents[i++] = Fcons (item, Qnil); ASET (menu_bar_items_vector, i, Fcons (item, Qnil)), i++;
XVECTOR (menu_bar_items_vector)->contents[i++] = make_number (0); ASET (menu_bar_items_vector, i, make_number (0)), i++;
menu_bar_items_index = i; menu_bar_items_index = i;
} }
/* We did find an item for this KEY. Add ITEM to its list of maps. */ /* We did find an item for this KEY. Add ITEM to its list of maps. */
else else
{ {
Lisp_Object old; Lisp_Object old;
old = XVECTOR (menu_bar_items_vector)->contents[i + 2]; old = AREF (menu_bar_items_vector, i + 2);
/* If the new and the old items are not both keymaps, /* If the new and the old items are not both keymaps,
the lookup will only find `item'. */ the lookup will only find `item'. */
item = Fcons (item, KEYMAPP (item) && KEYMAPP (XCAR (old)) ? old : Qnil); item = Fcons (item, KEYMAPP (item) && KEYMAPP (XCAR (old)) ? old : Qnil);
XVECTOR (menu_bar_items_vector)->contents[i + 2] = item; ASET (menu_bar_items_vector, i + 2, item);
} }
} }
@ -8184,7 +8184,7 @@ static int
parse_tool_bar_item (Lisp_Object key, Lisp_Object item) parse_tool_bar_item (Lisp_Object key, Lisp_Object item)
{ {
/* Access slot with index IDX of vector tool_bar_item_properties. */ /* Access slot with index IDX of vector tool_bar_item_properties. */
#define PROP(IDX) XVECTOR (tool_bar_item_properties)->contents[IDX] #define PROP(IDX) AREF (tool_bar_item_properties, (IDX))
Lisp_Object filter = Qnil; Lisp_Object filter = Qnil;
Lisp_Object caption; Lisp_Object caption;
@ -8629,7 +8629,7 @@ read_char_minibuf_menu_prompt (int commandflag,
/* Look at the next element of the map. */ /* Look at the next element of the map. */
if (idx >= 0) if (idx >= 0)
elt = XVECTOR (vector)->contents[idx]; elt = AREF (vector, idx);
else else
elt = Fcar_safe (rest); elt = Fcar_safe (rest);
@ -8664,7 +8664,7 @@ read_char_minibuf_menu_prompt (int commandflag,
Lisp_Object upcased_event, downcased_event; Lisp_Object upcased_event, downcased_event;
Lisp_Object desc = Qnil; Lisp_Object desc = Qnil;
Lisp_Object s Lisp_Object s
= XVECTOR (item_properties)->contents[ITEM_PROPERTY_NAME]; = AREF (item_properties, ITEM_PROPERTY_NAME);
upcased_event = Fupcase (event); upcased_event = Fupcase (event);
downcased_event = Fdowncase (event); downcased_event = Fdowncase (event);
@ -8682,12 +8682,12 @@ read_char_minibuf_menu_prompt (int commandflag,
s = concat2 (s, tem); s = concat2 (s, tem);
#endif #endif
tem tem
= XVECTOR (item_properties)->contents[ITEM_PROPERTY_TYPE]; = AREF (item_properties, ITEM_PROPERTY_TYPE);
if (EQ (tem, QCradio) || EQ (tem, QCtoggle)) if (EQ (tem, QCradio) || EQ (tem, QCtoggle))
{ {
/* Insert button prefix. */ /* Insert button prefix. */
Lisp_Object selected Lisp_Object selected
= XVECTOR (item_properties)->contents[ITEM_PROPERTY_SELECTED]; = AREF (item_properties, ITEM_PROPERTY_SELECTED);
if (EQ (tem, QCradio)) if (EQ (tem, QCradio))
tem = build_string (NILP (selected) ? "(*) " : "( ) "); tem = build_string (NILP (selected) ? "(*) " : "( ) ");
else else
@ -9457,7 +9457,7 @@ read_key_sequence (Lisp_Object *keybuf, int bufsize, Lisp_Object prompt,
&& current_buffer != starting_buffer) && current_buffer != starting_buffer)
{ {
GROW_RAW_KEYBUF; GROW_RAW_KEYBUF;
XVECTOR (raw_keybuf)->contents[raw_keybuf_count++] = key; ASET (raw_keybuf, raw_keybuf_count, key), raw_keybuf_count++;
keybuf[t++] = key; keybuf[t++] = key;
mock_input = t; mock_input = t;
Vquit_flag = Qnil; Vquit_flag = Qnil;
@ -9535,7 +9535,7 @@ read_key_sequence (Lisp_Object *keybuf, int bufsize, Lisp_Object prompt,
&& BUFFERP (XWINDOW (window)->buffer) && BUFFERP (XWINDOW (window)->buffer)
&& XBUFFER (XWINDOW (window)->buffer) != current_buffer) && XBUFFER (XWINDOW (window)->buffer) != current_buffer)
{ {
XVECTOR (raw_keybuf)->contents[raw_keybuf_count++] = key; ASET (raw_keybuf, raw_keybuf_count, key), raw_keybuf_count++;
keybuf[t] = key; keybuf[t] = key;
mock_input = t + 1; mock_input = t + 1;
@ -10566,7 +10566,7 @@ KEEP-RECORD is non-nil. */)
if (NILP (keep_record)) if (NILP (keep_record))
{ {
for (i = 0; i < ASIZE (recent_keys); ++i) for (i = 0; i < ASIZE (recent_keys); ++i)
XVECTOR (recent_keys)->contents[i] = Qnil; ASET (recent_keys, i, Qnil);
total_keys = 0; total_keys = 0;
recent_keys_index = 0; recent_keys_index = 0;
} }
@ -11585,7 +11585,7 @@ syms_of_keyboard (void)
modifier_symbols = Fmake_vector (make_number (len), Qnil); modifier_symbols = Fmake_vector (make_number (len), Qnil);
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
if (modifier_names[i]) if (modifier_names[i])
XVECTOR (modifier_symbols)->contents[i] = intern_c_string (modifier_names[i]); ASET (modifier_symbols, i, intern_c_string (modifier_names[i]));
staticpro (&modifier_symbols); staticpro (&modifier_symbols);
} }

14
src/lread.c
View file

@ -3748,7 +3748,7 @@ it defaults to the value of `obarray'. */)
SET_SYMBOL_VAL (XSYMBOL (sym), sym); SET_SYMBOL_VAL (XSYMBOL (sym), sym);
} }
ptr = &XVECTOR (obarray)->contents[XINT (tem)]; ptr = &AREF (obarray, XINT(tem));
if (SYMBOLP (*ptr)) if (SYMBOLP (*ptr))
XSYMBOL (sym)->next = XSYMBOL (*ptr); XSYMBOL (sym)->next = XSYMBOL (*ptr);
else else
@ -3827,18 +3827,18 @@ OBARRAY defaults to the value of the variable `obarray'. */)
hash = oblookup_last_bucket_number; hash = oblookup_last_bucket_number;
if (EQ (XVECTOR (obarray)->contents[hash], tem)) if (EQ (AREF (obarray, hash), tem))
{ {
if (XSYMBOL (tem)->next) if (XSYMBOL (tem)->next)
XSETSYMBOL (XVECTOR (obarray)->contents[hash], XSYMBOL (tem)->next); XSETSYMBOL (AREF (obarray, hash), XSYMBOL (tem)->next);
else else
XSETINT (XVECTOR (obarray)->contents[hash], 0); XSETINT (AREF (obarray, hash), 0);
} }
else else
{ {
Lisp_Object tail, following; Lisp_Object tail, following;
for (tail = XVECTOR (obarray)->contents[hash]; for (tail = AREF (obarray, hash);
XSYMBOL (tail)->next; XSYMBOL (tail)->next;
tail = following) tail = following)
{ {
@ -3877,7 +3877,7 @@ oblookup (Lisp_Object obarray, register const char *ptr, ptrdiff_t size, ptrdiff
/* This is sometimes needed in the middle of GC. */ /* This is sometimes needed in the middle of GC. */
obsize &= ~ARRAY_MARK_FLAG; obsize &= ~ARRAY_MARK_FLAG;
hash = hash_string (ptr, size_byte) % obsize; hash = hash_string (ptr, size_byte) % obsize;
bucket = XVECTOR (obarray)->contents[hash]; bucket = AREF (obarray, hash);
oblookup_last_bucket_number = hash; oblookup_last_bucket_number = hash;
if (EQ (bucket, make_number (0))) if (EQ (bucket, make_number (0)))
; ;
@ -3905,7 +3905,7 @@ map_obarray (Lisp_Object obarray, void (*fn) (Lisp_Object, Lisp_Object), Lisp_Ob
CHECK_VECTOR (obarray); CHECK_VECTOR (obarray);
for (i = ASIZE (obarray) - 1; i >= 0; i--) for (i = ASIZE (obarray) - 1; i >= 0; i--)
{ {
tail = XVECTOR (obarray)->contents[i]; tail = AREF (obarray, i);
if (SYMBOLP (tail)) if (SYMBOLP (tail))
while (1) while (1)
{ {

74
src/menu.c
View file

@ -197,7 +197,7 @@ static void
push_submenu_start (void) push_submenu_start (void)
{ {
ensure_menu_items (1); ensure_menu_items (1);
XVECTOR (menu_items)->contents[menu_items_used++] = Qnil; ASET (menu_items, menu_items_used, Qnil), menu_items_used++;
menu_items_submenu_depth++; menu_items_submenu_depth++;
} }
@ -207,7 +207,7 @@ static void
push_submenu_end (void) push_submenu_end (void)
{ {
ensure_menu_items (1); ensure_menu_items (1);
XVECTOR (menu_items)->contents[menu_items_used++] = Qlambda; ASET (menu_items, menu_items_used, Qlambda), menu_items_used++;
menu_items_submenu_depth--; menu_items_submenu_depth--;
} }
@ -219,7 +219,7 @@ static void
push_left_right_boundary (void) push_left_right_boundary (void)
{ {
ensure_menu_items (1); ensure_menu_items (1);
XVECTOR (menu_items)->contents[menu_items_used++] = Qquote; ASET (menu_items, menu_items_used, Qquote), menu_items_used++;
} }
/* Start a new menu pane in menu_items. /* Start a new menu pane in menu_items.
@ -231,9 +231,9 @@ push_menu_pane (Lisp_Object name, Lisp_Object prefix_vec)
ensure_menu_items (MENU_ITEMS_PANE_LENGTH); ensure_menu_items (MENU_ITEMS_PANE_LENGTH);
if (menu_items_submenu_depth == 0) if (menu_items_submenu_depth == 0)
menu_items_n_panes++; menu_items_n_panes++;
XVECTOR (menu_items)->contents[menu_items_used++] = Qt; ASET (menu_items, menu_items_used, Qt), menu_items_used++;
XVECTOR (menu_items)->contents[menu_items_used++] = name; ASET (menu_items, menu_items_used, name), menu_items_used++;
XVECTOR (menu_items)->contents[menu_items_used++] = prefix_vec; ASET (menu_items, menu_items_used, prefix_vec), menu_items_used++;
} }
/* Push one menu item into the current pane. NAME is the string to /* Push one menu item into the current pane. NAME is the string to
@ -343,10 +343,10 @@ single_menu_item (Lisp_Object key, Lisp_Object item, Lisp_Object dummy, void *sk
if (!res) if (!res)
return; /* Not a menu item. */ return; /* Not a menu item. */
map = XVECTOR (item_properties)->contents[ITEM_PROPERTY_MAP]; map = AREF (item_properties, ITEM_PROPERTY_MAP);
enabled = XVECTOR (item_properties)->contents[ITEM_PROPERTY_ENABLE]; enabled = AREF (item_properties, ITEM_PROPERTY_ENABLE);
item_string = XVECTOR (item_properties)->contents[ITEM_PROPERTY_NAME]; item_string = AREF (item_properties, ITEM_PROPERTY_NAME);
if (!NILP (map) && SREF (item_string, 0) == '@') if (!NILP (map) && SREF (item_string, 0) == '@')
{ {
@ -363,11 +363,11 @@ single_menu_item (Lisp_Object key, Lisp_Object item, Lisp_Object dummy, void *sk
front of them. */ front of them. */
{ {
Lisp_Object prefix = Qnil; Lisp_Object prefix = Qnil;
Lisp_Object type = XVECTOR (item_properties)->contents[ITEM_PROPERTY_TYPE]; Lisp_Object type = AREF (item_properties, ITEM_PROPERTY_TYPE);
if (!NILP (type)) if (!NILP (type))
{ {
Lisp_Object selected Lisp_Object selected
= XVECTOR (item_properties)->contents[ITEM_PROPERTY_SELECTED]; = AREF (item_properties, ITEM_PROPERTY_SELECTED);
if (skp->notbuttons) if (skp->notbuttons)
/* The first button. Line up previous items in this menu. */ /* The first button. Line up previous items in this menu. */
@ -378,7 +378,7 @@ single_menu_item (Lisp_Object key, Lisp_Object item, Lisp_Object dummy, void *sk
while (idx < menu_items_used) while (idx < menu_items_used)
{ {
tem tem
= XVECTOR (menu_items)->contents[idx + MENU_ITEMS_ITEM_NAME]; = AREF (menu_items, idx + MENU_ITEMS_ITEM_NAME);
if (NILP (tem)) if (NILP (tem))
{ {
idx++; idx++;
@ -397,8 +397,8 @@ single_menu_item (Lisp_Object key, Lisp_Object item, Lisp_Object dummy, void *sk
{ {
if (!submenu && SREF (tem, 0) != '\0' if (!submenu && SREF (tem, 0) != '\0'
&& SREF (tem, 0) != '-') && SREF (tem, 0) != '-')
XVECTOR (menu_items)->contents[idx + MENU_ITEMS_ITEM_NAME] ASET (menu_items, idx + MENU_ITEMS_ITEM_NAME,
= concat2 (build_string (" "), tem); concat2 (build_string (" "), tem));
idx += MENU_ITEMS_ITEM_LENGTH; idx += MENU_ITEMS_ITEM_LENGTH;
} }
} }
@ -430,11 +430,11 @@ single_menu_item (Lisp_Object key, Lisp_Object item, Lisp_Object dummy, void *sk
#endif /* HAVE_X_WINDOWS || MSDOS */ #endif /* HAVE_X_WINDOWS || MSDOS */
push_menu_item (item_string, enabled, key, push_menu_item (item_string, enabled, key,
XVECTOR (item_properties)->contents[ITEM_PROPERTY_DEF], AREF (item_properties, ITEM_PROPERTY_DEF),
XVECTOR (item_properties)->contents[ITEM_PROPERTY_KEYEQ], AREF (item_properties, ITEM_PROPERTY_KEYEQ),
XVECTOR (item_properties)->contents[ITEM_PROPERTY_TYPE], AREF (item_properties, ITEM_PROPERTY_TYPE),
XVECTOR (item_properties)->contents[ITEM_PROPERTY_SELECTED], AREF (item_properties, ITEM_PROPERTY_SELECTED),
XVECTOR (item_properties)->contents[ITEM_PROPERTY_HELP]); AREF (item_properties, ITEM_PROPERTY_HELP));
#if defined (USE_X_TOOLKIT) || defined (USE_GTK) || defined (HAVE_NS) || defined (HAVE_NTGUI) #if defined (USE_X_TOOLKIT) || defined (USE_GTK) || defined (HAVE_NS) || defined (HAVE_NTGUI)
/* Display a submenu using the toolkit. */ /* Display a submenu using the toolkit. */
@ -645,27 +645,27 @@ digest_single_submenu (int start, int end, int top_level_items)
i = start; i = start;
while (i < end) while (i < end)
{ {
if (EQ (XVECTOR (menu_items)->contents[i], Qnil)) if (EQ (AREF (menu_items, i), Qnil))
{ {
submenu_stack[submenu_depth++] = save_wv; submenu_stack[submenu_depth++] = save_wv;
save_wv = prev_wv; save_wv = prev_wv;
prev_wv = 0; prev_wv = 0;
i++; i++;
} }
else if (EQ (XVECTOR (menu_items)->contents[i], Qlambda)) else if (EQ (AREF (menu_items, i), Qlambda))
{ {
prev_wv = save_wv; prev_wv = save_wv;
save_wv = submenu_stack[--submenu_depth]; save_wv = submenu_stack[--submenu_depth];
i++; i++;
} }
else if (EQ (XVECTOR (menu_items)->contents[i], Qt) else if (EQ (AREF (menu_items, i), Qt)
&& submenu_depth != 0) && submenu_depth != 0)
i += MENU_ITEMS_PANE_LENGTH; i += MENU_ITEMS_PANE_LENGTH;
/* Ignore a nil in the item list. /* Ignore a nil in the item list.
It's meaningful only for dialog boxes. */ It's meaningful only for dialog boxes. */
else if (EQ (XVECTOR (menu_items)->contents[i], Qquote)) else if (EQ (AREF (menu_items, i), Qquote))
i += 1; i += 1;
else if (EQ (XVECTOR (menu_items)->contents[i], Qt)) else if (EQ (AREF (menu_items, i), Qt))
{ {
/* Create a new pane. */ /* Create a new pane. */
Lisp_Object pane_name; Lisp_Object pane_name;
@ -673,7 +673,7 @@ digest_single_submenu (int start, int end, int top_level_items)
panes_seen++; panes_seen++;
pane_name = XVECTOR (menu_items)->contents[i + MENU_ITEMS_PANE_NAME]; pane_name = AREF (menu_items, i + MENU_ITEMS_PANE_NAME);
#ifdef HAVE_NTGUI #ifdef HAVE_NTGUI
if (STRINGP (pane_name)) if (STRINGP (pane_name))
@ -893,25 +893,25 @@ find_and_call_menu_selection (FRAME_PTR f, int menu_bar_items_used, Lisp_Object
while (i < menu_bar_items_used) while (i < menu_bar_items_used)
{ {
if (EQ (XVECTOR (vector)->contents[i], Qnil)) if (EQ (AREF (vector, i), Qnil))
{ {
subprefix_stack[submenu_depth++] = prefix; subprefix_stack[submenu_depth++] = prefix;
prefix = entry; prefix = entry;
i++; i++;
} }
else if (EQ (XVECTOR (vector)->contents[i], Qlambda)) else if (EQ (AREF (vector, i), Qlambda))
{ {
prefix = subprefix_stack[--submenu_depth]; prefix = subprefix_stack[--submenu_depth];
i++; i++;
} }
else if (EQ (XVECTOR (vector)->contents[i], Qt)) else if (EQ (AREF (vector, i), Qt))
{ {
prefix = XVECTOR (vector)->contents[i + MENU_ITEMS_PANE_PREFIX]; prefix = AREF (vector, i + MENU_ITEMS_PANE_PREFIX);
i += MENU_ITEMS_PANE_LENGTH; i += MENU_ITEMS_PANE_LENGTH;
} }
else else
{ {
entry = XVECTOR (vector)->contents[i + MENU_ITEMS_ITEM_VALUE]; entry = AREF (vector, i + MENU_ITEMS_ITEM_VALUE);
/* Treat the pointer as an integer. There's no problem /* Treat the pointer as an integer. There's no problem
as long as pointers have enough bits to hold small integers. */ as long as pointers have enough bits to hold small integers. */
if ((intptr_t) client_data == i) if ((intptr_t) client_data == i)
@ -976,32 +976,32 @@ find_and_return_menu_selection (FRAME_PTR f, int keymaps, void *client_data)
while (i < menu_items_used) while (i < menu_items_used)
{ {
if (EQ (XVECTOR (menu_items)->contents[i], Qnil)) if (EQ (AREF (menu_items, i), Qnil))
{ {
subprefix_stack[submenu_depth++] = prefix; subprefix_stack[submenu_depth++] = prefix;
prefix = entry; prefix = entry;
i++; i++;
} }
else if (EQ (XVECTOR (menu_items)->contents[i], Qlambda)) else if (EQ (AREF (menu_items, i), Qlambda))
{ {
prefix = subprefix_stack[--submenu_depth]; prefix = subprefix_stack[--submenu_depth];
i++; i++;
} }
else if (EQ (XVECTOR (menu_items)->contents[i], Qt)) else if (EQ (AREF (menu_items, i), Qt))
{ {
prefix prefix
= XVECTOR (menu_items)->contents[i + MENU_ITEMS_PANE_PREFIX]; = AREF (menu_items, i + MENU_ITEMS_PANE_PREFIX);
i += MENU_ITEMS_PANE_LENGTH; i += MENU_ITEMS_PANE_LENGTH;
} }
/* Ignore a nil in the item list. /* Ignore a nil in the item list.
It's meaningful only for dialog boxes. */ It's meaningful only for dialog boxes. */
else if (EQ (XVECTOR (menu_items)->contents[i], Qquote)) else if (EQ (AREF (menu_items, i), Qquote))
i += 1; i += 1;
else else
{ {
entry entry
= XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_VALUE]; = AREF (menu_items, i + MENU_ITEMS_ITEM_VALUE);
if (&XVECTOR (menu_items)->contents[i] == client_data) if (&AREF (menu_items, i) == client_data)
{ {
if (keymaps != 0) if (keymaps != 0)
{ {

10
src/minibuf.c
View file

@ -1266,7 +1266,7 @@ is used to further constrain the set of candidates. */)
{ {
collection = check_obarray (collection); collection = check_obarray (collection);
obsize = ASIZE (collection); obsize = ASIZE (collection);
bucket = XVECTOR (collection)->contents[idx]; bucket = AREF (collection, idx);
} }
while (1) while (1)
@ -1301,7 +1301,7 @@ is used to further constrain the set of candidates. */)
break; break;
else else
{ {
bucket = XVECTOR (collection)->contents[idx]; bucket = AREF (collection, idx);
continue; continue;
} }
} }
@ -1529,7 +1529,7 @@ with a space are ignored unless STRING itself starts with a space. */)
{ {
collection = check_obarray (collection); collection = check_obarray (collection);
obsize = ASIZE (collection); obsize = ASIZE (collection);
bucket = XVECTOR (collection)->contents[idx]; bucket = AREF (collection, idx);
} }
while (1) while (1)
@ -1564,7 +1564,7 @@ with a space are ignored unless STRING itself starts with a space. */)
break; break;
else else
{ {
bucket = XVECTOR (collection)->contents[idx]; bucket = AREF (collection, idx);
continue; continue;
} }
} }
@ -1772,7 +1772,7 @@ the values STRING, PREDICATE and `lambda'. */)
{ {
for (i = ASIZE (collection) - 1; i >= 0; i--) for (i = ASIZE (collection) - 1; i >= 0; i--)
{ {
tail = XVECTOR (collection)->contents[i]; tail = AREF (collection, i);
if (SYMBOLP (tail)) if (SYMBOLP (tail))
while (1) while (1)
{ {

6
src/msdos.c
View file

@ -2466,12 +2466,10 @@ dos_rawgetc (void)
sc = regs.h.ah; sc = regs.h.ah;
total_doskeys += 2; total_doskeys += 2;
XVECTOR (recent_doskeys)->contents[recent_doskeys_index++] ASET (recent_doskeys, recent_doskeys_index, make_number (c)), recent_doskeys_index++;
= make_number (c);
if (recent_doskeys_index == NUM_RECENT_DOSKEYS) if (recent_doskeys_index == NUM_RECENT_DOSKEYS)
recent_doskeys_index = 0; recent_doskeys_index = 0;
XVECTOR (recent_doskeys)->contents[recent_doskeys_index++] ASET (recent_doskeys, recent_doskeys_index, make_number (sc)), recent_doskeys_index++;
= make_number (sc);
if (recent_doskeys_index == NUM_RECENT_DOSKEYS) if (recent_doskeys_index == NUM_RECENT_DOSKEYS)
recent_doskeys_index = 0; recent_doskeys_index = 0;

4
src/print.c
View file

@ -1208,7 +1208,7 @@ print_preprocess (Lisp_Object obj)
if (size & PSEUDOVECTOR_FLAG) if (size & PSEUDOVECTOR_FLAG)
size &= PSEUDOVECTOR_SIZE_MASK; size &= PSEUDOVECTOR_SIZE_MASK;
for (i = 0; i < size; i++) for (i = 0; i < size; i++)
print_preprocess (XVECTOR (obj)->contents[i]); print_preprocess (AREF (obj, i));
if (HASH_TABLE_P (obj)) if (HASH_TABLE_P (obj))
{ /* For hash tables, the key_and_value slot is past { /* For hash tables, the key_and_value slot is past
`size' because it needs to be marked specially in case `size' because it needs to be marked specially in case
@ -1960,7 +1960,7 @@ print_object (Lisp_Object obj, register Lisp_Object printcharfun, int escapeflag
for (i = 0; i < size; i++) for (i = 0; i < size; i++)
{ {
if (i) PRINTCHAR (' '); if (i) PRINTCHAR (' ');
tem = XVECTOR (obj)->contents[i]; tem = AREF (obj, i);
print_object (tem, printcharfun, escapeflag); print_object (tem, printcharfun, escapeflag);
} }
if (size < real_size) if (size < real_size)

19
src/syntax.c
View file

@ -988,7 +988,7 @@ text property. */)
} }
if (val < ASIZE (Vsyntax_code_object) && NILP (match)) if (val < ASIZE (Vsyntax_code_object) && NILP (match))
return XVECTOR (Vsyntax_code_object)->contents[val]; return AREF (Vsyntax_code_object, val);
else else
/* Since we can't use a shared object, let's make a new one. */ /* Since we can't use a shared object, let's make a new one. */
return Fcons (make_number (val), match); return Fcons (make_number (val), match);
@ -3386,32 +3386,31 @@ init_syntax_once (void)
/* Create objects which can be shared among syntax tables. */ /* Create objects which can be shared among syntax tables. */
Vsyntax_code_object = Fmake_vector (make_number (Smax), Qnil); Vsyntax_code_object = Fmake_vector (make_number (Smax), Qnil);
for (i = 0; i < ASIZE (Vsyntax_code_object); i++) for (i = 0; i < ASIZE (Vsyntax_code_object); i++)
XVECTOR (Vsyntax_code_object)->contents[i] ASET (Vsyntax_code_object, i, Fcons (make_number (i), Qnil));
= Fcons (make_number (i), Qnil);
/* Now we are ready to set up this property, so we can /* Now we are ready to set up this property, so we can
create syntax tables. */ create syntax tables. */
Fput (Qsyntax_table, Qchar_table_extra_slots, make_number (0)); Fput (Qsyntax_table, Qchar_table_extra_slots, make_number (0));
temp = XVECTOR (Vsyntax_code_object)->contents[(int) Swhitespace]; temp = AREF (Vsyntax_code_object, (int) Swhitespace);
Vstandard_syntax_table = Fmake_char_table (Qsyntax_table, temp); Vstandard_syntax_table = Fmake_char_table (Qsyntax_table, temp);
/* Control characters should not be whitespace. */ /* Control characters should not be whitespace. */
temp = XVECTOR (Vsyntax_code_object)->contents[(int) Spunct]; temp = AREF (Vsyntax_code_object, (int) Spunct);
for (i = 0; i <= ' ' - 1; i++) for (i = 0; i <= ' ' - 1; i++)
SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, i, temp); SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, i, temp);
SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, 0177, temp); SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, 0177, temp);
/* Except that a few really are whitespace. */ /* Except that a few really are whitespace. */
temp = XVECTOR (Vsyntax_code_object)->contents[(int) Swhitespace]; temp = AREF (Vsyntax_code_object, (int) Swhitespace);
SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, ' ', temp); SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, ' ', temp);
SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, '\t', temp); SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, '\t', temp);
SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, '\n', temp); SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, '\n', temp);
SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, 015, temp); SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, 015, temp);
SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, 014, temp); SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, 014, temp);
temp = XVECTOR (Vsyntax_code_object)->contents[(int) Sword]; temp = AREF (Vsyntax_code_object, (int) Sword);
for (i = 'a'; i <= 'z'; i++) for (i = 'a'; i <= 'z'; i++)
SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, i, temp); SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, i, temp);
for (i = 'A'; i <= 'Z'; i++) for (i = 'A'; i <= 'Z'; i++)
@ -3439,14 +3438,14 @@ init_syntax_once (void)
SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, '\\', SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, '\\',
Fcons (make_number ((int) Sescape), Qnil)); Fcons (make_number ((int) Sescape), Qnil));
temp = XVECTOR (Vsyntax_code_object)->contents[(int) Ssymbol]; temp = AREF (Vsyntax_code_object, (int) Ssymbol);
for (i = 0; i < 10; i++) for (i = 0; i < 10; i++)
{ {
c = "_-+*/&|<>="[i]; c = "_-+*/&|<>="[i];
SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, c, temp); SET_RAW_SYNTAX_ENTRY (Vstandard_syntax_table, c, temp);
} }
temp = XVECTOR (Vsyntax_code_object)->contents[(int) Spunct]; temp = AREF (Vsyntax_code_object, (int) Spunct);
for (i = 0; i < 12; i++) for (i = 0; i < 12; i++)
{ {
c = ".,;:?!#@~^'`"[i]; c = ".,;:?!#@~^'`"[i];
@ -3454,7 +3453,7 @@ init_syntax_once (void)
} }
/* All multibyte characters have syntax `word' by default. */ /* All multibyte characters have syntax `word' by default. */
temp = XVECTOR (Vsyntax_code_object)->contents[(int) Sword]; temp = AREF (Vsyntax_code_object, (int) Sword);
char_table_set_range (Vstandard_syntax_table, 0x80, MAX_CHAR, temp); char_table_set_range (Vstandard_syntax_table, 0x80, MAX_CHAR, temp);
} }

4
src/window.c
View file

@ -6036,8 +6036,8 @@ saved by this function. */)
tem = Fmake_vector (make_number (n_windows), Qnil); tem = Fmake_vector (make_number (n_windows), Qnil);
data->saved_windows = tem; data->saved_windows = tem;
for (i = 0; i < n_windows; i++) for (i = 0; i < n_windows; i++)
XVECTOR (tem)->contents[i] ASET (tem, i,
= Fmake_vector (make_number (VECSIZE (struct saved_window)), Qnil); Fmake_vector (make_number (VECSIZE (struct saved_window)), Qnil));
save_window_save (FRAME_ROOT_WINDOW (f), XVECTOR (tem), 0); save_window_save (FRAME_ROOT_WINDOW (f), XVECTOR (tem), 0);
XSETWINDOW_CONFIGURATION (tem, data); XSETWINDOW_CONFIGURATION (tem, data);
return (tem); return (tem);

84
src/xmenu.c
View file

@ -1040,9 +1040,9 @@ set_frame_menubar (FRAME_PTR f, int first_time, int deep_p)
{ {
Lisp_Object key, string, maps; Lisp_Object key, string, maps;
key = XVECTOR (items)->contents[4 * i]; key = AREF (items, 4 * i);
string = XVECTOR (items)->contents[4 * i + 1]; string = AREF (items, 4 * i + 1);
maps = XVECTOR (items)->contents[4 * i + 2]; maps = AREF (items, 4 * i + 2);
if (NILP (string)) if (NILP (string))
break; break;
@ -1093,7 +1093,7 @@ set_frame_menubar (FRAME_PTR f, int first_time, int deep_p)
/* Compare the new menu items with the ones computed last time. */ /* Compare the new menu items with the ones computed last time. */
for (i = 0; i < previous_menu_items_used; i++) for (i = 0; i < previous_menu_items_used; i++)
if (menu_items_used == i if (menu_items_used == i
|| (!EQ (previous_items[i], XVECTOR (menu_items)->contents[i]))) || (!EQ (previous_items[i], AREF (menu_items, i))))
break; break;
if (i == menu_items_used && i == previous_menu_items_used && i != 0) if (i == menu_items_used && i == previous_menu_items_used && i != 0)
{ {
@ -1118,7 +1118,7 @@ set_frame_menubar (FRAME_PTR f, int first_time, int deep_p)
for (i = 0; i < ASIZE (items); i += 4) for (i = 0; i < ASIZE (items); i += 4)
{ {
Lisp_Object string; Lisp_Object string;
string = XVECTOR (items)->contents[i + 1]; string = AREF (items, i + 1);
if (NILP (string)) if (NILP (string))
break; break;
wv->name = SSDATA (string); wv->name = SSDATA (string);
@ -1145,7 +1145,7 @@ set_frame_menubar (FRAME_PTR f, int first_time, int deep_p)
{ {
Lisp_Object string; Lisp_Object string;
string = XVECTOR (items)->contents[i + 1]; string = AREF (items, i + 1);
if (NILP (string)) if (NILP (string))
break; break;
@ -1677,7 +1677,7 @@ xmenu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps,
i = 0; i = 0;
while (i < menu_items_used) while (i < menu_items_used)
{ {
if (EQ (XVECTOR (menu_items)->contents[i], Qnil)) if (EQ (AREF (menu_items, i), Qnil))
{ {
submenu_stack[submenu_depth++] = save_wv; submenu_stack[submenu_depth++] = save_wv;
save_wv = prev_wv; save_wv = prev_wv;
@ -1685,21 +1685,21 @@ xmenu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps,
first_pane = 1; first_pane = 1;
i++; i++;
} }
else if (EQ (XVECTOR (menu_items)->contents[i], Qlambda)) else if (EQ (AREF (menu_items, i), Qlambda))
{ {
prev_wv = save_wv; prev_wv = save_wv;
save_wv = submenu_stack[--submenu_depth]; save_wv = submenu_stack[--submenu_depth];
first_pane = 0; first_pane = 0;
i++; i++;
} }
else if (EQ (XVECTOR (menu_items)->contents[i], Qt) else if (EQ (AREF (menu_items, i), Qt)
&& submenu_depth != 0) && submenu_depth != 0)
i += MENU_ITEMS_PANE_LENGTH; i += MENU_ITEMS_PANE_LENGTH;
/* Ignore a nil in the item list. /* Ignore a nil in the item list.
It's meaningful only for dialog boxes. */ It's meaningful only for dialog boxes. */
else if (EQ (XVECTOR (menu_items)->contents[i], Qquote)) else if (EQ (AREF (menu_items, i), Qquote))
i += 1; i += 1;
else if (EQ (XVECTOR (menu_items)->contents[i], Qt)) else if (EQ (AREF (menu_items, i), Qt))
{ {
/* Create a new pane. */ /* Create a new pane. */
Lisp_Object pane_name, prefix; Lisp_Object pane_name, prefix;
@ -1789,7 +1789,7 @@ xmenu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps,
make the call_data null so that it won't display a box make the call_data null so that it won't display a box
when the mouse is on it. */ when the mouse is on it. */
wv->call_data wv->call_data
= (!NILP (def) ? (void *) &XVECTOR (menu_items)->contents[i] : 0); = (!NILP (def) ? (void *) &AREF (menu_items, i) : 0);
wv->enabled = !NILP (enable); wv->enabled = !NILP (enable);
if (NILP (type)) if (NILP (type))
@ -1865,32 +1865,32 @@ xmenu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps,
i = 0; i = 0;
while (i < menu_items_used) while (i < menu_items_used)
{ {
if (EQ (XVECTOR (menu_items)->contents[i], Qnil)) if (EQ (AREF (menu_items, i), Qnil))
{ {
subprefix_stack[submenu_depth++] = prefix; subprefix_stack[submenu_depth++] = prefix;
prefix = entry; prefix = entry;
i++; i++;
} }
else if (EQ (XVECTOR (menu_items)->contents[i], Qlambda)) else if (EQ (AREF (menu_items, i), Qlambda))
{ {
prefix = subprefix_stack[--submenu_depth]; prefix = subprefix_stack[--submenu_depth];
i++; i++;
} }
else if (EQ (XVECTOR (menu_items)->contents[i], Qt)) else if (EQ (AREF (menu_items, i), Qt))
{ {
prefix prefix
= XVECTOR (menu_items)->contents[i + MENU_ITEMS_PANE_PREFIX]; = AREF (menu_items, i + MENU_ITEMS_PANE_PREFIX);
i += MENU_ITEMS_PANE_LENGTH; i += MENU_ITEMS_PANE_LENGTH;
} }
/* Ignore a nil in the item list. /* Ignore a nil in the item list.
It's meaningful only for dialog boxes. */ It's meaningful only for dialog boxes. */
else if (EQ (XVECTOR (menu_items)->contents[i], Qquote)) else if (EQ (AREF (menu_items, i), Qquote))
i += 1; i += 1;
else else
{ {
entry entry
= XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_VALUE]; = AREF (menu_items, i + MENU_ITEMS_ITEM_VALUE);
if (menu_item_selection == &XVECTOR (menu_items)->contents[i]) if (menu_item_selection == &AREF (menu_items, i))
{ {
if (keymaps != 0) if (keymaps != 0)
{ {
@ -2058,8 +2058,8 @@ xdialog_show (FRAME_PTR f,
{ {
Lisp_Object pane_name, prefix; Lisp_Object pane_name, prefix;
const char *pane_string; const char *pane_string;
pane_name = XVECTOR (menu_items)->contents[MENU_ITEMS_PANE_NAME]; pane_name = AREF (menu_items, MENU_ITEMS_PANE_NAME);
prefix = XVECTOR (menu_items)->contents[MENU_ITEMS_PANE_PREFIX]; prefix = AREF (menu_items, MENU_ITEMS_PANE_PREFIX);
pane_string = (NILP (pane_name) pane_string = (NILP (pane_name)
? "" : SSDATA (pane_name)); ? "" : SSDATA (pane_name));
prev_wv = xmalloc_widget_value (); prev_wv = xmalloc_widget_value ();
@ -2078,10 +2078,10 @@ xdialog_show (FRAME_PTR f,
/* Create a new item within current pane. */ /* Create a new item within current pane. */
Lisp_Object item_name, enable, descrip; Lisp_Object item_name, enable, descrip;
item_name = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_NAME]; item_name = AREF (menu_items, i + MENU_ITEMS_ITEM_NAME);
enable = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_ENABLE]; enable = AREF (menu_items, i + MENU_ITEMS_ITEM_ENABLE);
descrip descrip
= XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_EQUIV_KEY]; = AREF (menu_items, i + MENU_ITEMS_ITEM_EQUIV_KEY);
if (NILP (item_name)) if (NILP (item_name))
{ {
@ -2110,7 +2110,7 @@ xdialog_show (FRAME_PTR f,
if (!NILP (descrip)) if (!NILP (descrip))
wv->key = SSDATA (descrip); wv->key = SSDATA (descrip);
wv->value = SSDATA (item_name); wv->value = SSDATA (item_name);
wv->call_data = (void *) &XVECTOR (menu_items)->contents[i]; wv->call_data = (void *) &AREF (menu_items, i);
wv->enabled = !NILP (enable); wv->enabled = !NILP (enable);
wv->help = Qnil; wv->help = Qnil;
prev_wv = wv; prev_wv = wv;
@ -2177,13 +2177,13 @@ xdialog_show (FRAME_PTR f,
{ {
Lisp_Object entry; Lisp_Object entry;
if (EQ (XVECTOR (menu_items)->contents[i], Qt)) if (EQ (AREF (menu_items, i), Qt))
{ {
prefix prefix
= XVECTOR (menu_items)->contents[i + MENU_ITEMS_PANE_PREFIX]; = AREF (menu_items, i + MENU_ITEMS_PANE_PREFIX);
i += MENU_ITEMS_PANE_LENGTH; i += MENU_ITEMS_PANE_LENGTH;
} }
else if (EQ (XVECTOR (menu_items)->contents[i], Qquote)) else if (EQ (AREF (menu_items, i), Qquote))
{ {
/* This is the boundary between left-side elts and /* This is the boundary between left-side elts and
right-side elts. */ right-side elts. */
@ -2192,8 +2192,8 @@ xdialog_show (FRAME_PTR f,
else else
{ {
entry entry
= XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_VALUE]; = AREF (menu_items, i + MENU_ITEMS_ITEM_VALUE);
if (menu_item_selection == &XVECTOR (menu_items)->contents[i]) if (menu_item_selection == &AREF (menu_items, i))
{ {
if (keymaps != 0) if (keymaps != 0)
{ {
@ -2353,7 +2353,7 @@ xmenu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps,
lpane = XM_FAILURE; lpane = XM_FAILURE;
while (i < menu_items_used) while (i < menu_items_used)
{ {
if (EQ (XVECTOR (menu_items)->contents[i], Qt)) if (EQ (AREF (menu_items, i), Qt))
{ {
/* Create a new pane. */ /* Create a new pane. */
Lisp_Object pane_name, prefix; Lisp_Object pane_name, prefix;
@ -2361,8 +2361,8 @@ xmenu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps,
maxlines = max (maxlines, lines); maxlines = max (maxlines, lines);
lines = 0; lines = 0;
pane_name = XVECTOR (menu_items)->contents[i + MENU_ITEMS_PANE_NAME]; pane_name = AREF (menu_items, i + MENU_ITEMS_PANE_NAME);
prefix = XVECTOR (menu_items)->contents[i + MENU_ITEMS_PANE_PREFIX]; prefix = AREF (menu_items, i + MENU_ITEMS_PANE_PREFIX);
pane_string = (NILP (pane_name) pane_string = (NILP (pane_name)
? "" : SSDATA (pane_name)); ? "" : SSDATA (pane_name));
if (keymaps && !NILP (prefix)) if (keymaps && !NILP (prefix))
@ -2382,7 +2382,7 @@ xmenu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps,
while (j < menu_items_used) while (j < menu_items_used)
{ {
Lisp_Object item; Lisp_Object item;
item = XVECTOR (menu_items)->contents[j]; item = AREF (menu_items, j);
if (EQ (item, Qt)) if (EQ (item, Qt))
break; break;
if (NILP (item)) if (NILP (item))
@ -2399,7 +2399,7 @@ xmenu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps,
} }
/* Ignore a nil in the item list. /* Ignore a nil in the item list.
It's meaningful only for dialog boxes. */ It's meaningful only for dialog boxes. */
else if (EQ (XVECTOR (menu_items)->contents[i], Qquote)) else if (EQ (AREF (menu_items, i), Qquote))
i += 1; i += 1;
else else
{ {
@ -2408,11 +2408,11 @@ xmenu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps,
char *item_data; char *item_data;
char const *help_string; char const *help_string;
item_name = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_NAME]; item_name = AREF (menu_items, i + MENU_ITEMS_ITEM_NAME);
enable = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_ENABLE]; enable = AREF (menu_items, i + MENU_ITEMS_ITEM_ENABLE);
descrip descrip
= XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_EQUIV_KEY]; = AREF (menu_items, i + MENU_ITEMS_ITEM_EQUIV_KEY);
help = XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_HELP]; help = AREF (menu_items, i + MENU_ITEMS_ITEM_HELP);
help_string = STRINGP (help) ? SSDATA (help) : NULL; help_string = STRINGP (help) ? SSDATA (help) : NULL;
if (!NILP (descrip)) if (!NILP (descrip))
@ -2526,11 +2526,11 @@ xmenu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps,
i = 0; i = 0;
while (i < menu_items_used) while (i < menu_items_used)
{ {
if (EQ (XVECTOR (menu_items)->contents[i], Qt)) if (EQ (AREF (menu_items, i), Qt))
{ {
if (pane == 0) if (pane == 0)
pane_prefix pane_prefix
= XVECTOR (menu_items)->contents[i + MENU_ITEMS_PANE_PREFIX]; = AREF (menu_items, i + MENU_ITEMS_PANE_PREFIX);
pane--; pane--;
i += MENU_ITEMS_PANE_LENGTH; i += MENU_ITEMS_PANE_LENGTH;
} }
@ -2541,7 +2541,7 @@ xmenu_show (FRAME_PTR f, int x, int y, int for_click, int keymaps,
if (selidx == 0) if (selidx == 0)
{ {
entry entry
= XVECTOR (menu_items)->contents[i + MENU_ITEMS_ITEM_VALUE]; = AREF (menu_items, i + MENU_ITEMS_ITEM_VALUE);
if (keymaps != 0) if (keymaps != 0)
{ {
entry = Fcons (entry, Qnil); entry = Fcons (entry, Qnil);

17
src/xselect.c
View file

@ -1816,12 +1816,12 @@ lisp_data_to_selection_data (Display *display, Lisp_Object obj,
ptrdiff_t i; ptrdiff_t i;
ptrdiff_t size = ASIZE (obj); ptrdiff_t size = ASIZE (obj);
if (SYMBOLP (XVECTOR (obj)->contents [0])) if (SYMBOLP (AREF (obj, 0)))
/* This vector is an ATOM set */ /* This vector is an ATOM set */
{ {
if (NILP (type)) type = QATOM; if (NILP (type)) type = QATOM;
for (i = 0; i < size; i++) for (i = 0; i < size; i++)
if (!SYMBOLP (XVECTOR (obj)->contents [i])) if (!SYMBOLP (AREF (obj, i)))
signal_error ("All elements of selection vector must have same type", obj); signal_error ("All elements of selection vector must have same type", obj);
*data_ret = xnmalloc (size, sizeof (Atom)); *data_ret = xnmalloc (size, sizeof (Atom));
@ -1829,7 +1829,7 @@ lisp_data_to_selection_data (Display *display, Lisp_Object obj,
*size_ret = size; *size_ret = size;
for (i = 0; i < size; i++) for (i = 0; i < size; i++)
(*(Atom **) data_ret) [i] (*(Atom **) data_ret) [i]
= symbol_to_x_atom (dpyinfo, XVECTOR (obj)->contents [i]); = symbol_to_x_atom (dpyinfo, AREF (obj, i));
} }
else else
/* This vector is an INTEGER set, or something like it */ /* This vector is an INTEGER set, or something like it */
@ -1839,7 +1839,7 @@ lisp_data_to_selection_data (Display *display, Lisp_Object obj,
if (NILP (type)) type = QINTEGER; if (NILP (type)) type = QINTEGER;
for (i = 0; i < size; i++) for (i = 0; i < size; i++)
{ {
if (! RANGED_INTEGERP (X_SHRT_MIN, XVECTOR (obj)->contents[i], if (! RANGED_INTEGERP (X_SHRT_MIN, AREF (obj, i),
X_SHRT_MAX)) X_SHRT_MAX))
{ {
/* Use sizeof (long) even if it is more than 32 bits. /* Use sizeof (long) even if it is more than 32 bits.
@ -1857,10 +1857,10 @@ lisp_data_to_selection_data (Display *display, Lisp_Object obj,
{ {
if (format == 32) if (format == 32)
(*((unsigned long **) data_ret)) [i] = (*((unsigned long **) data_ret)) [i] =
cons_to_x_long (XVECTOR (obj)->contents[i]); cons_to_x_long (AREF (obj, i));
else else
(*((short **) data_ret)) [i] = (*((short **) data_ret)) [i] =
XINT (XVECTOR (obj)->contents[i]); XINT (AREF (obj, i));
} }
} }
} }
@ -1895,11 +1895,10 @@ clean_local_selection_data (Lisp_Object obj)
ptrdiff_t size = ASIZE (obj); ptrdiff_t size = ASIZE (obj);
Lisp_Object copy; Lisp_Object copy;
if (size == 1) if (size == 1)
return clean_local_selection_data (XVECTOR (obj)->contents [0]); return clean_local_selection_data (AREF (obj, 0));
copy = Fmake_vector (make_number (size), Qnil); copy = Fmake_vector (make_number (size), Qnil);
for (i = 0; i < size; i++) for (i = 0; i < size; i++)
XVECTOR (copy)->contents [i] ASET (copy, i, clean_local_selection_data (AREF (obj, i)));
= clean_local_selection_data (XVECTOR (obj)->contents [i]);
return copy; return copy;
} }
return obj; return obj;