aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman2006-09-18 21:56:30 +0000
committerRichard M. Stallman2006-09-18 21:56:30 +0000
commita0c489f163dc4c90a2b5bb5477d57490e5741473 (patch)
tree2c1723d7cd7cec412209089dcedc28fb94706378
parentf573c8b0357cf6d8563db405ead5c5a9f37d492b (diff)
downloademacs-a0c489f163dc4c90a2b5bb5477d57490e5741473.tar.gz
emacs-a0c489f163dc4c90a2b5bb5477d57490e5741473.zip
(Fields): Clarify explanation of constrain-to-field.
-rw-r--r--lispref/ChangeLog4
-rw-r--r--lispref/text.texi23
2 files changed, 18 insertions, 9 deletions
diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index f517868bc80..740313c0393 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,7 @@
12006-09-18 Richard Stallman <rms@gnu.org>
2
3 * text.texi (Fields): Clarify explanation of constrain-to-field.
4
12006-09-16 Eli Zaretskii <eliz@gnu.org> 52006-09-16 Eli Zaretskii <eliz@gnu.org>
2 6
3 * variables.texi (Tips for Defining): Fix a typo. 7 * variables.texi (Tips for Defining): Fix a typo.
diff --git a/lispref/text.texi b/lispref/text.texi
index 4d2f278bee8..8d513b7f6bd 100644
--- a/lispref/text.texi
+++ b/lispref/text.texi
@@ -3783,20 +3783,25 @@ This function ``constrains'' @var{new-pos} to the field that
3783closest to @var{new-pos} that is in the same field as @var{old-pos}. 3783closest to @var{new-pos} that is in the same field as @var{old-pos}.
3784 3784
3785If @var{new-pos} is @code{nil}, then @code{constrain-to-field} uses 3785If @var{new-pos} is @code{nil}, then @code{constrain-to-field} uses
3786the value of point instead, and moves point to the resulting position. 3786the value of point instead, and moves point to the resulting position
3787as well as returning it.
3787 3788
3788If @var{old-pos} is at the boundary of two fields, then the acceptable 3789If @var{old-pos} is at the boundary of two fields, then the acceptable
3789positions for @var{new-pos} depend on the value of the optional argument 3790final positions depend on the argument @var{escape-from-edge}. If
3790@var{escape-from-edge}. If @var{escape-from-edge} is @code{nil}, then 3791@var{escape-from-edge} is @code{nil}, then @var{new-pos} must be in
3791@var{new-pos} is constrained to the field that has the same @code{field} 3792the field whose @code{field} property equals what new characters
3792property (either a text-property or an overlay property) that new 3793inserted at @var{old-pos} would inherit. (This depends on the
3793characters inserted at @var{old-pos} would get. (This depends on the
3794stickiness of the @code{field} property for the characters before and 3794stickiness of the @code{field} property for the characters before and
3795after @var{old-pos}.) If @var{escape-from-edge} is non-@code{nil}, 3795after @var{old-pos}.) If @var{escape-from-edge} is non-@code{nil},
3796@var{new-pos} is constrained to the union of the two adjacent fields. 3796@var{new-pos} can be anywhere in the two adjacent fields.
3797Additionally, if two fields are separated by another field with the 3797Additionally, if two fields are separated by another field with the
3798special value @code{boundary}, then any point within this special field 3798special value @code{boundary}, then any point within this special
3799is also considered to be ``on the boundary.'' 3799field is also considered to be ``on the boundary.''
3800
3801Commands like @kbd{C-a} with no argumemt, that normally move backward
3802to a specific kind of location and stay there once there, probably
3803should specify @code{nil} for @var{escape-from-edge}. Other motion
3804commands that check fields should probably pass @code{t}.
3800 3805
3801If the optional argument @var{only-in-line} is non-@code{nil}, and 3806If the optional argument @var{only-in-line} is non-@code{nil}, and
3802constraining @var{new-pos} in the usual way would move it to a different 3807constraining @var{new-pos} in the usual way would move it to a different