aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChong Yidong2006-06-28 00:00:57 +0000
committerChong Yidong2006-06-28 00:00:57 +0000
commitdf8ffa055d3e9487df52405f749a1c721426ae52 (patch)
tree6c84a3fe2a938da08e174bfcc141202992f8c0aa /src
parent7fa6147188096c6569f8c31c644199c0ef1f0ec5 (diff)
downloademacs-df8ffa055d3e9487df52405f749a1c721426ae52.tar.gz
emacs-df8ffa055d3e9487df52405f749a1c721426ae52.zip
* editfns.c (Fdelete_field, Ffield_string, Ffield_beginning)
(Ffield_string_no_properties, Ffield_end): Mention args-out-of-range error condition in docstring.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog6
-rw-r--r--src/editfns.c25
2 files changed, 26 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index db45905d4f2..06c9b970833 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
12006-06-27 Chong Yidong <cyd@stupidchicken.com>
2
3 * editfns.c (Fdelete_field, Ffield_string, Ffield_beginning)
4 (Ffield_string_no_properties, Ffield_end): Mention
5 args-out-of-range error condition in docstring.
6
12006-06-27 Kim F. Storm <storm@cua.dk> 72006-06-27 Kim F. Storm <storm@cua.dk>
2 8
3 * xdisp.c (handle_composition_prop): Set stop_charpos before push_it. 9 * xdisp.c (handle_composition_prop): Set stop_charpos before push_it.
diff --git a/src/editfns.c b/src/editfns.c
index 85ce94c8f8a..cbaf1bb18ac 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -628,7 +628,10 @@ find_field (pos, merge_at_boundary, beg_limit, beg, end_limit, end)
628DEFUN ("delete-field", Fdelete_field, Sdelete_field, 0, 1, 0, 628DEFUN ("delete-field", Fdelete_field, Sdelete_field, 0, 1, 0,
629 doc: /* Delete the field surrounding POS. 629 doc: /* Delete the field surrounding POS.
630A field is a region of text with the same `field' property. 630A field is a region of text with the same `field' property.
631If POS is nil, the value of point is used for POS. */) 631If POS is nil, the value of point is used for POS.
632
633An `args-out-of-range' error is signaled if POS is outside the
634buffer's accessible portion. */)
632 (pos) 635 (pos)
633 Lisp_Object pos; 636 Lisp_Object pos;
634{ 637{
@@ -642,7 +645,10 @@ If POS is nil, the value of point is used for POS. */)
642DEFUN ("field-string", Ffield_string, Sfield_string, 0, 1, 0, 645DEFUN ("field-string", Ffield_string, Sfield_string, 0, 1, 0,
643 doc: /* Return the contents of the field surrounding POS as a string. 646 doc: /* Return the contents of the field surrounding POS as a string.
644A field is a region of text with the same `field' property. 647A field is a region of text with the same `field' property.
645If POS is nil, the value of point is used for POS. */) 648If POS is nil, the value of point is used for POS.
649
650An `args-out-of-range' error is signaled if POS is outside the
651buffer's accessible portion. */)
646 (pos) 652 (pos)
647 Lisp_Object pos; 653 Lisp_Object pos;
648{ 654{
@@ -654,7 +660,10 @@ If POS is nil, the value of point is used for POS. */)
654DEFUN ("field-string-no-properties", Ffield_string_no_properties, Sfield_string_no_properties, 0, 1, 0, 660DEFUN ("field-string-no-properties", Ffield_string_no_properties, Sfield_string_no_properties, 0, 1, 0,
655 doc: /* Return the contents of the field around POS, without text-properties. 661 doc: /* Return the contents of the field around POS, without text-properties.
656A field is a region of text with the same `field' property. 662A field is a region of text with the same `field' property.
657If POS is nil, the value of point is used for POS. */) 663If POS is nil, the value of point is used for POS.
664
665An `args-out-of-range' error is signaled if POS is outside the
666buffer's accessible portion. */)
658 (pos) 667 (pos)
659 Lisp_Object pos; 668 Lisp_Object pos;
660{ 669{
@@ -670,7 +679,10 @@ If POS is nil, the value of point is used for POS.
670If ESCAPE-FROM-EDGE is non-nil and POS is at the beginning of its 679If ESCAPE-FROM-EDGE is non-nil and POS is at the beginning of its
671field, then the beginning of the *previous* field is returned. 680field, then the beginning of the *previous* field is returned.
672If LIMIT is non-nil, it is a buffer position; if the beginning of the field 681If LIMIT is non-nil, it is a buffer position; if the beginning of the field
673is before LIMIT, then LIMIT will be returned instead. */) 682is before LIMIT, then LIMIT will be returned instead.
683
684An `args-out-of-range' error is signaled if POS is outside the
685buffer's accessible portion. */)
674 (pos, escape_from_edge, limit) 686 (pos, escape_from_edge, limit)
675 Lisp_Object pos, escape_from_edge, limit; 687 Lisp_Object pos, escape_from_edge, limit;
676{ 688{
@@ -686,7 +698,10 @@ If POS is nil, the value of point is used for POS.
686If ESCAPE-FROM-EDGE is non-nil and POS is at the end of its field, 698If ESCAPE-FROM-EDGE is non-nil and POS is at the end of its field,
687then the end of the *following* field is returned. 699then the end of the *following* field is returned.
688If LIMIT is non-nil, it is a buffer position; if the end of the field 700If LIMIT is non-nil, it is a buffer position; if the end of the field
689is after LIMIT, then LIMIT will be returned instead. */) 701is after LIMIT, then LIMIT will be returned instead.
702
703An `args-out-of-range' error is signaled if POS is outside the
704buffer's accessible portion. */)
690 (pos, escape_from_edge, limit) 705 (pos, escape_from_edge, limit)
691 Lisp_Object pos, escape_from_edge, limit; 706 Lisp_Object pos, escape_from_edge, limit;
692{ 707{