Commit 7539e11f authored by Ken Raeburn's avatar Ken Raeburn

more XCAR/XCDR/XFLOAT_DATA uses, to help isolete lisp engine

parent 3a7093d8
No preview for this file type
......@@ -24,6 +24,10 @@ Boston, MA 02111-1307, USA. */
/* Note that this declares bzero on OSF/1. How dumb. */
#include <signal.h>
/* This file is part of the core Lisp implementation, and thus must
deal with the real data structures. If the Lisp implementation is
replaced, this file likely will not be used. */
#undef HIDE_LISP_IMPLEMENTATION
#include "lisp.h"
#include "intervals.h"
#include "puresize.h"
......
This diff is collapsed.
......@@ -148,11 +148,11 @@ quotify_args (exp)
Lisp_Object exp;
{
register Lisp_Object tail;
register struct Lisp_Cons *ptr;
for (tail = exp; CONSP (tail); tail = ptr->cdr)
Lisp_Object next;
for (tail = exp; CONSP (tail); tail = next)
{
ptr = XCONS (tail);
ptr->car = quotify_arg (ptr->car);
next = XCDR (tail);
XCAR (tail) = quotify_arg (XCAR (tail));
}
return exp;
}
......
......@@ -510,7 +510,7 @@ Error if arg is not nil and not a cons cell. See also `car-safe'.")
while (1)
{
if (CONSP (list))
return XCONS (list)->car;
return XCAR (list);
else if (EQ (list, Qnil))
return Qnil;
else
......@@ -524,7 +524,7 @@ DEFUN ("car-safe", Fcar_safe, Scar_safe, 1, 1, 0,
Lisp_Object object;
{
if (CONSP (object))
return XCONS (object)->car;
return XCAR (object);
else
return Qnil;
}
......@@ -539,7 +539,7 @@ Error if arg is not nil and not a cons cell. See also `cdr-safe'.")
while (1)
{
if (CONSP (list))
return XCONS (list)->cdr;
return XCDR (list);
else if (EQ (list, Qnil))
return Qnil;
else
......@@ -553,7 +553,7 @@ DEFUN ("cdr-safe", Fcdr_safe, Scdr_safe, 1, 1, 0,
Lisp_Object object;
{
if (CONSP (object))
return XCONS (object)->cdr;
return XCDR (object);
else
return Qnil;
}
......@@ -567,7 +567,7 @@ DEFUN ("setcar", Fsetcar, Ssetcar, 2, 2, 0,
cell = wrong_type_argument (Qconsp, cell);
CHECK_IMPURE (cell);
XCONS (cell)->car = newcar;
XCAR (cell) = newcar;
return newcar;
}
......@@ -580,7 +580,7 @@ DEFUN ("setcdr", Fsetcdr, Ssetcdr, 2, 2, 0,
cell = wrong_type_argument (Qconsp, cell);
CHECK_IMPURE (cell);
XCONS (cell)->cdr = newcdr;
XCDR (cell) = newcdr;
return newcdr;
}
......@@ -846,7 +846,7 @@ swap_in_symval_forwarding (symbol, valcontents)
if (NILP (tem1) || current_buffer != XBUFFER (tem1)
|| !EQ (selected_frame, XBUFFER_LOCAL_VALUE (valcontents)->frame))
{
tem1 = XCONS (XBUFFER_LOCAL_VALUE (valcontents)->cdr)->car;
tem1 = XCAR (XBUFFER_LOCAL_VALUE (valcontents)->cdr);
Fsetcdr (tem1,
do_symval_forwarding (XBUFFER_LOCAL_VALUE (valcontents)->realvalue));
tem1 = assq_no_quit (symbol, current_buffer->local_var_alist);
......@@ -864,7 +864,7 @@ swap_in_symval_forwarding (symbol, valcontents)
else
XBUFFER_LOCAL_VALUE (valcontents)->found_for_buffer = 1;
XCONS (XBUFFER_LOCAL_VALUE (valcontents)->cdr)->car = tem1;
XCAR (XBUFFER_LOCAL_VALUE (valcontents)->cdr) = tem1;
XSETBUFFER (XBUFFER_LOCAL_VALUE (valcontents)->buffer, current_buffer);
XBUFFER_LOCAL_VALUE (valcontents)->frame = selected_frame;
store_symval_forwarding (symbol,
......@@ -1006,7 +1006,7 @@ set_internal (symbol, newval, bindflag)
/* What value are we caching right now? */
current_alist_element
= XCONS (XBUFFER_LOCAL_VALUE (valcontents)->cdr)->car;
= XCAR (XBUFFER_LOCAL_VALUE (valcontents)->cdr);
/* If the current buffer is not the buffer whose binding is
currently cached, or if it's a Lisp_Buffer_Local_Value and
......@@ -1015,7 +1015,7 @@ set_internal (symbol, newval, bindflag)
if (current_buffer != XBUFFER (XBUFFER_LOCAL_VALUE (valcontents)->buffer)
|| !EQ (selected_frame, XBUFFER_LOCAL_VALUE (valcontents)->frame)
|| (BUFFER_LOCAL_VALUEP (valcontents)
&& EQ (XCONS (current_alist_element)->car,
&& EQ (XCAR (current_alist_element),
current_alist_element)))
{
/* Write out the cached value for the old buffer; copy it
......@@ -1062,7 +1062,7 @@ set_internal (symbol, newval, bindflag)
}
/* Cache the new buffer's assoc in CURRENT-ALIST-ELEMENT. */
XCONS (XBUFFER_LOCAL_VALUE (valcontents)->cdr)->car
XCAR (XBUFFER_LOCAL_VALUE (valcontents)->cdr)
= tem1;
/* Set BUFFER and FRAME for binding now loaded. */
......@@ -1117,12 +1117,12 @@ default_value (symbol)
ordinary setq stores just that slot. So use that. */
Lisp_Object current_alist_element, alist_element_car;
current_alist_element
= XCONS (XBUFFER_LOCAL_VALUE (valcontents)->cdr)->car;
alist_element_car = XCONS (current_alist_element)->car;
= XCAR (XBUFFER_LOCAL_VALUE (valcontents)->cdr);
alist_element_car = XCAR (current_alist_element);
if (EQ (alist_element_car, current_alist_element))
return do_symval_forwarding (XBUFFER_LOCAL_VALUE (valcontents)->realvalue);
else
return XCONS (XBUFFER_LOCAL_VALUE (valcontents)->cdr)->cdr;
return XCDR (XBUFFER_LOCAL_VALUE (valcontents)->cdr);
}
/* For other variables, get the current value. */
return do_symval_forwarding (valcontents);
......@@ -1197,11 +1197,11 @@ for this variable.")
return Fset (symbol, value);
/* Store new value into the DEFAULT-VALUE slot */
XCONS (XBUFFER_LOCAL_VALUE (valcontents)->cdr)->cdr = value;
XCDR (XBUFFER_LOCAL_VALUE (valcontents)->cdr) = value;
/* If that slot is current, we must set the REALVALUE slot too */
current_alist_element
= XCONS (XBUFFER_LOCAL_VALUE (valcontents)->cdr)->car;
= XCAR (XBUFFER_LOCAL_VALUE (valcontents)->cdr);
alist_element_buffer = Fcar (current_alist_element);
if (EQ (alist_element_buffer, current_alist_element))
store_symval_forwarding (symbol, XBUFFER_LOCAL_VALUE (valcontents)->realvalue,
......@@ -1280,7 +1280,7 @@ The function `default-value' gets the default value and `set-default' sets it.")
if (EQ (valcontents, Qunbound))
XSYMBOL (variable)->value = Qnil;
tem = Fcons (Qnil, Fsymbol_value (variable));
XCONS (tem)->car = tem;
XCAR (tem) = tem;
newval = allocate_misc ();
XMISCTYPE (newval) = Lisp_Misc_Buffer_Local_Value;
XBUFFER_LOCAL_VALUE (newval)->realvalue = XSYMBOL (variable)->value;
......@@ -1337,7 +1337,7 @@ Use `make-local-hook' instead.")
{
Lisp_Object newval;
tem = Fcons (Qnil, do_symval_forwarding (valcontents));
XCONS (tem)->car = tem;
XCAR (tem) = tem;
newval = allocate_misc ();
XMISCTYPE (newval) = Lisp_Misc_Some_Buffer_Local_Value;
XBUFFER_LOCAL_VALUE (newval)->realvalue = XSYMBOL (variable)->value;
......@@ -1359,7 +1359,7 @@ Use `make-local-hook' instead.")
find_symbol_value (variable);
current_buffer->local_var_alist
= Fcons (Fcons (variable, XCONS (XBUFFER_LOCAL_VALUE (XSYMBOL (variable)->value)->cdr)->cdr),
= Fcons (Fcons (variable, XCDR (XBUFFER_LOCAL_VALUE (XSYMBOL (variable)->value)->cdr)),
current_buffer->local_var_alist);
/* Make sure symbol does not think it is set up for this buffer;
......@@ -1474,7 +1474,7 @@ See `modify-frame-parameters'.")
if (EQ (valcontents, Qunbound))
XSYMBOL (variable)->value = Qnil;
tem = Fcons (Qnil, Fsymbol_value (variable));
XCONS (tem)->car = tem;
XCAR (tem) = tem;
newval = allocate_misc ();
XMISCTYPE (newval) = Lisp_Misc_Some_Buffer_Local_Value;
XBUFFER_LOCAL_VALUE (newval)->realvalue = XSYMBOL (variable)->value;
......@@ -1513,10 +1513,10 @@ BUFFER defaults to the current buffer.")
|| SOME_BUFFER_LOCAL_VALUEP (valcontents))
{
Lisp_Object tail, elt;
for (tail = buf->local_var_alist; CONSP (tail); tail = XCONS (tail)->cdr)
for (tail = buf->local_var_alist; CONSP (tail); tail = XCDR (tail))
{
elt = XCONS (tail)->car;
if (EQ (variable, XCONS (elt)->car))
elt = XCAR (tail);
if (EQ (variable, XCAR (elt)))
return Qt;
}
}
......@@ -1561,10 +1561,10 @@ BUFFER defaults to the current buffer.")
if (SOME_BUFFER_LOCAL_VALUEP (valcontents))
{
Lisp_Object tail, elt;
for (tail = buf->local_var_alist; CONSP (tail); tail = XCONS (tail)->cdr)
for (tail = buf->local_var_alist; CONSP (tail); tail = XCDR (tail))
{
elt = XCONS (tail)->car;
if (EQ (variable, XCONS (elt)->car))
elt = XCAR (tail);
if (EQ (variable, XCAR (elt)))
return Qt;
}
}
......@@ -1896,8 +1896,8 @@ arithcompare (num1, num2, comparison)
if (FLOATP (num1) || FLOATP (num2))
{
floatp = 1;
f1 = (FLOATP (num1)) ? XFLOAT (num1)->data : XINT (num1);
f2 = (FLOATP (num2)) ? XFLOAT (num2)->data : XINT (num2);
f1 = (FLOATP (num1)) ? XFLOAT_DATA (num1) : XINT (num1);
f2 = (FLOATP (num2)) ? XFLOAT_DATA (num2) : XINT (num2);
}
#else
CHECK_NUMBER_COERCE_MARKER (num1, 0);
......@@ -2000,7 +2000,7 @@ DEFUN ("zerop", Fzerop, Szerop, 1, 1, 0, "Return t if NUMBER is zero.")
if (FLOATP (number))
{
if (XFLOAT(number)->data == 0.0)
if (XFLOAT_DATA (number) == 0.0)
return Qt;
return Qnil;
}
......@@ -2035,10 +2035,10 @@ cons_to_long (c)
Lisp_Object top, bot;
if (INTEGERP (c))
return XINT (c);
top = XCONS (c)->car;
bot = XCONS (c)->cdr;
top = XCAR (c);
bot = XCDR (c);
if (CONSP (bot))
bot = XCONS (bot)->car;
bot = XCAR (bot);
return ((XINT (top) << 16) | XINT (bot));
}
......@@ -2060,7 +2060,7 @@ NUMBER may be an integer or a floating point number.")
{
char pigbuf[350]; /* see comments in float_to_string */
float_to_string (pigbuf, XFLOAT(number)->data);
float_to_string (pigbuf, XFLOAT_DATA (number));
return build_string (pigbuf);
}
#endif /* LISP_FLOAT_TYPE */
......@@ -2249,7 +2249,7 @@ float_arith_driver (accum, argnum, code, nargs, args)
if (FLOATP (val))
{
next = XFLOAT (val)->data;
next = XFLOAT_DATA (val);
}
else
{
......@@ -2520,7 +2520,7 @@ Markers are converted to integers.")
CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (number, 0);
if (FLOATP (number))
return (make_float (1.0 + XFLOAT (number)->data));
return (make_float (1.0 + XFLOAT_DATA (number)));
#else
CHECK_NUMBER_COERCE_MARKER (number, 0);
#endif /* LISP_FLOAT_TYPE */
......@@ -2539,7 +2539,7 @@ Markers are converted to integers.")
CHECK_NUMBER_OR_FLOAT_COERCE_MARKER (number, 0);
if (FLOATP (number))
return (make_float (-1.0 + XFLOAT (number)->data));
return (make_float (-1.0 + XFLOAT_DATA (number)));
#else
CHECK_NUMBER_COERCE_MARKER (number, 0);
#endif /* LISP_FLOAT_TYPE */
......
......@@ -5693,9 +5693,9 @@ the current state.\n")
No need to test for the end of the vector
because the last element of the vector is lambda
and that will always cause a mismatch. */
for (tail = Vbuffer_alist; CONSP (tail); tail = XCONS (tail)->cdr)
for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail))
{
buf = XCONS (XCONS (tail)->car)->cdr;
buf = XCDR (XCAR (tail));
/* Ignore buffers that aren't included in buffer lists. */
if (XSTRING (XBUFFER (buf)->name)->data[0] == ' ')
continue;
......@@ -5714,7 +5714,7 @@ the current state.\n")
n = 1;
FOR_EACH_FRAME (tail, frame)
n += 2;
for (tail = Vbuffer_alist; CONSP (tail); tail = XCONS (tail)->cdr)
for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail))
n += 3;
/* Reallocate the vector if it's grown, or if it's shrunk a lot. */
if (n > XVECTOR (frame_and_buffer_state)->size
......@@ -5727,9 +5727,9 @@ the current state.\n")
*vecp++ = frame;
*vecp++ = XFRAME (frame)->name;
}
for (tail = Vbuffer_alist; CONSP (tail); tail = XCONS (tail)->cdr)
for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail))
{
buf = XCONS (XCONS (tail)->car)->cdr;
buf = XCDR (XCAR (tail));
/* Ignore buffers that aren't included in buffer lists. */
if (XSTRING (XBUFFER (buf)->name)->data[0] == ' ')
continue;
......
......@@ -1077,11 +1077,11 @@ the Bugs section of the Emacs manual or the file BUGS.\n", argv[0]);
}
for (tail = Vbuffer_alist; CONSP (tail);
tail = XCONS (tail)->cdr)
tail = XCDR (tail))
{
Lisp_Object buffer;
buffer = Fcdr (XCONS (tail)->car);
buffer = Fcdr (XCAR (tail));
/* Verify that all buffers are empty now, as they
ought to be. */
if (BUF_Z (XBUFFER (buffer)) > BUF_BEG (XBUFFER (buffer)))
......
......@@ -218,24 +218,24 @@ fs_load_font (f, font_table, charset, fontname, fontset)
for (i = MIN_CHARSET_OFFICIAL_DIMENSION1; i <= MAX_CHARSET; i++)
fontp->encoding[i] = 1;
/* Then override them by a specification in Vfont_encoding_alist. */
for (list = Vfont_encoding_alist; CONSP (list); list = XCONS (list)->cdr)
for (list = Vfont_encoding_alist; CONSP (list); list = XCDR (list))
{
elt = XCONS (list)->car;
elt = XCAR (list);
if (CONSP (elt)
&& STRINGP (XCONS (elt)->car) && CONSP (XCONS (elt)->cdr)
&& (fast_c_string_match_ignore_case (XCONS (elt)->car, fontname)
&& STRINGP (XCAR (elt)) && CONSP (XCDR (elt))
&& (fast_c_string_match_ignore_case (XCAR (elt), fontname)
>= 0))
{
Lisp_Object tmp;
for (tmp = XCONS (elt)->cdr; CONSP (tmp); tmp = XCONS (tmp)->cdr)
if (CONSP (XCONS (tmp)->car)
&& ((i = get_charset_id (XCONS (XCONS (tmp)->car)->car))
for (tmp = XCDR (elt); CONSP (tmp); tmp = XCDR (tmp))
if (CONSP (XCAR (tmp))
&& ((i = get_charset_id (XCAR (XCAR (tmp))))
>= 0)
&& INTEGERP (XCONS (XCONS (tmp)->car)->cdr)
&& XFASTINT (XCONS (XCONS (tmp)->car)->cdr) < 4)
&& INTEGERP (XCDR (XCAR (tmp)))
&& XFASTINT (XCDR (XCAR (tmp))) < 4)
fontp->encoding[i]
= XFASTINT (XCONS (XCONS (tmp)->car)->cdr);
= XFASTINT (XCDR (XCAR (tmp)));
}
}
}
......@@ -328,12 +328,12 @@ fs_register_fontset (f, fontset_info)
int i;
if (!CONSP (fontset_info)
|| !STRINGP (XCONS (fontset_info)->car)
|| !CONSP (XCONS (fontset_info)->cdr))
|| !STRINGP (XCAR (fontset_info))
|| !CONSP (XCDR (fontset_info)))
/* Invalid data in FONTSET_INFO. */
return -1;
name = XCONS (fontset_info)->car;
name = XCAR (fontset_info);
if ((fontset = fs_query_fontset (f, XSTRING (name)->data)) >= 0)
/* This fontset already exists on frame F. */
return fontset;
......@@ -351,21 +351,21 @@ fs_register_fontset (f, fontset_info)
fontsetp->font_indexes[i] = FONT_NOT_OPENED;
}
for (fontlist = XCONS (fontset_info)->cdr; CONSP (fontlist);
fontlist = XCONS (fontlist)->cdr)
for (fontlist = XCDR (fontset_info); CONSP (fontlist);
fontlist = XCDR (fontlist))
{
Lisp_Object tem = Fcar (fontlist);
int charset;
if (CONSP (tem)
&& (charset = get_charset_id (XCONS (tem)->car)) >= 0
&& STRINGP (XCONS (tem)->cdr))
&& (charset = get_charset_id (XCAR (tem))) >= 0
&& STRINGP (XCDR (tem)))
{
fontsetp->fontname[charset]
= (char *) xmalloc (XSTRING (XCONS (tem)->cdr)->size + 1);
bcopy (XSTRING (XCONS (tem)->cdr)->data,
= (char *) xmalloc (XSTRING (XCDR (tem))->size + 1);
bcopy (XSTRING (XCDR (tem))->data,
fontsetp->fontname[charset],
XSTRING (XCONS (tem)->cdr)->size + 1);
XSTRING (XCDR (tem))->size + 1);
}
else
/* Broken or invalid data structure. */
......@@ -400,8 +400,8 @@ fs_register_fontset (f, fontset_info)
the corresponding regular expression. */
static Lisp_Object Vcached_fontset_data;
#define CACHED_FONTSET_NAME (XSTRING (XCONS (Vcached_fontset_data)->car)->data)
#define CACHED_FONTSET_REGEX (XCONS (Vcached_fontset_data)->cdr)
#define CACHED_FONTSET_NAME (XSTRING (XCAR (Vcached_fontset_data))->data)
#define CACHED_FONTSET_REGEX (XCDR (Vcached_fontset_data))
/* If fontset name PATTERN contains any wild card, return regular
expression corresponding to PATTERN. */
......@@ -473,9 +473,9 @@ If REGEXPP is non-nil, PATTERN is a regular expression.")
else
regexp = pattern;
for (tem = Vglobal_fontset_alist; CONSP (tem); tem = XCONS (tem)->cdr)
for (tem = Vglobal_fontset_alist; CONSP (tem); tem = XCDR (tem))
{
Lisp_Object fontset_name = XCONS (XCONS (tem)->car)->car;
Lisp_Object fontset_name = XCAR (XCAR (tem));
if (!NILP (regexp))
{
if (fast_c_string_match_ignore_case (regexp,
......@@ -574,14 +574,14 @@ FONTLIST is an alist of charsets vs corresponding font names.")
XSTRING (name)->data, XSTRING (fullname)->data);
/* Check the validity of FONTLIST. */
for (tail = fontlist; CONSP (tail); tail = XCONS (tail)->cdr)
for (tail = fontlist; CONSP (tail); tail = XCDR (tail))
{
Lisp_Object tem = XCONS (tail)->car;
Lisp_Object tem = XCAR (tail);
int charset;
if (!CONSP (tem)
|| (charset = get_charset_id (XCONS (tem)->car)) < 0
|| !STRINGP (XCONS (tem)->cdr))
|| (charset = get_charset_id (XCAR (tem))) < 0
|| !STRINGP (XCDR (tem)))
error ("Elements of fontlist must be a cons of charset and font name");
}
......@@ -632,14 +632,14 @@ If FRAME is omitted or nil, all frames are affected.")
if (NILP (frame))
{
Lisp_Object fontset_info = Fassoc (fullname, Vglobal_fontset_alist);
Lisp_Object tem = Fassq (charset_symbol, XCONS (fontset_info)->cdr);
Lisp_Object tem = Fassq (charset_symbol, XCDR (fontset_info));
if (NILP (tem))
XCONS (fontset_info)->cdr
XCDR (fontset_info)
= Fcons (Fcons (charset_symbol, fontname),
XCONS (fontset_info)->cdr);
XCDR (fontset_info));
else
XCONS (tem)->cdr = fontname;
XCDR (tem) = fontname;
}
/* Then, update information in the specified frame or all existing
......@@ -671,7 +671,7 @@ If FRAME is omitted or nil, all frames are affected.")
if (set_frame_fontset_func
&& !NILP (font_param)
&& !strcmp (XSTRING (fullname)->data,
XSTRING (XCONS (font_param)->cdr)->data))
XSTRING (XCDR (font_param))->data))
/* This fontset is the default fontset on frame TEM.
We may have to resize this frame because of new
ASCII font. */
......
......@@ -631,9 +631,9 @@ do_switch_frame (frame, no_enter, track)
/* If FRAME is a switch-frame event, extract the frame we should
switch to. */
if (CONSP (frame)
&& EQ (XCONS (frame)->car, Qswitch_frame)
&& CONSP (XCONS (frame)->cdr))
frame = XCONS (XCONS (frame)->cdr)->car;
&& EQ (XCAR (frame), Qswitch_frame)
&& CONSP (XCDR (frame)))
frame = XCAR (XCDR (frame));
/* This used to say CHECK_LIVE_FRAME, but apparently it's possible for
a switch-frame event to arrive after a frame is no longer live,
......@@ -659,17 +659,17 @@ do_switch_frame (frame, no_enter, track)
{
Lisp_Object tail;
for (tail = Vframe_list; CONSP (tail); tail = XCONS (tail)->cdr)
for (tail = Vframe_list; CONSP (tail); tail = XCDR (tail))
{
Lisp_Object focus;
if (!FRAMEP (XCONS (tail)->car))
if (!FRAMEP (XCAR (tail)))
abort ();
focus = FRAME_FOCUS_FRAME (XFRAME (XCONS (tail)->car));
focus = FRAME_FOCUS_FRAME (XFRAME (XCAR (tail)));
if (FRAMEP (focus) && XFRAME (focus) == SELECTED_FRAME ())
Fredirect_frame_focus (XCONS (tail)->car, frame);
Fredirect_frame_focus (XCAR (tail), frame);
}
}
#else /* ! 0 */
......@@ -893,11 +893,11 @@ next_frame (frame, minibuf)
CHECK_LIVE_FRAME (frame, 0);
while (1)
for (tail = Vframe_list; CONSP (tail); tail = XCONS (tail)->cdr)
for (tail = Vframe_list; CONSP (tail); tail = XCDR (tail))
{
Lisp_Object f;
f = XCONS (tail)->car;
f = XCAR (tail);
if (passed
&& FRAME_KBOARD (XFRAME (f)) == FRAME_KBOARD (XFRAME (frame)))
......@@ -968,11 +968,11 @@ prev_frame (frame, minibuf)
abort ();
prev = Qnil;
for (tail = Vframe_list; CONSP (tail); tail = XCONS (tail)->cdr)
for (tail = Vframe_list; CONSP (tail); tail = XCDR (tail))
{
Lisp_Object f;
f = XCONS (tail)->car;
f = XCAR (tail);
if (!FRAMEP (f))
abort ();
......@@ -1087,11 +1087,11 @@ other_visible_frames (f)
for (frames = Vframe_list;
CONSP (frames);
frames = XCONS (frames)->cdr)
frames = XCDR (frames))
{
Lisp_Object this;
this = XCONS (frames)->car;
this = XCAR (frames);
/* Verify that the frame's window still exists
and we can still talk to it. And note any recent change
in visibility. */
......@@ -1148,7 +1148,7 @@ but if the second optional argument FORCE is non-nil, you may do so.")
#if 0
/* This is a nice idea, but x_connection_closed needs to be able
to delete the last frame, if it is gone. */
if (NILP (XCONS (Vframe_list)->cdr))
if (NILP (XCDR (Vframe_list)))
error ("Attempt to delete the only frame");
#endif
......@@ -1160,10 +1160,10 @@ but if the second optional argument FORCE is non-nil, you may do so.")
for (frames = Vframe_list;
CONSP (frames);
frames = XCONS (frames)->cdr)
frames = XCDR (frames))
{
Lisp_Object this;
this = XCONS (frames)->car;
this = XCAR (frames);
if (! EQ (this, frame)
&& EQ (frame,
......@@ -1280,9 +1280,9 @@ but if the second optional argument FORCE is non-nil, you may do so.")
for (frames = Vframe_list;
CONSP (frames);
frames = XCONS (frames)->cdr)
frames = XCDR (frames))
{
f = XFRAME (XCONS (frames)->car);
f = XFRAME (XCAR (frames));
if (!FRAME_MINIBUF_ONLY_P (f))
{
last_nonminibuf_frame = f;
......@@ -1308,12 +1308,12 @@ but if the second optional argument FORCE is non-nil, you may do so.")
for (frames = Vframe_list;
CONSP (frames);
frames = XCONS (frames)->cdr)
frames = XCDR (frames))
{
Lisp_Object this;
struct frame *f1;
this = XCONS (frames)->car;
this = XCAR (frames);
if (!FRAMEP (this))
abort ();
f1 = XFRAME (this);
......@@ -1662,9 +1662,9 @@ DEFUN ("visible-frame-list", Fvisible_frame_list, Svisible_frame_list,
Lisp_Object value;
value = Qnil;
for (tail = Vframe_list; CONSP (tail); tail = XCONS (tail)->cdr)
for (tail = Vframe_list; CONSP (tail); tail = XCDR (tail))
{
frame = XCONS (tail)->car;
frame = XCAR (tail);
if (!FRAMEP (frame))
continue;
f = XFRAME (frame);
......
This diff is collapsed.
......@@ -360,11 +360,11 @@ read_minibuf (map, initial, prompt, backup_n, expflag,
for (buf_list = Vbuffer_alist;
CONSP (buf_list);
buf_list = XCONS (buf_list)->cdr)
buf_list = XCDR (buf_list))
{
Lisp_Object other_buf;
other_buf = XCONS (XCONS (buf_list)->car)->cdr;
other_buf = XCDR (XCAR (buf_list));
if (STRINGP (XBUFFER (other_buf)->directory))
{
current_buffer->directory = XBUFFER (other_buf)->directory;
......@@ -565,7 +565,7 @@ get_minibuffer (depth)
enabled in it. */
Fbuffer_enable_undo (buf);
XCONS (tail)->car = buf;
XCAR (tail) = buf;
}
else
{
......@@ -1026,9 +1026,9 @@ or the symbol from the obarray.")
/* Ignore this element if it fails to match all the regexps. */
for (regexps = Vcompletion_regexp_list; CONSP (regexps);
regexps = XCONS (regexps)->cdr)
regexps = XCDR (regexps))
{
tem = Fstring_match (XCONS (regexps)->car, eltstring, zero);
tem = Fstring_match (XCAR (regexps), eltstring, zero);
if (NILP (tem))
break;
}
......@@ -1280,9 +1280,9 @@ are ignored unless STRING itself starts with a space.")
/* Ignore this element if it fails to match all the regexps. */
for (regexps = Vcompletion_regexp_list; CONSP (regexps);
regexps = XCONS (regexps)->cdr)
regexps = XCDR (regexps))
{
tem = Fstring_match (XCONS (regexps)->car, eltstring, zero);
tem = Fstring_match (XCAR (regexps), eltstring, zero);
if (NILP (tem))
break;
}
......
......@@ -4836,13 +4836,13 @@ A nil width parameter means no margin.")
/* Check widths < 0 and translate a zero width to nil.
Margins that are too wide have to be checked elsewhere. */
if ((INTEGERP (left) && XINT (left) < 0)
|| (FLOATP (left) && XFLOAT (left)->data <= 0))
|| (FLOATP (left) && XFLOAT_DATA (left) <= 0))
XSETFASTINT (left, 0);