Merge branch 'emacs-25-merge'

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

diff --git a/doc/emacs/regs.texi b/doc/emacs/regs.texi
index d8841caa311e0e6f2ad0287a332a61144db93499..13c03f78a52217a5dc5ad19996ad97209bc3d33f 100644 (file)
--- a/doc/emacs/regs.texi
+++ b/doc/emacs/regs.texi
@@ -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,