Merge remote-tracking branch 'origin/develop' into download-iosevka

modules/ui/pretty-code/+fira.el

@@ -110,7 +110,12 @@
     ("~>"     . #Xe167)
     ("~~"     . #Xe168)
     ("~~>"    . #Xe169)
-    ("%%"     . #Xe16a)))
+    ("%%"     . #Xe16a)
+    ("x"      . #Xe16b)
+    (":"      . #Xe16c)
+    ("+"      . #Xe16d)
+    ("+"      . #Xe16e)
+    ("*"      . #Xe16f)))
 
 (defun +pretty-code-setup-fira-ligatures-h ()
   (set-fontset-font t '(#Xe100 . #Xe16f) +pretty-code-fira-code-font-name)

modules/ui/pretty-code/autoload.el

@@ -15,14 +15,11 @@ and whose values are strings representing the text to be replaced with that
 symbol. If the car of PLIST is nil, then unset any pretty symbols previously
 defined for MODES.
 
-The following properties are special:
+This function accepts one special property:
 
   :alist ALIST
     Appends ALIST to `prettify-symbols-alist' literally, without mapping text to
     `+pretty-code-symbols'.
-  :merge BOOL
-    If non-nil, merge with previously defined `prettify-symbols-alist',
-    otherwise overwrite it.
 
 For example, the rule for emacs-lisp-mode is very simple:
 
@@ -38,18 +35,17 @@ Pretty symbols can be unset for emacs-lisp-mode with:
   (declare (indent defun))
   (if (null (car-safe plist))
       (dolist (mode (doom-enlist modes))
-        (delq (assq mode +pretty-code-symbols-alist)
-              +pretty-code-symbols-alist))
-    (let (results merge key)
+        (assq-delete-all mode +pretty-code-symbols-alist))
+    (let (results)
       (while plist
-        (pcase (setq key (pop plist))
-          (:merge (setq merge (pop plist)))
-          (:alist (setq results (append (pop plist) results)))
-          (_
-           (when-let (char (plist-get +pretty-code-symbols key))
-             (push (cons (pop plist) char) results)))))
+        (let ((key (pop plist)))
+          (if (eq key :alist)
+              (prependq! results (pop plist))
+            (when-let (char (plist-get +pretty-code-symbols key))
+              (push (cons (pop plist) char) results)))))
       (dolist (mode (doom-enlist modes))
-        (unless merge
-          (delq (assq mode +pretty-code-symbols-alist)
-                +pretty-code-symbols-alist))
-        (push (cons mode results) +pretty-code-symbols-alist)))))
+        (setf (alist-get mode +pretty-code-symbols-alist)
+              (if-let (old-results (alist-get mode +pretty-code-symbols-alist))
+                  (dolist (cell results old-results)
+                    (setf (alist-get (car cell) old-results) (cdr cell)))
+                results))))))

modules/ui/pretty-code/config.el

@@ -82,8 +82,12 @@ 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 ((featurep! +fira)
+;; 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)
        (load! "+iosevka"))