From: Karl Fogel <kfogel@red-bean.com>
Date: Tue, 10 Nov 2015 04:14:49 +0000 (-0600)
Subject: Fix some recently-perturbed bookmark autoloads
X-Git-Tag: emacs-25.0.90~859
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0f50e5163cf747fcf18124039a82b5156a48316b;p=emacs.git

Fix some recently-perturbed bookmark autoloads

* lisp/bookmark.el (bookmark-set-internal): Remove unnecessary autoload.
  (bookmark-set): Restore autoload.
  (bookmark-set-no-overwrite): Add autoload.

Thanks to Juanma Barranquero for noticing the autoload problems
introduced by my recent commit adding/changing the above functions
(Sun Nov 8 14:16:43 2015 -0500, git commit 3812e17978).
---

diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index e3b1dc4ebd3..0729bdd2d44 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -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.