jt/emacs-prelude
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #936 from dylnclrk/master

Browse source 
Don't invoke set-fontset-font if it is void
This commit is contained in:
Bozhidar Batsov 2015-12-09 21:48:05 +02:00
parent c468da28d4 a164dfa742
commit 5ce441b5ca
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/prelude-osx.el
View file

@ -67,7 +67,9 @@ Windows external keyboard from time to time."
(menu-bar-mode +1)
;; Enable emoji, and stop the UI from freezing when trying to display them.
(set-fontset-font t 'unicode "Apple Color Emoji" nil 'prepend)
(if (fboundp 'set-fontset-font)
(set-fontset-font t 'unicode "Apple Color Emoji" nil 'prepend))
(provide 'prelude-osx)
;;; prelude-osx.el ends here