X-Git-Url: http://gitweb.michael.orlitzky.com/?p=emacs.d.git;a=blobdiff_plain;f=.emacs;h=94aa3148311b76b3720454097fce31b393c31d87;hp=9cea735b0848b69ca5398a258a26b8de835005cc;hb=HEAD;hpb=a1a36c43288c2318736e907b304d61b2a7bd124b

diff --git a/.emacs b/.emacs
index 9cea735..dbb5283 100644
--- a/.emacs
+++ b/.emacs
@@ -12,14 +12,11 @@
 
 ;; Gentoo *or somebody* made the default too small.
 ;; Make it too big to overcompensate.
-(set-default-font "DejaVu Sans Mono-14")
+(set-frame-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
@@ -56,13 +53,13 @@
 ;; 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"))
+;; Don't let the file's contents modify my editor, because that needs
+;; to be said? More importantly, don't interrupt me to ask me if I
+;; want to process the variables that emacs KNOWS are unsafe.
+(setq enable-local-variables nil)
 
+;; 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)
@@ -77,14 +74,11 @@
 ;; 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)
 
 (load-library "fix-nonstandard-chars")
+(load-library "latex-query-replace-regexp-math")
 
 
 ;; Enable dired-find-alternate-file without having to stop
@@ -95,6 +89,13 @@
 ;; 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))
+;; I want to see trailing whitespace.
+(setq-default show-trailing-whitespace t)
+
+;; Don't ignore .git directories when tab-completing filenames, for
+;; two reasons. First, it's nice to be able to tell that a directory
+;; is a git repository from the output of "ls", and giving them a .git
+;; suffix is an easy way to do that. Second, editing .git/config is
+;; the easiest way to do a lot of things in git.
+(setq completion-ignored-extensions
+      (remove ".git/" completion-ignored-extensions))