aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiles Bader2001-11-25 12:38:45 +0000
committerMiles Bader2001-11-25 12:38:45 +0000
commit9c7fce05050dd86673f656ef177413fc7855a12b (patch)
treea710ac6ec23196f409c5f5770ed7628f4d36992c
parent97d012e8a6f14471a2a5e63106d89c9a6085e4dc (diff)
downloademacs-9c7fce05050dd86673f656ef177413fc7855a12b.tar.gz
emacs-9c7fce05050dd86673f656ef177413fc7855a12b.zip
(Fields): Describe new `limit' arg in field-beginning/field-end.
-rw-r--r--lispref/ChangeLog5
-rw-r--r--lispref/text.texi12
2 files changed, 15 insertions, 2 deletions
diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index d0ab7b221bc..606e30d23a5 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,8 @@
12001-11-25 Miles Bader <miles@gnu.org>
2
3 * text.texi (Fields): Describe new `limit' arg in
4 field-beginning/field-end.
5
12001-11-17 Eli Zaretskii <eliz@is.elta.co.il> 62001-11-17 Eli Zaretskii <eliz@is.elta.co.il>
2 7
3 * permute-index: Don't depend on csh-specific features. Replace 8 * permute-index: Don't depend on csh-specific features. Replace
diff --git a/lispref/text.texi b/lispref/text.texi
index 1c417f29481..5f5b33f8177 100644
--- a/lispref/text.texi
+++ b/lispref/text.texi
@@ -3185,7 +3185,7 @@ to an empty field whose beginning and end are both at @var{pos}.
3185 In all of these functions, if @var{pos} is omitted or @code{nil}, the 3185 In all of these functions, if @var{pos} is omitted or @code{nil}, the
3186value of point is used by default. 3186value of point is used by default.
3187 3187
3188@defun field-beginning &optional pos escape-from-edge 3188@defun field-beginning &optional pos escape-from-edge limit
3189@tindex field-beginning 3189@tindex field-beginning
3190This function returns the beginning of the field specified by @var{pos}. 3190This function returns the beginning of the field specified by @var{pos}.
3191 3191
@@ -3194,9 +3194,13 @@ If @var{pos} is at the beginning of its field, and
3194always the beginning of the preceding field that @emph{ends} at @var{pos}, 3194always the beginning of the preceding field that @emph{ends} at @var{pos},
3195regardless of the stickiness of the @code{field} properties around 3195regardless of the stickiness of the @code{field} properties around
3196@var{pos}. 3196@var{pos}.
3197
3198If @var{limit} is non-@code{nil}, it is a buffer position; if the
3199beginning of the field is before @var{limit}, then @var{limit} will be
3200returned instead.
3197@end defun 3201@end defun
3198 3202
3199@defun field-end &optional pos escape-from-edge 3203@defun field-end &optional pos escape-from-edge limit
3200@tindex field-end 3204@tindex field-end
3201This function returns the end of the field specified by @var{pos}. 3205This function returns the end of the field specified by @var{pos}.
3202 3206
@@ -3204,6 +3208,10 @@ If @var{pos} is at the end of its field, and @var{escape-from-edge} is
3204non-@code{nil}, then the return value is always the end of the following 3208non-@code{nil}, then the return value is always the end of the following
3205field that @emph{begins} at @var{pos}, regardless of the stickiness of 3209field that @emph{begins} at @var{pos}, regardless of the stickiness of
3206the @code{field} properties around @var{pos}. 3210the @code{field} properties around @var{pos}.
3211
3212If @var{limit} is non-@code{nil}, it is a buffer position; if the end
3213of the field is after @var{limit}, then @var{limit} will be returned
3214instead.
3207@end defun 3215@end defun
3208 3216
3209@defun field-string &optional pos 3217@defun field-string &optional pos