Compute our load-path automatically from the path of .emacs.

[emacs.d.git] / .emacs

diff --git a/.emacs b/.emacs
index 630ea6680d29d151c2a7d7b117a67fbaba798bf9..68341ddf165707c19154d47d298682bb071b6e94 100644 (file)
--- 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"))
@@ -77,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)
@@ -91,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))