# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1282835385 14400
# Node ID b2115e1dafc05c705b4fae94601f0819149be0ea
# Parent  fae81355c62c7ff81287479ac0ef0746e8172c9e
* simple.el (beginning-of-buffer, end-of-buffer): Doc fix (Bug#6907).

diff -r fae81355c62c -r b2115e1dafc0 lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Aug 22 20:44:55 2010 -0400
+++ b/lisp/ChangeLog	Thu Aug 26 11:09:45 2010 -0400
@@ -1,3 +1,8 @@
+2010-08-26  Chong Yidong  <cyd@stupidchicken.com>
+
+	* simple.el (beginning-of-buffer, end-of-buffer): Doc fix
+	(Bug#6907).
+
 2010-08-23  Chris Foote <chris@foote.com.au>  (tiny change)
 
 	* progmodes/python.el (python-block-pairs): Allow use of "finally"
diff -r fae81355c62c -r b2115e1dafc0 lisp/simple.el
--- a/lisp/simple.el	Sun Aug 22 20:44:55 2010 -0400
+++ b/lisp/simple.el	Thu Aug 26 11:09:45 2010 -0400
@@ -784,15 +784,16 @@
        (constrain-to-field nil orig-pos t)))))
 
 (defun beginning-of-buffer (&optional arg)
-  "Move point to the beginning of the buffer; leave mark at previous position.
-With \\[universal-argument] prefix, do not set mark at previous position.
+  "Move point to the beginning of the buffer.
 With numeric arg N, put point N/10 of the way from the beginning.
-
-If the buffer is narrowed, this command uses the beginning and size
-of the accessible part of the buffer.
+If the buffer is narrowed, this command uses the beginning of the
+accessible part of the buffer.
+
+If Transient Mark mode is disabled, leave mark at previous
+position, unless a \\[universal-argument] prefix is supplied.
 
 Don't use this command in Lisp programs!
-\(goto-char (point-min)) is faster and avoids clobbering the mark."
+\(goto-char (point-min)) is faster."
   (interactive "^P")
   (or (consp arg)
       (region-active-p)
@@ -809,15 +810,16 @@
   (if (and arg (not (consp arg))) (forward-line 1)))
 
 (defun end-of-buffer (&optional arg)
-  "Move point to the end of the buffer; leave mark at previous position.
-With \\[universal-argument] prefix, do not set mark at previous position.
+  "Move point to the end of the buffer.
 With numeric arg N, put point N/10 of the way from the end.
-
-If the buffer is narrowed, this command uses the beginning and size
-of the accessible part of the buffer.
+If the buffer is narrowed, this command uses the end of the
+accessible part of the buffer.
+
+If Transient Mark mode is disabled, leave mark at previous
+position, unless a \\[universal-argument] prefix is supplied.
 
 Don't use this command in Lisp programs!
-\(goto-char (point-max)) is faster and avoids clobbering the mark."
+\(goto-char (point-max)) is faster."
   (interactive "^P")
   (or (consp arg) (region-active-p) (push-mark))
   (let ((size (- (point-max) (point-min))))