From 96f9d1dd446897cf421313a43144099c3e1782ee Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Sat, 7 May 2016 22:05:00 -0400
Subject: [PATCH] General cleanup

---
 bootstrap.el          | 15 +++------------
 core/core-editor.el   |  9 ++++-----
 core/core-flycheck.el | 12 ++++++------
 core/core-sessions.el | 16 ++++++++--------
 4 files changed, 21 insertions(+), 31 deletions(-)

diff --git a/bootstrap.el b/bootstrap.el
index d2a604b2f..6a3fe5b80 100644
--- a/bootstrap.el
+++ b/bootstrap.el
@@ -68,20 +68,11 @@
           (append (list (expand-file-name "themes/" narf-private-dir))
                   custom-theme-load-path))
 
-    (require 'f)
-    (require 'dash)
-    (require 's)
-
-    ;; Load local settings, if available
-    (when (file-exists-p "~/.emacs.local.el")
-      (load "~/.emacs.local.el"))
-
-    ;; Global settings
+    ;; Local settings
+    (load "~/.emacs.local.el" t t)
     (setq narf-current-theme narf-default-theme
           narf-current-font  narf-default-font)
-
-    ;; Load 'em up!
-    (load-theme narf-current-theme t)
+    ;; Here we a'go!
     (mapc 'require packages)))
 
 ;;; bootstrap.el ends here
diff --git a/core/core-editor.el b/core/core-editor.el
index 92466f254..9f1ca8508 100644
--- a/core/core-editor.el
+++ b/core/core-editor.el
@@ -215,11 +215,10 @@ enable multiple minor modes for the same regexp.")
   (setq hs-set-up-overlay
         (lambda (ov)
           (when (eq 'code (overlay-get ov 'hs))
-            (let* ((marker-string "*fringe-dummy*")
-                   (marker-length (length marker-string))
-                   (display-string (format " ... " (count-lines (overlay-start ov)
-                                                                (overlay-end ov)))))
-              (put-text-property 0 marker-length 'display
+            (let ((marker-string "*")
+                  (display-string (format " ... " (count-lines (overlay-start ov)
+                                                               (overlay-end ov)))))
+              (put-text-property 0 1 'display
                                  (list 'right-fringe 'hs-marker 'hs-fringe-face) marker-string)
               (put-text-property 0 (length display-string) 'face 'hs-face display-string)
               (overlay-put ov 'before-string marker-string)
diff --git a/core/core-flycheck.el b/core/core-flycheck.el
index 73c52f680..f5e32576a 100644
--- a/core/core-flycheck.el
+++ b/core/core-flycheck.el
@@ -15,13 +15,13 @@
       (byte-compile-file path)))
 
   (map! :map flycheck-error-list-mode-map
-        :n "C-n"    'flycheck-error-list-next-error
-        :n "C-p"    'flycheck-error-list-previous-error
-        :n "j"      'flycheck-error-list-next-error
-        :n "k"      'flycheck-error-list-previous-error
-        :n "RET"    'flycheck-error-list-goto-error)
+        :n "C-n" 'flycheck-error-list-next-error
+        :n "C-p" 'flycheck-error-list-previous-error
+        :n "j"   'flycheck-error-list-next-error
+        :n "k"   'flycheck-error-list-previous-error
+        :n "RET" 'flycheck-error-list-goto-error)
 
-  ;; And on ESC in normal mode.
+  ;; Flycheck buffer on ESC in normal mode.
   (advice-add 'evil-force-normal-state :after 'narf*flycheck-buffer)
 
   (define-fringe-bitmap 'flycheck-fringe-bitmap-double-arrow
diff --git a/core/core-sessions.el b/core/core-sessions.el
index 946bd48b3..b3ad17c5c 100644
--- a/core/core-sessions.el
+++ b/core/core-sessions.el
@@ -36,20 +36,20 @@ automatically renamed to the project name.")
    wg-restore-margins nil
    wg-restore-point-max t ; Throws silent errors if non-nil
 
-   wg-list-display-decor-divider         " "
-   wg-list-display-decor-left-brace      ""
-   wg-list-display-decor-right-brace     "| "
-   wg-list-display-decor-current-left    ""
-   wg-list-display-decor-current-right   ""
-   wg-list-display-decor-previous-left   ""
-   wg-list-display-decor-previous-right  "")
+   wg-list-display-decor-divider " "
+   wg-list-display-decor-left-brace ""
+   wg-list-display-decor-right-brace "| "
+   wg-list-display-decor-current-left ""
+   wg-list-display-decor-current-right ""
+   wg-list-display-decor-previous-left ""
+   wg-list-display-decor-previous-right "")
 
   (add-hook 'emacs-startup-hook 'workgroups-mode)
   :config
   (unless (file-exists-p wg-workgroup-directory)
     (mkdir wg-workgroup-directory))
 
-  ;; Remember the set names in between sessions
+  ;; Remember fixed workgroup names between sessions
   (push 'narf-wg-names savehist-additional-variables)
 
   ;; `wg-mode-line-display-on' wasn't enough