emacs: src/buffer.c comparison

comparison src/buffer.c @ 26164:d39ec0a27081

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

author	Ken Raeburn <raeburn@raeburn.org>
date	Mon, 25 Oct 1999 04:58:18 +0000
parents	b7aa6ac26872
children	8455090c3fb2

comparison

equal deleted inserted replaced

-:99c35bcce8c0
+:d39ec0a27081
 /* Remove from GENERAL any buffer that duplicates one in FRAMELIST.  */
 tail = framelist;
 while (! NILP (tail))
 	{
-	  general = Fdelq (XCONS (tail)->car, general);
+	  general = Fdelq (XCAR (tail), general);
-	  tail = XCONS (tail)->cdr;
+	  tail = XCDR (tail);
 	}
 return nconc2 (framelist, general);
 }
 return general;
 call the corresponding file handler.  */
 handler = Ffind_file_name_handler (filename, Qget_file_buffer);
 if (!NILP (handler))
 return call2 (handler, Qget_file_buffer, filename);
-for (tail = Vbuffer_alist; CONSP (tail); tail = XCONS (tail)->cdr)
+for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail))
 {
-buf = Fcdr (XCONS (tail)->car);
+buf = Fcdr (XCAR (tail));
 if (!BUFFERP (buf)) continue;
 if (!STRINGP (XBUFFER (buf)->filename)) continue;
 tem = Fstring_equal (XBUFFER (buf)->filename, filename);
 if (!NILP (tem))
 	return buf;
 get_truename_buffer (filename)
 register Lisp_Object filename;
 {
 register Lisp_Object tail, buf, tem;
-for (tail = Vbuffer_alist; CONSP (tail); tail = XCONS (tail)->cdr)
+for (tail = Vbuffer_alist; CONSP (tail); tail = XCDR (tail))
 {
-buf = Fcdr (XCONS (tail)->car);
+buf = Fcdr (XCAR (tail));
 if (!BUFFERP (buf)) continue;
 if (!STRINGP (XBUFFER (buf)->file_truename)) continue;
 tem = Fstring_equal (XBUFFER (buf)->file_truename, filename);
 if (!NILP (tem))
 	return buf;
 result = Qnil;
 {
 register Lisp_Object tail;
-for (tail = buf->local_var_alist; CONSP (tail); tail = XCONS (tail)->cdr)
+for (tail = buf->local_var_alist; CONSP (tail); tail = XCDR (tail))
 {
 	Lisp_Object val, elt;
-	elt = XCONS (tail)->car;
+	elt = XCAR (tail);
 	/* Reference each variable in the alist in buf.
 	   If inquiring about the current buffer, this gets the current values,
 	   so store them into the alist so the alist is up to date.
 	   If inquiring about some other buffer, this swaps out any values
 	   for that buffer, making the alist up to date automatically.  */
-	val = find_symbol_value (XCONS (elt)->car);
+	val = find_symbol_value (XCAR (elt));
 	/* Use the current buffer value only if buf is the current buffer.  */
 	if (buf != current_buffer)
-	  val = XCONS (elt)->cdr;
+	  val = XCDR (elt);
 	/* If symbol is unbound, put just the symbol in the list.  */
 	if (EQ (val, Qunbound))
-	  result = Fcons (XCONS (elt)->car, result);
+	  result = Fcons (XCAR (elt), result);
 	/* Otherwise, put (symbol . value) in the list.  */
 	else
-	  result = Fcons (Fcons (XCONS (elt)->car, val), result);
+	  result = Fcons (Fcons (XCAR (elt), val), result);
 }
 }
 /* Add on all the variables stored in special slots.  */
 {
 tem = frame_buffer_list (frame);
 add_ons = Qnil;
 while (CONSP (tem))
 {
-if (BUFFERP (XCONS (tem)->car))
+if (BUFFERP (XCAR (tem)))
-	add_ons = Fcons (Fcons (Qnil, XCONS (tem)->car), add_ons);
+	add_ons = Fcons (Fcons (Qnil, XCAR (tem)), add_ons);
-tem = XCONS (tem)->cdr;
+tem = XCDR (tem);
 }
 tail = nconc2 (Fnreverse (add_ons), tail);
 for (; !NILP (tail); tail = Fcdr (tail))
 {
 register Lisp_Object link, prev;
 Lisp_Object frame;
 frame = selected_frame;
 prev = Qnil;
-for (link = Vbuffer_alist; CONSP (link); link = XCONS (link)->cdr)
+for (link = Vbuffer_alist; CONSP (link); link = XCDR (link))
 {
-if (EQ (XCONS (XCONS (link)->car)->cdr, buf))
+if (EQ (XCDR (XCAR (link)), buf))
 	break;
 prev = link;
 }
 /* Effectively do Vbuffer_alist = Fdelq (link, Vbuffer_alist);
 we cannot use Fdelq itself here because it allows quitting.  */
 if (NILP (prev))
-Vbuffer_alist = XCONS (Vbuffer_alist)->cdr;
+Vbuffer_alist = XCDR (Vbuffer_alist);
 else
-XCONS (prev)->cdr = XCONS (XCONS (prev)->cdr)->cdr;
+XCDR (prev) = XCDR (XCDR (prev));
-XCONS (link)->cdr = Vbuffer_alist;
+XCDR (link) = Vbuffer_alist;
 Vbuffer_alist = link;
 /* Now move this buffer to the front of frame_buffer_list also.  */
 prev = Qnil;
 for (link = frame_buffer_list (frame); CONSP (link);
-link = XCONS (link)->cdr)
+link = XCDR (link))
 {
-if (EQ (XCONS (link)->car, buf))
+if (EQ (XCAR (link), buf))
 	break;
 prev = link;
 }
 /* Effectively do delq.  */
 if (CONSP (link))
 {
 if (NILP (prev))
 	set_frame_buffer_list (frame,
-			       XCONS (frame_buffer_list (frame))->cdr);
+			       XCDR (frame_buffer_list (frame)));
 else
-	XCONS (prev)->cdr = XCONS (XCONS (prev)->cdr)->cdr;
+	XCDR (prev) = XCDR (XCDR (prev));
-XCONS (link)->cdr = frame_buffer_list (frame);
+XCDR (link) = frame_buffer_list (frame);
 set_frame_buffer_list (frame, link);
 }
 else
 set_frame_buffer_list (frame, Fcons (buf, frame_buffer_list (frame)));
 }
 }
 /* Look down buffer's list of local Lisp variables
 to find and update any that forward into C variables. */
-for (tail = b->local_var_alist; !NILP (tail); tail = XCONS (tail)->cdr)
+for (tail = b->local_var_alist; !NILP (tail); tail = XCDR (tail))
 {
-valcontents = XSYMBOL (XCONS (XCONS (tail)->car)->car)->value;
+valcontents = XSYMBOL (XCAR (XCAR (tail)))->value;
 if ((BUFFER_LOCAL_VALUEP (valcontents)
 	   || SOME_BUFFER_LOCAL_VALUEP (valcontents))
 	  && (tem = XBUFFER_LOCAL_VALUE (valcontents)->realvalue,
 	      (BOOLFWDP (tem) || INTFWDP (tem) || OBJFWDP (tem))))
 	/* Just reference the variable
 	     to cause it to become set for this buffer.  */
-	Fsymbol_value (XCONS (XCONS (tail)->car)->car);
+	Fsymbol_value (XCAR (XCAR (tail)));
 }
 /* Do the same with any others that were local to the previous buffer */
 if (old_buf)
-for (tail = old_buf->local_var_alist; !NILP (tail); tail = XCONS (tail)->cdr)
+for (tail = old_buf->local_var_alist; !NILP (tail); tail = XCDR (tail))
 {
-	valcontents = XSYMBOL (XCONS (XCONS (tail)->car)->car)->value;
+	valcontents = XSYMBOL (XCAR (XCAR (tail)))->value;
 	if ((BUFFER_LOCAL_VALUEP (valcontents)
 	     || SOME_BUFFER_LOCAL_VALUEP (valcontents))
 	    && (tem = XBUFFER_LOCAL_VALUE (valcontents)->realvalue,
 		(BOOLFWDP (tem) || INTFWDP (tem) || OBJFWDP (tem))))
 	  /* Just reference the variable
 to cause it to become set for this buffer.  */
-	  Fsymbol_value (XCONS (XCONS (tail)->car)->car);
+	  Fsymbol_value (XCAR (XCAR (tail)));
 }
 }
 /* Switch to buffer B temporarily for redisplay purposes.
 This avoids certain things that don't need to be done within redisplay.  */
 register Lisp_Object aelt, link;
 aelt = Frassq (buffer, Vbuffer_alist);
 link = Fmemq (aelt, Vbuffer_alist);
 Vbuffer_alist = Fdelq (aelt, Vbuffer_alist);
