emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[nongnu] elpa/mastodon 16c4ddcd69 6/6: Merge branch 'develop'


From: ELPA Syncer
Subject: [nongnu] elpa/mastodon 16c4ddcd69 6/6: Merge branch 'develop'
Date: Wed, 30 Oct 2024 10:01:18 -0400 (EDT)

branch: elpa/mastodon
commit 16c4ddcd693068c738ae4bb271c60841f1912f4c
Merge: 879eaeefb5 e97547a160
Author: marty hiatt <martianhiatus@disroot.org>
Commit: marty hiatt <martianhiatus@disroot.org>

    Merge branch 'develop'
---
 lisp/mastodon-http.el    | 4 +++-
 lisp/mastodon-profile.el | 2 +-
 lisp/mastodon-tl.el      | 2 +-
 lisp/mastodon.el         | 4 ++--
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/lisp/mastodon-http.el b/lisp/mastodon-http.el
index 1093de1762..47b96fed12 100644
--- a/lisp/mastodon-http.el
+++ b/lisp/mastodon-http.el
@@ -243,7 +243,9 @@ Callback to `mastodon-http--get-response-async', usually
             ;; ideally we should handle the status code in here rather than
             ;; this crappy hack?
             ((string-prefix-p "\n<" json-string) ; html hack
-             (mastodon-http--render-html-err json-string))
+             ;; NB: in this case, process-response returns t!:
+             (mastodon-http--render-html-err json-string)
+             nil) ;; return nil instead of t
             ;; if no json or html, maybe we have a plain string error message
             ;; (misskey does this, but there are probably better ways to do
             ;; this):
diff --git a/lisp/mastodon-profile.el b/lisp/mastodon-profile.el
index b4a8d4fc28..c16d88dfd4 100644
--- a/lisp/mastodon-profile.el
+++ b/lisp/mastodon-profile.el
@@ -614,7 +614,7 @@ FIELDS means provide a fields vector fetched by other 
means."
   "Insert each of the PINNED-STATUSES for a given account."
   (mapc (lambda (pinned-status)
           (insert
-           (concat "   "
+           (concat "\n   "
                    (propertize " pinned "
                                'face '(:inherit success :box t))
                    "   "))
diff --git a/lisp/mastodon-tl.el b/lisp/mastodon-tl.el
index 5eb52e3a43..5178a25721 100644
--- a/lisp/mastodon-tl.el
+++ b/lisp/mastodon-tl.el
@@ -159,7 +159,7 @@ nil."
     (favourite       . ("⭐" . "F"))
     (bookmark        . ("🔖" . "K"))
     (media           . ("📹" . "[media]"))
-    (verified        . ("" . "V"))
+    (verified        . ("✓" . "V"))
     (locked          . ("🔒" . "[locked]"))
     (private         . ("🔒" . "[followers]"))
     (direct          . ("✉" . "[direct]"))
diff --git a/lisp/mastodon.el b/lisp/mastodon.el
index deee0c12db..119a0459c3 100644
--- a/lisp/mastodon.el
+++ b/lisp/mastodon.el
@@ -6,8 +6,8 @@
 ;; Author: Johnson Denen <johnson.denen@gmail.com>
 ;;         Marty Hiatt <mousebot@disroot.org>
 ;; Maintainer: Marty Hiatt <mousebot@disroot.org>
-;; Version: 1.1.2
-;; Package-Requires: ((emacs "28.1") (request "0.3.0") (persist "0.4") (tp 
"0.1"))
+;; Version: 1.1.3
+;; Package-Requires: ((emacs "28.1") (request "0.3.0") (persist "0.4") (tp 
"0.5"))
 ;; Homepage: https://codeberg.org/martianh/mastodon.el
 
 ;; This file is not part of GNU Emacs.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]