rename search-query to query

5 files changed, 13 insertions, 13 deletions

diff --git a/lisp/mastodon-discover.el b/lisp/mastodon-discover.el
index c1d28f3..b3d8537 100644
--- a/lisp/mastodon-discover.el
+++ b/lisp/mastodon-discover.el
@@ -87,7 +87,7 @@
          ("N" "Notifications" mastodon-notifications-get)
          ("@" "Notifications with mentions" mastodon-notifications--get-mentions)
          ("g/u" "Update timeline" mastodon-tl--update)
-         ("s" "Search" mastodon-search--search-query)
+         ("s" "Search" mastodon-search--query)
          ("O" "Jump to your profile" mastodon-profile--my-profile)
          ("U" "Update your profile note" mastodon-profile--update-user-profile-note)
          ("K" "View bookmarks" mastodon-profile--view-bookmarks)
diff --git a/lisp/mastodon-profile.el b/lisp/mastodon-profile.el
index 95137e0..3d27bb4 100644
--- a/lisp/mastodon-profile.el
+++ b/lisp/mastodon-profile.el
@@ -80,7 +80,7 @@
 (autoload 'mastodon-views--add-account-to-list "mastodon-views")
 (autoload 'mastodon-return-credential-account "mastodon")
 (autoload 'mastodon-tl--buffer-property "mastodon-tl")
-(autoload 'mastodon-search--search-query "mastodon-search")
+(autoload 'mastodon-search--query "mastodon-search")
 
 (defvar mastodon-tl--horiz-bar)
 (defvar mastodon-tl--update-point)
@@ -223,7 +223,7 @@ NO-REBLOGS means do not display boosts in statuses."
   (interactive "sSearch account for: ")
   (let* ((ep (mastodon-tl--buffer-property 'endpoint))
          (id (nth 1 (split-string ep "/"))))
-    (mastodon-search--search-query query "statuses" nil nil id)))
+    (mastodon-search--query query "statuses" nil nil id)))
 
 
 ;;; ACCOUNT PREFERENCES
@@ -833,7 +833,7 @@ Optionally provide the ID of the account to remove."
 (defun mastodon-profile--remove-from-followers-list ()
   "Select a user from your followers and remove from followers.
 Currently limited to 100 handles. If not found, try
-`mastodon-search--search-query'."
+`mastodon-search--query'."
   (interactive)
   (let* ((endpoint (format "accounts/%s/followers"
                            (mastodon-auth--get-account-id)))
diff --git a/lisp/mastodon-search.el b/lisp/mastodon-search.el
index 2a2a995..772bfd2 100644
--- a/lisp/mastodon-search.el
+++ b/lisp/mastodon-search.el
@@ -144,9 +144,9 @@ PRINT-FUN is the function used to print the data from the response."
 (defvar mastodon-search-types
   '("statuses" "accounts" "hashtags"))
 
-(defun mastodon-search--search-query (query
-                                      &optional type limit
-                                      following account-id offset)
+(defun mastodon-search--query (query
+                               &optional type limit
+                               following account-id offset)
   "Prompt for a search QUERY and return accounts, statuses, and hashtags.
 TYPE is a member of `mastodon-search-types'.
 LIMIT is a number as string, up to 40, with 40 the default.
@@ -221,16 +221,16 @@ ACCOUNT-ID means limit search to that account, for \"statuses\" type only."
          (type (alist-get "type" spec nil nil #'equal))
          (query (alist-get "q" spec nil nil #'equal)))
     (cond ((equal type "hashtags")
-           (mastodon-search--search-query query "accounts"))
+           (mastodon-search--query query "accounts"))
           ((equal type "accounts")
-           (mastodon-search--search-query query "statuses"))
+           (mastodon-search--query query "statuses"))
           ((equal type "statuses")
-           (mastodon-search--search-query query "hashtags")))))
+           (mastodon-search--query query "hashtags")))))
 
 (defun mastodon-serach--query-accounts-followed (query)
   "Run an accounts search QUERY, limited to your followers."
   (interactive "sSearch mastodon for: ")
-  (mastodon-search--search-query query "accounts" :following))
+  (mastodon-search--query query "accounts" :following))
 
 (defun mastodon-search--insert-users-propertized (json &optional note)
   "Insert users list into the buffer.
diff --git a/lisp/mastodon.el b/lisp/mastodon.el
index 57d02ca..11be674 100644
--- a/lisp/mastodon.el
+++ b/lisp/mastodon.el
@@ -165,7 +165,7 @@ Use. e.g. \"%c\" for your locale's date and time format."
     (define-key map (kbd "N") #'mastodon-notifications-get)
     (define-key map (kbd "@") #'mastodon-notifications--get-mentions)
     (define-key map (kbd "P") #'mastodon-profile--show-user)
-    (define-key map (kbd "s") #'mastodon-search--search-query)
+    (define-key map (kbd "s") #'mastodon-search--query)
     (define-key map (kbd "/") #'mastodon-switch-to-buffer)
     ;; quitting mastodon
     (define-key map (kbd "q") #'kill-current-buffer)
diff --git a/mastodon-index.org b/mastodon-index.org
index 0c273b4..6199328 100644
--- a/mastodon-index.org
+++ b/mastodon-index.org
@@ -94,7 +94,7 @@
 |                  | mastodon-profile-mode                             | Toggle mastodon profile minor mode.                                            |
 |                  | mastodon-profile-update-mode                      | Minor mode to update Mastodon user profile.                                    |
 |                  | mastodon-search--query-cycle                      | Cycle through search types: accounts, hashtags, and statuses.                  |
-| s                | mastodon-search--search-query                     | Prompt for a search QUERY and return accounts, statuses, and hashtags.         |
+| s                | mastodon-search--query                     | Prompt for a search QUERY and return accounts, statuses, and hashtags.         |
 |                  | mastodon-search--trending-statuses                | Display a list of statuses trending on your instance.                          |
 |                  | mastodon-search--trending-tags                    | Display a list of tags trending on your instance.                              |
 |                  | mastodon-search-mode                              | Toggle mastodon search minor mode.                                             |