 
 ;;-------------------------------------Server------------------
 (require 'server)
-;; Start a server if (server-running-p) does not return t (e.g. if it
-;; returns nil or :other)
-(or (eq (server-running-p) t)
+(or (server-running-p)
     (server-start))
 ;;-------------------------------------Server------------------
 

   (quote
    (org flyspell-popup flyspell-correct evil flycheck rainbow-mode yasnippet solarized-theme emmet-mode)))
 '(powerline-height nil)
 '(ring-bell-function (quote ignore))
 '(send-mail-function (quote mailclient-send-it))
 '(show-paren-mode t)
 '(solarized-distinct-doc-face nil)
 '(solarized-use-variable-pitch nil)
 '(standard-indent 2)
 '(tool-bar-mode nil)
 )


(custom-set-faces


(add-to-list 'load-path "~/.emacs.d/elpa/htmlize")
(require 'htmlize)

(require 'smooth-scrolling)

(add-to-list 'load-path "~/.emacs.d/elpa/aggressive-indent")
(require 'aggressive-indent)
