aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/emacs/regs.texi10
-rw-r--r--etc/NEWS1
2 files changed, 10 insertions, 1 deletions
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.
293Set the bookmark for the visited file, at point. 293Set the bookmark for the visited file, at point.
294 294
295@item C-x r m @var{bookmark} @key{RET} 295@item C-x r m @var{bookmark} @key{RET}
296@findex bookmark-set
297Set the bookmark named @var{bookmark} at point (@code{bookmark-set}). 296Set the bookmark named @var{bookmark} at point (@code{bookmark-set}).
298 297
298@item C-x r M @var{bookmark} @key{RET}
299Like @kbd{C-x r m}, but don't overwrite an existing bookmark.
300
299@item C-x r b @var{bookmark} @key{RET} 301@item C-x r b @var{bookmark} @key{RET}
300@findex bookmark-jump 302@findex bookmark-jump
301Jump to the bookmark named @var{bookmark} (@code{bookmark-jump}). 303Jump 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
320can conveniently revisit any of those files with @kbd{C-x r b}, and move 322can conveniently revisit any of those files with @kbd{C-x r b}, and move
321to the position of the bookmark at the same time. 323to the position of the bookmark at the same time.
322 324
325@kindex C-x r M
326@findex bookmark-set-no-overwrite
327 The command @kbd{C-x r M} (@code{bookmark-set-no-overwrite}) works
328like @kbd{C-x r m}, but it signals an error if the specified bookmark
329already exists, instead of overwriting it.
330
323@kindex C-x r l 331@kindex C-x r l
324 To display a list of all your bookmarks in a separate buffer, type 332 To display a list of all your bookmarks in a separate buffer, type
325@kbd{C-x r l} (@code{list-bookmarks}). If you switch to that buffer, 333@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
305It's meant for use together with `compile': 305It's meant for use together with `compile':
306emacs -batch --eval "(checkdoc-file \"subr.el\")" 306emacs -batch --eval "(checkdoc-file \"subr.el\")"
307 307
308+++
308** New function `bookmark-set-no-overwrite' bound to C-x r M. 309** New function `bookmark-set-no-overwrite' bound to C-x r M.
309It raises an error if a bookmark of that name already exists, 310It raises an error if a bookmark of that name already exists,
310unlike `bookmark-set' which silently updates an existing bookmark. 311unlike `bookmark-set' which silently updates an existing bookmark.