Merged from miles@gnu.org--gnu-2005 (patch 187, 704)

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--base-0
   tag of miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-704

 * emacs@sv.gnu.org/emacs--devo--0--patch-1
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-2
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-3
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-4
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-5
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-6
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-7
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-8
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-9
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-10
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-11
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-12
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-13
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-14
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-15
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-16
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-17
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-18
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-19
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-20
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-21
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-22
   Install ERC.

 * emacs@sv.gnu.org/emacs--devo--0--patch-23
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-24
   Fix ERC compiler warnings.

 * emacs@sv.gnu.org/emacs--devo--0--patch-25
   Use utf-8 encoding in ERC ChangeLogs.

 * emacs@sv.gnu.org/emacs--devo--0--patch-26
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-27
   Merge ERC-related Viper hacks into Viper.

 * emacs@sv.gnu.org/emacs--devo--0--patch-28
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-29
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-30
   Merge from erc--main--0

 * emacs@sv.gnu.org/gnus--rel--5.10--base-0
   tag of miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-187

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-1
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-2
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-3
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-4
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-5
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-6
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-7
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-704
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-187
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-501

1 files changed, 12 insertions, 11 deletions

diff --git a/src/cmds.c b/src/cmds.c
index cc5bd90cca7..8f7e3bf02df 100644
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -157,13 +157,13 @@ DEFUN ("beginning-of-line", Fbeginning_of_line, Sbeginning_of_line, 0, 1, "p",
 With argument N not nil or 1, move forward N - 1 lines first.
 If point reaches the beginning or end of buffer, it stops there.
 
-This command does not move point across a field boundary unless doing so
-would move beyond there to a different line; If N is nil or 1, and point
-starts at a field boundary, point does not move.  To ignore field
-boundaries, either bind `inhibit-field-text-motion' to t, or use the
-`forward-line' function instead.  For instance, `(forward-line 0)' does
-the same thing as `(beginning-of-line)', except that it ignores field
-boundaries.  */)
+This function constrains point to the current field unless this moves
+point to a different line than the original, unconstrained result.  If
+N is nil or 1, and a front-sticky field starts at point, the point
+does not move.  To ignore field boundaries bind
+`inhibit-field-text-motion' to t, or use the `forward-line' function
+instead.  For instance, `(forward-line 0)' does the same thing as
+`(beginning-of-line)', except that it ignores field boundaries.  */)
      (n)
      Lisp_Object n;
 {
@@ -183,10 +183,11 @@ With argument N not nil or 1, move forward N - 1 lines first.
 If point reaches the beginning or end of buffer, it stops there.
 To ignore intangibility, bind `inhibit-point-motion-hooks' to t.
 
-This command does not move point across a field boundary unless doing so
-would move beyond there to a different line; if N is nil or 1, and
-point starts at a field boundary, point does not move.  To ignore field
-boundaries bind `inhibit-field-text-motion' to t.  */)
+This function constrains point to the current field unless this moves
+point to a different line than the original, unconstrained result.  If
+N is nil or 1, and a rear-sticky field ends at point, the point does
+not move.  To ignore field boundaries bind `inhibit-field-text-motion'
+to t.  */)
      (n)
      Lisp_Object n;
 {