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

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

[nongnu] elpa/mastodon 54be3ac245 5/8: compose: only try to enable emoji


From: ELPA Syncer
Subject: [nongnu] elpa/mastodon 54be3ac245 5/8: compose: only try to enable emojify-mode if its bound
Date: Wed, 28 Feb 2024 07:00:20 -0500 (EST)

branch: elpa/mastodon
commit 54be3ac2457ca21fbc827c6304009e2461ffacec
Author: marty hiatt <martianhiatus@riseup.net>
Commit: marty hiatt <martianhiatus@riseup.net>

    compose: only try to enable emojify-mode if its bound
---
 lisp/mastodon-toot.el | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lisp/mastodon-toot.el b/lisp/mastodon-toot.el
index 366a00086c..1d9157827b 100644
--- a/lisp/mastodon-toot.el
+++ b/lisp/mastodon-toot.el
@@ -155,7 +155,8 @@ If the original toot visibility is different we use the 
more restricted one."
   :type 'boolean)
 
 (defcustom mastodon-toot--emojify-in-compose-buffer t
-  "Whether to enable `emojify' in the compose buffer."
+  "Whether to enable `emojify-mode' in the compose buffer.
+We only attempt to enable it if its bound."
   :type 'boolean)
 
 (defcustom mastodon-toot--proportional-fonts-compose nil
@@ -1902,7 +1903,9 @@ 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
+    (when (and mastodon-toot--emojify-in-compose-buffer
+               ;; emojify loaded but poss not enabled in our buffer:
+               (boundp 'emojify-mode))
       (emojify-mode))
     (when (and initial-text
                (not reply-json))



reply via email to

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