summaryrefslogtreecommitdiffstats
path: root/.emacs.d
diff options
context:
space:
mode:
authorGravatar Tom Willemse2014-02-23 21:35:32 +0100
committerGravatar Tom Willemse2014-02-23 21:35:32 +0100
commit311364592790c8c2396b3fcec5b422bf84d4fdf3 (patch)
tree2f08e7b5dcb72fa9aa5d633bee4d9e7a42a24da9 /.emacs.d
parent3434a51e977d6965839a55d597b2f31dc0891420 (diff)
downloademacs-311364592790c8c2396b3fcec5b422bf84d4fdf3.tar.gz
emacs-311364592790c8c2396b3fcec5b422bf84d4fdf3.zip
Simplify theme loading
Since I don't use the color function in yoshi-theme anymore it's not necessary to wait a jiffy before applying a theme in order to have the right colors.
Diffstat (limited to '.emacs.d')
-rw-r--r--.emacs.d/init.el10
1 files changed, 2 insertions, 8 deletions
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 7e63f2d..4ed29ea 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -709,7 +709,7 @@ For `python-mode' I prefer `python-imenu-create-flat-index'."
"Try to set the theme for the current (first) frame."
(ignore frame)
(unless setp
- (run-at-time .1 nil (lambda () (setq setp (load-theme theme t))))
+ (load-theme theme t)
(smt/enable)
(require 'my-smt)
(smt/set-theme 'my-smt)
@@ -718,13 +718,7 @@ For `python-mode' I prefer `python-imenu-create-flat-index'."
(if (daemonp)
(add-hook 'after-make-frame-functions #'oni:set-theme)
- (oni:eval-after-init
- (load-theme theme t)
- (smt/enable)
- (require 'my-smt)
- (smt/set-theme 'my-smt)
- (set-face-attribute 'mode-line nil :box nil)
- (set-face-attribute 'mode-line-inactive nil :box nil))))
+ (oni:eval-after-init (oni:set-theme))))
(defun oni:shell-command-with-command (command &optional output-buffer)
"Print both COMMAND and the output into OUTPUT-BUFFER."