aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarty hiatt <martianhiatus@riseup.net>2024-02-23 18:03:29 +0100
committermarty hiatt <martianhiatus@riseup.net>2024-02-23 18:03:29 +0100
commit25bae1042ff59efa516d6443a729453dc023dd11 (patch)
treebae1800434e44fbe243c88450d0e04a3266a9941
parentd66e27be92992a628b27cd630939ed99c36f0cd8 (diff)
parentcbf084a0570fb952c59b53c9222557239be2c90c (diff)
Merge branch 'develop'
-rw-r--r--lisp/mastodon-toot.el4
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index e414552..366a000 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -154,7 +154,7 @@ If the original toot visibility is different we use the more restricted one."
"Whether to enable your instance's custom emoji by default."
:type 'boolean)
-(defcustom mastodon-toot--emojify-in-compose-buffer nil
+(defcustom mastodon-toot--emojify-in-compose-buffer t
"Whether to enable `emojify' in the compose buffer."
:type 'boolean)
@@ -1902,6 +1902,8 @@ EDIT means we are editing an existing toot, not composing a new one."
(setq mastodon-toot-previous-window-config previous-window-config)
(when mastodon-toot--proportional-fonts-compose
(facemenu-set-face 'variable-pitch))
+ (when mastodon-toot--emojify-in-compose-buffer
+ (emojify-mode))
(when (and initial-text
(not reply-json))
(insert initial-text))))