cleanup mastodon-mode-map, switch s / S bindings. FIX $408

1 files changed, 31 insertions, 29 deletions

diff --git a/lisp/mastodon.el b/lisp/mastodon.el
index 731aba2..d54380d 100644
--- a/lisp/mastodon.el
+++ b/lisp/mastodon.el
@@ -153,64 +153,66 @@ Use. e.g. \"%c\" for your locale's date and time format."
     (define-key map [backtab] #'mastodon-tl--previous-tab-item)
     (define-key map [?\S-\t] #'mastodon-tl--previous-tab-item)
     (define-key map [?\M-\t] #'mastodon-tl--previous-tab-item)
+    (define-key map (kbd "l") #'recenter-top-bottom)
     ;; navigation between timelines
     (define-key map (kbd "#") #'mastodon-tl--get-tag-timeline)
+    (define-key map (kbd ":") #'mastodon-tl--list-followed-tags)
     (define-key map (kbd "A") #'mastodon-profile--get-toot-author)
     (define-key map (kbd "F") #'mastodon-tl--get-federated-timeline)
     (define-key map (kbd "H") #'mastodon-tl--get-home-timeline)
     (define-key map (kbd "L") #'mastodon-tl--get-local-timeline)
     (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 "T") #'mastodon-tl--thread)
-    ;; navigation out of mastodon
+    (define-key map (kbd "s") #'mastodon-search--search-query)
+    ;; quitting mastodon
     (define-key map (kbd "q") #'kill-current-buffer)
     (define-key map (kbd "Q") #'kill-buffer-and-window)
-    ;; timeline actions
-    (define-key map (kbd "b") #'mastodon-toot--toggle-boost)
+    (define-key map (kbd "M-C-q") #'mastodon-kill-all-buffers)
+    ;; toot actions
     (define-key map (kbd "c") #'mastodon-tl--toggle-spoiler-text-in-toot)
+    (define-key map (kbd "b") #'mastodon-toot--toggle-boost)
     (define-key map (kbd "f") #'mastodon-toot--toggle-favourite)
     (define-key map (kbd "k") #'mastodon-toot--toggle-bookmark)
     (define-key map (kbd "r") #'mastodon-toot--reply)
-    ;; this is now duplicated by 'g', cd remove/use for else:
-    (define-key map (kbd "u") #'mastodon-tl--update)
-    ;; new toot
-    (define-key map (kbd "t") #'mastodon-toot)
+    (define-key map (kbd "C") #'mastodon-toot--copy-toot-url)
+    (define-key map (kbd "v") #'mastodon-tl--poll-vote)
+    (define-key map (kbd "E") #'mastodon-toot--view-toot-edits)
+    (define-key map (kbd "T") #'mastodon-tl--thread)
+    (when (require 'lingva nil :no-error)
+      (define-key map (kbd "a") #'mastodon-toot--translate-toot-text))
+    (define-key map (kbd ",") #'mastodon-toot--list-toot-favouriters)
+    (define-key map (kbd ".") #'mastodon-toot--list-toot-boosters)
+    (define-key map (kbd ";") #'mastodon-views--view-instance-description)
     ;; override special mode binding
     (define-key map (kbd "g") #'undefined)
     (define-key map (kbd "g") #'mastodon-tl--update)
-    ;; mousebot additions
+    ;; this is now duplicated by 'g', cd remove/use for else:
+    (define-key map (kbd "u") #'mastodon-tl--update)
+    ;; own toot actions:
+    (define-key map (kbd "t") #'mastodon-toot)
+    (define-key map (kbd "d") #'mastodon-toot--delete-toot)
+    (define-key map (kbd "D") #'mastodon-toot--delete-and-redraft-toot)
+    (define-key map (kbd "i") #'mastodon-toot--pin-toot-toggle)
+    (define-key map (kbd "e") #'mastodon-toot--edit-toot-at-point)
+    ;; user actions
     (define-key map (kbd "W") #'mastodon-tl--follow-user)
     (define-key map (kbd "C-S-W") #'mastodon-tl--unfollow-user)
     (define-key map (kbd "B") #'mastodon-tl--block-user)
     (define-key map (kbd "C-S-B") #'mastodon-tl--unblock-user)
     (define-key map (kbd "M") #'mastodon-tl--mute-user)
     (define-key map (kbd "C-S-M") #'mastodon-tl--unmute-user)
+    ;; own profile
     (define-key map (kbd "O") #'mastodon-profile--my-profile)
-    (define-key map (kbd "S") #'mastodon-search--search-query)
-    (define-key map (kbd "d") #'mastodon-toot--delete-toot)
-    (define-key map (kbd "D") #'mastodon-toot--delete-and-redraft-toot)
-    (define-key map (kbd "C") #'mastodon-toot--copy-toot-url)
-    (define-key map (kbd "i") #'mastodon-toot--pin-toot-toggle)
-    (define-key map (kbd "V") #'mastodon-profile--view-favourites)
-    (define-key map (kbd "R") #'mastodon-views--view-follow-requests)
     (define-key map (kbd "U") #'mastodon-profile--update-user-profile-note)
-    (define-key map (kbd "v") #'mastodon-tl--poll-vote)
+    (define-key map (kbd "V") #'mastodon-profile--view-favourites)
     (define-key map (kbd "K") #'mastodon-profile--view-bookmarks)
+    ;; minor views
+    (define-key map (kbd "R") #'mastodon-views--view-follow-requests)
+    (define-key map (kbd "S") #'mastodon-views--view-scheduled-toots)
     (define-key map (kbd "I") #'mastodon-views--view-filters)
     (define-key map (kbd "G") #'mastodon-views--view-follow-suggestions)
     (define-key map (kbd "X") #'mastodon-views--view-lists)
-    (define-key map (kbd "@") #'mastodon-notifications--get-mentions)
-    (define-key map (kbd "e") #'mastodon-toot--edit-toot-at-point)
-    (define-key map (kbd "E") #'mastodon-toot--view-toot-edits)
-    (define-key map (kbd "l") #'recenter-top-bottom)
-    (when (require 'lingva nil :no-error)
-      (define-key map (kbd "a") #'mastodon-toot--translate-toot-text))
-    (define-key map (kbd "s") #'mastodon-views--view-scheduled-toots)
-    (define-key map (kbd "M-C-q") #'mastodon-kill-all-buffers)
-    (define-key map (kbd ";") #'mastodon-views--view-instance-description)
-    (define-key map (kbd ":") #'mastodon-tl--list-followed-tags)
-    (define-key map (kbd ",") #'mastodon-toot--list-toot-favouriters)
-    (define-key map (kbd ".") #'mastodon-toot--list-toot-boosters)
     map)
   "Keymap for `mastodon-mode'.")