comparison src/xdisp.c @ 83533:02e39decdc84

Merged from [e-mail] Patches applied: * [e-mail]/emacs--devo--0--patch-351 Update from CVS * [e-mail]/emacs--devo--0--patch-352 Update from CVS * [e-mail]/emacs--devo--0--patch-353 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-354 Update from CVS * [e-mail]/emacs--devo--0--patch-355 Update from CVS * [e-mail]/emacs--devo--0--patch-356 Update from CVS * [e-mail]/emacs--devo--0--patch-357 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-358 Update from CVS * [e-mail]/emacs--devo--0--patch-359 Update from CVS * [e-mail]/emacs--devo--0--patch-360 Update from CVS * [e-mail]/emacs--devo--0--patch-361 Update from CVS * [e-mail]/emacs--devo--0--patch-362 Update from CVS * [e-mail]/emacs--devo--0--patch-363 Update from CVS * [e-mail]/emacs--devo--0--patch-364 Update from CVS * [e-mail]/emacs--devo--0--patch-365 Update from CVS * [e-mail]/emacs--devo--0--patch-366 Update from CVS * [e-mail]/emacs--devo--0--patch-367 Merge from gnus--rel--5.10 * [e-mail]/emacs--devo--0--patch-368 Update from CVS * [e-mail]/emacs--devo--0--patch-369 Update from CVS * [e-mail]/emacs--devo--0--patch-370 Update from CVS * [e-mail]/gnus--rel--5.10--patch-115 Update from CVS * [e-mail]/gnus--rel--5.10--patch-116 Update from CVS * [e-mail]/gnus--rel--5.10--patch-117 Update from CVS * [e-mail]/gnus--rel--5.10--patch-118 Merge from emacs--devo--0 * [e-mail]/gnus--rel--5.10--patch-119 Update from CVS * [e-mail]/gnus--rel--5.10--patch-120 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-573

