Merge pull request #2476 from xeijin/patch-1

Disable all-the-icons font install on windows
This commit is contained in:
Henrik Lissner 2020-02-02 19:02:56 -05:00 committed by GitHub
commit acf437e00a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -80,9 +80,17 @@ DOOMDIR environment variable. e.g.
(print! "Regenerating autoloads files") (print! "Regenerating autoloads files")
(doom-cli-reload-autoloads) (doom-cli-reload-autoloads)
(if nofonts-p (cond (nofonts-p)
(print! (warn "Not installing fonts, as requested")) (IS-WINDOWS
(when (or doom-auto-accept (print! (warn "Doom cannot install all-the-icons' fonts on Windows!\n"))
(print-group!
(print!
(concat "You'll have to do so manually:\n\n"
" 1. Launch Doom Emacs\n"
" 2. Execute 'M-x all-the-icons-install-fonts' to download the fonts\n"
" 3. Open the download location in windows explorer\n"
" 4. Open each font file to install them"))))
((or doom-auto-accept
(y-or-n-p "Download and install all-the-icon's fonts?")) (y-or-n-p "Download and install all-the-icon's fonts?"))
(require 'all-the-icons) (require 'all-the-icons)
(let ((window-system (cond (IS-MAC 'ns) (let ((window-system (cond (IS-MAC 'ns)