General cleanup

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

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))
+            (let ((marker-string "*")
                   (display-string (format " ... " (count-lines (overlay-start ov)
                                                                (overlay-end ov)))))
-              (put-text-property 0 marker-length 'display
+              (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)

core/core-flycheck.el

@@ -21,7 +21,7 @@
         :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

core/core-sessions.el

@@ -49,7 +49,7 @@ automatically renamed to the project name.")
   (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