-XCONS (link)->cdr = Qnil;
+XCDR (link) = Qnil;
 Vbuffer_alist = nconc2 (Vbuffer_alist, link);
 }
 frames_bury_buffer (buffer);
 update_mode_lines++;
 /* Any which are supposed to be permanent,
 make local again, with the same values they had.  */
-for (alist = oalist; !NILP (alist); alist = XCONS (alist)->cdr)
+for (alist = oalist; !NILP (alist); alist = XCDR (alist))
 {
-sym = XCONS (XCONS (alist)->car)->car;
+sym = XCAR (XCAR (alist));
 tem = Fget (sym, Qpermanent_local);
 if (! NILP (tem))
 	{
 	  Fmake_local_variable (sym);
-	  Fset (sym, XCONS (XCONS (alist)->car)->cdr);
+	  Fset (sym, XCDR (XCAR (alist)));
 	}
 }
 /* Force mode-line redisplay.  Useful here because all major mode
 commands call this function.  */
 Lisp_Object oalist, alist, sym, tem, buffer;
 XSETBUFFER (buffer, b);
 oalist = b->local_var_alist;
-for (alist = oalist; !NILP (alist); alist = XCONS (alist)->cdr)
+for (alist = oalist; !NILP (alist); alist = XCDR (alist))
 {
-sym = XCONS (XCONS (alist)->car)->car;
+sym = XCAR (XCAR (alist));
 /* Need not do anything if some other buffer's binding is now encached.  */
 tem = XBUFFER_LOCAL_VALUE (XSYMBOL (sym)->value)->buffer;
 if (XBUFFER (tem) == current_buffer)
 	{
 	  tem = XBUFFER_LOCAL_VALUE (XSYMBOL (sym)->value)->cdr;
 	  /* Store the symbol's current value into the alist entry
 	     it is currently set up for.  This is so that, if the
 	     local is marked permanent, and we make it local again
 	     later in Fkill_all_local_variables, we don't lose the value.  */
-	  XCONS (XCONS (tem)->car)->cdr
+	  XCDR (XCAR (tem))
 	    = do_symval_forwarding (XBUFFER_LOCAL_VALUE (XSYMBOL (sym)->value)->realvalue);
 	  /* Switch to the symbol's default-value alist entry.  */
-	  XCONS (tem)->car = tem;
+	  XCAR (tem) = tem;
 	  /* Mark it as current for buffer B.  */
 	  XBUFFER_LOCAL_VALUE (XSYMBOL (sym)->value)->buffer = buffer;
 	  /* Store the current value into any forwarding in the symbol.  */
 	  store_symval_forwarding (sym,
 				   XBUFFER_LOCAL_VALUE (XSYMBOL (sym)->value)->realvalue,
-				   XCONS (tem)->cdr);
+				   XCDR (tem));
 	}
 }
 }
 /* Find all the overlays in the current buffer that contain position POS.
 int prev = BEGV;
 int inhibit_storing = 0;
 for (tail = current_buffer->overlays_before;
 GC_CONSP (tail);
-tail = XCONS (tail)->cdr)
+tail = XCDR (tail))
 {
 int startpos, endpos;
-overlay = XCONS (tail)->car;
+overlay = XCAR (tail);
 start = OVERLAY_START (overlay);
 end = OVERLAY_END (overlay);
 endpos = OVERLAY_POSITION (end);
 if (endpos < pos)
 	next = startpos;
 }
 for (tail = current_buffer->overlays_after;
 GC_CONSP (tail);
-tail = XCONS (tail)->cdr)
+tail = XCDR (tail))
 {
 int startpos, endpos;
-overlay = XCONS (tail)->car;
+overlay = XCAR (tail);
 start = OVERLAY_START (overlay);
 end = OVERLAY_END (overlay);
 startpos = OVERLAY_POSITION (start);
 if (pos < startpos)
 int prev = BEGV;
 int inhibit_storing = 0;
 for (tail = current_buffer->overlays_before;
 GC_CONSP (tail);
-tail = XCONS (tail)->cdr)
+tail = XCDR (tail))
 {
 int startpos, endpos;
-overlay = XCONS (tail)->car;
+overlay = XCAR (tail);
 ostart = OVERLAY_START (overlay);
 oend = OVERLAY_END (overlay);
 endpos = OVERLAY_POSITION (oend);
 if (endpos < beg)
 	next = startpos;
 }
 for (tail = current_buffer->overlays_after;
 GC_CONSP (tail);
-tail = XCONS (tail)->cdr)
+tail = XCDR (tail))
 {
 int startpos, endpos;
-overlay = XCONS (tail)->car;
+overlay = XCAR (tail);
 ostart = OVERLAY_START (overlay);
 oend = OVERLAY_END (overlay);
 startpos = OVERLAY_POSITION (ostart);
 if (end < startpos)
 int pos;
 {
 Lisp_Object tail, overlay;
 for (tail = current_buffer->overlays_before; GC_CONSP (tail);
-tail = XCONS (tail)->cdr)
+tail = XCDR (tail))
 {
 int endpos;
-overlay = XCONS (tail)->car;
+overlay = XCAR (tail);
 if (!GC_OVERLAYP (overlay))
 	abort ();
 endpos = OVERLAY_POSITION (OVERLAY_END (overlay));
 if (endpos < pos)
 if (endpos == pos || OVERLAY_POSITION (OVERLAY_START (overlay)) == pos)
 	return 1;
 }
 for (tail = current_buffer->overlays_after; GC_CONSP (tail);
-tail = XCONS (tail)->cdr)
+tail = XCDR (tail))
 {
 int startpos;
-overlay = XCONS (tail)->car;
+overlay = XCAR (tail);
 if (!GC_OVERLAYP (overlay))
 	abort ();
 startpos = OVERLAY_POSITION (OVERLAY_START (overlay));
 if (pos < startpos)
 int startpos, endpos;
 int multibyte = ! NILP (current_buffer->enable_multibyte_characters);
 overlay_heads.used = overlay_heads.bytes = 0;
 overlay_tails.used = overlay_tails.bytes = 0;
-for (ov = current_buffer->overlays_before; CONSP (ov); ov = XCONS (ov)->cdr)
+for (ov = current_buffer->overlays_before; CONSP (ov); ov = XCDR (ov))
 {
-overlay = XCONS (ov)->car;
+overlay = XCAR (ov);
 if (!OVERLAYP (overlay))
 	abort ();
 startpos = OVERLAY_POSITION (OVERLAY_START (overlay));
 endpos = OVERLAY_POSITION (OVERLAY_END (overlay));
 	  && (str = Foverlay_get (overlay, Qafter_string), STRINGP (str)))
 	record_overlay_string (&overlay_tails, str, Qnil,
 			       Foverlay_get (overlay, Qpriority),
 			       endpos - startpos);
 }
-for (ov = current_buffer->overlays_after; CONSP (ov); ov = XCONS (ov)->cdr)
+for (ov = current_buffer->overlays_after; CONSP (ov); ov = XCDR (ov))
 {
-overlay = XCONS (ov)->car;
+overlay = XCAR (ov);
 if (!OVERLAYP (overlay))
 	abort ();
 startpos = OVERLAY_POSITION (OVERLAY_START (overlay));
 endpos = OVERLAY_POSITION (OVERLAY_END (overlay));
 prev = Qnil;
 for (tail = buf->overlays_before;
 CONSP (tail);
 prev = tail, tail = next)
 {
-next = XCONS (tail)->cdr;
+next = XCDR (tail);
-overlay = XCONS (tail)->car;
+overlay = XCAR (tail);
 /* If the overlay is not valid, get rid of it.  */
 if (!OVERLAY_VALID (overlay))
 #if 1
 	abort ();
 #else
 	{
 	  /* Splice the cons cell TAIL out of overlays_before.  */
 	  if (!NILP (prev))
-	    XCONS (prev)->cdr = next;
+	    XCDR (prev) = next;
 	  else
 	    buf->overlays_before = next;
 	  tail = prev;
 	  continue;
 	}
 	  int where = OVERLAY_POSITION (beg);
 	  Lisp_Object other, other_prev;
 	  /* Splice the cons cell TAIL out of overlays_before.  */
 	  if (!NILP (prev))
