diff options
| author | Case Duckworth | 2022-01-31 00:53:30 -0600 |
|---|---|---|
| committer | Case Duckworth | 2022-01-31 00:53:30 -0600 |
| commit | e8589cec6ca1048b4771be5dbea6323b7f87df9b (patch) | |
| tree | 806c3e05212605151481ecaf1938a0c0586f73a6 | |
| parent | gah (diff) | |
| download | emacs-e8589cec6ca1048b4771be5dbea6323b7f87df9b.tar.gz emacs-e8589cec6ca1048b4771be5dbea6323b7f87df9b.zip | |
Change face-setting logic
| -rw-r--r-- | early-init.el | 13 | ||||
| -rw-r--r-- | lisp/acdw.el | 8 | ||||
| -rw-r--r-- | machines/bob.el | 8 |
3 files changed, 14 insertions, 15 deletions
| diff --git a/early-init.el b/early-init.el index 8ceb74f..137c04c 100644 --- a/early-init.el +++ b/early-init.el | |||
| @@ -76,19 +76,6 @@ See `no-littering' for examples.") | |||
| 76 | 76 | ||
| 77 | ;;; Fonts | 77 | ;;; Fonts |
| 78 | (+with-ensure-after-init | 78 | (+with-ensure-after-init |
| 79 | (unless noninteractive ;; Set default faces | ||
| 80 | (+with-message "Setting default faces" | ||
| 81 | (let ((font-name machine-default-font) | ||
| 82 | (font-size machine-default-height) | ||
| 83 | (variable-font-name machine-variable-pitch-font) | ||
| 84 | (variable-font-size machine-variable-pitch-height)) | ||
| 85 | (set-face-attribute 'default nil :family font-name | ||
| 86 | :height font-size :weight 'book) | ||
| 87 | (set-face-attribute 'italic nil :family font-name | ||
| 88 | :height font-size :slant 'italic) | ||
| 89 | (set-face-attribute 'variable-pitch nil :family variable-font-name | ||
| 90 | :height variable-font-size)))) | ||
| 91 | |||
| 92 | ;; Emoji fonts | 79 | ;; Emoji fonts |
| 93 | (+with-message "Adding emoji fonts" | 80 | (+with-message "Adding emoji fonts" |
| 94 | (let ((ffl (font-family-list))) | 81 | (let ((ffl (font-family-list))) |
| diff --git a/lisp/acdw.el b/lisp/acdw.el index c2f9767..916591c 100644 --- a/lisp/acdw.el +++ b/lisp/acdw.el | |||
| @@ -259,5 +259,13 @@ Use like `setq'." | |||
| 259 | into ret | 259 | into ret |
| 260 | finally return ret))) | 260 | finally return ret))) |
| 261 | 261 | ||
| 262 | (defun +set-faces (specs) | ||
| 263 | "Set fonts to SPECS. | ||
| 264 | Specs is an alist: its cars are faces and its cdrs are the plist | ||
| 265 | passed to `set-face-attribute'. Note that the FRAME argument is | ||
| 266 | always nil; this function is mostly intended for use in init." | ||
| 267 | (dolist (spec specs) | ||
| 268 | (apply #'set-face-attribute (car spec) nil (cdr spec)))) | ||
| 269 | |||
| 262 | (provide 'acdw) | 270 | (provide 'acdw) |
| 263 | ;;; acdw.el ends here | 271 | ;;; acdw.el ends here |
| diff --git a/machines/bob.el b/machines/bob.el index e9b444c..37831db 100644 --- a/machines/bob.el +++ b/machines/bob.el | |||
| @@ -4,7 +4,11 @@ | |||
| 4 | 4 | ||
| 5 | ;;; Code: | 5 | ;;; Code: |
| 6 | 6 | ||
| 7 | (setq machine-default-font "DejaVu Sans Mono" | 7 | (require 'acdw) |
| 8 | machine-default-height 105) | 8 | |
| 9 | (+set-faces `((default :family "CMU Typewriter Text" | ||
| 10 | :height 120) | ||
| 11 | (variable-pitch :family "CMU Typewriter Text Variable Width" | ||
| 12 | :height 1.1))) | ||
| 9 | 13 | ||
| 10 | ;;; bob.el ends here | 14 | ;;; bob.el ends here |