Fixed some minor bugs.

2 files changed, 8 insertions, 9 deletions

diff --git a/hoersten-c-style.el b/hoersten-c-style.el
index cdd62b2..825ca24 100644
--- a/hoersten-c-style.el
+++ b/hoersten-c-style.el
@@ -31,7 +31,6 @@
 ;; c-like language settings (c, c++, java, etc.)
 ;;(require 'doxymacs)
 (setq-default c-default-style "hoersten") ; load c-style
-(c-set-style "hoersten")
 
 (message "Loading Hoersten C style...done")
 (provide 'hoersten-c-style)
diff --git a/init.el b/init.el
index e452016..6c06566 100644
--- a/init.el
+++ b/init.el
@@ -1,7 +1,6 @@
 ;; ~/.emacs.d/init.el (~/.emacs)
 ;; Luke Hoersten <[email protected]>
 
-
 ;;;; General ;;;;
 (add-to-list 'load-path "~/.emacs.d")            ; set default emacs load path
 
@@ -57,13 +56,7 @@
       (scroll-bar-mode -1)    ; remove scroll bar
       (visual-line-mode t)    ; word wrap break on whitespace
       (global-hl-line-mode t) ; highlight current line
-      (set-frame-font (get-font))
-
-      ;; twilight theme
-      (require 'color-theme)
-      (load "color-theme-twilight")
-      (color-theme-twilight)
-      ))
+      (set-frame-font (get-font))))
 
 ;;; terminal
 (global-set-key (kbd "C-c s") 'eshell) ; start shell
@@ -140,6 +133,13 @@
 (require 'move-line)          ; move line up or down
 (require 'rainbow-delimiters) ; multi-colored parens
 
+;;; twilight theme
+(if window-system
+    (progn
+      (require 'color-theme)
+      (load "color-theme-twilight")
+      (color-theme-twilight)))
+
 ;;; yasnippets
 (add-to-list 'load-path "~/.emacs.d/thirdparty/yasnippet")
 (require 'yasnippet)