comparison src/intervals.c @ 20557:b1edf278ca98

(set_point_both): Renamed from set_point; New arg BYTE; BUFFER is now first arg; use temp_set_point_both. (set_point): New function; uses set_point_both. (temp_set_point_both): New function. (temp_set_point): Update BUF_PT_BYTE. (get_local_map): Save and restore both forms of the buffer bounds.

20556:8f6f64cc1f08

	  pleft = NULL_INTERVAL_P (prev) ? Qnil : prev->plist;
	  pright = NULL_INTERVAL_P (i) ? Qnil : i->plist;
	  newi.plist = merge_properties_sticky (pleft, pright);

	  if(! prev) /* i.e. position == BEG */
	    {
	      if (! intervals_equal (i, &newi))
		{
		  i = split_interval_left (i, length);
		  i->plist = newi.plist;

    return Fplist_get (Vdefault_text_properties, prop);
  return Qnil;
}


/* Set point in BUFFER to POSITION.  If the target position is 
   before an intangible character, move to an ok place.  */

void
set_point (position, buffer)
     register int position;
     register struct buffer *buffer;
{
  register INTERVAL to, from, toprev, fromprev, target;
  int buffer_point;
  register Lisp_Object obj;
  int old_position = BUF_PT (buffer);
  int backwards = (position < old_position ? 1 : 0);
  int have_overlays;
  int original_position;

  buffer->point_before_scroll = Qnil;

  if (position == BUF_PT (buffer))
    return;

  /* Check this now, before checking if the buffer has any intervals.
     That way, we can catch conditions which break this sanity check
     whether or not there are intervals in the buffer.  */
  if (position > BUF_ZV (buffer) || position < BUF_BEGV (buffer))
    abort ();

  have_overlays = (! NILP (buffer->overlays_before)
		   || ! NILP (buffer->overlays_after));

  /* If we have no text properties and overlays,
     then we can do it quickly.  */
  if (NULL_INTERVAL_P (BUF_INTERVALS (buffer)) && ! have_overlays)
    {
      BUF_PT (buffer) = position;
      return;
    }

  /* Set TO to the interval containing the char after POSITION,
     and TOPREV to the interval containing the char before POSITION.
     Either one may be null.  They may be equal.  */
  to = find_interval (BUF_INTERVALS (buffer), position);
  if (position == BUF_BEGV (buffer))
    toprev = 0;
  else if (to && to->position == position)
    toprev = previous_interval (to);
  else
    toprev = to;

  buffer_point = (BUF_PT (buffer) == BUF_ZV (buffer)

  /* Moving within an interval.  */
  if (to == from && toprev == fromprev && INTERVAL_VISIBLE_P (to)
      && ! have_overlays)
    {
      BUF_PT (buffer) = position;
      return;
    }

  original_position = position;

  /* If the new position is between two intangible characters
     with the same intangible property value,
     move forward or backward until a change in that property.  */
  if (NILP (Vinhibit_point_motion_hooks)
      && ((! NULL_INTERVAL_P (to) && ! NULL_INTERVAL_P (toprev))
	  || have_overlays)
      /* Intangibility never stops us from positioning at the beginning
	 or end of the buffer, so don't bother checking in that case.  */
      && position != BEGV && position != ZV)
    {
      Lisp_Object intangible_propval;
      Lisp_Object pos;

      XSETINT (pos, position);

      if (backwards)
	{
	  intangible_propval = Fget_char_property (make_number (position),
						   Qintangible, Qnil);

	  /* If following char is intangible,
	     skip back over all chars with matching intangible property.  */
	  if (! NILP (intangible_propval))

			  intangible_propval))
	      pos = Fprevious_char_property_change (pos, Qnil);
	}
      else
	{
	  intangible_propval = Fget_char_property (make_number (position - 1),
						   Qintangible, Qnil);

	  /* If following char is intangible,
	     skip back over all chars with matching intangible property.  */
	  if (! NILP (intangible_propval))

			  intangible_propval))
	      pos = Fnext_char_property_change (pos, Qnil);

	}

      position = XINT (pos);
    }

  if (position != original_position)
    {
      /* Set TO to the interval containing the char after POSITION,
	 and TOPREV to the interval containing the char before POSITION.
	 Either one may be null.  They may be equal.  */
      to = find_interval (BUF_INTERVALS (buffer), position);
      if (position == BUF_BEGV (buffer))
	toprev = 0;
      else if (to && to->position == position)
	toprev = previous_interval (to);
      else
	toprev = to;
    }

  /* Here TO is the interval after the stopping point
     and TOPREV is the interval before the stopping point.
     One or the other may be null.  */

  BUF_PT (buffer) = position;

  /* We run point-left and point-entered hooks here, iff the
     two intervals are not equivalent.  These hooks take
     (old_point, new_point) as arguments.  */
  if (NILP (Vinhibit_point_motion_hooks)

      else
	enter_before = Qnil;

      if (! EQ (leave_before, enter_before) && !NILP (leave_before))
	call2 (leave_before, make_number (old_position),
	       make_number (position));
      if (! EQ (leave_after, enter_after) && !NILP (leave_after))
	call2 (leave_after, make_number (old_position),
	       make_number (position));

      if (! EQ (enter_before, leave_before) && !NILP (enter_before))
	call2 (enter_before, make_number (old_position),
	       make_number (position));
      if (! EQ (enter_after, leave_after) && !NILP (enter_after))
	call2 (enter_after, make_number (old_position),
	       make_number (position));
    }
}

