diff options
| author | Miles Bader <miles@gnu.org> | 2006-02-08 04:26:44 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2006-02-08 04:26:44 +0000 |
| commit | 380874900ca183ec2fdce91949d841328852d7a8 (patch) | |
| tree | 6918a4182f8657251e83223511aa7827fb8820ed /src/editfns.c | |
| parent | 72b464afc12a7532fc8555352db04c65647c15ae (diff) | |
| parent | c96ec15a58817ac97db5348187e2d8695f609cb5 (diff) | |
| download | emacs-380874900ca183ec2fdce91949d841328852d7a8.tar.gz | |
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-13
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 43-57)
- Update from CVS
- Merge from erc--emacs--0
- Make constrain-to-field notice overlays
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 18-21)
- Update from CVS
- Merge from emacs--devo--0
Diffstat (limited to 'src/editfns.c')
| -rw-r--r-- | src/editfns.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/editfns.c b/src/editfns.c index 073ee4bff80..7c2c2a8edd0 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -1,7 +1,7 @@ /* Lisp functions pertaining to editing. Copyright (C) 1985, 1986, 1987, 1989, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - 2005 Free Software Foundation, Inc. + 2005, 2006 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -717,7 +717,8 @@ Field boundaries are not noticed if `inhibit-field-text-motion' is non-nil. */) { /* If non-zero, then the original point, before re-positioning. */ int orig_point = 0; - int fwd, prev_old, prev_new; + int fwd; + Lisp_Object prev_old, prev_new; if (NILP (new_pos)) /* Use the current point, and afterwards, set it. */ @@ -736,24 +737,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. */ { |