83532:b19aaf4ab0ee

     struct text_pos *position;
     int display_replaced_before_p;
{
  Lisp_Object form;
  Lisp_Object location, value;
  struct text_pos start_pos;
  int valid_p;

  /* If SPEC is a list of the form `(when FORM . VALUE)', evaluate FORM.
     If the result is non-nil, use VALUE instead of SPEC.  */
  form = Qt;

	}

      /* Save current settings of IT so that we can restore them
	 when we are finished with the glyph property value.  */

      push_it (it);

      it->area = TEXT_AREA;
      it->what = IT_IMAGE;
      it->image_id = -1; /* no image */
      it->position = start_pos;

  if (valid_p && !display_replaced_before_p)
    {
      /* Save current settings of IT so that we can restore them
	 when we are finished with the glyph property value.  */
      push_it (it);
      if (NILP (location))
	it->area = TEXT_AREA;
      else if (EQ (location, Qleft_margin))
	it->area = LEFT_MARGIN_AREA;
      else

      it->cmp_len = p->u.comp.cmp_len;
      break;
    case GET_FROM_STRETCH:
      it->object = p->u.comp.object;
      break;
    }
  it->end_charpos = p->end_charpos;
  it->string_nchars = p->string_nchars;
  it->area = p->area;
  it->multibyte_p = p->multibyte_p;

  /* POS must be a reasonable value.  */
  xassert (CHARPOS (pos) >= BEGV && CHARPOS (pos) <= ZV);

  it->current.pos = it->position = pos;
  XSETBUFFER (it->object, current_buffer);
  it->end_charpos = ZV;
  it->dpvec = NULL;
  it->current.dpvec_index = -1;
  it->current.overlay_string_index = -1;
  IT_STRING_CHARPOS (*it) = -1;

      pop_it (it);
      if (it->method == GET_FROM_STRING)
	{
	  IT_STRING_BYTEPOS (*it) += it->len;
	  IT_STRING_CHARPOS (*it) += it->cmp_len;
	  it->object = it->string;
	  goto consider_string_end;
	}
      else if (it->method == GET_FROM_BUFFER)
	{
	  IT_BYTEPOS (*it) += it->len;
	  IT_CHARPOS (*it) += it->cmp_len;
	  it->object = it->w->buffer;
	}
      break;

    case GET_FROM_C_STRING:
      /* Current display element of IT is from a C string.  */

	  it->c = SREF (it->string, IT_STRING_BYTEPOS (*it));
	  it->len = 1;
	}
    }

  /* Record what we have and where it came from.  Note that we store a
     buffer position in IT->position although it could arguably be a
     string position.  */
  it->what = IT_CHARACTER;
  it->object = it->string;
  it->position = position;
  return 1;
}

	    }

	  if (reached)
	    break;
	}
      else
	skip = move_it_in_display_line_to (it, to_charpos, -1, MOVE_TO_POS);

      switch (skip)
	{

  /* Temporarily make frame's keyboard the current kboard so that
     kboard-local variables in the mode_line_format will get the right
     values.  */
  push_kboard (FRAME_KBOARD (it.f));
  display_mode_element (&it, 0, 0, 0, format, Qnil, 0);
  pop_kboard ();

  unbind_to (count, Qnil);

83533:02e39decdc84

     struct text_pos *position;
     int display_replaced_before_p;
{
  Lisp_Object form;
  Lisp_Object location, value;
  struct text_pos start_pos, save_pos;
  int valid_p;

  /* If SPEC is a list of the form `(when FORM . VALUE)', evaluate FORM.
     If the result is non-nil, use VALUE instead of SPEC.  */
  form = Qt;

	}

      /* Save current settings of IT so that we can restore them
	 when we are finished with the glyph property value.  */

      save_pos = it->position;
      it->position = *position;
      push_it (it);
      it->position = save_pos;

      it->area = TEXT_AREA;
      it->what = IT_IMAGE;
      it->image_id = -1; /* no image */
      it->position = start_pos;

  if (valid_p && !display_replaced_before_p)
    {
      /* Save current settings of IT so that we can restore them
	 when we are finished with the glyph property value.  */
      save_pos = it->position;
      it->position = *position;
      push_it (it);
      it->position = save_pos;

      if (NILP (location))
	it->area = TEXT_AREA;
      else if (EQ (location, Qleft_margin))
	it->area = LEFT_MARGIN_AREA;
      else

      it->cmp_len = p->u.comp.cmp_len;
      break;
    case GET_FROM_STRETCH:
      it->object = p->u.comp.object;
      break;
    case GET_FROM_BUFFER:
      it->object = it->w->buffer;
      break;
    case GET_FROM_STRING:
      it->object = it->string;
      break;
    }
  it->end_charpos = p->end_charpos;
  it->string_nchars = p->string_nchars;
  it->area = p->area;
  it->multibyte_p = p->multibyte_p;

  /* POS must be a reasonable value.  */
  xassert (CHARPOS (pos) >= BEGV && CHARPOS (pos) <= ZV);

  it->current.pos = it->position = pos;
  it->end_charpos = ZV;
  it->dpvec = NULL;
  it->current.dpvec_index = -1;
  it->current.overlay_string_index = -1;
  IT_STRING_CHARPOS (*it) = -1;

      pop_it (it);
      if (it->method == GET_FROM_STRING)
	{
	  IT_STRING_BYTEPOS (*it) += it->len;
	  IT_STRING_CHARPOS (*it) += it->cmp_len;
	  goto consider_string_end;
	}
      else if (it->method == GET_FROM_BUFFER)
	{
	  IT_BYTEPOS (*it) += it->len;
	  IT_CHARPOS (*it) += it->cmp_len;
	}
      break;

    case GET_FROM_C_STRING:
      /* Current display element of IT is from a C string.  */

	  it->c = SREF (it->string, IT_STRING_BYTEPOS (*it));
	  it->len = 1;
	}
    }

  /* Record what we have and where it came from.  */
  it->what = IT_CHARACTER;
  it->object = it->string;
  it->position = position;
  return 1;
}

	    }

	  if (reached)
	    break;
	}
      else if (BUFFERP (it->object)
	       && it->method == GET_FROM_BUFFER
	       && IT_CHARPOS (*it) >= to_charpos)
	skip = MOVE_POS_MATCH_OR_ZV;
      else
	skip = move_it_in_display_line_to (it, to_charpos, -1, MOVE_TO_POS);

      switch (skip)
	{

  /* Temporarily make frame's keyboard the current kboard so that
     kboard-local variables in the mode_line_format will get the right
     values.  */
  push_kboard (FRAME_KBOARD (it.f));
  record_unwind_save_match_data ();
  display_mode_element (&it, 0, 0, 0, format, Qnil, 0);
  pop_kboard ();

  unbind_to (count, Qnil);