summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/font-config.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/modules/font-config.el b/modules/font-config.el
index 7da2e8af4..6198954d7 100644
--- a/modules/font-config.el
+++ b/modules/font-config.el
@@ -134,8 +134,9 @@ Note that server-after-make-frame-hook is available only in Emacs 27+."
:custom
(emojify-download-emojis-p t) ;; don't ask, just download emojis
:bind
- ("C-c e i" . emojify-insert-emoji) ;; emoji insert
- ("C-c e l" . emojify-list-emojis) ;; emoji list
+ ;; using this keybinding for ediff
+ ;; ("C-c e i" . emojify-insert-emoji) ;; emoji insert
+ ;; ("C-c e l" . emojify-list-emojis) ;; emoji list
:config
(setq emojify-show-help nil)
(setq emojify-point-entered-behaviour 'uncover)