From 1ecc48cee66117da048cac97b8f6f894e01d1caa Mon Sep 17 00:00:00 2001
From: Jim Myhrberg <contact@jimeh.me>
Date: Thu, 5 Apr 2012 08:35:29 +0100
Subject: [PATCH] Clean up linum configuration

Part of the configuration was in packages.el right after the require
call to linum+. It's now in appearance.el next to the related linum
settings.
---
 appearance.el | 6 ++++++
 packages.el   | 3 +--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/appearance.el b/appearance.el
index 48e77e2..30dab1b 100644
--- a/appearance.el
+++ b/appearance.el
@@ -31,6 +31,12 @@
 (setq linum+-smart-format " %%%dd ")
 (setq linum+-dynamic-format " %%%dd ")
 
+;; Linum+ resets linum-format to "smart" when it's loaded, hence we have to
+;; use a eval-after-load hook to set it to "dynamic".
+(eval-after-load "linum+"
+  '(progn
+     (setq linum-format 'dynamic)))
+
 ;; meaningful names for buffers with the same name
 (require 'uniquify)
 (setq uniquify-buffer-name-style 'forward)
diff --git a/packages.el b/packages.el
index 878bd3b..d031c70 100644
--- a/packages.el
+++ b/packages.el
@@ -181,8 +181,7 @@
   (require 'undo-tree)
 
   ;; Load Linum+
-  (when (require 'linum+ nil 'noerror)
-    (setq linum-format 'dynamic))
+  (require 'linum+)
 
   ;; Load full-ack
   (require 'full-ack)