aboutsummaryrefslogtreecommitdiff
path: root/lisp/mastodon.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/mastodon.el')
-rw-r--r--lisp/mastodon.el6
1 files changed, 5 insertions, 1 deletions
diff --git a/lisp/mastodon.el b/lisp/mastodon.el
index 055de21..6b56341 100644
--- a/lisp/mastodon.el
+++ b/lisp/mastodon.el
@@ -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)
@@ -208,7 +212,7 @@ Use. e.g. \"%c\" for your locale's date and time format."
(defface mastodon-handle-face
'((t :inherit default))
- "Face used for user display names.")
+ "Face used for user handles in bylines.")
(defface mastodon-display-name-face
'((t :inherit warning))