-	    XCONS (prev)->cdr = next;
+	    XCDR (prev) = next;
 	  else
 	    buf->overlays_before = next;
 	  /* Search thru overlays_after for where to put it.  */
 	  other_prev = Qnil;
 	  for (other = buf->overlays_after;
 	       CONSP (other);
-	       other_prev = other, other = XCONS (other)->cdr)
+	       other_prev = other, other = XCDR (other))
 	    {
 	      Lisp_Object otherbeg, otheroverlay;
-	      otheroverlay = XCONS (other)->car;
+	      otheroverlay = XCAR (other);
 	      if (! OVERLAY_VALID (otheroverlay))
 		abort ();
 	      otherbeg = OVERLAY_START (otheroverlay);
 	      if (OVERLAY_POSITION (otherbeg) >= where)
 		break;
 	    }
 	  /* Add TAIL to overlays_after before OTHER.  */
-	  XCONS (tail)->cdr = other;
+	  XCDR (tail) = other;
 	  if (!NILP (other_prev))
-	    XCONS (other_prev)->cdr = tail;
+	    XCDR (other_prev) = tail;
 	  else
 	    buf->overlays_after = tail;
 	  tail = prev;
 	}
 else
 prev = Qnil;
 for (tail = buf->overlays_after;
 CONSP (tail);
 prev = tail, tail = next)
 {
-next = XCONS (tail)->cdr;
+next = XCDR (tail);
-overlay = XCONS (tail)->car;
+overlay = XCAR (tail);
 /* If the overlay is not valid, get rid of it.  */
 if (!OVERLAY_VALID (overlay))
 #if 1
 	abort ();
 #else
 	{
 	  /* Splice the cons cell TAIL out of overlays_after.  */
 	  if (!NILP (prev))
-	    XCONS (prev)->cdr = next;
+	    XCDR (prev) = next;
 	  else
 	    buf->overlays_after = next;
 	  tail = prev;
 	  continue;
 	}
 	  int where = OVERLAY_POSITION (end);
 	  Lisp_Object other, other_prev;
 	  /* Splice the cons cell TAIL out of overlays_after.  */
 	  if (!NILP (prev))
-	    XCONS (prev)->cdr = next;
+	    XCDR (prev) = next;
 	  else
 	    buf->overlays_after = next;
 	  /* Search thru overlays_before for where to put it.  */
 	  other_prev = Qnil;
 	  for (other = buf->overlays_before;
 	       CONSP (other);
-	       other_prev = other, other = XCONS (other)->cdr)
+	       other_prev = other, other = XCDR (other))
 	    {
 	      Lisp_Object otherend, otheroverlay;
-	      otheroverlay = XCONS (other)->car;
+	      otheroverlay = XCAR (other);
 	      if (! OVERLAY_VALID (otheroverlay))
 		abort ();
 	      otherend = OVERLAY_END (otheroverlay);
 	      if (OVERLAY_POSITION (otherend) <= where)
 		break;
 	    }
 	  /* Add TAIL to overlays_before before OTHER.  */
