From f2e4b8d3772d37aa04a34efd8f74a6513ac56b23 Mon Sep 17 00:00:00 2001 From: NicholasTD07 Date: Tue, 12 Sep 2017 11:14:40 +1000 Subject: [PATCH] Run `set-fontset-font` only if it is available (for emoji layer) --- CHANGELOG.develop | 2 ++ layers/+fun/emoji/funcs.el | 19 ++++++++++--------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.develop b/CHANGELOG.develop index fe0405a95..86b455488 100644 --- a/CHANGELOG.develop +++ b/CHANGELOG.develop @@ -1365,6 +1365,8 @@ Other: - Added support for Emoji fonts on macOS and Linux (thanks to CodeFalling) - Setup =emojify= cache directory (thanks to Boris Buliga) - Hide mode-line indicator: =emoji= (thanks to duianto) +- Prevented =set-fontset-font= from being set in Emacs without a window system + (thanks to NicholasTD07k) **** ERC - Key bindings: - ~SPC m b~ to switch between ERC buffers (thanks to Evan Klitzke) diff --git a/layers/+fun/emoji/funcs.el b/layers/+fun/emoji/funcs.el index 60a1c3fe1..4a58d4194 100644 --- a/layers/+fun/emoji/funcs.el +++ b/layers/+fun/emoji/funcs.el @@ -13,15 +13,16 @@ ;; Mac OS X and using the Cocoa version of Emacs (defun spacemacs//set-emoji-font (frame) "Adjust the font settings of FRAME so Emacs can display emoji properly." - (cond - ((spacemacs/system-is-mac) - (set-fontset-font t 'symbol - (font-spec :family "Apple Color Emoji") - frame 'prepend)) - ((spacemacs/system-is-linux) - (set-fontset-font t 'symbol - (font-spec :family "Symbola") - frame 'prepend)))) + (when (fboundp 'set-fontset-font) + (cond + ((spacemacs/system-is-mac) + (set-fontset-font t 'symbol + (font-spec :family "Apple Color Emoji") + frame 'prepend)) + ((spacemacs/system-is-linux) + (set-fontset-font t 'symbol + (font-spec :family "Symbola") + frame 'prepend))))) (defun spacemacs//set-emoji-font-for-current-frame () "Adjust the font settings of current frame so Emacs can display emoji