branch: elpa/mastodon
commit 3c00418bfbb13f450551c28a97f8870e8ce3fef9
Merge: 1ac040c113c fdeb5f2d770
Author: marty hiatt <[email protected]>
Commit: marty hiatt <[email protected]>
Merge branch 'develop'
---
lisp/mastodon-tl.el | 4 ++--
lisp/mastodon.el | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index 0a14fa242f5..87b6f5a5bb0 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -1957,7 +1957,7 @@ CW-EXPANDED means treat content warnings as unfolded."
(string-empty-p
(alist-get 'spoiler_text toot))))
(body-tags (mastodon-tl--body-tags body))
- (quote (alist-get 'quote toot)))
+ (quote (mastodon-tl--field 'quote toot)))
(insert
(propertize ;; body + byline:
(concat
@@ -1975,12 +1975,12 @@ CW-EXPANDED means treat content warnings as unfolded."
(mastodon-tl--fold-body body)
body)))
(concat
- ;; insert quote maybe:
(if (and after-reply-status-p thread)
(propertize body
'line-prefix bar
'wrap-prefix bar)
body)
+ ;; insert quote maybe:
(when quote
(concat "\n\n"
(mastodon-tl--insert-quoted quote)
diff --git a/lisp/mastodon.el b/lisp/mastodon.el
index 4fc821a6860..9ec106889f9 100644
--- a/lisp/mastodon.el
+++ b/lisp/mastodon.el
@@ -6,7 +6,7 @@
;; Author: Johnson Denen <[email protected]>
;; Marty Hiatt <[email protected]>
;; Maintainer: Marty Hiatt <[email protected]>
-;; Version: 2.0.7
+;; Version: 2.0.8
;; Package-Requires: ((emacs "28.1") (persist "0.8") (tp "0.7"))
;; Homepage: https://codeberg.org/martianh/mastodon.el