-	  XCONS (tail)->cdr = other;
+	  XCDR (tail) = other;
 	  if (!NILP (other_prev))
-	    XCONS (other_prev)->cdr = tail;
+	    XCDR (other_prev) = tail;
 	  else
 	    buf->overlays_before = tail;
 	  tail = prev;
 	}
 }
 *pbefore (resp. *pafter) points to, is still uninitialized.
 So it's not a bug that before_list isn't initialized, although
 it may look strange.  */
 for (ptail = &current_buffer->overlays_before; CONSP (*ptail);)
 {
-overlay = XCONS (*ptail)->car;
+overlay = XCAR (*ptail);
 endpos = OVERLAY_POSITION (OVERLAY_END (overlay));
 if (endpos < start)
 	break;
 startpos = OVERLAY_POSITION (OVERLAY_START (overlay));
 if (endpos < end
 	  /* Add it to the end of the wrong list.  Later on,
 	     recenter_overlay_lists will move it to the right place.  */
 	  if (endpos < XINT (current_buffer->overlay_center))
 	    {
 	      *pafter = *ptail;
-	      pafter = &XCONS (*ptail)->cdr;
+	      pafter = &XCDR (*ptail);
 	    }
 	  else
 	    {
 	      *pbefore = *ptail;
-	      pbefore = &XCONS (*ptail)->cdr;
+	      pbefore = &XCDR (*ptail);
 	    }
-	  *ptail = XCONS (*ptail)->cdr;
+	  *ptail = XCDR (*ptail);
 	}
 else
-	ptail = &XCONS (*ptail)->cdr;
+	ptail = &XCDR (*ptail);
 }
 for (ptail = &current_buffer->overlays_after; CONSP (*ptail);)
 {
-overlay = XCONS (*ptail)->car;
+overlay = XCAR (*ptail);
 startpos = OVERLAY_POSITION (OVERLAY_START (overlay));
 if (startpos >= end)
 	break;
 endpos = OVERLAY_POSITION (OVERLAY_END (overlay));
 if (startpos >= start
 	      tem = startpos; startpos = endpos; endpos = tem;
 	    }
 	  if (endpos < XINT (current_buffer->overlay_center))
 	    {
 	      *pafter = *ptail;
-	      pafter = &XCONS (*ptail)->cdr;
+	      pafter = &XCDR (*ptail);
 	    }
 	  else
 	    {
 	      *pbefore = *ptail;
-	      pbefore = &XCONS (*ptail)->cdr;
+	      pbefore = &XCDR (*ptail);
 	    }
-	  *ptail = XCONS (*ptail)->cdr;
+	  *ptail = XCDR (*ptail);
 	}
 else
