From d88870711561364dfe9a66e59ab548dcb7588162 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <shumakl@purdue.edu>
Date: Mon, 9 Feb 2015 19:21:50 -0500
Subject: upgrade to emacs 24.4

---
 .config/emacs/custom.el | 10 ++++++++--
 .config/emacs/init.el   |  6 +++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/.config/emacs/custom.el b/.config/emacs/custom.el
index aca35b0..ba22862 100644
--- a/.config/emacs/custom.el
+++ b/.config/emacs/custom.el
@@ -12,11 +12,17 @@
  '(global-whitespace-mode nil)
  '(inhibit-startup-screen t)
  '(mdmua-maildir "~/Maildir")
- '(minibuffer-prompt-properties (quote (read-only t point-entered minibuffer-avoid-prompt face minibuffer-prompt)))
+ '(minibuffer-prompt-properties
+   (quote
+    (read-only t point-entered minibuffer-avoid-prompt face minibuffer-prompt)))
  '(page-break-lines-char 45)
  '(ruby-deep-arglist nil)
  '(ruby-deep-indent-paren nil)
- '(safe-local-variable-values (quote ((Nginx-indent-tabs-mode) (Nginx-indent-level . 4) (Nginx-indent-level . 8))))
+ '(safe-local-variable-values
+   (quote
+    ((Nginx-indent-tabs-mode)
+     (Nginx-indent-level . 4)
+     (Nginx-indent-level . 8))))
  '(scroll-bar-mode nil)
  '(scss-compile-at-save nil)
  '(send-mail-function (quote smtpmail-send-it))
diff --git a/.config/emacs/init.el b/.config/emacs/init.el
index e69a9ec..35d57bb 100644
--- a/.config/emacs/init.el
+++ b/.config/emacs/init.el
@@ -42,7 +42,7 @@
 ;; This isn't particularly important, but set it before doing a whole
 ;; lot (loading packages), so there isn't a weird change in text size.
 (setq notify-method 'notify-via-libnotify)
-(set-face-attribute 'default nil :height 93)
+(set-face-attribute 'default nil :height 80 :foundry "unknown" :family "DejaVu Sans Mono")
 
 
 ;;;; Bootstrap el-get ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -136,7 +136,7 @@
   "Use spaces for alignment"
   (let ((indent-tabs-mode nil))
     (apply orig-fun args)))
-;(advice-add 'align-regexp :around #'align-regexp--use-spaces)
+(advice-add 'align-regexp :around #'align-regexp--use-spaces)
 
 (defun sh-smie-sh-rules--fix (args)
   "Replace :after \"then\" with :after \"if\" because Emacs 24
@@ -144,7 +144,7 @@ sh-script.el is broken."
   (if (equal args (list :after "then"))
       (list :after "if")
     args))
-;(advice-add 'sh-smie-sh-rules :filter-args #'sh-smie-sh-rules--fix)
+(advice-add 'sh-smie-sh-rules :filter-args #'sh-smie-sh-rules--fix)
 
 (require 'go-mode-load nil t)
 
-- 
cgit v1.2.3