From: Phil Sainty <psainty@orcon.net.nz>
Date: Fri, 30 Oct 2015 10:05:33 +0000 (+0200)
Subject: Fix documentation of 'beginning/end-of-buffer'
X-Git-Tag: emacs-25.0.90~967
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=44470fed6f720792b2d91b907c52ce30559d03e7;p=emacs.git

Fix documentation of 'beginning/end-of-buffer'

* lisp/simple.el (beginning-of-buffer, end-of-buffer): Clarify
conditions under which the mark will be pushed at the previous
position.  (Bug#21748)
---

diff --git a/lisp/simple.el b/lisp/simple.el
index 338a0600829..1f2f4fe0444 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -905,8 +905,8 @@ With numeric arg N, put point N/10 of the way from the beginning.
 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."
+Push mark at previous position, unless either a \\[universal-argument] prefix
+is supplied, or Transient Mark mode is enabled and the mark is active."
   (declare (interactive-only "use `(goto-char (point-min))' instead."))
   (interactive "^P")
   (or (consp arg)
@@ -929,8 +929,8 @@ With numeric arg N, put point N/10 of the way from the end.
 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."
+Push mark at previous position, unless either a \\[universal-argument] prefix
+is supplied, or Transient Mark mode is enabled and the mark is active."
   (declare (interactive-only "use `(goto-char (point-max))' instead."))
   (interactive "^P")
   (or (consp arg) (region-active-p) (push-mark))