Use XCAR, XCDR, XFLOAT_DATA instead of explicit member access.

1 files changed, 14 insertions, 14 deletions

diff --git a/src/callint.c b/src/callint.c
index f033d32b417..644f9bc55c0 100644
--- a/src/callint.c
+++ b/src/callint.c
@@ -314,17 +314,17 @@ Otherwise, this is done only if an arg is read using the minibuffer.")
 	     instead of the present values.  */
 	  if (CONSP (input))
 	    {
-	      car = XCONS (input)->car;
+	      car = XCAR (input);
 	      /* Skip through certain special forms.  */
 	      while (EQ (car, Qlet) || EQ (car, Qletx)
 		     || EQ (car, Qsave_excursion))
 		{
-		  while (CONSP (XCONS (input)->cdr))
-		    input = XCONS (input)->cdr;
-		  input = XCONS (input)->car;
+		  while (CONSP (XCDR (input)))
+		    input = XCDR (input);
+		  input = XCAR (input);
 		  if (!CONSP (input))
 		    break;
-		  car = XCONS (input)->car;
+		  car = XCAR (input);
 		}
 	      if (EQ (car, Qlist))
 		{
@@ -353,7 +353,7 @@ Otherwise, this is done only if an arg is read using the minibuffer.")
 	    {
 	      teml = Fnthcdr (Vhistory_length, Vcommand_history);
 	      if (CONSP (teml))
-		XCONS (teml)->cdr = Qnil;
+		XCDR (teml) = Qnil;
 	    }
 	}
       single_kboard_state ();
@@ -388,9 +388,9 @@ Otherwise, this is done only if an arg is read using the minibuffer.")
 
 	  event = XVECTOR (keys)->contents[next_event];
 	  if (EVENT_HAS_PARAMETERS (event)
-	      && (event = XCONS (event)->cdr, CONSP (event))
-	      && (event = XCONS (event)->car, CONSP (event))
-	      && (event = XCONS (event)->car, WINDOWP (event)))
+	      && (event = XCDR (event), CONSP (event))
+	      && (event = XCAR (event), CONSP (event))
+	      && (event = XCAR (event), WINDOWP (event)))
 	    {
 	      if (MINI_WINDOW_P (XWINDOW (event))
 		  && ! (minibuf_level > 0 && EQ (event, minibuf_window)))
@@ -554,7 +554,7 @@ Otherwise, this is done only if an arg is read using the minibuffer.")
 	       discard the following up-event.  */
 	    teml = Faref (args[i], make_number (XINT (Flength (args[i])) - 1));
 	    if (CONSP (teml))
-	      teml = XCONS (teml)->car;
+	      teml = XCAR (teml);
 	    if (SYMBOLP (teml))
 	      {
 		Lisp_Object tem2;
@@ -582,7 +582,7 @@ Otherwise, this is done only if an arg is read using the minibuffer.")
 	       discard the following up-event.  */
 	    teml = Faref (args[i], make_number (XINT (Flength (args[i])) - 1));
 	    if (CONSP (teml))
-	      teml = XCONS (teml)->car;
+	      teml = XCAR (teml);
 	    if (SYMBOLP (teml))
 	      {
 		Lisp_Object tem2;
@@ -771,7 +771,7 @@ Otherwise, this is done only if an arg is read using the minibuffer.")
 	{
 	  teml = Fnthcdr (Vhistory_length, Vcommand_history);
 	  if (CONSP (teml))
-	    XCONS (teml)->cdr = Qnil;
+	    XCDR (teml) = Qnil;
 	}
     }
 
@@ -807,8 +807,8 @@ Its numeric meaning is what you would get from `(interactive \"p\")'.")
     XSETFASTINT (val, 1);
   else if (EQ (raw, Qminus))
     XSETINT (val, -1);
-  else if (CONSP (raw) && INTEGERP (XCONS (raw)->car))
-    XSETINT (val, XINT (XCONS (raw)->car));
+  else if (CONSP (raw) && INTEGERP (XCAR (raw)))
+    XSETINT (val, XINT (XCAR (raw)));
   else if (INTEGERP (raw))
     val = raw;
   else