summaryrefslogtreecommitdiff
path: root/dotfiles/.emacs.d
diff options
context:
space:
mode:
authorDavid Thompson <davet@gnu.org>2015-05-24 04:35:45 -0400
committerDavid Thompson <davet@gnu.org>2015-05-24 04:35:45 -0400
commitb1c4c71db309021c818f0eb57d3177f3b4dddd7d (patch)
tree25e503cb19293c5a2ba142c9c0957a89ca3f1bff /dotfiles/.emacs.d
parent00367f29c97c6a08c88d2ce7a4fcc85ca1f40ec5 (diff)
emacs: Fix error when config is loaded in daemon mode.
Diffstat (limited to 'dotfiles/.emacs.d')
-rw-r--r--dotfiles/.emacs.d/init.el7
1 files changed, 5 insertions, 2 deletions
diff --git a/dotfiles/.emacs.d/init.el b/dotfiles/.emacs.d/init.el
index f2ab70a..8c46f79 100644
--- a/dotfiles/.emacs.d/init.el
+++ b/dotfiles/.emacs.d/init.el
@@ -50,8 +50,11 @@
"Return 't' if FONT exists."
(not (null (x-list-fonts font))))
-(when (font-exists-p "Inconsolata")
- (set-default-font "Inconsolata-11"))
+;; The font cannot be set until a frame has been created.
+(add-to-list 'after-make-frame-functions
+ (lambda (frame)
+ (when (font-exists-p "Inconsolata")
+ (set-default-font "Inconsolata-11"))))
(load-theme 'wombat t)
(column-number-mode t)