comparison src/w32term.c @ 25646:9154af188477

Use XCAR and XCDR instead of explicit member references.

25645:a14111a2a100

{
  Lisp_Object tail, frame;

  for (tail = Vframe_list;
       XGCTYPE (tail) == Lisp_Cons;
       tail = XCONS (tail)->cdr)
    {
      Lisp_Object frame, bar, condemned;

      frame = XCONS (tail)->car;
      /* All elements of Vframe_list should be frames.  */
      if (! GC_FRAMEP (frame))
	abort ();

      /* Scan this frame's scroll bar list for a scroll bar with the

			bufp++;
			count++;
			numchars--;
		      }
		    else if (! NILP(Vframe_list)
			     && ! NILP (XCONS (Vframe_list)->cdr))
		      /* Force a redisplay sooner or later to update the
			 frame titles in case this is the second frame.  */
		      record_asynch_buffer_change ();
		  }
		else

  dpyinfo->next = NULL;
  
  /* Put it on w32_display_name_list as well, to keep them parallel.  */ 
  w32_display_name_list = Fcons (Fcons (display_name, Qnil),
				   w32_display_name_list);
  dpyinfo->name_list_element = XCONS (w32_display_name_list)->car;
  
  dpyinfo->w32_id_name
    = (char *) xmalloc (XSTRING (Vinvocation_name)->size
			+ XSTRING (Vsystem_name)->size
			+ 2);

     struct w32_display_info *dpyinfo;
{
  /* Discard this display from w32_display_name_list and w32_display_list.
     We can't use Fdelq because that can quit.  */
  if (! NILP (w32_display_name_list)
      && EQ (XCONS (w32_display_name_list)->car, dpyinfo->name_list_element))
    w32_display_name_list = XCONS (w32_display_name_list)->cdr;
  else
    {
      Lisp_Object tail;

      tail = w32_display_name_list;
      while (CONSP (tail) && CONSP (XCONS (tail)->cdr))
	{
	  if (EQ (XCONS (XCONS (tail)->cdr)->car,
		  dpyinfo->name_list_element))
	    {
	      XCONS (tail)->cdr = XCONS (XCONS (tail)->cdr)->cdr;
	      break;
	    }
	  tail = XCONS (tail)->cdr;
	}
    }

  /* free palette table */
  {

25646:9154af188477

{
  Lisp_Object tail, frame;

  for (tail = Vframe_list;
       XGCTYPE (tail) == Lisp_Cons;
       tail = XCDR (tail))
    {
      Lisp_Object frame, bar, condemned;

      frame = XCAR (tail);
      /* All elements of Vframe_list should be frames.  */
      if (! GC_FRAMEP (frame))
	abort ();

      /* Scan this frame's scroll bar list for a scroll bar with the

			bufp++;
			count++;
			numchars--;
		      }
		    else if (! NILP(Vframe_list)
			     && ! NILP (XCDR (Vframe_list)))
		      /* Force a redisplay sooner or later to update the
			 frame titles in case this is the second frame.  */
		      record_asynch_buffer_change ();
		  }
		else

  dpyinfo->next = NULL;
  
  /* Put it on w32_display_name_list as well, to keep them parallel.  */ 
  w32_display_name_list = Fcons (Fcons (display_name, Qnil),
				   w32_display_name_list);
  dpyinfo->name_list_element = XCAR (w32_display_name_list);
  
  dpyinfo->w32_id_name
    = (char *) xmalloc (XSTRING (Vinvocation_name)->size
			+ XSTRING (Vsystem_name)->size
			+ 2);

     struct w32_display_info *dpyinfo;
{
  /* Discard this display from w32_display_name_list and w32_display_list.
     We can't use Fdelq because that can quit.  */
  if (! NILP (w32_display_name_list)
      && EQ (XCAR (w32_display_name_list), dpyinfo->name_list_element))
    w32_display_name_list = XCDR (w32_display_name_list);
  else
    {
      Lisp_Object tail;

      tail = w32_display_name_list;
      while (CONSP (tail) && CONSP (XCDR (tail)))
	{
	  if (EQ (XCAR (XCDR (tail)),
		  dpyinfo->name_list_element))
	    {
	      XCDR (tail) = XCDR (XCDR (tail));
	      break;
	    }
	  tail = XCDR (tail);
	}
    }

  /* free palette table */
  {