diff options
| author | marty hiatt <martianhiatus@riseup.net> | 2024-07-08 13:45:42 +0200 |
|---|---|---|
| committer | marty hiatt <martianhiatus@riseup.net> | 2024-07-08 13:45:42 +0200 |
| commit | a7fec255574decfe24302f260b451203d13a8b22 (patch) | |
| tree | 4b7b1c9a1a3c2fc17cf50c2286f87b4c9410b8f1 /lisp/mastodon.el | |
| parent | 7b4d77b86bb88377ca75938d2f1b88b839e96a02 (diff) | |
| parent | 4e8d28616431d2ddedc01eb021d20718f1eb1877 (diff) | |
Merge branch 'multisession' into develop
Diffstat (limited to 'lisp/mastodon.el')
| -rw-r--r-- | lisp/mastodon.el | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lisp/mastodon.el b/lisp/mastodon.el index d0dddee..8a0aa91 100644 --- a/lisp/mastodon.el +++ b/lisp/mastodon.el @@ -7,7 +7,7 @@ ;; Marty Hiatt <martianhiatus@riseup.net> ;; Maintainer: Marty Hiatt <martianhiatus@riseup.net> ;; Version: 1.0.24 -;; Package-Requires: ((emacs "27.1") (request "0.3.0") (persist "0.4")) +;; Package-Requires: ((emacs "27.1") (request "0.3.0")) ;; Homepage: https://codeberg.org/martianh/mastodon.el ;; This file is not part of GNU Emacs. @@ -144,6 +144,11 @@ The default value \"%F %T\" prints ISO8601-style YYYY-mm-dd HH:MM:SS. Use. e.g. \"%c\" for your locale's date and time format." :type 'string) +(defcustom mastodon-use-emojify nil + "Whether to use emojify.el to display emojis. +From version 28, Emacs can display emojis natively. But +currently, it doesn't seem to have a way to handle custom emoji, +while emojify,el has this feature and mastodon.el implements it.") (defun mastodon-kill-window () "Quit window and delete helper." @@ -464,7 +469,8 @@ Calls `mastodon-tl--get-buffer-type', which see." (defun mastodon-mode-hook-fun () "Function to add to `mastodon-mode-hook'." - (when (require 'emojify nil :noerror) + (when (and mastodon-use-emojify + (require 'emojify nil :noerror)) (emojify-mode t) (when mastodon-toot--enable-custom-instance-emoji (mastodon-toot--enable-custom-emoji))) |