2 files changed, 17 insertions, 11 deletions
diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index 3978e12..b50cbf6 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -70,11 +70,13 @@
 (autoload 'mastodon-tl--toot-id "mastodon-tl")
 (autoload 'mastodon-toot "mastodon")
 
+;;;###autoload
 (defgroup mastodon-toot nil
   "Tooting in Mastodon."
   :prefix "mastodon-toot-"
   :group 'mastodon)
 
+;;;###autoload
 (defcustom mastodon-toot--default-visibility "public"
   "The default visibility for new toots.
 
@@ -87,16 +89,19 @@ followers-only), or \"direct\"."
           (const :tag "followers only" "private")
           (const :tag "direct" "direct")))
 
+;;;###autoload
 (defcustom mastodon-toot--default-media-directory "~/"
   "The default directory when prompting for a media file to upload."
   :group 'mastodon-toot
   :type 'string)
 
+;;;###autoload
 (defcustom mastodon-toot--attachment-height 80
   "Height of the attached images preview in the toot draft buffer."
   :group 'mastodon-toot
   :type 'integer)
 
+;;;###autoload
 (defcustom mastodon-toot--enable-completion-for-mentions
   (if (require 'company nil :noerror) "following" "off")
   "Whether to enable company completion for mentions.
@@ -110,6 +115,7 @@ This is only used if company mode is installed."
           (const :tag "following only" "following")
           (const :tag "all users" "all")))
 
+;;;###autoload
 (defcustom mastodon-toot--enable-custom-instance-emoji nil
   "Whether to enable your instance's custom emoji by default."
   :group 'mastodon-toot
diff --git a/lisp/mastodon.el b/lisp/mastodon.el
index ab199f9..bd0a557 100644
--- a/lisp/mastodon.el
+++ b/lisp/mastodon.el
@@ -32,8 +32,6 @@
 
 ;;; Code:
 (require 'cl-lib) ; for `cl-some' call in mastodon
-;; hack to make mastodon-toot customizes visible prior to running mastodon-toot:
-(require 'mastodon-toot)
 
 (declare-function discover-add-context-menu "discover")
 (declare-function emojify-mode "emojify")
@@ -54,10 +52,10 @@
 (autoload 'mastodon-profile--get-toot-author "mastodon-profile")
 (autoload 'mastodon-profile--make-author-buffer "mastodon-profile")
 (autoload 'mastodon-profile--show-user "mastodon-profile")
-;; (autoload 'mastodon-toot--compose-buffer "mastodon-toot")
-;; (autoload 'mastodon-toot--reply "mastodon-toot")
-;; (autoload 'mastodon-toot--toggle-boost "mastodon-toot")
-;; (autoload 'mastodon-toot--toggle-favourite "mastodon-toot")
+(autoload 'mastodon-toot--compose-buffer "mastodon-toot")
+(autoload 'mastodon-toot--reply "mastodon-toot")
+(autoload 'mastodon-toot--toggle-boost "mastodon-toot")
+(autoload 'mastodon-toot--toggle-favourite "mastodon-toot")
 (autoload 'mastodon-discover "mastodon-discover")
 
 (autoload 'mastodon-tl--block-user "mastodon-tl")
@@ -72,9 +70,9 @@
 (autoload 'mastodon-notifications--follow-request-accept "mastodon-notifications")
 (autoload 'mastodon-notifications--follow-request-reject "mastodon-notifications")
 (autoload 'mastodon-search--search-query "mastodon-search")
-;; (autoload 'mastodon-toot--delete-toot "mastodon-toot")
-;; (autoload 'mastodon-toot--copy-toot-url "mastodon-toot")
-;; (autoload 'mastodon-toot--pin-toot-toggle "mastodon-toot")
+(autoload 'mastodon-toot--delete-toot "mastodon-toot")
+(autoload 'mastodon-toot--copy-toot-url "mastodon-toot")
+(autoload 'mastodon-toot--pin-toot-toggle "mastodon-toot")
 (autoload 'mastodon-auth--get-account-name "mastodon-auth")
 ;; (autoload 'mastodon-async--stream-federated "mastodon-async")
 ;; (autoload 'mastodon-async--stream-local "mastodon-async")
@@ -84,9 +82,11 @@
 (autoload 'mastodon-profile--update-user-profile-note "mastodon-profile")
 (autoload 'mastodon-auth--user-acct "mastodon-auth")
 (autoload 'mastodon-tl--poll-vote "mastodon-http")
-;; (autoload 'mastodon-toot--delete-and-redraft-toot "mastodon-toot")
+(autoload 'mastodon-toot--delete-and-redraft-toot "mastodon-toot")
 (autoload 'mastodon-profile--view-bookmarks "mastodon-profile")
-;; (autoload 'mastodon-toot--bookmark-toot-toggle "mastodon-toot")
+(autoload 'mastodon-toot--bookmark-toot-toggle "mastodon-toot")
+(autoload 'mastodon-toot--enable-custom-emoji "mastodon-toot")
+(defvar mastodon-toot--enable-custom-instance-emoji)
 
 (defgroup mastodon nil
   "Interface with Mastodon."