4 files changed, 9 insertions, 5 deletions
diff --git a/lisp/mastodon-http.el b/lisp/mastodon-http.el
index 42b599d..5035cb4 100644
--- a/lisp/mastodon-http.el
+++ b/lisp/mastodon-http.el
@@ -302,7 +302,8 @@ Optionally specify the PARAMS to send."
 
 (defun mastodon-http--patch (url &optional params json)
   "Make synchronous PATCH request to URL.
-Optionally specify the PARAMS to send."
+Optionally specify the PARAMS to send.
+JSON means send params as JSON data."
   (mastodon-http--authorized-request "PATCH"
     ;; NB: unlike POST, PATCHing only works if we use query params!
     ;; so here, unless JSON arg, we use query params and do not set
diff --git a/lisp/mastodon-media.el b/lisp/mastodon-media.el
index fff5d23..ccd258c 100644
--- a/lisp/mastodon-media.el
+++ b/lisp/mastodon-media.el
@@ -38,6 +38,7 @@
 (require 'image-mode)
 
 (autoload 'mastodon-tl--propertize-img-str-or-url "mastodon-tl")
+(autoload 'mastodon-tl--image-trans-check "mastodon-tl")
 
 (defvar url-show-status)
 
diff --git a/lisp/mastodon-profile.el b/lisp/mastodon-profile.el
index 8db1d69..c6a0276 100644
--- a/lisp/mastodon-profile.el
+++ b/lisp/mastodon-profile.el
@@ -84,6 +84,7 @@
 (autoload 'mastodon-search--query "mastodon-search")
 (autoload 'mastodon-tl--field-status "mastodon-tl")
 
+(defvar mastodon-active-user)
 (defvar mastodon-tl--horiz-bar)
 (defvar mastodon-tl--update-point)
 (defvar mastodon-toot--max-toot-chars)
diff --git a/lisp/mastodon-search.el b/lisp/mastodon-search.el
index 90519ed..262f75c 100644
--- a/lisp/mastodon-search.el
+++ b/lisp/mastodon-search.el
@@ -28,8 +28,7 @@
 
 ;;; Code:
 (require 'json)
-(eval-when-compile
-  (require 'mastodon-tl))
+(require 'mastodon-tl)
 
 (autoload 'mastodon-auth--access-token "mastodon-auth")
 (autoload 'mastodon-http--api "mastodon-http")
@@ -44,6 +43,7 @@
 (autoload 'mastodon-tl--timeline "mastodon-tl")
 (autoload 'mastodon-tl--toot "mastodon-tl")
 (autoload 'mastodon-tl--buffer-property "mastodon-tl")
+(autoload 'mastodon-http--api-v2 "mastodon-http")
 
 (defvar mastodon-toot--completion-style-for-mentions)
 (defvar mastodon-instance-url)
@@ -165,7 +165,8 @@ Optionally add string TYPE after HEADING."
 
 (defun mastodon-search--format-heading (str &optional type no-newline)
   "Format STR as a heading.
-Optionally add string TYPE after HEADING."
+Optionally add string TYPE after HEADING.
+NO-NEWLINE means don't add add a newline at end."
   (mastodon-tl--set-face
    (concat "\n " mastodon-tl--horiz-bar "\n "
            (upcase str) " "
@@ -189,7 +190,7 @@ is used for pagination."
   ;; TODO: handle no results
   (interactive "sSearch mastodon for: ")
   (let* ((url (mastodon-http--api-v2 "search"))
-         (following (when (or following (eq current-prefix-arg '(4)))
+         (following (when (or following (equal current-prefix-arg '(4)))
                       "true"))
          (type (or type
                    (if (eq current-prefix-arg '(4))