-	ptail = &XCONS (*ptail)->cdr;
+	ptail = &XCDR (*ptail);
 }
 /* Splice the constructed (wrong) lists into the buffer's lists,
 and let the recenter function make it sane again.  */
 *pbefore = current_buffer->overlays_before;
 /* At first, find a place where disordered overlays should be linked
 in.  It is where an overlay which end before POS exists. (i.e. an
 overlay whose ending marker is after-insertion-marker if disorder
 exists).  */
 while (!NILP (*tailp)
-	 && ((end = OVERLAY_POSITION (OVERLAY_END (XCONS (*tailp)->car)))
+	 && ((end = OVERLAY_POSITION (OVERLAY_END (XCAR (*tailp))))
 	     >= pos))
-tailp = &XCONS (*tailp)->cdr;
+tailp = &XCDR (*tailp);
 /* If we don't find such an overlay,
 or the found one ends before PREV,
 or the found one is the last one in the list,
 we don't have to fix anything.  */
 if (NILP (*tailp)
 || end < prev
-|| NILP (XCONS (*tailp)->cdr))
+|| NILP (XCDR (*tailp)))
 return;
 right_place = tailp;
-tailp = &XCONS (*tailp)->cdr;
+tailp = &XCDR (*tailp);
 /* Now, end position of overlays in the list *TAILP should be before
 or equal to PREV.  In the loop, an overlay which ends at POS is
 moved ahead to the place pointed by RIGHT_PLACE.  If we found an
 overlay which ends before PREV, the remaining overlays are in
 correct order.  */
 while (!NILP (*tailp))
 {
-end = OVERLAY_POSITION (OVERLAY_END (XCONS (*tailp)->car));
+end = OVERLAY_POSITION (OVERLAY_END (XCAR (*tailp)));
 if (end == pos)
 	{			/* This overlay is disordered. */
 	  Lisp_Object found = *tailp;
 	  /* Unlink the found overlay.  */
-	  *tailp = XCONS (found)->cdr;
+	  *tailp = XCDR (found);
 	  /* Move an overlay at RIGHT_PLACE to the next of the found one.  */
-	  XCONS (found)->cdr = *right_place;
+	  XCDR (found) = *right_place;
 	  /* Link it into the right place.  */
 	  *right_place = found;
 	}
 else if (end == prev)
-	tailp = &XCONS (*tailp)->cdr;
+	tailp = &XCDR (*tailp);
 else			/* No more disordered overlay. */
 	break;
 }
 }
 CHECK_OVERLAY (overlay, 0);
 fallback = Qnil;
 for (plist = XOVERLAY (overlay)->plist;
-CONSP (plist) && CONSP (XCONS (plist)->cdr);
+CONSP (plist) && CONSP (XCDR (plist));
-plist = XCONS (XCONS (plist)->cdr)->cdr)
+plist = XCDR (XCDR (plist)))
 {
-if (EQ (XCONS (plist)->car, prop))
+if (EQ (XCAR (plist), prop))
-	return XCONS (XCONS (plist)->cdr)->car;
+	return XCAR (XCDR (plist));
-else if (EQ (XCONS (plist)->car, Qcategory))
+else if (EQ (XCAR (plist), Qcategory))
 	{
 	  Lisp_Object tem;
 	  tem = Fcar (Fcdr (plist));
 	  if (SYMBOLP (tem))
 	    fallback = Fget (tem, prop);
 CHECK_OVERLAY (overlay, 0);
 buffer = Fmarker_buffer (OVERLAY_START (overlay));
 for (tail = XOVERLAY (overlay)->plist;
-CONSP (tail) && CONSP (XCONS (tail)->cdr);
+CONSP (tail) && CONSP (XCDR (tail));
-tail = XCONS (XCONS (tail)->cdr)->cdr)
+tail = XCDR (XCDR (tail)))
-if (EQ (XCONS (tail)->car, prop))
+if (EQ (XCAR (tail), prop))
 {
-	changed = !EQ (XCONS (XCONS (tail)->cdr)->car, value);
+	changed = !EQ (XCAR (XCDR (tail)), value);
-	XCONS (XCONS (tail)->cdr)->car = value;
+	XCAR (XCDR (tail)) = value;
 	goto found;
 }
 /* It wasn't in the list, so add it to the front.  */
 changed = !NILP (value);
 XOVERLAY (overlay)->plist
 Scan the overlays to find the functions to call.  */
 last_overlay_modification_hooks_used = 0;
 tail_copied = 0;
 for (tail = current_buffer->overlays_before;
 CONSP (tail);
-tail = XCONS (tail)->cdr)
+tail = XCDR (tail))
 {
 int startpos, endpos;
 Lisp_Object ostart, oend;
-overlay = XCONS (tail)->car;
+overlay = XCAR (tail);
 ostart = OVERLAY_START (overlay);
 oend = OVERLAY_END (overlay);
 endpos = OVERLAY_POSITION (oend);
 if (XFASTINT (start) > endpos)
 }
 tail_copied = 0;
 for (tail = current_buffer->overlays_after;
 CONSP (tail);
-tail = XCONS (tail)->cdr)
+tail = XCDR (tail))
 {
 int startpos, endpos;
 Lisp_Object ostart, oend;
-overlay = XCONS (tail)->car;
+overlay = XCAR (tail);
 ostart = OVERLAY_START (overlay);
 oend = OVERLAY_END (overlay);
 startpos = OVERLAY_POSITION (ostart);
 endpos = OVERLAY_POSITION (oend);
 Lisp_Object tail, overlay, hit_list;
 hit_list = Qnil;
 if (pos <= XFASTINT (current_buffer->overlay_center))
 for (tail = current_buffer->overlays_before; CONSP (tail);
-	 tail = XCONS (tail)->cdr)
+	 tail = XCDR (tail))
 {
 	int endpos;
-	overlay = XCONS (tail)->car;
+	overlay = XCAR (tail);
 	endpos = OVERLAY_POSITION (OVERLAY_END (overlay));
 	if (endpos < pos)
 	  break;
 	if (endpos == pos && OVERLAY_POSITION (OVERLAY_START (overlay)) == pos
 	    && ! NILP (Foverlay_get (overlay, Qevaporate)))
 	  hit_list = Fcons (overlay, hit_list);
 }
 else
 for (tail = current_buffer->overlays_after; CONSP (tail);
-	 tail = XCONS (tail)->cdr)
+	 tail = XCDR (tail))
 {
 	int startpos;
-	overlay = XCONS (tail)->car;
+	overlay = XCAR (tail);
 	startpos = OVERLAY_POSITION (OVERLAY_START (overlay));
 	if (startpos > pos)
 	  break;
 	if (startpos == pos && OVERLAY_POSITION (OVERLAY_END (overlay)) == pos
 	    && ! NILP (Foverlay_get (overlay, Qevaporate)))
 	  hit_list = Fcons (overlay, hit_list);
 }
-for (; CONSP (hit_list); hit_list = XCONS (hit_list)->cdr)
+for (; CONSP (hit_list); hit_list = XCDR (hit_list))
-Fdelete_overlay (XCONS (hit_list)->car);
+Fdelete_overlay (XCAR (hit_list));
 }
 /* Somebody has tried to store a value with an unacceptable type
 in the slot with offset OFFSET.  */

Mercurial > emacs

comparison src/buffer.c @ 26164:d39ec0a27081