all repos — nixfiles @ 779a06009887201ca50ade43feda540fbaa690b5

System and user configuration, managed by nix and home-manager

Emacs: Use builtin function to create font-spec

Alan Pearce
commit

779a06009887201ca50ade43feda540fbaa690b5

parent

987c7b55294c59c289b2440ba4d4c33a8126402f

1 file changed, 3 insertions(+), 6 deletions(-)

jump to
M tag-emacs/emacs.d/init.orgtag-emacs/emacs.d/init.org
@@ -155,17 +155,14 @@ (interactive)
(variable-pitch-mode) (setq cursor-type 'bar)) - (defun format-font (name style size) - (format "-*-%s-%s-*-*-*-%s-*-*-*-*-*-*" name style size)) - (defun ap/set-fonts (mono-face mono-font-size variable-face variable-font-size) (when mono-face - (let ((default-font (format-font mono-face "normal" mono-font-size))) + (let ((default-font (font-spec :name mono-face :size mono-font-size))) (add-to-list 'default-frame-alist `(font . ,default-font)) (set-face-font 'fixed-pitch default-font) (set-frame-font default-font t t))) (when variable-face - (set-face-font 'variable-pitch (format-font variable-face "normal" variable-font-size)))) + (set-face-font 'variable-pitch (font-spec :name variable-face :size variable-font-size)))) (defun ap/set-fonts-according-to-system () (interactive)
@@ -178,7 +175,7 @@ (if (eq displays 1)
(ap/set-fonts "SF Mono" 12 "Lucida Grande" 12) (ap/set-fonts "ProggyTiny" 11 "Lucida Grande" 12)))) ((eq window-system 'x) - (ap/set-fonts "Terminus" 10 "Lucida" 10)))) + (ap/set-fonts "Terminus" 12 "Lucida" 10)))) (ap/set-fonts-according-to-system)) #+END_SRC