From 3c9f160c16e75503d32444a6f5b2b849cabc0be9 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Thu, 6 Aug 2015 12:49:32 +0200
Subject: [PATCH] Clean up

---
 core/core-os-osx.el                    |  2 ++
 core/core.el                           | 29 ++++++++++++++------------
 core/lib/defuns-compile.el             |  2 --
 modules/module-r.el                    |  3 +--
 private/themes/narf/narf-dark-theme.el |  4 ++--
 5 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/core/core-os-osx.el b/core/core-os-osx.el
index dc0ffebb3..1f3af6ce1 100644
--- a/core/core-os-osx.el
+++ b/core/core-os-osx.el
@@ -1,5 +1,7 @@
 ;;; core-os-osx.el --- Mac-specific settings
 
+(eval-when-compile (require 'core))
+
 ;; Use a shared clipboard
 (setq x-select-enable-clipboard t
       ;; Curse Lion and its sudden but inevitable fullscreen mode!
diff --git a/core/core.el b/core/core.el
index 74b1c579d..16791bb95 100644
--- a/core/core.el
+++ b/core/core.el
@@ -140,11 +140,6 @@
  undo-tree-auto-save-history t
  undo-tree-history-directory-alist `(("." . ,(! (concat narf-temp-dir "undo/")))))
 
-;; Save cursor location across sessions. Only save for files that exist.
-(require 'saveplace)
-(setq save-place-file (! (concat narf-temp-dir "saveplace")))
-(add-hook! find-file (if (file-exists-p (buffer-file-name)) (setq save-place t)))
-
 ;; Save history across sessions
 (require 'savehist)
 (setq savehist-file (! (concat narf-temp-dir "savehist"))
@@ -162,19 +157,27 @@
       recentf-auto-cleanup 600)
 (recentf-mode 1)
 
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Save cursor location across sessions. Only save for files that exist.
+(use-package saveplace
+  :defer t
+  :config (setq save-place-file (! (concat narf-temp-dir "saveplace")))
+  :init
+  (add-hook! find-file
+    (if (file-exists-p (buffer-file-name))
+        (require 'saveplace)
+        (setq save-place t))))
+
+(use-package popwin :config (popwin-mode 1))
 
 (use-package help-fns+ ; Improved help commands
   :commands (describe-buffer describe-command describe-file
              describe-keymap describe-option describe-option-of-type))
 
-(use-package popwin :config (popwin-mode 1))
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(require 'server)
-(unless (server-running-p)
-  (server-start))
+(use-package server
+  :defer 1
+  :config
+  (unless (server-running-p)
+    (server-start)))
 
 (provide 'core)
 ;;; core.el ends here
diff --git a/core/lib/defuns-compile.el b/core/lib/defuns-compile.el
index 53d3d4cd0..e42716ed6 100644
--- a/core/lib/defuns-compile.el
+++ b/core/lib/defuns-compile.el
@@ -18,9 +18,7 @@
 (evil-define-command narf:compile-el (&optional bang)
   :repeat nil
   (interactive "<!>")
-  (byte-recompile-file (f-expand "init.el" narf-emacs-dir) nil 0)
   (byte-recompile-file (f-expand "init-load-path.el" narf-emacs-dir) nil 0)
-  (byte-recompile-file (f-expand "core.el" narf-core-dir) t 0)
   (if (and (eq major-mode 'emacs-lisp-mode) (not bang))
       (byte-recompile-file (buffer-file-name) t 0)
     (load (concat narf-script-dir "byte-compile.el"))))
diff --git a/modules/module-r.el b/modules/module-r.el
index 9a37a32ef..54542baff 100644
--- a/modules/module-r.el
+++ b/modules/module-r.el
@@ -1,7 +1,6 @@
 ;;; module-r.el
 
-(use-package ess-site
-  :mode (("\\.r$" . R-mode)))
+(use-package ess-site :mode (("\\.r$" . R-mode)))
 
 (provide 'module-r)
 ;;; module-r.el ends here
diff --git a/private/themes/narf/narf-dark-theme.el b/private/themes/narf/narf-dark-theme.el
index 381cef0a7..782d81004 100644
--- a/private/themes/narf/narf-dark-theme.el
+++ b/private/themes/narf/narf-dark-theme.el
@@ -86,8 +86,8 @@
    `(font-lock-doc-face                ((t (:foreground ,comments))))
 
    `(trailing-whitespace               ((t (:background "#884444"))))
-   `(whitespace-tab                    ((t (:foreground ,line-hl))))
-   `(whitespace-newline                ((t (:foreground ,line-hl))))
+   `(whitespace-tab                    ((t (:foreground "#343d46"))))
+   `(whitespace-newline                ((t (:foreground "#343d46"))))
    `(whitespace-trailing               ((t (:background "#553333"))))
 
    `(highlight-indentation-face                 ((t (:background "#2f3641"))))