X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=.emacs;h=b990474d74dd029f30f3fc7540f8f8204fc6d075;hb=39cecd0853516f6ffebc60706d7e0b91b1b29508;hp=4732256f31692726080c24d0cb7e6f76bc5c649a;hpb=c8ef0ff3bd4f0b1ddaaadf9770d64db7fe28159a;p=emacs.d.git

diff --git a/.emacs b/.emacs
index 4732256..b990474 100644
--- a/.emacs
+++ b/.emacs
@@ -4,9 +4,22 @@
 (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")
+
 ;; Set the frame title to the name of the buffer, if supported.
 (setq frame-title-format "%b")
 
+;; Currently needed to make Emacs 23 behave sanely.
+'(diff-jump-to-old-file t)
+
 ;; Disable the menu/tool bars when we're using X.
 (menu-bar-mode -1)
 (when window-system
@@ -43,49 +56,36 @@
 ;; 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")
 
 
-(defun load-erc()
-  (interactive)
-  (ignore-errors
-    (load-library "erc")
-    )
-  )
-
-(global-set-key "\C-ce" 'load-erc)
-
+;; Open private IRC messages in a new buffer.
+(setq erc-auto-query 'buffer)
 
 ;; Never ask me anything, emacs.
 (setq save-abbrevs nil)
 
-
 (load-library "diff-buffer-against-file")
 (global-set-key "\C-cd" 'diff-buffer-against-file)
 
 (load-library "fix-nonstandard-chars")
 
 
-;; These next functions override the defaults provided by emacs. They
-;; prevent warning messages related to file modification times,
-;; particularly on weird filesystems.
+;; Enable dired-find-alternate-file without having to stop
+;; and explain myself to Emacs.
+(put 'dired-find-alternate-file 'disabled nil)
+
 
-;;(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))