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

diff --git a/.emacs b/.emacs
index ba4547d..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
@@ -92,19 +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
- ;; custom-set-variables was added by Custom.
- ;; If you edit it by hand, you could mess it up, so be careful.
- ;; Your init file should contain only one such instance.
- ;; If there is more than one, they won't work right.
- '(auth-source-save-behavior nil)
- '(show-trailing-whitespace t))
-(custom-set-faces
- ;; custom-set-faces was added by Custom.
- ;; If you edit it by hand, you could mess it up, so be careful.
- ;; Your init file should contain only one such instance.
- ;; If there is more than one, they won't work right.
- )
+;; 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))