Merge pull request #936 from dylnclrk/master

Don't invoke set-fontset-font if it is void
10 years ago · 5ce441b5ca
1 changed files with 3 additions and 1 deletions
--- a/core/prelude-osx.el
+++ b/core/prelude-osx.el
@ -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