aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Kangas2019-07-02 07:09:13 +0200
committerEli Zaretskii2019-07-06 11:54:55 +0300
commit43d2a0a4a8092d675bc9c5412f0bf71f78b1f97f (patch)
tree1482c85cb8dbc95b4d7a34a9988cd4bd274681f6
parent4436bd30aed4b1a0c64f94321e48bb1c174ccc4b (diff)
downloademacs-43d2a0a4a8092d675bc9c5412f0bf71f78b1f97f.tar.gz
emacs-43d2a0a4a8092d675bc9c5412f0bf71f78b1f97f.zip
* lisp/bookmark.el (bookmark-set-internal): Doc fix. (Bug#25032)
-rw-r--r--lisp/bookmark.el29
1 files changed, 17 insertions, 12 deletions
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index d4a54895aa0..4f908313ccf 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -746,18 +746,23 @@ CODING is the symbol of the coding-system in which the file is encoded."
746 map)) 746 map))
747 747
748(defun bookmark-set-internal (prompt name overwrite-or-push) 748(defun bookmark-set-internal (prompt name overwrite-or-push)
749 "Interactively set a bookmark named NAME at the current location. 749 "Set a bookmark using specified NAME or prompting with PROMPT.
750 750The bookmark is set at the current location.
751Begin the interactive prompt with PROMPT, followed by a space, a 751
752generated default name in parentheses, a colon and a space. 752If NAME is non-nil, use it as the name of the new bookmark. In
753 753this case, the value of PROMPT is ignored.
754If OVERWRITE-OR-PUSH is nil, then error if there is already a 754
755bookmark named NAME; if `overwrite', then replace any existing 755Otherwise, prompt the user for the bookmark name. Begin the
756bookmark if there is one; if `push' then push the new bookmark 756interactive prompt with PROMPT, followed by a space, a generated
757onto the bookmark alist. The `push' behavior means that among 757default name in parentheses, a colon and a space.
758bookmarks named NAME, this most recently set one becomes the one in 758
759effect, but the others are still there, in order, if the topmost one 759OVERWRITE-OR-PUSH controls what happens if there is already a
760is ever deleted." 760bookmark with the same name: nil means signal an error;
761`overwrite' means replace any existing bookmark; `push' means
762push the new bookmark onto the bookmark alist. The `push'
763behavior means that among bookmarks with the same name, this most
764recently set one becomes the one in effect, but the others are
765still there, in order, if the topmost one is ever deleted."
761 (unwind-protect 766 (unwind-protect
762 (let* ((record (bookmark-make-record)) 767 (let* ((record (bookmark-make-record))
763 ;; `defaults' is a transient element of the 768 ;; `defaults' is a transient element of the