General refactor & cleanup, across the board

This commit is contained in:
Henrik Lissner 2019-09-13 21:59:03 -04:00
parent 4ddc5c194b
commit 2d365619cd
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
35 changed files with 141 additions and 155 deletions

View file

@ -112,11 +112,11 @@
("~~>" . #Xe169)
("%%" . #Xe16a)))
(defun +pretty-code|setup-fira-ligatures ()
(defun +pretty-code-setup-fira-ligatures-h ()
(set-fontset-font t '(#Xe100 . #Xe16f) +pretty-code-fira-code-font-name)
(setq-default prettify-symbols-alist
(append prettify-symbols-alist
(mapcar #'+pretty-code--correct-symbol-bounds
+pretty-code-fira-code-font-ligatures))))
(add-hook 'doom-init-ui-hook #'+pretty-code|setup-fira-ligatures)
(add-hook 'doom-init-ui-hook #'+pretty-code-setup-fira-ligatures-h)

View file

@ -48,11 +48,11 @@
("<->" . #Xe129)))
(defun +pretty-code|setup-hasklig-ligatures ()
(defun +pretty-code-setup-hasklig-ligatures-h ()
(set-fontset-font t '(#Xe100 . #Xe129) +pretty-code-hasklig-font-name)
(setq-default prettify-symbols-alist
(append prettify-symbols-alist
(mapcar #'+pretty-code--correct-symbol-bounds
+pretty-code-hasklig-font-ligatures))))
(add-hook 'doom-init-ui-hook #'+pretty-code|setup-hasklig-ligatures)
(add-hook 'doom-init-ui-hook #'+pretty-code-setup-hasklig-ligatures-h)

View file

@ -223,11 +223,10 @@
("+>" . #Xe1cc))
"Defines the character mappings for ligatures for Iosevka.")
(defun +pretty-code|setup-iosevka-ligatures ()
(defun +pretty-code-setup-iosevka-ligatures-h ()
(set-fontset-font t '(#Xe100 . #Xe1cc) +pretty-code-iosevka-font-name)
(setq-default prettify-symbols-alist
(append prettify-symbols-alist
+pretty-code-iosevka-font-ligatures)))
(add-hook 'doom-init-ui-hook #'+pretty-code|setup-iosevka-ligatures)
(add-hook 'doom-init-ui-hook #'+pretty-code-setup-iosevka-ligatures-h)

View file

@ -198,10 +198,10 @@
("\">" . #XEA90))
"Defines the character mappings for ligatures for Pragmata Pro.")
(defun +pretty-code|setup-pragmata-pro-ligatures ()
(defun +pretty-code-setup-pragmata-pro-ligatures-h ()
(setq-default prettify-symbols-alist
(append prettify-symbols-alist
(mapcar #'+pretty-code--correct-symbol-bounds
+pretty-code-pragmata-pro-font-ligatures))))
(add-hook 'doom-init-ui-hook #'+pretty-code|setup-pragmata-pro-ligatures)
(add-hook 'doom-init-ui-hook #'+pretty-code-setup-pragmata-pro-ligatures-h)

View file

@ -17,7 +17,7 @@ besides what is listed.")
;; When you get to the right edge, it goes back to how it normally prints
(setq prettify-symbols-unprettify-at-point 'right-edge)
(defun +pretty-code|init-pretty-symbols ()
(defun +pretty-code-init-pretty-symbols-h ()
"Enable `prettify-symbols-mode'.
If in fundamental-mode, or a mode derived from special, comint, eshell or term
@ -39,4 +39,4 @@ Otherwise it builds `prettify-code-symbols-alist' according to
(prettify-symbols-mode -1))
(prettify-symbols-mode +1))))
(add-hook 'after-change-major-mode-hook #'+pretty-code|init-pretty-symbols)
(add-hook 'after-change-major-mode-hook #'+pretty-code-init-pretty-symbols-h)