X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=.emacs;h=0399811c31d95960e8b795c550a54a2768a81a5c;hb=4addcd06ba6702c8da5aa04bd76726a7df7896ba;hp=806f28675f9d7042667fd213cae4388fbb04734b;hpb=5f43bda6762c12de0a35fa7e3a9beff46c060563;p=emacs.d.git

diff --git a/.emacs b/.emacs
index 806f286..0399811 100644
--- a/.emacs
+++ b/.emacs
@@ -1,6 +1,3 @@
-(load-library "zenburn")
-(zenburn)
-
 ;; Disable auto-save for all file buffers
 (setq auto-save-default nil)
 
@@ -59,20 +56,14 @@
 ;; Don't leave backups everywhere.
 (setq backup-inhibited t)
 
-;; Add this to load-path manually, then add the rest in load-paths.el
-(add-to-list 'load-path "~/.home/emacs/")
-(load-library "load-paths")
-
-(if (eq system-type 'cygwin)
-    (load-library "win32"))
-
+;; Add the directory containing .emacs to the load-path.
+(add-to-list 'load-path (file-name-directory (file-truename user-init-file)))
 
 ;; Need this for ignore-errors, and some modes.
 (require 'cl)
 
 (load-library "auto-modes")
 (load-library "mode-hooks")
-(load-library "autoloads")
 
 
 ;; Open private IRC messages in a new buffer.
@@ -81,6 +72,9 @@
 ;; Never ask me anything, emacs.
 (setq save-abbrevs nil)
 
+;; Like ansi-term, except I don't get trapped in an inferior emacs
+;; session every once in a while.
+(load-library "multi-term")
 
 (load-library "diff-buffer-against-file")
 (global-set-key "\C-cd" 'diff-buffer-against-file)
@@ -95,3 +89,7 @@
 
 ;; Enable the downcase-region function.
 (put 'downcase-region 'disabled nil)
+
+;; Show trailing whitespace, without having to drop into
+;; whitespace-mode.
+(custom-set-variables '(show-trailing-whitespace t))