TakeV/spacemacs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Run set-fontset-font only if it is available (for emoji layer)

Browse source
This commit is contained in:
NicholasTD07 2017-09-12 11:14:40 +10:00 committed by duianto
parent 7818fa3ccf
commit f2e4b8d377
2 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.develop
View file

@ -1365,6 +1365,8 @@ Other:
- Added support for Emoji fonts on macOS and Linux (thanks to CodeFalling) - Added support for Emoji fonts on macOS and Linux (thanks to CodeFalling)
- Setup =emojify= cache directory (thanks to Boris Buliga) - Setup =emojify= cache directory (thanks to Boris Buliga)
- Hide mode-line indicator: =emoji= (thanks to duianto) - 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 **** ERC
- Key bindings: - Key bindings:
- ~SPC m b~ to switch between ERC buffers (thanks to Evan Klitzke) - ~SPC m b~ to switch between ERC buffers (thanks to Evan Klitzke)

19
layers/+fun/emoji/funcs.el
View file

@ -13,15 +13,16 @@
;; Mac OS X and using the Cocoa version of Emacs ;; Mac OS X and using the Cocoa version of Emacs
(defun spacemacs//set-emoji-font (frame) (defun spacemacs//set-emoji-font (frame)
"Adjust the font settings of FRAME so Emacs can display emoji properly." "Adjust the font settings of FRAME so Emacs can display emoji properly."
(cond (when (fboundp 'set-fontset-font)
((spacemacs/system-is-mac) (cond
(set-fontset-font t 'symbol ((spacemacs/system-is-mac)
(font-spec :family "Apple Color Emoji") (set-fontset-font t 'symbol
frame 'prepend)) (font-spec :family "Apple Color Emoji")
((spacemacs/system-is-linux) frame 'prepend))
(set-fontset-font t 'symbol ((spacemacs/system-is-linux)
(font-spec :family "Symbola") (set-fontset-font t 'symbol
frame 'prepend)))) (font-spec :family "Symbola")
frame 'prepend)))))
(defun spacemacs//set-emoji-font-for-current-frame () (defun spacemacs//set-emoji-font-for-current-frame ()
"Adjust the font settings of current frame so Emacs can display emoji "Adjust the font settings of current frame so Emacs can display emoji