Merge branch 'develop'

1 files changed, 74 insertions, 70 deletions

diff --git a/lisp/mastodon-discover.el b/lisp/mastodon-discover.el
index 57c1aa0..958df92 100644
--- a/lisp/mastodon-discover.el
+++ b/lisp/mastodon-discover.el
@@ -45,75 +45,79 @@
      :bind "?"
      :mode 'mastodon-mode
      :mode-hook 'mastodon-mode-hook
-     :context-menu '(mastodon
-                     (description "Mastodon feed viewer")
-                     (actions
-                      ("Toots"
-                       ("A" "View profile of author" mastodon-profile--get-toot-author)
-                       ("b" "Boost" mastodon-toot--boost)
-                       ("f" "Favourite" mastodon-toot--favourite)
-                       ("c" "Toggle hidden text (CW)" mastodon-tl--toggle-spoiler-text-in-toot)
-                       ("k" "Bookmark toot" mastodon-toot--bookmark-toot-toggle)
-                       ("v" "Vote on poll" mastodon-tl--poll-vote)
-                       ("n" "Next" mastodon-tl--goto-next-toot)
-                       ("p" "Prev" mastodon-tl--goto-prev-toot)
-                       ("TAB" "Next link item" mastodon-tl--next-tab-item)
-                       ("S-TAB" "Prev link item" mastodon-tl--previous-tab-item)
-                       ;; NB: (when (require 'mpv etc. calls don't work here
-                       ("C-RET" "Play media" mastodon-tl--mpv-play-video-at-point)
-                       ("t" "New toot" mastodon-toot)
-                       ("r" "Reply" mastodon-toot--reply)
-                       ("C" "Copy toot URL" mastodon-toot--copy-toot-url)
-                       ("d" "Delete (your) toot" mastodon-toot--delete-toot)
-                       ("D" "Delete and redraft (your) toot" mastodon-toot--delete-toot)
-                       ("e" "Edit (your) toot" mastodon-toot--edit-toot-at-point)
-                       ("E" "View edits of (your) toot" mastodon-toot--view-toot-edits)
-                       ("i" "Pin/Unpin (your) toot" mastodon-toot--pin-toot-toggle)
-                       ("P" "View user profile" mastodon-profile--show-user)
-                       ("a" "Translate toot at point" mastodon-toot--translate-toot-text)
-                       ("T" "View thread" mastodon-tl--thread)
-                       ("v" "Vote on poll" mastodon-tl--poll-vote)
-                       ("," "View toot's favouriters" mastodon-toot--list-toot-favouriters)
-                       ("." "View toot's boosters" mastodon-toot--list-toot-boosters))
-                      ("Views"
-                       ("h/?" "View mode help/keybindings" describe-mode)
-                       ("#" "Tag search" mastodon-tl--get-tag-timeline)
-                       ("F" "Federated" mastodon-tl--get-federated-timeline)
-                       ("H" "Home" mastodon-tl--get-home-timeline)
-                       ("L" "Local" mastodon-tl--get-local-timeline)
-                       ("N" "Notifications" mastodon-notifications-get)
-                       ("@" "Notifications with mentions" mastodon-notifications--get-mentions)
-                       ("u" "Update timeline" mastodon-tl--update)
-                       ("S" "Search" mastodon-search--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)
-                       ("V" "View favourites" mastodon-profile--view-favourites)
-                       ("R" "View follow requests" mastodon-profile--view-follow-requests)
-                       ("G" "View follow suggestions" mastodon-tl--get-follow-suggestions)
-                       ("I" "View filters" mastodon-tl--view-filters)
-                       ("X" "View lists" mastodon-tl--view-lists)
-                       ("s" "View scheduled toots" mastodon-tl--view-scheduled-toots)
-                       (";" "View instance description" mastodon-tl--view-instance-description))
-                      ("Users"
-                       ("W" "Follow" mastodon-tl--follow-user)
-                       ("C-S-W" "Unfollow" mastodon-tl--unfollow-user)
-                       ("M" "Mute" mastodon-tl--mute-user)
-                       ("C-S-M" "Unmute" mastodon-tl--unmute-user)
-                       ("B" "Block" mastodon-tl--block-user)
-                       ("C-S-B" "Unblock" mastodon-tl--unblock-user))
-                      ("Images"
-                       ;; RET errors here also :/
-                       ("<return>/i" "Load full image in browser" 'shr-browse-image)
-                       ("r" "rotate" 'image-rotate)
-                       ("+" "zoom in" 'image-increase-size)
-                       ("-" "zoom out" 'image-decrease-size)
-                       ("u" "copy URL" 'shr-maybe-probe-and-copy-url))
-                      ("Profile view"
-                       ("C-c C-c" "Cycle profile views" mastodon-profile--account-view-cycle))
-                      ("Quit"
-                       ("q" "Quit mastodon and bury buffer." kill-this-buffer)
-                       ("Q" "Quit mastodon buffer and kill window." kill-buffer-and-window)))))))
+     :context-menu
+     '(mastodon
+       (description "Mastodon feed viewer")
+       (actions
+        ("Toots"
+         ("A" "View profile of author" mastodon-profile--get-toot-author)
+         ("b" "Boost" mastodon-toot--boost)
+         ("f" "Favourite" mastodon-toot--favourite)
+         ("c" "Toggle hidden text (CW)" mastodon-tl--toggle-spoiler-text-in-toot)
+         ("k" "Bookmark toot" mastodon-toot--toggle-bookmark)
+         ("v" "Vote on poll" mastodon-tl--poll-vote)
+         ("n" "Next" mastodon-tl--goto-next-toot)
+         ("p" "Prev" mastodon-tl--goto-prev-toot)
+         ("TAB" "Next link item" mastodon-tl--next-tab-item)
+         ("S-TAB" "Prev link item" mastodon-tl--previous-tab-item)
+         ;; NB: (when (require 'mpv etc. calls don't work here
+         ("C-RET" "Play media" mastodon-tl--mpv-play-video-at-point)
+         ("t" "New toot" mastodon-toot)
+         ("r" "Reply" mastodon-toot--reply)
+         ("C" "Copy toot URL" mastodon-toot--copy-toot-url)
+         ("d" "Delete (your) toot" mastodon-toot--delete-toot)
+         ("D" "Delete and redraft (your) toot" mastodon-toot--delete-toot)
+         ("e" "Edit (your) toot" mastodon-toot--edit-toot-at-point)
+         ("E" "View edits of (your) toot" mastodon-toot--view-toot-edits)
+         ("i" "Pin/Unpin (your) toot" mastodon-toot--pin-toot-toggle)
+         ("P" "View user profile" mastodon-profile--show-user)
+         ("a" "Translate toot at point" mastodon-toot--translate-toot-text)
+         ("T" "View thread" mastodon-tl--thread)
+         ("v" "Vote on poll" mastodon-tl--poll-vote)
+         ("," "View toot's favouriters" mastodon-toot--list-toot-favouriters)
+         ("." "View toot's boosters" mastodon-toot--list-toot-boosters)
+         ("/" "Switch buffers" mastodon-switch-to-buffer))
+        ("Views"
+         ("h/?" "View mode help/keybindings" describe-mode)
+         ("#" "Tag search" mastodon-tl--get-tag-timeline)
+         (";" "List followed tags" mastodon-tl--list-followed-tags)
+         ("F" "Federated" mastodon-tl--get-federated-timeline)
+         ("H" "Home" mastodon-tl--get-home-timeline)
+         ("L" "Local" mastodon-tl--get-local-timeline)
+         ("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)
+         ("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)
+         ("V" "View favourites" mastodon-profile--view-favourites)
+         ("R" "View follow requests" mastodon-profile--view-follow-requests)
+         ("G" "View follow suggestions" mastodon-tl--get-follow-suggestions)
+         ("I" "View filters" mastodon-tl--view-filters)
+         ("X" "View lists" mastodon-tl--view-lists)
+         ("S" "View scheduled toots" mastodon-tl--view-scheduled-toots)
+         (";" "View instance description" mastodon-tl--view-instance-description))
+        ("Users"
+         ("W" "Follow" mastodon-tl--follow-user)
+         ("C-S-W" "Unfollow" mastodon-tl--unfollow-user)
+         ("M" "Mute" mastodon-tl--mute-user)
+         ("C-S-M" "Unmute" mastodon-tl--unmute-user)
+         ("B" "Block" mastodon-tl--block-user)
+         ("C-S-B" "Unblock" mastodon-tl--unblock-user))
+        ("Images"
+         ;; RET errors here also :/
+         ("<return>/i" "Load full image in browser" 'shr-browse-image)
+         ("r" "rotate" 'image-rotate)
+         ("+" "zoom in" 'image-increase-size)
+         ("-" "zoom out" 'image-decrease-size)
+         ("u" "copy URL" 'shr-maybe-probe-and-copy-url))
+        ("Profile view"
+         ("C-c C-c" "Cycle profile views" mastodon-profile--account-view-cycle))
+        ("Quit"
+         ("q" "Quit mastodon and bury buffer." kill-this-buffer)
+         ("Q" "Quit mastodon buffer and kill window." kill-buffer-and-window)
+         ("M-C-q" "Quit mastodon and kill all buffers." mastodon-kill-all-buffers)))))))
 
-  (provide 'mastodon-discover)
+(provide 'mastodon-discover)
 ;;; mastodon-discover.el ends here