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

diff --git a/.emacs b/.emacs
index f8ddfd6..0399811 100644
--- a/.emacs
+++ b/.emacs
@@ -1,12 +1,15 @@
-(load-library "zenburn")
-(zenburn)
-
 ;; Disable auto-save for all file buffers
 (setq auto-save-default nil)
 
 (global-set-key "\C-m" 'newline-and-indent)
 (global-font-lock-mode t)
 
+;; These are otherwise bound to C-Up and C-Down. To heck with that
+;; nonsense, M-n and M-p are unused and analogous to C-f, C-b and M-f,
+;; M-b respectively.
+(global-set-key "\M-p" 'backward-paragraph)
+(global-set-key "\M-n" 'forward-paragraph)
+
 ;; Gentoo *or somebody* made the default too small.
 ;; Make it too big to overcompensate.
 (set-default-font "DejaVu Sans Mono-14")
@@ -53,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.
@@ -75,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)
@@ -87,13 +87,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))