diff options
| author | mousebot <mousebot@riseup.net> | 2021-12-16 16:09:35 +0100 |
|---|---|---|
| committer | mousebot <mousebot@riseup.net> | 2021-12-16 16:09:35 +0100 |
| commit | c06776ba115c561ddb23fd9887aad1c19c5b960a (patch) | |
| tree | b11357c0809f2a578541f09a1fa1bea8f031e7db /lisp/mastodon.el | |
| parent | dd9ef80d940655bb24958d3c48a86aad45cefa43 (diff) | |
| parent | 7653aacf64214fdaf376f4a5b8c7327116da6a90 (diff) | |
Merge branch 'develop' into echo-faves-in-thread
Diffstat (limited to 'lisp/mastodon.el')
| -rw-r--r-- | lisp/mastodon.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/mastodon.el b/lisp/mastodon.el index 826787a..662b691 100644 --- a/lisp/mastodon.el +++ b/lisp/mastodon.el @@ -145,7 +145,7 @@ Use. e.g. \"%c\" for your locale's date and time format." (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) - (define-key map (kbd "C-S-P") #'mastodon-profile--my-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) @@ -223,7 +223,9 @@ If REPLY-JSON is the json of the toot being replied to." ;;;###autoload (add-hook 'mastodon-mode-hook (lambda () (when (require 'emojify nil :noerror) - (emojify-mode t)))) + (emojify-mode t) + (when mastodon-toot--enable-custom-instance-emoji + (mastodon-toot--enable-custom-emoji))))) (define-derived-mode mastodon-mode special-mode "Mastodon" "Major mode for Mastodon, the federated microblogging network." |