diff options
| author | Chong Yidong | 2012-03-12 00:27:36 +0800 |
|---|---|---|
| committer | Chong Yidong | 2012-03-12 00:27:36 +0800 |
| commit | 66c5eebd416975af2bb1b2e0557dac967cc51f16 (patch) | |
| tree | e0ae5aacad63152a99f952c08e73a252609f3492 /src | |
| parent | d3760c4b0ad02dd26225f6886611940ab281bd27 (diff) | |
| download | emacs-66c5eebd416975af2bb1b2e0557dac967cc51f16.tar.gz emacs-66c5eebd416975af2bb1b2e0557dac967cc51f16.zip | |
* src/editfns.c (Fconstrain_to_field): Doc fix.
* doc/lispref/text.texi (Fields): Minor copyedit.
Fixes: debbugs:9452
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/editfns.c | 7 |
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 @@ | |||
| 1 | 2012-03-11 Chong Yidong <cyd@gnu.org> | ||
| 2 | |||
| 3 | * editfns.c (Fconstrain_to_field): Doc fix (Bug#9452). | ||
| 4 | |||
| 1 | 2012-03-10 Chong Yidong <cyd@gnu.org> | 5 | 2012-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 | ||
| 664 | DEFUN ("constrain-to-field", Fconstrain_to_field, Sconstrain_to_field, 2, 5, 0, | 664 | DEFUN ("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 | |||
| 667 | A field is a region of text with the same `field' property. | 666 | A field is a region of text with the same `field' property. |
| 668 | If NEW-POS is nil, then the current point is used instead, and set to the | 667 | |
| 669 | constrained position if that is different. | 668 | If NEW-POS is nil, then use the current point instead, and move point |
| 669 | to the resulting constrained position, in addition to returning that | ||
| 670 | position. | ||
| 670 | 671 | ||
| 671 | If OLD-POS is at the boundary of two fields, then the allowable | 672 | If OLD-POS is at the boundary of two fields, then the allowable |
| 672 | positions for NEW-POS depends on the value of the optional argument | 673 | positions for NEW-POS depends on the value of the optional argument |