[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 597598f 16/17: Merge from origin/emacs-25
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] master 597598f 16/17: Merge from origin/emacs-25 |
Date: |
Sun, 19 Mar 2017 15:41:44 -0400 (EDT) |
branch: master
commit 597598fff47f809c150e452d813c998b868376ec
Merge: 679341e d71e071
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>
Merge from origin/emacs-25
d71e071 Improve documentation of interactive "r".
---
doc/lispref/commands.texi | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/doc/lispref/commands.texi b/doc/lispref/commands.texi
index 424d25a..274f8b4 100644
--- a/doc/lispref/commands.texi
+++ b/doc/lispref/commands.texi
@@ -484,7 +484,8 @@ I/O.
@cindex region argument
Point and the mark, as two numeric arguments, smallest first. This is
the only code letter that specifies two successive arguments rather than
-one. No I/O.
+one. This will signal an error if the mark is not set in the buffer
+which is current when the command is invoked. No I/O.
@item s
Arbitrary text, read in the minibuffer and returned as a string
- [Emacs-diffs] master 2cb8186 07/17: ; Merge from origin/emacs-25, (continued)
- [Emacs-diffs] master 2cb8186 07/17: ; Merge from origin/emacs-25, Paul Eggert, 2017/03/19
- [Emacs-diffs] master 94d41e9 09/17: ; Merge from origin/emacs-25, Paul Eggert, 2017/03/19
- [Emacs-diffs] master bd4598a 10/17: Merge from origin/emacs-25, Paul Eggert, 2017/03/19
- [Emacs-diffs] master c4fca5c 11/17: ; Merge from origin/emacs-25, Paul Eggert, 2017/03/19
- [Emacs-diffs] master 6403353 13/17: ; Merge from origin/emacs-25, Paul Eggert, 2017/03/19
- [Emacs-diffs] master 59ced45 04/17: Merge from origin/emacs-25, Paul Eggert, 2017/03/19
- [Emacs-diffs] master 6be0830 08/17: Merge from origin/emacs-25, Paul Eggert, 2017/03/19
- [Emacs-diffs] master 679341e 15/17: ; Merge from origin/emacs-25, Paul Eggert, 2017/03/19
- [Emacs-diffs] master e6fd84d 06/17: Merge from origin/emacs-25, Paul Eggert, 2017/03/19
- [Emacs-diffs] master 90f5282 12/17: Merge from origin/emacs-25, Paul Eggert, 2017/03/19
- [Emacs-diffs] master 597598f 16/17: Merge from origin/emacs-25,
Paul Eggert <=
- [Emacs-diffs] master da17b70 14/17: Merge from origin/emacs-25, Paul Eggert, 2017/03/19
- [Emacs-diffs] master 468259c 02/17: Merge from origin/emacs-25, Paul Eggert, 2017/03/19
- [Emacs-diffs] master d7f4830 17/17: Fixups after merge from emacs-25, Paul Eggert, 2017/03/19