From af7fca016ab0e83c129147f8102dc8ee893571a8 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Sat, 19 Jul 2014 18:06:08 -0400
Subject: get changes from build64-par

---
 .config/emacs/init.el | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to '.config/emacs/init.el')

diff --git a/.config/emacs/init.el b/.config/emacs/init.el
index 2a7645f..11765b0 100644
--- a/.config/emacs/init.el
+++ b/.config/emacs/init.el
@@ -17,7 +17,7 @@
     (eval-region (point) (point-max))
     (kill-buffer (current-buffer)))))
 
- ;; ELPA stuff ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; ELPA stuff ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (unless (require 'package nil t)
   (eval-url "http://tromey.com/elpa/package-install.el"))
@@ -59,6 +59,7 @@
 ;; General settings ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (require 'go-mode-load)
+(require 'uniquify)
 
 (require 'mailcrypt)
 (mc-setversion "gpg")
@@ -127,8 +128,7 @@
       inhibit-startup-screen t
       line-number-mode t
       server-use-tcp t
-      server-mode t
-      show-paren-mode t)
+      server-mode t)
 
 (setq browse-url-generic-program (executable-find "v-www-browser")
       browse-url-browser-function 'browse-url-generic)
-- 
cgit v1.2.3-2-g168b