From ec7a067109853288c0372d168d1dd86e1f831683 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Thu, 2 Jan 2020 21:13:50 -0500 Subject: [PATCH] Enable ligatures on emacs-mac if pretty-code is enabled No longer necessary to enable a font ligature flag for it. --- modules/ui/pretty-code/config.el | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/modules/ui/pretty-code/config.el b/modules/ui/pretty-code/config.el index 0299a2aba..a1f942bc0 100644 --- a/modules/ui/pretty-code/config.el +++ b/modules/ui/pretty-code/config.el @@ -82,14 +82,11 @@ Otherwise it builds `prettify-code-symbols-alist' according to (add-hook 'after-change-major-mode-hook #'+pretty-code-init-pretty-symbols-h) -;; Font-specific ligature support -(cond ((and IS-MAC - (fboundp 'mac-auto-operator-composition-mode) - (or (featurep! +fira) - (featurep! +iosevka) - (featurep! +hasklig) - (featurep! +pragmata-pro))) +;; The emacs-mac build of Emacs appear to have built-in support for ligatures, +;; so use that instead if this module is enabled. +(cond ((and IS-MAC (fboundp 'mac-auto-operator-composition-mode)) (mac-auto-operator-composition-mode)) + ;; Font-specific ligature support ((featurep! +fira) (load! "+fira")) ((featurep! +iosevka)