Mercurial > emacs
diff src/editfns.c @ 68669:82590f3df577
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-51
Make constrain-to-field notice overlays
2006-02-08 Miles Bader <miles@gnu.org>
* src/editfns.c (Fconstrain_to_field): Use Fget_char_property instead
of Fget_text_property (other field functions word with overlays as
well as text-properties).
author | Miles Bader <miles@gnu.org> |
---|---|
date | Tue, 07 Feb 2006 09:08:53 +0000 |
parents | 3bd95f4f2941 |
children | 55e66496ae1a c5406394f567 |
line wrap: on
line diff
--- a/src/editfns.c Tue Feb 07 08:01:08 2006 +0000 +++ b/src/editfns.c Tue Feb 07 09:08:53 2006 +0000 @@ -739,24 +739,24 @@ if (NILP (Vinhibit_field_text_motion) && !EQ (new_pos, old_pos) - && (!NILP (Fget_text_property (new_pos, Qfield, Qnil)) - || !NILP (Fget_text_property (old_pos, Qfield, Qnil)) + && (!NILP (Fget_char_property (new_pos, Qfield, Qnil)) + || !NILP (Fget_char_property (old_pos, Qfield, Qnil)) /* To recognize field boundaries, we must also look at the previous positions; we could use `get_pos_property' instead, but in itself that would fail inside non-sticky fields (like comint prompts). */ || (XFASTINT (new_pos) > BEGV - && !NILP (Fget_text_property (prev_new, Qfield, Qnil))) + && !NILP (Fget_char_property (prev_new, Qfield, Qnil))) || (XFASTINT (old_pos) > BEGV - && !NILP (Fget_text_property (prev_old, Qfield, Qnil)))) + && !NILP (Fget_char_property (prev_old, Qfield, Qnil)))) && (NILP (inhibit_capture_property) /* Field boundaries are again a problem; but now we must decide the case exactly, so we need to call `get_pos_property' as well. */ || (NILP (get_pos_property (old_pos, inhibit_capture_property, Qnil)) && (XFASTINT (old_pos) <= BEGV - || NILP (Fget_text_property (old_pos, inhibit_capture_property, Qnil)) - || NILP (Fget_text_property (prev_old, inhibit_capture_property, Qnil)))))) + || NILP (Fget_char_property (old_pos, inhibit_capture_property, Qnil)) + || NILP (Fget_char_property (prev_old, inhibit_capture_property, Qnil)))))) /* It is possible that NEW_POS is not within the same field as OLD_POS; try to move NEW_POS so that it is. */ {