/* Set point temporarily, without checking any text properties.  */

INLINE void
temp_set_point (position, buffer)
     int position;
     struct buffer *buffer;
{
  BUF_PT (buffer) = position;
}

/* Move point to POSITION, unless POSITION is inside an intangible
   segment that reaches all the way to point.  */

get_local_map (position, buffer)
     register int position;
     register struct buffer *buffer;
{
  Lisp_Object prop, tem, lispy_position, lispy_buffer;
  int old_begv, old_zv;

  /* Perhaps we should just change `position' to the limit.  */
  if (position > BUF_Z (buffer) || position < BUF_BEG (buffer))
    abort ();

  /* Ignore narrowing, so that a local map continues to be valid even if
     the visible region contains no characters and hence no properties.  */
  old_begv = BUF_BEGV (buffer);
  old_zv = BUF_ZV (buffer);
  BUF_BEGV (buffer) = BUF_BEG (buffer);
  BUF_ZV (buffer) = BUF_Z (buffer);

  /* There are no properties at the end of the buffer, so in that case
     check for a local map on the last character of the buffer instead.  */
  if (position == BUF_Z (buffer) && BUF_Z (buffer) > BUF_BEG (buffer))
    --position;

  XSETBUFFER (lispy_buffer, buffer);
  prop = Fget_char_property (lispy_position, Qlocal_map, lispy_buffer);

  BUF_BEGV (buffer) = old_begv;
  BUF_ZV (buffer) = old_zv;

  /* Use the local map only if it is valid.  */
  /* Do allow symbols that are defined as keymaps.  */
  if (SYMBOLP (prop) && !NILP (prop))
    prop = Findirect_function (prop);

20557:b1edf278ca98

	  pleft = NULL_INTERVAL_P (prev) ? Qnil : prev->plist;
	  pright = NULL_INTERVAL_P (i) ? Qnil : i->plist;
	  newi.plist = merge_properties_sticky (pleft, pright);

	  if (! prev) /* i.e. position == BEG */
	    {
	      if (! intervals_equal (i, &newi))
		{
		  i = split_interval_left (i, length);
		  i->plist = newi.plist;

    return Fplist_get (Vdefault_text_properties, prop);
  return Qnil;
}


/* Set point "temporarily", without checking any text properties.  */

INLINE void
temp_set_point (buffer, charpos)
     struct buffer *buffer;
     int charpos;
{
  temp_set_point_both (buffer, charpos,
		       buf_charpos_to_bytepos (buffer, charpos));
}

/* Set point in BUFFER "temporarily" to CHARPOS, which corresponds to
   byte position BYTEPOS.  */

INLINE void
temp_set_point_both (buffer, charpos, bytepos)
     int charpos;
     struct buffer *buffer;
{
  /* In a single-byte buffer, the two positions must be equal.  */
  if (BUF_ZV (buffer) == BUF_ZV_BYTE (buffer)
      && charpos != bytepos)
    abort ();

  if (charpos > bytepos)
    abort ();

  if (charpos > BUF_ZV (buffer) || charpos < BUF_BEGV (buffer))
    abort ();

  BUF_PT_BYTE (buffer) = bytepos;
  BUF_PT (buffer) = charpos;
}

/* Set point in BUFFER to CHARPOS.  If the target position is 
   before an intangible character, move to an ok place.  */

void
set_point (buffer, charpos)
     register struct buffer *buffer;
     register int charpos;
{
  set_point_both (buffer, charpos, buf_charpos_to_bytepos (buffer, charpos));
}

/* Set point in BUFFER to CHARPOS, which corresponds to byte
   position BYTEPOS.  If the target position is 
   before an intangible character, move to an ok place.  */

void
set_point_both (buffer, charpos, bytepos)
     register struct buffer *buffer;
     register int charpos;
{
  register INTERVAL to, from, toprev, fromprev, target;
  int buffer_point;
  register Lisp_Object obj;
  int old_position = BUF_PT (buffer);
  int backwards = (charpos < old_position ? 1 : 0);
  int have_overlays;
  int original_position;

  buffer->point_before_scroll = Qnil;

  if (charpos == BUF_PT (buffer))
    return;

  /* In a single-byte buffer, the two positions must be equal.  */
  if (BUF_ZV (buffer) == BUF_ZV_BYTE (buffer)
      && charpos != bytepos)
    abort ();

  /* Check this now, before checking if the buffer has any intervals.
     That way, we can catch conditions which break this sanity check
     whether or not there are intervals in the buffer.  */
  if (charpos > BUF_ZV (buffer) || charpos < BUF_BEGV (buffer))
    abort ();

  have_overlays = (! NILP (buffer->overlays_before)
		   || ! NILP (buffer->overlays_after));

  /* If we have no text properties and overlays,
     then we can do it quickly.  */
  if (NULL_INTERVAL_P (BUF_INTERVALS (buffer)) && ! have_overlays)
    {
      temp_set_point_both (buffer, charpos, bytepos);
      return;
    }

  /* Set TO to the interval containing the char after CHARPOS,
     and TOPREV to the interval containing the char before CHARPOS.
     Either one may be null.  They may be equal.  */
  to = find_interval (BUF_INTERVALS (buffer), charpos);
  if (charpos == BUF_BEGV (buffer))
    toprev = 0;
  else if (to && to->position == charpos)
    toprev = previous_interval (to);
  else
    toprev = to;

  buffer_point = (BUF_PT (buffer) == BUF_ZV (buffer)

  /* Moving within an interval.  */
  if (to == from && toprev == fromprev && INTERVAL_VISIBLE_P (to)
      && ! have_overlays)
    {
      temp_set_point_both (buffer, charpos, bytepos);
      return;
    }

  original_position = charpos;

  /* If the new position is between two intangible characters
     with the same intangible property value,
     move forward or backward until a change in that property.  */
  if (NILP (Vinhibit_point_motion_hooks)
      && ((! NULL_INTERVAL_P (to) && ! NULL_INTERVAL_P (toprev))
	  || have_overlays)
      /* Intangibility never stops us from positioning at the beginning
	 or end of the buffer, so don't bother checking in that case.  */
      && charpos != BEGV && charpos != ZV)
    {
      Lisp_Object intangible_propval;
      Lisp_Object pos;

      XSETINT (pos, charpos);

      if (backwards)
	{
	  intangible_propval = Fget_char_property (make_number (charpos),
						   Qintangible, Qnil);

	  /* If following char is intangible,
	     skip back over all chars with matching intangible property.  */
	  if (! NILP (intangible_propval))

			  intangible_propval))
	      pos = Fprevious_char_property_change (pos, Qnil);
	}
      else
	{
	  intangible_propval = Fget_char_property (make_number (charpos - 1),
						   Qintangible, Qnil);

	  /* If following char is intangible,
	     skip back over all chars with matching intangible property.  */
	  if (! NILP (intangible_propval))

			  intangible_propval))
	      pos = Fnext_char_property_change (pos, Qnil);

	}

      charpos = XINT (pos);
      bytepos = buf_charpos_to_bytepos (buffer, charpos);
    }

  if (charpos != original_position)
    {
      /* Set TO to the interval containing the char after CHARPOS,
	 and TOPREV to the interval containing the char before CHARPOS.
	 Either one may be null.  They may be equal.  */
      to = find_interval (BUF_INTERVALS (buffer), charpos);
      if (charpos == BUF_BEGV (buffer))
	toprev = 0;
      else if (to && to->position == charpos)
	toprev = previous_interval (to);
      else
	toprev = to;
    }

  /* Here TO is the interval after the stopping point
     and TOPREV is the interval before the stopping point.
     One or the other may be null.  */

  temp_set_point_both (buffer, charpos, bytepos);

  /* We run point-left and point-entered hooks here, iff the
     two intervals are not equivalent.  These hooks take
     (old_point, new_point) as arguments.  */
  if (NILP (Vinhibit_point_motion_hooks)

      else
	enter_before = Qnil;

      if (! EQ (leave_before, enter_before) && !NILP (leave_before))
	call2 (leave_before, make_number (old_position),
	       make_number (charpos));
      if (! EQ (leave_after, enter_after) && !NILP (leave_after))
	call2 (leave_after, make_number (old_position),
	       make_number (charpos));

      if (! EQ (enter_before, leave_before) && !NILP (enter_before))
	call2 (enter_before, make_number (old_position),
	       make_number (charpos));
      if (! EQ (enter_after, leave_after) && !NILP (enter_after))
	call2 (enter_after, make_number (old_position),
	       make_number (charpos));
    }
}

