comparison src/xdisp.c @ 25598:709e9cdaaab1

(handle_single_display_prop): Change conditional display property to `:when FORM . VALUE'.

25597:16a9c3c6f90e

  Lisp_Object value;
  int space_or_image_found_p = 0;

  Lisp_Object form;

  /* If PROP is a list of the form `(:when FORM VALUE)', FORM is
     evaluated.  If the result is nil, VALUE is ignored.  */
  form = Qt;
  if (CONSP (prop) && EQ (XCAR (prop), QCwhen))
    {
      prop = XCDR (prop);
      if (!CONSP (prop))
	return 0;
      form = XCAR (prop);
      prop = XCDR (prop);
      if (!CONSP (prop))
	return 0;
      prop = XCAR (prop);
    }

  if (!NILP (form) && !EQ (form, Qt))
    {
      struct gcpro gcpro1;

25598:709e9cdaaab1

  Lisp_Object value;
  int space_or_image_found_p = 0;

  Lisp_Object form;

  /* If PROP is a list of the form `(:when FORM . VALUE)', FORM is
     evaluated.  If the result is nil, VALUE is ignored. */
  form = Qt;
  if (CONSP (prop) && EQ (XCAR (prop), QCwhen))
    {
      prop = XCDR (prop);
      if (!CONSP (prop))
	return 0;
      form = XCAR (prop);
      prop = XCDR (prop);
    }

  if (!NILP (form) && !EQ (form, Qt))
    {
      struct gcpro gcpro1;