summaryrefslogtreecommitdiffstats
path: root/.emacs.d/init.el
diff options
context:
space:
mode:
Diffstat (limited to '.emacs.d/init.el')
-rw-r--r--.emacs.d/init.el12
1 files changed, 5 insertions, 7 deletions
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index d1c7355..cfe1e92 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -18,8 +18,7 @@
(add-to-list 'load-path directory)
(let ((default-directory directory))
(normal-top-level-add-subdirs-to-load-path)))
- '("/usr/share/emacs/site-lisp" "~/.emacs.d/site-lisp"))
- (add-to-list 'load-path "~/.emacs.d/"))
+ '("/usr/share/emacs/site-lisp" "~/.emacs.d/site-lisp")))
(require 'ext)
(require 'mode-icons)
@@ -165,8 +164,7 @@
(vertical-scroll-bars . nil)
(menu-bar-lines . nil)
(tool-bar-lines . nil)
- (font . "Monaco:pixelsize=16")
- (left-fringe . 0)))
+ (font . "Monaco:pixelsize=16")))
(setq emms-source-file-default-directory "/mnt/music/")
(setq erc-autojoin-channels-alist
'(("freenode.net" "#ninthfloor" "#emacs" "#dispass")))
@@ -226,6 +224,7 @@
"Access to a protected member"))))
(setq frame-title-format '(:eval (concat "emacs: " (buffer-name))))
(setq geiser-repl-history-filename "~/.emacs.d/geiser-history")
+(setq gnus-init-file "~/.emacs.d/gnus")
(setq gtags-auto-update t)
(setq help-at-pt-display-when-idle t)
(setq ido-auto-merge-delay-time 1000000)
@@ -262,11 +261,11 @@
("marmalade" . "http://marmalade-repo.org/packages/")))
(setq package-load-list '((htmlize "1.39")
(lua-mode "20111107")
- (python "0.24.2")
all))
(setq php-function-call-face 'font-lock-function-name-face)
(setq php-mode-force-pear t)
(setq pony-tpl-indent-moves t)
+(setq pretty-symbol-categories '(lambda relational logical))
(setq rainbow-delimiters-max-face-count 12)
(setq redisplay-dont-pause t)
(setq scroll-conservatively 101)
@@ -414,8 +413,7 @@
(load "rudel-loaddefs.el")
(unless (server-running-p)
- (server-start)
- (load "wm-init"))
+ (server-start))
(provide 'init)