aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/editfns.c7
2 files changed, 8 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index f77134be49c..8d925c7bbad 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12012-03-11 Chong Yidong <cyd@gnu.org>
2
3 * editfns.c (Fconstrain_to_field): Doc fix (Bug#9452).
4
12012-03-10 Chong Yidong <cyd@gnu.org> 52012-03-10 Chong Yidong <cyd@gnu.org>
2 6
3 * frame.c (other_visible_frames): Don't assume the selected frame 7 * frame.c (other_visible_frames): Don't assume the selected frame
diff --git a/src/editfns.c b/src/editfns.c
index bbeb5033664..a41565d8588 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -663,10 +663,11 @@ is after LIMIT, then LIMIT will be returned instead. */)
663 663
664DEFUN ("constrain-to-field", Fconstrain_to_field, Sconstrain_to_field, 2, 5, 0, 664DEFUN ("constrain-to-field", Fconstrain_to_field, Sconstrain_to_field, 2, 5, 0,
665 doc: /* Return the position closest to NEW-POS that is in the same field as OLD-POS. 665 doc: /* Return the position closest to NEW-POS that is in the same field as OLD-POS.
666
667A field is a region of text with the same `field' property. 666A field is a region of text with the same `field' property.
668If NEW-POS is nil, then the current point is used instead, and set to the 667
669constrained position if that is different. 668If NEW-POS is nil, then use the current point instead, and move point
669to the resulting constrained position, in addition to returning that
670position.
670 671
671If OLD-POS is at the boundary of two fields, then the allowable 672If OLD-POS is at the boundary of two fields, then the allowable
672positions for NEW-POS depends on the value of the optional argument 673positions for NEW-POS depends on the value of the optional argument