1 files changed, 13 insertions, 13 deletions

@@ -72,19 +72,18 @@
 
 (add-function :after after-focus-change-function
               (defun hook--setup-fonts ()
-                (dolist (face '(default fixed-pitch))
-                  ;; `default' and `fixed-pitch' should be the same.
-                  (set-face-attribute face nil
-                                      :font (pcase acdw/system
-                                              (:home "DejaVu Sans Mono-10")
-                                              (:work "Consolas-10")
-                                              (:other "monospace-10"))))
-                ;; `variable-pitch' is, of course, different.
-                (set-face-attribute 'variable-pitch nil
-                                    :font (pcase acdw/system
+                (require 'acdw-fonts)
+                (setq acdw-fonts/monospace (pcase acdw/system
+                                             (:home "DejaVu Sans Mono")
+                                             (:work "Consolas")
+                                             (:other "monospace"))
+                      acdw-fonts/monospace-size 10
+                      acdw-fonts/variable (pcase acdw/system
                                             (:home "DejaVu Sans")
-                                            (:work "Calibri-11")
-                                            (:other "sans-serif")))
+                                            (:work "Calibri")
+                                            (:other "sans-serif"))
+                      acdw-fonts/variable-size 11)
+                (acdw-fonts/set)
                 (remove-function after-focus-change-function
                                  'hook--setup-fonts)))
 
@@ -98,7 +97,8 @@
                     (expand-file-name "~/usr/bin")
                     (expand-file-name "~/cmd")
                     (expand-file-name "~/mingw64/bin")
-                    (expand-file-name "~/clisp-2.49")))
+                    (expand-file-name "~/clisp-2.49"))
+              exec-path)
   (when (file-exists-p path)
     (add-to-list 'exec-path path :append)))