summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAlan Pearce2017-02-06 08:51:20 +0100
committerAlan Pearce2017-02-06 08:51:20 +0100
commit5d1e45b22d968d016dd2bb419e080c6679ef3081 (patch)
tree595818a9ca7a212040ae23d5076a1127715854aa
parent57d40296cdb4ad759b857b0ea4c396d2ade94b80 (diff)
parentbd8cffa2c4d377935bd70b4780235bbec92dc9f7 (diff)
downloaddotfiles-5d1e45b22d968d016dd2bb419e080c6679ef3081.tar.lz
dotfiles-5d1e45b22d968d016dd2bb419e080c6679ef3081.tar.zst
dotfiles-5d1e45b22d968d016dd2bb419e080c6679ef3081.zip
Merge remote-tracking branch 'origin/master'
-rw-r--r--tag-emacs/emacs.d/init.org4
-rw-r--r--tag-zsh/config/zsh/zshenv2
2 files changed, 3 insertions, 3 deletions
diff --git a/tag-emacs/emacs.d/init.org b/tag-emacs/emacs.d/init.org
index ad025d5..d2fd813 100644
--- a/tag-emacs/emacs.d/init.org
+++ b/tag-emacs/emacs.d/init.org
@@ -232,8 +232,8 @@ because I manage those in my [[file:~/projects/dotfiles/tag-xresources/xresource
             (ap/set-fonts "SF Mono" 12 "Lucida Grande" 12 t)
           (ap/set-fonts "Monaco" 10 "Lucida Grande" 12 nil))))
      ((eq window-system 'x)
-      (set-fontset-font "fontset-default" 'unicode (font-spec :name "Terminus" :size 12))
-      (ap/set-fonts "Terminus" 12 "Lucida" 10 nil))))
+      (set-fontset-font "fontset-default" 'unicode (font-spec :name "Terminus" :size 10))
+      (ap/set-fonts "Terminus" 10 "Lucida" 10 nil))))
 
   (ap/set-fonts-according-to-system))
 #+END_SRC
diff --git a/tag-zsh/config/zsh/zshenv b/tag-zsh/config/zsh/zshenv
index e62dca5..e75704c 100644
--- a/tag-zsh/config/zsh/zshenv
+++ b/tag-zsh/config/zsh/zshenv
@@ -1,4 +1,4 @@
-if [[ $SHLVL -eq 1 || (-n $DISPLAY && $SHLVL -lt 3) ]]
+if [[ $SHLVL -eq 1 || -n $DISPLAY ]]
 then
   if [[ -f $ZDOTDIR/zshenv.local ]]
   then