From 909c27796843a4b3e236354f96d0dd98266e5b97 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Wed, 23 Oct 2019 18:05:08 -0400
Subject: [PATCH] ui/modeline: fix ligature/all-the-icons conflict #1216

Relevant to seagle0128/doom-modeline#69
---
 modules/ui/modeline/config.el | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/modules/ui/modeline/config.el b/modules/ui/modeline/config.el
index 61cc8add0..a6bf23010 100644
--- a/modules/ui/modeline/config.el
+++ b/modules/ui/modeline/config.el
@@ -37,6 +37,16 @@
 
   (add-hook '+doom-dashboard-mode-hook #'doom-modeline-set-project-modeline)
 
+  (when (or (featurep! :ui pretty-code +fira)
+            (featurep! :ui pretty-code +iosevka))
+    ;; Fix #1216 and seagle0128/doom-modeline#69: wrong icon displayed for
+    ;; 'save' icon in modeline.
+    (defadvice! +modeline-fix-font-conflict-with-ligatures-a (icon-name &rest args)
+      (when doom-modeline-icon
+        (pcase (car args)
+          ("save" (apply 'all-the-icons-faicon (cons "floppy-o" (plist-put (cdr args) :v-adjust -0.0575))))
+          (other (apply 'all-the-icons-material args))))))
+
   (add-hook! 'magit-mode-hook
     (defun +modeline-hide-in-non-status-buffer-h ()
       "Show minimal modeline in magit-status buffer, no modeline elsewhere."