summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAlan Pearce2017-09-08 23:20:05 +0200
committerAlan Pearce2017-09-08 23:20:05 +0200
commitf64d27e5aa9fa4668773a0e01bd4bf396b69d819 (patch)
tree4b92c73278cd7450a6265a6a1cb1d06f5500f72e
parent841e31a841e73ed3f6ad717c1aa45d8d80166ea8 (diff)
downloaddotfiles-f64d27e5aa9fa4668773a0e01bd4bf396b69d819.tar.lz
dotfiles-f64d27e5aa9fa4668773a0e01bd4bf396b69d819.tar.zst
dotfiles-f64d27e5aa9fa4668773a0e01bd4bf396b69d819.zip
Emacs: Use system default font from Xresources
-rw-r--r--emacs/.emacs.d/main.el4
-rw-r--r--xresources/.xresources/main6
2 files changed, 3 insertions, 7 deletions
diff --git a/emacs/.emacs.d/main.el b/emacs/.emacs.d/main.el
index b51e1f3..7da0f6b 100644
--- a/emacs/.emacs.d/main.el
+++ b/emacs/.emacs.d/main.el
@@ -223,10 +223,6 @@
             (ap/set-fonts "Fira Code" 14 "Lucida Grande" 14 t nil)
           (ap/set-fonts "Monoid" 12 "Helvetica Neue" 12 t 0.1))))
      ((and (eq window-system 'x)
-           (not (eq system-type 'gnu/linux/windows)))
-      (set-fontset-font "fontset-default" 'unicode (font-spec :name "PT Mono" :size 14))
-      (ap/set-fonts "PT Mono" 14 "Noto Sans" 14 nil))
-     ((and (eq window-system 'x)
            (eq system-type 'gnu/linux/windows))
       (ap/set-fonts "Noto Mono" 12 "Sans" 12 nil)))))
 
diff --git a/xresources/.xresources/main b/xresources/.xresources/main
index f8a7269..f89da07 100644
--- a/xresources/.xresources/main
+++ b/xresources/.xresources/main
@@ -28,9 +28,9 @@ URxvt.pointerBlank:       true
 URxvt.pointerBlankDelay:  987654321
 URxvt.letterSpace:        0
 
-Emacs.Font:                         -Misc-Fixed-normal-normal-normal-*-14-*-*-*-c-70-iso10646-1
-Emacs.fixed-pitch.attributeFont:    -Misc-Fixed-normal-normal-normal-*-14-*-*-*-c-70-iso10646-1
-Emacs.variable-pitch.attributeFont: -*-PT Sans-medium-r-*-*-14-*-*-*-*-*-*-*
+Emacs.Font:                         monospace-10
+Emacs.fixed-pitch.attributeFont:    monospace-10
+Emacs.variable-pitch.attributeFont: sans-10
 
 ! Local Variables:
 ! compile-command: (concat "xrdb -merge " (shell-quote-argument buffer-file-name))