From: Lars Hansen <larsh@soem.dk>
Date: Sun, 23 Apr 2006 08:14:52 +0000 (+0000)
Subject: (find_field): Fix comment.
X-Git-Tag: emacs-pretest-22.0.90~2983
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=59062dce6704f1eca7888d2f46d6e056be3da5cc;p=emacs.git

(find_field): Fix comment.
(Ffield_beginning): Fix bug when POS is at field beginning.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 9f883ce6a95..83fb4e6af6a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2006-04-23  Lars Hansen <larsh@soem.dk>
+	* editfns.c (find_field): Fix comment.
+	(Ffield_beginning): Fix bug when POS is at field beginning.
+
 2006-04-22  Eli Zaretskii  <eliz@gnu.org>
 
 	* puresize.h (BASE_PURESIZE): Increase to 1205000.
diff --git a/src/editfns.c b/src/editfns.c
index 450a7684584..7466639012d 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -491,24 +491,21 @@ get_pos_property (position, prop, object)
 }
 
 /* Find the field surrounding POS in *BEG and *END.  If POS is nil,
-   the value of point is used instead.  If BEG or END null,
+   the value of point is used instead.  If BEG or END is null,
    means don't store the beginning or end of the field.
 
    BEG_LIMIT and END_LIMIT serve to limit the ranged of the returned
    results; they do not effect boundary behavior.
 
-   If MERGE_AT_BOUNDARY is nonzero, then if POS is at the very first
-   position of a field, then the beginning of the previous field is
-   returned instead of the beginning of POS's field (since the end of a
-   field is actually also the beginning of the next input field, this
-   behavior is sometimes useful).  Additionally in the MERGE_AT_BOUNDARY
+   If MERGE_AT_BOUNDARY is nonzero, then if POS is at the very last
+   position of a field, then the end of the next field is returned
+   instead of the end of POS's field (since the end of a field is
+   actually also the beginning of the next input field, this behavior
+   is sometimes useful).  Additionally in the MERGE_AT_BOUNDARY
    true case, if two fields are separated by a field with the special
    value `boundary', and POS lies within it, then the two separated
    fields are considered to be adjacent, and POS between them, when
-   finding the beginning and ending of the "merged" field.
-
-   Either BEG or END may be 0, in which case the corresponding value
-   is not stored.  */
+   finding the beginning and ending of the "merged" field.  */
 
 static void
 find_field (pos, merge_at_boundary, beg_limit, beg, end_limit, end)
@@ -674,9 +671,14 @@ is before LIMIT, then LIMIT will be returned instead.  */)
      (pos, escape_from_edge, limit)
      Lisp_Object pos, escape_from_edge, limit;
 {
-  int beg;
-  find_field (pos, escape_from_edge, limit, &beg, Qnil, 0);
-  return make_number (beg);
+  int beg, end;
+  find_field (pos, escape_from_edge, limit, &beg, Qnil, &end);
+  /* When pos is at a field boundary and escape_from_edge (merge_at_boundary)
+     is nil, find_field returns the *previous* field. In this case we return
+     end instead of beg. */
+  return make_number (NILP (escape_from_edge)
+                      && XFASTINT (pos) == end
+                      && end != ZV ? end : beg);
 }
 
 DEFUN ("field-end", Ffield_end, Sfield_end, 0, 3, 0,