aboutsummaryrefslogtreecommitdiff
path: root/lisp/mastodon-toot.el
diff options
context:
space:
mode:
authormarty hiatt <martianhiatus [a t] riseup [d o t] net>2023-10-05 11:43:49 +0200
committermarty hiatt <martianhiatus [a t] riseup [d o t] net>2023-10-05 11:43:49 +0200
commitb8c5e9d50dcb68222070303726c0e6027a9c0d26 (patch)
tree975b759c8b058050533fdf6a37ffb377ee9c8828 /lisp/mastodon-toot.el
parente8f10073a659ea2133377bc8d2e7d826ce772882 (diff)
parent083222c20cd23755ca93fc2a9e320f653cffe9ef (diff)
Merge branch 'develop'
Diffstat (limited to 'lisp/mastodon-toot.el')
-rw-r--r--lisp/mastodon-toot.el16
1 files changed, 9 insertions, 7 deletions
diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index 7478037..f46fc6d 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -947,7 +947,7 @@ Buffer-local variable `mastodon-toot-previous-window-config' holds the config."
"Apply `mastodon-toot--process-local' function to each mention in MENTIONS.
Remove empty string (self) from result and joins the sequence with whitespace."
(mapconcat (lambda (mention) mention)
- (remove "" (mapcar #'mastodon-toot--process-local mentions))
+ (remove "" (mapcar #'mastodon-toot--process-local mentions))
" "))
(defun mastodon-toot--process-local (acct)
@@ -1485,27 +1485,29 @@ REPLY-TEXT is the text of the toot being replied to."
'toot-reply t)
"")
divider
- "\n")
- 'rear-nonsticky t
+ )
'face 'mastodon-toot-docs-face
'read-only "Edit your message below."
- 'toot-post-header t))))
+ 'toot-post-header t)
+ ;; allow us to enter text after read-only header:
+ (propertize "\n"
+ 'rear-nonsticky t))))
(defun mastodon-toot--most-restrictive-visibility (reply-visibility)
"Return REPLY-VISIBILITY or default visibility, whichever is more restrictive.
The default is given by `mastodon-toot--default-reply-visibility'."
(unless (null reply-visibility)
(let ((less-restrictive (member (intern mastodon-toot--default-reply-visibility)
- mastodon-toot-visibility-list)))
+ mastodon-toot-visibility-list)))
(if (member (intern reply-visibility) less-restrictive)
- mastodon-toot--default-reply-visibility reply-visibility))))
+ mastodon-toot--default-reply-visibility reply-visibility))))
(defun mastodon-toot--setup-as-reply (reply-to-user reply-to-id reply-json)
"If REPLY-TO-USER is provided, inject their handle into the message.
If REPLY-TO-ID is provided, set `mastodon-toot--reply-to-id'.
REPLY-JSON is the full JSON of the toot being replied to."
(let ((reply-visibility (mastodon-toot--most-restrictive-visibility
- (alist-get 'visibility reply-json)))
+ (alist-get 'visibility reply-json)))
(reply-cw (alist-get 'spoiler_text reply-json)))
(when reply-to-user
(when (> (length reply-to-user) 0) ; self is "" unforch