Merge branch 'emacs-25-merge'

[gnu-emacs] / doc / emacs / regs.texi

diff --git a/doc/emacs/regs.texi b/doc/emacs/regs.texi
index dc53c3b524838a5fa38cd42fea4cc08eedad11af..13c03f78a52217a5dc5ad19996ad97209bc3d33f 100644 (file)
--- a/doc/emacs/regs.texi
+++ b/doc/emacs/regs.texi
@@ -32,7 +32,7 @@ Display a description of what register @var{r} contains.
 @vindex register-preview-delay
 @cindex preview of registers
   All of the commands that prompt for a register will display a
-``preview'' window that lists the existing registers (if there are
+preview window that lists the existing registers (if there are
 any) after a short delay.  To change the length of the delay,
 customize @code{register-preview-delay}.  To prevent this display, set
 that option to @code{nil}.  You can explicitly request a preview
@@ -121,7 +121,7 @@ reactivates the mark where it was last set.  The mark is deactivated
 at the end of this command.  @xref{Mark}.  @kbd{C-u C-x r s @var{r}},
 the same command with a prefix argument, copies the text into register
 @var{r} and deletes the text from the buffer as well; you can think of
-this as ``moving'' the region text into the register.
+this as moving the region text into the register.
 
 @findex append-to-register
 @findex prepend-to-register
@@ -151,7 +151,7 @@ during the collection process, you can use the following setting.
   @kbd{C-x r i @var{r}} inserts in the buffer the text from register
 @var{r}.  Normally it leaves point after the text and sets the mark
 before, without activating it.  With a numeric argument, it instead
-puts before after the text and the mark after.
+puts point before the text and the mark after.
 
 @node Rectangle Registers
 @section Saving Rectangles in Registers
@@ -285,7 +285,7 @@ restore a frameset.)
   @dfn{Bookmarks} are somewhat like registers in that they record
 positions you can jump to.  Unlike registers, they have long names, and
 they persist automatically from one Emacs session to the next.  The
-prototypical use of bookmarks is to record ``where you were reading'' in
+prototypical use of bookmarks is to record where you were reading in
 various files.
 
 @table @kbd
@@ -293,9 +293,11 @@ various files.
 Set the bookmark for the visited file, at point.
 
 @item C-x r m @var{bookmark} @key{RET}
-@findex bookmark-set
 Set the bookmark named @var{bookmark} at point (@code{bookmark-set}).
 
+@item C-x r M @var{bookmark} @key{RET}
+Like @kbd{C-x r m}, but don't overwrite an existing bookmark.
+
 @item C-x r b @var{bookmark} @key{RET}
 @findex bookmark-jump
 Jump to the bookmark named @var{bookmark} (@code{bookmark-jump}).
@@ -320,6 +322,12 @@ name.  If you name each bookmark after the file it points to, then you
 can conveniently revisit any of those files with @kbd{C-x r b}, and move
 to the position of the bookmark at the same time.
 
+@kindex C-x r M
+@findex bookmark-set-no-overwrite
+  The command @kbd{C-x r M} (@code{bookmark-set-no-overwrite}) works
+like @kbd{C-x r m}, but it signals an error if the specified bookmark
+already exists, instead of overwriting it.
+
 @kindex C-x r l
   To display a list of all your bookmarks in a separate buffer, type
 @kbd{C-x r l} (@code{list-bookmarks}).  If you switch to that buffer,