bug#21748: 25.0.50; [PATCH] ; Docstring fixes for beginning- and end-of-buffer

[Phil Sainty <psainty@orcon.net.nz>]

[-- Attachment #1: Type: text/plain, Size: 0 bytes --]



[-- Attachment #2: 0001-Docstring-fixes-for-beginning-and-end-of-buffer.patch --]
[-- Type: text/x-patch, Size: 1871 bytes --]

From 3a842ea6c610bdeca10d992222e26efa30a17260 Mon Sep 17 00:00:00 2001
From: Phil Sainty <psainty@orcon.net.nz>
Date: Sun, 25 Oct 2015 00:56:10 +1300
Subject: [PATCH] ; Docstring fixes for beginning- and 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. The docstrings
previously stated that this is conditional on whether Transient Mark mode is
enabled, when the code actually uses (region-active-p) which is true only if
Transient Mark mode is enabled AND the mark is active.
---
 lisp/simple.el | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lisp/simple.el b/lisp/simple.el
index 8acb683..51dae23 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -895,8 +895,8 @@ beginning-of-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."
+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)
@@ -919,8 +919,8 @@ end-of-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."
+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))
-- 
2.1.4