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

diff --git a/.emacs b/.emacs
index 06ca36c..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
@@ -93,4 +90,12 @@
 (put 'downcase-region 'disabled nil)
 
 ;; I want to see trailing whitespace.
-(custom-set-variables '(show-trailing-whitespace t))
+(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))