aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarty hiatt <martianhiatus@riseup.net>2024-10-22 08:04:26 +0200
committermarty hiatt <martianhiatus@riseup.net>2024-10-22 08:04:26 +0200
commit31df8d9a0ae57342961ff46fe032c6871d2cefbb (patch)
tree873ed2239093fcf50a406e12b962375c6e3bf37c
parentcafdc7131f7c31f96bb890d478a21efe4e9f7c83 (diff)
parent8c6b2a484923f72b7790fbf4ef4fe8d93f74f553 (diff)
Merge branch 'develop'
-rw-r--r--lisp/mastodon-toot.el4
-rw-r--r--mastodon.info8
-rw-r--r--mastodon.texi2
3 files changed, 7 insertions, 7 deletions
diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index fc5825a..7440fe5 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -1696,8 +1696,8 @@ The default is given by `mastodon-toot--default-reply-visibility'."
(let ((less-restrictive (member (intern mastodon-toot--default-reply-visibility)
mastodon-toot-visibility-list)))
(if (member (intern reply-visibility) less-restrictive)
- mastodon-toot--default-reply-visibility
- reply-visibility))))
+ reply-visibility
+ mastodon-toot--default-reply-visibility))))
(defun mastodon-toot--render-reply-region-str (str)
"Refill STR and prefix all lines with >, as reply-quote text."
diff --git a/mastodon.info b/mastodon.info
index 7380080..6d44f1d 100644
--- a/mastodon.info
+++ b/mastodon.info
@@ -718,8 +718,8 @@ File: mastodon.info, Node: Supporting mastodonel, Next: Contributors, Prev: C
If you’d like to support continued development of ‘mastodon.el’, I
accept donations via paypal: paypal.me/martianh
(https://paypal.me/martianh). If you would prefer a different payment
-method, please write to me at <martianhiatus [at] riseup [dot] net> and
-I can provide IBAN or other bank account details.
+method, please write to me at <mousebot@disroot.org> and I can provide
+IBAN or other bank account details.
I don’t have a tech worker’s income, so even a small tip would help
out.
@@ -803,8 +803,8 @@ Node: Bug reports24801
Node: Fixes and features25712
Node: Coding style26213
Node: Supporting mastodonel26837
-Node: Contributors27404
-Node: screenshots27839
+Node: Contributors27389
+Node: screenshots27824

End Tag Table
diff --git a/mastodon.texi b/mastodon.texi
index d1c9268..761ac8f 100644
--- a/mastodon.texi
+++ b/mastodon.texi
@@ -818,7 +818,7 @@ There's no need for a blank line after the first docstring line (one is added au
If you'd like to support continued development of @samp{mastodon.el}, I accept
donations via paypal: @uref{https://paypal.me/martianh, paypal.me/martianh}. If you would prefer a different
-payment method, please write to me at <mousebot@disroot.org> and I can
+payment method, please write to me at <mousebot@@disroot.org> and I can
provide IBAN or other bank account details.
I don't have a tech worker's income, so even a small tip would help out.