From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 5 Dec 2015 12:21:00 +0000 (+0200)
Subject: Document 'bookmark-set-no-overwrite'
X-Git-Tag: emacs-25.0.90~532
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ce81e87751047ef964c8d7f15edbfb3ee4de6703;p=emacs.git

Document 'bookmark-set-no-overwrite'

* doc/emacs/regs.texi (Bookmarks): Document the new command
'bookmark-set-no-overwrite' and its keybinding.
---

diff --git a/doc/emacs/regs.texi b/doc/emacs/regs.texi
index d8841caa311..13c03f78a52 100644
--- 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,
diff --git a/etc/NEWS b/etc/NEWS
index 482db099d6b..e3638b4f804 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -305,6 +305,7 @@ current package keywords are recognized.  Set the new option
 It's meant for use together with `compile':
 emacs -batch --eval "(checkdoc-file \"subr.el\")"
 
++++
 ** New function `bookmark-set-no-overwrite' bound to C-x r M.
 It raises an error if a bookmark of that name already exists,
 unlike `bookmark-set' which silently updates an existing bookmark.