emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

doom/doctor: improve error handler for font detection

Browse source 
Fixes #3008
This commit is contained in:
Henrik Lissner 2020-05-15 04:59:10 -04:00
parent 805976b8bd
commit 87e279ce61
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

23
core/cli/doctor.el
View file

@ -132,14 +132,21 @@ in."
(`darwin "~/Library/Fonts/")) (`darwin "~/Library/Fonts/"))
(require 'all-the-icons nil t)) (require 'all-the-icons nil t))
(with-temp-buffer (with-temp-buffer
(insert (cdr (doom-call-process "fc-list" "" "file"))) (let ((errors 0))
(dolist (font all-the-icons-font-names) (cl-destructuring-bind (status . output)
(if (save-excursion (re-search-backward font nil t)) (doom-call-process "fc-list" "" "file")
(success! "Found font %s" font) (if (not (zerop status))
(print! (warn "Warning: couldn't find %S font") font) (print! (error "There was an error running `fc-list'. Is fontconfig installed correctly?"))
(explain! "You can install it by running `M-x all-the-icons-install-fonts' within Emacs.\n\n" (insert (cdr (doom-call-process "fc-list" "" "file")))
"This could also mean you've installed them in non-standard locations, in which " (dolist (font all-the-icons-font-names)
"case feel free to ignore this warning."))))))) (if (save-excursion (re-search-backward font nil t))
(success! "Found font %s" font)
(print! (warn "Warning: couldn't find %S font") font)))
(when (> errors 0)
(explain! "Some all-the-icons fonts were missing.\n\n"
"You can install them by running `M-x all-the-icons-install-fonts' within Emacs.\n"
"This could also mean you've installed them in non-standard locations, in which "
"case feel free to ignore this warning.")))))))))
(print! (start "Checking for stale elc files in your DOOMDIR...")) (print! (start "Checking for stale elc files in your DOOMDIR..."))
(when (file-directory-p doom-private-dir) (when (file-directory-p doom-private-dir)