* src/editfns.c (Fconstrain_to_field): Doc fix.

* doc/lispref/text.texi (Fields): Minor copyedit.

Fixes: debbugs:9452

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 4b4521c4323fd9c984dd4f383550189acfd21567..3584c89d5fe5b6edf02c5d47e98e94e75cab3550 100644 (file)
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -6,6 +6,8 @@
        * display.texi (Temporary Displays): with-output-to-temp-buffer is
        now a macro.
 
+       * text.texi (Fields): Minor copyedit.
+
 2012-03-10  Eli Zaretskii  <eliz@gnu.org>
 
        * strings.texi (String Basics):

diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi
index c60150cc061d0d421b2b930a77549136b5445e12..1ba0cae43b640960c560aeebd42f5245a86fe900 100644 (file)
--- a/doc/lispref/text.texi
+++ b/doc/lispref/text.texi
@@ -3777,7 +3777,7 @@ closest to @var{new-pos} that is in the same field as @var{old-pos}.
 
 If @var{new-pos} is @code{nil}, then @code{constrain-to-field} uses
 the value of point instead, and moves point to the resulting position
-as well as returning it.
+in addition to returning that position.
 
 If @var{old-pos} is at the boundary of two fields, then the acceptable
 final positions depend on the argument @var{escape-from-edge}.  If

diff --git a/src/ChangeLog b/src/ChangeLog
index f77134be49c1dfb3288be6106506e282a7228cb8..8d925c7bbadd0c03a5f781908c61ab559506aeb9 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2012-03-11  Chong Yidong  <cyd@gnu.org>
+
+       * editfns.c (Fconstrain_to_field): Doc fix (Bug#9452).
+
 2012-03-10  Chong Yidong  <cyd@gnu.org>
 
        * frame.c (other_visible_frames): Don't assume the selected frame

diff --git a/src/editfns.c b/src/editfns.c
index bbeb50336645dae7cff3efb893f04a7d3f539cbb..a41565d858832d0ff558a01fa3813dcde3b76284 100644 (file)
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -663,10 +663,11 @@ is after LIMIT, then LIMIT will be returned instead.  */)
 
 DEFUN ("constrain-to-field", Fconstrain_to_field, Sconstrain_to_field, 2, 5, 0,
        doc: /* Return the position closest to NEW-POS that is in the same field as OLD-POS.
-
 A field is a region of text with the same `field' property.
-If NEW-POS is nil, then the current point is used instead, and set to the
-constrained position if that is different.
+
+If NEW-POS is nil, then use the current point instead, and move point
+to the resulting constrained position, in addition to returning that
+position.
 
 If OLD-POS is at the boundary of two fields, then the allowable
 positions for NEW-POS depends on the value of the optional argument