X-Git-Url: http://gitweb.michael.orlitzky.com/?p=emacs.d.git;a=blobdiff_plain;f=.emacs;h=68341ddf165707c19154d47d298682bb071b6e94;hp=7626bb67a2b1640b78d8a9288c4ba8ddafa392d4;hb=e89798fb461ea70f3d71f81e7918794a5e21d8f8;hpb=5b0477a6fe73109726c3e6e727daf4e44e0fe2b7

diff --git a/.emacs b/.emacs
index 7626bb6..68341dd 100644
--- a/.emacs
+++ b/.emacs
@@ -56,9 +56,8 @@
 ;; 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")
+;; Add the directory containing .emacs to the load-path.
+(add-to-list 'load-path (file-name-directory (file-truename user-init-file)))
 
 (if (eq system-type 'cygwin)
     (load-library "win32"))
@@ -69,7 +68,6 @@
 
 (load-library "auto-modes")
 (load-library "mode-hooks")
-(load-library "autoloads")
 
 
 ;; Open private IRC messages in a new buffer.
@@ -78,6 +76,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)
@@ -92,3 +93,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))