X-Git-Url: http://gitweb.michael.orlitzky.com/?p=emacs.d.git;a=blobdiff_plain;f=.emacs;h=68341ddf165707c19154d47d298682bb071b6e94;hp=67010c42eb4f31740c6ac38ad931f3100e95a177;hb=e89798fb461ea70f3d71f81e7918794a5e21d8f8;hpb=27976cca513553f0a4a3aeb8dd1c4f8e79e276e5

diff --git a/.emacs b/.emacs
index 67010c4..68341dd 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,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"))
@@ -72,7 +68,6 @@
 
 (load-library "auto-modes")
 (load-library "mode-hooks")
-(load-library "autoloads")
 
 
 ;; Open private IRC messages in a new buffer.
@@ -81,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)
@@ -93,13 +91,9 @@
 (put 'dired-find-alternate-file 'disabled nil)
 
 
-;; These next functions override the defaults provided by emacs. They
-;; prevent warning messages related to file modification times,
-;; particularly on weird filesystems.
-
-;;(defun ask-user-about-supersession-threat (fn)
-;;  )
+;; Enable the downcase-region function.
+(put 'downcase-region 'disabled nil)
 
-;;(defun verify-visited-file-modtime (bf)
-;;  t
-;;  )
+;; Show trailing whitespace, without having to drop into
+;; whitespace-mode.
+(custom-set-variables '(show-trailing-whitespace t))