aboutsummaryrefslogtreecommitdiffstats
path: root/src/editfns.c
diff options
context:
space:
mode:
authorMiles Bader2006-07-06 08:59:39 +0000
committerMiles Bader2006-07-06 08:59:39 +0000
commit6a46b0188332c8007c23014bd0ba97441be6abe8 (patch)
treee6bad7efe8102d87934fbae8f1b34341cd4e4957 /src/editfns.c
parent5ed089581a49f8f0eba2d911203ff5db57eac322 (diff)
parent978db1472a9d4bbaafbc93b9176f7c409ac209bd (diff)
downloademacs-6a46b0188332c8007c23014bd0ba97441be6abe8.tar.gz
emacs-6a46b0188332c8007c23014bd0ba97441be6abe8.zip
Merge from emacs--devo--0
Patches applied: * emacs--devo--0 (patch 320-342) - Update from CVS - Merge from gnus--rel--5.10 - lisp/play/cookie1.el (cookie): Work properly when there's only one entry - Add note about "link" button-class to etc/TODO * gnus--rel--5.10 (patch 108-112) - Merge from emacs--devo--0 - Clean up merge mistakes - Update from CVS - Update from CVS: texi/gnus.texi (Summary Buffer Lines): Fix typo. Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-86
Diffstat (limited to 'src/editfns.c')
-rw-r--r--src/editfns.c25
1 files changed, 20 insertions, 5 deletions
diff --git a/src/editfns.c b/src/editfns.c
index 4578af6973c..d758e82bbb0 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -626,7 +626,10 @@ find_field (pos, merge_at_boundary, beg_limit, beg, end_limit, end)
626DEFUN ("delete-field", Fdelete_field, Sdelete_field, 0, 1, 0, 626DEFUN ("delete-field", Fdelete_field, Sdelete_field, 0, 1, 0,
627 doc: /* Delete the field surrounding POS. 627 doc: /* Delete the field surrounding POS.
628A field is a region of text with the same `field' property. 628A field is a region of text with the same `field' property.
629If POS is nil, the value of point is used for POS. */) 629If POS is nil, the value of point is used for POS.
630
631An `args-out-of-range' error is signaled if POS is outside the
632buffer's accessible portion. */)
630 (pos) 633 (pos)
631 Lisp_Object pos; 634 Lisp_Object pos;
632{ 635{
@@ -640,7 +643,10 @@ If POS is nil, the value of point is used for POS. */)
640DEFUN ("field-string", Ffield_string, Sfield_string, 0, 1, 0, 643DEFUN ("field-string", Ffield_string, Sfield_string, 0, 1, 0,
641 doc: /* Return the contents of the field surrounding POS as a string. 644 doc: /* Return the contents of the field surrounding POS as a string.
642A field is a region of text with the same `field' property. 645A field is a region of text with the same `field' property.
643If POS is nil, the value of point is used for POS. */) 646If POS is nil, the value of point is used for POS.
647
648An `args-out-of-range' error is signaled if POS is outside the
649buffer's accessible portion. */)
644 (pos) 650 (pos)
645 Lisp_Object pos; 651 Lisp_Object pos;
646{ 652{
@@ -652,7 +658,10 @@ If POS is nil, the value of point is used for POS. */)
652DEFUN ("field-string-no-properties", Ffield_string_no_properties, Sfield_string_no_properties, 0, 1, 0, 658DEFUN ("field-string-no-properties", Ffield_string_no_properties, Sfield_string_no_properties, 0, 1, 0,
653 doc: /* Return the contents of the field around POS, without text-properties. 659 doc: /* Return the contents of the field around POS, without text-properties.
654A field is a region of text with the same `field' property. 660A field is a region of text with the same `field' property.
655If POS is nil, the value of point is used for POS. */) 661If POS is nil, the value of point is used for POS.
662
663An `args-out-of-range' error is signaled if POS is outside the
664buffer's accessible portion. */)
656 (pos) 665 (pos)
657 Lisp_Object pos; 666 Lisp_Object pos;
658{ 667{
@@ -668,7 +677,10 @@ If POS is nil, the value of point is used for POS.
668If ESCAPE-FROM-EDGE is non-nil and POS is at the beginning of its 677If ESCAPE-FROM-EDGE is non-nil and POS is at the beginning of its
669field, then the beginning of the *previous* field is returned. 678field, then the beginning of the *previous* field is returned.
670If LIMIT is non-nil, it is a buffer position; if the beginning of the field 679If LIMIT is non-nil, it is a buffer position; if the beginning of the field
671is before LIMIT, then LIMIT will be returned instead. */) 680is before LIMIT, then LIMIT will be returned instead.
681
682An `args-out-of-range' error is signaled if POS is outside the
683buffer's accessible portion. */)
672 (pos, escape_from_edge, limit) 684 (pos, escape_from_edge, limit)
673 Lisp_Object pos, escape_from_edge, limit; 685 Lisp_Object pos, escape_from_edge, limit;
674{ 686{
@@ -684,7 +696,10 @@ If POS is nil, the value of point is used for POS.
684If ESCAPE-FROM-EDGE is non-nil and POS is at the end of its field, 696If ESCAPE-FROM-EDGE is non-nil and POS is at the end of its field,
685then the end of the *following* field is returned. 697then the end of the *following* field is returned.
686If LIMIT is non-nil, it is a buffer position; if the end of the field 698If LIMIT is non-nil, it is a buffer position; if the end of the field
687is after LIMIT, then LIMIT will be returned instead. */) 699is after LIMIT, then LIMIT will be returned instead.
700
701An `args-out-of-range' error is signaled if POS is outside the
702buffer's accessible portion. */)
688 (pos, escape_from_edge, limit) 703 (pos, escape_from_edge, limit)
689 Lisp_Object pos, escape_from_edge, limit; 704 Lisp_Object pos, escape_from_edge, limit;
690{ 705{