Fix the prefix action of shr-copy-url

[gnu-emacs] / lisp / bookmark.el

diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index e3b1dc4ebd3062aa8df1ea9395d56e93376df2b5..f3c8b2a755f8a6bbf0eadca9d0e76ccc6a18e69f 100644 (file)
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -1,6 +1,6 @@
 ;;; bookmark.el --- set bookmarks, maybe annotate them, jump to them later
 
-;; Copyright (C) 1993-1997, 2001-2015 Free Software Foundation, Inc.
+;; Copyright (C) 1993-1997, 2001-2016 Free Software Foundation, Inc.
 
 ;; Author: Karl Fogel <kfogel@red-bean.com>
 ;; Maintainer: Karl Fogel <kfogel@red-bean.com>
@@ -74,7 +74,7 @@ bookmark is to set this variable to 1 (or 0, which produces the same
 behavior.)
 
 To specify the file in which to save them, modify the variable
-`bookmark-default-file', which is `~/.emacs.bmk' by default."
+`bookmark-default-file'."
   :type '(choice (const nil) integer (other t))
   :group 'bookmark)
 
@@ -756,7 +756,6 @@ This expects to be called from `point-min' in a bookmark file."
     (define-key map "\C-w" 'bookmark-yank-word)
     map))
 
-;;;###autoload
 (defun bookmark-set-internal (prompt name overwrite-or-push)
   "Interactively set a bookmark named NAME at the current location.
 
@@ -824,6 +823,7 @@ is ever deleted."
     (setq bookmark-current-buffer nil)))
 
 
+;;;###autoload
 (defun bookmark-set (&optional name no-overwrite)
   "Set a bookmark named NAME at the current location.
 If NAME is nil, then prompt the user.
@@ -853,6 +853,7 @@ the list of bookmarks.)"
          (if no-overwrite "Set bookmark" "Set bookmark unconditionally")))
     (bookmark-set-internal prompt name (if no-overwrite 'push 'overwrite))))
 
+;;;###autoload
 (defun bookmark-set-no-overwrite (&optional name push-bookmark)
   "Set a bookmark named NAME at the current location.
 If NAME is nil, then prompt the user.
@@ -1480,9 +1481,9 @@ while loading.
 If you load a file that doesn't contain a proper bookmark alist, you
 will corrupt Emacs's bookmark list.  Generally, you should only load
 in files that were created with the bookmark functions in the first
-place.  Your own personal bookmark file, `~/.emacs.bmk', is
-maintained automatically by Emacs; you shouldn't need to load it
-explicitly.
+place.  Your own personal bookmark file, specified by the variable
+`bookmark-default-file', is maintained automatically by Emacs; you
+shouldn't need to load it explicitly.
 
 If you load a file containing bookmarks with the same names as
 bookmarks already present in your Emacs, the new bookmarks will get