branch: elpa/mastodon
commit 95350f346fafa686ffaec9e5e900639dac0e8d10
Merge: fac7d15c7e 8c513d363f
Author: marty hiatt <[email protected]>
Commit: marty hiatt <[email protected]>
Merge branch 'develop'
---
lisp/mastodon-notifications.el | 2 +-
lisp/mastodon-tl.el | 9 ++++++---
lisp/mastodon.el | 1 +
mastodon-index.org | 1 +
4 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/lisp/mastodon-notifications.el b/lisp/mastodon-notifications.el
index 0bb2cacd30..5db7114e6b 100644
--- a/lisp/mastodon-notifications.el
+++ b/lisp/mastodon-notifications.el
@@ -1045,7 +1045,7 @@ When FORCE, skip all checks and show an alert (for
debugging)."
(when (or force
(and (> count 0)
(not mastodon-notifications-notify-shown)))
- (if (not (require 'alert :noerror))
+ (if (not (require 'alert nil :noerror))
(message "mastodon.el: new notifications %s" count)
(alert (format "New notifications: <b>%s</b>" count)
:title "mastodon.el"
diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index 6edbc6e143..7531217fd7 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -3108,9 +3108,12 @@ Annotate the candidates with display name or user name."
'(account acct)))
(alist-get 'account data))))))
(when user
- (concat " "
- (or (alist-get 'display_name user)
- (alist-get 'username user)))))))))
+ (concat
+ (propertize " "
+ 'display '(space :align-to 40))
+ (propertize (or (alist-get 'display_name user)
+ (alist-get 'username user))
+ 'face 'mastodon-display-name-face))))))))
(completing-read prompt user-handles nil 'confirm)))
(defun mastodon-tl--user-handles-get (action)
diff --git a/lisp/mastodon.el b/lisp/mastodon.el
index 92cafdd688..74d8e5c792 100644
--- a/lisp/mastodon.el
+++ b/lisp/mastodon.el
@@ -309,6 +309,7 @@ Also nil `mastodon-auth--token-alist'."
(define-key map (kbd "a") #'mastodon-toot-translate-toot-text))
(define-key map (kbd ",") #'mastodon-toot-list-favouriters)
(define-key map (kbd ".") #'mastodon-toot-list-boosters)
+ (define-key map (kbd "C-,") #'mastodon-toot-jump-to-quoting)
(define-key map (kbd ";") #'mastodon-views-view-instance-description)
(define-key map (kbd "M-;") #'mastodon-tl-nodeinfo-for-toot)
;; override special mode binding
diff --git a/mastodon-index.org b/mastodon-index.org
index 164ed8bb42..fbcccbfd75 100644
--- a/mastodon-index.org
+++ b/mastodon-index.org
@@ -230,6 +230,7 @@
| e | mastodon-toot-edit-toot-at-point | Edit the
user's toot at point. |
| | mastodon-toot-enable-custom-emoji | Add
`mastodon-instance-url's custom emoji to `emojify'. |
| C-c C-e | mastodon-toot-insert-emoji | Prompt to
insert an emoji. |
+| | mastodon-toot-jump-to-quoting | Prompt for a
toot quoting the toot at point and load it. |
| . | mastodon-toot-list-boosters | List the
boosters of toot at point. |
| , | mastodon-toot-list-favouriters | List the
favouriters of toot at point. |
| | mastodon-toot-mode | Minor mode
for composing toots. |
