Mercurial > emacs
changeset 68392:a0208539b9a3
(Fconstrain_to_field): Use get_pos_property, not Fget_char_property,
to fix handling of field boundaries. Fix bogus comment.
(Fline_beginning_position, Fline_end_position): Clarify confusing doc
string.
| author | Károly Lőrentey <lorentey@elte.hu> |
|---|---|
| date | Thu, 26 Jan 2006 03:12:45 +0000 |
| parents | 64fbda7a8666 |
| children | b5ff41ef0331 |
| files | src/ChangeLog src/editfns.c |
| diffstat | 2 files changed, 23 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Thu Jan 26 03:05:15 2006 +0000 +++ b/src/ChangeLog Thu Jan 26 03:12:45 2006 +0000 @@ -1,3 +1,13 @@ +2006-01-26 L$,1 q(Brentey K,Aa(Broly <lorentey@elte.hu> + + * editfns.c (Fconstrain_to_field): Use get_pos_property, not + Fget_char_property. Fix bogus comment. + (Fline_beginning_position, Fline_end_position): Clarify + confusing doc string. + + * cmds.c (Fbeginning_of_line, Fend_of_line): Clarify confusing doc + string. + 2006-01-26 Kenichi Handa <handa@m17n.org> * callproc.c (Fcall_process): GCPRO error_file. Encode infile,
--- a/src/editfns.c Thu Jan 26 03:05:15 2006 +0000 +++ b/src/editfns.c Thu Jan 26 03:12:45 2006 +0000 @@ -727,12 +727,12 @@ if (NILP (Vinhibit_field_text_motion) && !EQ (new_pos, old_pos) - && (!NILP (Fget_char_property (new_pos, Qfield, Qnil)) - || !NILP (Fget_char_property (old_pos, Qfield, Qnil))) + && (!NILP (get_pos_property (new_pos, Qfield, Qnil)) + || !NILP (get_pos_property (old_pos, Qfield, Qnil))) && (NILP (inhibit_capture_property) - || NILP (Fget_char_property(old_pos, inhibit_capture_property, Qnil)))) - /* NEW_POS is not within the same field as OLD_POS; try to - move NEW_POS so that it is. */ + || NILP (get_pos_property (old_pos, 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. */ { int fwd, shortage; Lisp_Object field_bound; @@ -782,9 +782,10 @@ With argument N not nil or 1, move forward N - 1 lines first. If scan reaches end of buffer, return that position. -The scan does not cross a field boundary unless doing so would move -beyond there to a different line; if N is nil or 1, and scan starts at a -field boundary, the scan stops as soon as it starts. To ignore field +This function constrains the returned position to the current field +unless that would be on a different line than the original, +unconstrained result. If N is nil or 1, and a front-sticky field +starts at point, the scan stops as soon as it starts. To ignore field boundaries bind `inhibit-field-text-motion' to t. This function does not move point. */) @@ -816,9 +817,10 @@ With argument N not nil or 1, move forward N - 1 lines first. If scan reaches end of buffer, return that position. -The scan does not cross a field boundary unless doing so would move -beyond there to a different line; if N is nil or 1, and scan starts at a -field boundary, the scan stops as soon as it starts. To ignore field +This function constrains the returned position to the current field +unless that would be on a different line than the original, +unconstrained result. If N is nil or 1, and a rear-sticky field ends +at point, the scan stops as soon as it starts. To ignore field boundaries bind `inhibit-field-text-motion' to t. This function does not move point. */)