comparison src/keyboard.c @ 50941:5490960951c1

(adjust_point_for_property): Try harder to move point to the non-sticky end of an invisible property.

50940:ee3ba06bba1a

/* Keyboard and mouse input; editor command loop.
   Copyright (C) 1985,86,87,88,89,93,94,95,96,97,99, 2000, 01, 02
     Free Software Foundation, Inc.

This file is part of GNU Emacs.

GNU Emacs is free software; you can redistribute it and/or modify

     int modified;
{
  int beg, end;
  Lisp_Object val, overlay, tmp;
  int check_composition = 1, check_display = 1, check_invisible = 1;

  while (check_composition || check_display || check_invisible)
    {
      if (check_composition
	  && PT > BEGV && PT < ZV
	  && get_property_and_range (PT, Qcomposition, &val, &beg, &end, Qnil)

	    }

	  /* Move away from the inside area.  */
	  if (beg < PT && end > PT)
	    {
	      SET_PT (PT < last_pt ? beg : end);
	      check_composition = check_display = 1;
	    }
	  xassert (PT == beg || PT == end);
	  /* Pretend the area doesn't exist if the buffer is not
	     modified.  */

50941:5490960951c1

/* Keyboard and mouse input; editor command loop.
   Copyright (C) 1985,86,87,88,89,93,94,95,96,97,99,2000,01,02,03
     Free Software Foundation, Inc.

This file is part of GNU Emacs.

GNU Emacs is free software; you can redistribute it and/or modify

     int modified;
{
  int beg, end;
  Lisp_Object val, overlay, tmp;
  int check_composition = 1, check_display = 1, check_invisible = 1;
  int orig_pt = PT;

  /* FIXME: cycling is probably not necessary because these properties
     can't be usefully combined anyway.  */
  while (check_composition || check_display || check_invisible)
    {
      if (check_composition
	  && PT > BEGV && PT < ZV
	  && get_property_and_range (PT, Qcomposition, &val, &beg, &end, Qnil)

	    }

	  /* Move away from the inside area.  */
	  if (beg < PT && end > PT)
	    {
	      SET_PT ((orig_pt == PT && (last_pt < beg || last_pt > end))
		      /* We haven't moved yet (so we don't need to fear
			 infinite-looping) and we were outside the range
			 before (so either end of the range still corresponds
			 to a move in the right direction): pretend we moved
			 less than we actually did, so that we still have
			 more freedom below in choosing which end of the range
			 to go to.  */
		      ? (PT < last_pt ? end : beg)
		      /* We either have moved already or the last point
			 was already in the range: we don't get to choose
			 which end of the range we have to go to.  */
		      : (PT < last_pt ? beg : end));
	      check_composition = check_display = 1;
	    }
	  xassert (PT == beg || PT == end);
	  /* Pretend the area doesn't exist if the buffer is not
	     modified.  */