diff options
| author | marty hiatt <martianhiatus [a t] riseup [d o t] net> | 2022-11-19 11:15:20 +0100 |
|---|---|---|
| committer | marty hiatt <martianhiatus [a t] riseup [d o t] net> | 2022-11-19 11:15:20 +0100 |
| commit | a9f0e504cf441db0fd311141c1a9433cf9a46be7 (patch) | |
| tree | 117c930fc6fe761b6e7db24dbd7423307de57f0f /lisp/mastodon.el | |
| parent | ecaf47eac07c94781dc7e4e48a89d223917f832e (diff) | |
| parent | 653bf0e90b5f1b281d689f2411fda16876df0c0b (diff) | |
Merge branch 'develop' into lists
Diffstat (limited to 'lisp/mastodon.el')
| -rw-r--r-- | lisp/mastodon.el | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lisp/mastodon.el b/lisp/mastodon.el index e49a121..6b56341 100644 --- a/lisp/mastodon.el +++ b/lisp/mastodon.el @@ -91,7 +91,7 @@ (when (require 'lingva nil :no-error) (autoload 'mastodon-toot--translate-toot-text "mastodon-toot")) (autoload 'mastodon-search--trending-tags "mastodon-search") -(autoload 'mastodon-profile-fetch-server-account-settings "mastodon-profile") +(autoload 'mastodon-profile--fetch-server-account-settings "mastodon-profile") (defgroup mastodon nil "Interface with Mastodon." @@ -193,7 +193,11 @@ Use. e.g. \"%c\" for your locale's date and time format." (define-key map (kbd "K") #'mastodon-profile--view-bookmarks) (define-key map (kbd "I") #'mastodon-tl--view-filters) (define-key map (kbd "G") #'mastodon-tl--get-follow-suggestions) +<<<<<<< HEAD (define-key map (kbd "X") #'mastodon-tl--view-lists) +======= + (define-key map (kbd "@") #'mastodon-notifications--get-mentions) +>>>>>>> develop (when (require 'lingva nil :no-error) (define-key map (kbd "s") #'mastodon-toot--translate-toot-text)) map) @@ -324,7 +328,7 @@ not, just browse the URL in the normal fashion." (mastodon-toot--enable-custom-emoji))))) ;;;###autoload -(add-hook 'mastodon-mode-hook #'mastodon-profile-fetch-server-account-settings) +(add-hook 'mastodon-mode-hook #'mastodon-profile--fetch-server-account-settings) (define-derived-mode mastodon-mode special-mode "Mastodon" "Major mode for Mastodon, the federated microblogging network." |