Commit 42ab8e36 authored by Miles Bader's avatar Miles Bader

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).
parent 6a80c3ba
2006-02-08 Miles Bader <miles@gnu.org>
* 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).
2006-02-07 Kenichi Handa <handa@m17n.org>
* dispextern.h (unibyte_display_via_language_environment): Extern
......
......@@ -739,24 +739,24 @@ Field boundaries are not noticed if `inhibit-field-text-motion' is non-nil. */)
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. */
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment