[Emacs-diffs] /srv/bzr/emacs/trunk r107571: * src/editfns.c (Fconstrain_to_field): Doc fix.

[Chong Yidong]

------------------------------------------------------------
revno: 107571
fixes bug(s): http://debbugs.gnu.org/9452
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Mon 2012-03-12 00:27:36 +0800
message:
  * src/editfns.c (Fconstrain_to_field): Doc fix.
  
  * doc/lispref/text.texi (Fields): Minor copyedit.
modified:
  doc/lispref/ChangeLog
  doc/lispref/text.texi
  src/ChangeLog
  src/editfns.c

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2012-03-11 16:10:07 +0000
+++ b/doc/lispref/ChangeLog     2012-03-11 16:27:36 +0000
@@ -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  <address@hidden>
 
        * strings.texi (String Basics):

=== modified file 'doc/lispref/text.texi'
--- a/doc/lispref/text.texi     2012-03-08 05:27:03 +0000
+++ b/doc/lispref/text.texi     2012-03-11 16:27:36 +0000
@@ -3777,7 +3777,7 @@
 
 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

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-03-10 07:46:07 +0000
+++ b/src/ChangeLog     2012-03-11 16:27:36 +0000
@@ -1,3 +1,7 @@
+2012-03-11  Chong Yidong  <address@hidden>
+
+       * editfns.c (Fconstrain_to_field): Doc fix (Bug#9452).
+
 2012-03-10  Chong Yidong  <address@hidden>
 
        * frame.c (other_visible_frames): Don't assume the selected frame

=== modified file 'src/editfns.c'
--- a/src/editfns.c     2012-01-19 07:21:25 +0000
+++ b/src/editfns.c     2012-03-11 16:27:36 +0000
@@ -663,10 +663,11 @@
 
 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