/* Move point to POSITION, unless POSITION is inside an intangible
   segment that reaches all the way to point.  */

get_local_map (position, buffer)
     register int position;
     register struct buffer *buffer;
{
  Lisp_Object prop, tem, lispy_position, lispy_buffer;
  int old_begv, old_zv, old_begv_byte, old_zv_byte;

  /* Perhaps we should just change `position' to the limit.  */
  if (position > BUF_Z (buffer) || position < BUF_BEG (buffer))
    abort ();

  /* Ignore narrowing, so that a local map continues to be valid even if
     the visible region contains no characters and hence no properties.  */
  old_begv = BUF_BEGV (buffer);
  old_zv = BUF_ZV (buffer);
  old_begv_byte = BUF_BEGV_BYTE (buffer);
  old_zv_byte = BUF_ZV_BYTE (buffer);
  BUF_BEGV (buffer) = BUF_BEG (buffer);
  BUF_ZV (buffer) = BUF_Z (buffer);
  BUF_BEGV_BYTE (buffer) = BUF_BEG_BYTE (buffer);
  BUF_ZV_BYTE (buffer) = BUF_Z_BYTE (buffer);

  /* There are no properties at the end of the buffer, so in that case
     check for a local map on the last character of the buffer instead.  */
  if (position == BUF_Z (buffer) && BUF_Z (buffer) > BUF_BEG (buffer))
    --position;

  XSETBUFFER (lispy_buffer, buffer);
  prop = Fget_char_property (lispy_position, Qlocal_map, lispy_buffer);

  BUF_BEGV (buffer) = old_begv;
  BUF_ZV (buffer) = old_zv;
  BUF_BEGV_BYTE (buffer) = old_begv_byte;
  BUF_ZV_BYTE (buffer) = old_zv_byte;

  /* Use the local map only if it is valid.  */
  /* Do allow symbols that are defined as keymaps.  */
  if (SYMBOLP (prop) && !NILP (prop))
    prop = Findirect_function (prop);