From 7d5612c87c7af42d910254639d1e310ec45a2dcc Mon Sep 17 00:00:00 2001
From: Jim Myhrberg <contact@jimeh.me>
Date: Sun, 31 Jan 2016 10:43:35 +0000
Subject: [PATCH] Minor tweaks and cleanup to the code

---
 init.el                      | 5 ++---
 modules/siren-goto-symbol.el | 3 ++-
 modules/siren-sh.el          | 2 +-
 siren-modules.el             | 1 -
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/init.el b/init.el
index 1f223d4..44ab274 100644
--- a/init.el
+++ b/init.el
@@ -8,13 +8,12 @@
 
 ;; I need to keep this here commented out like this to prevent package.el from
 ;; automatically adding it again. I call `(package-initalize)' manually from
-;; the `packages.el' file that's loaded in further down.
+;; the `core/siren-packages.el' file that's loaded in further down.
 ;;
 ;; (package-initialize)
 
 (defvar current-user
-      (getenv
-       (if (equal system-type 'windows-nt) "USERNAME" "USER")))
+      (getenv (if (equal system-type 'windows-nt) "USERNAME" "USER")))
 
 (message "Siren is powering up... Be patient, Master %s!" current-user)
 
diff --git a/modules/siren-goto-symbol.el b/modules/siren-goto-symbol.el
index 0acff93..95dea40 100644
--- a/modules/siren-goto-symbol.el
+++ b/modules/siren-goto-symbol.el
@@ -57,7 +57,8 @@
         (unless (or (null position) (null name)
                     (string= (car imenu--rescan-item) name))
           (add-to-list 'symbol-names (substring-no-properties name))
-          (add-to-list 'name-and-pos (cons (substring-no-properties name) position))))))))
+          (add-to-list 'name-and-pos (cons (substring-no-properties name)
+                                           position))))))))
 
 
 (global-set-key (kbd "C-t") 'siren-goto-symbol)
diff --git a/modules/siren-sh.el b/modules/siren-sh.el
index 72acc2f..45a9193 100644
--- a/modules/siren-sh.el
+++ b/modules/siren-sh.el
@@ -15,7 +15,7 @@
   (setq tab-width 2)
   (setq sh-basic-offset 2)
   (setq sh-indentation 2)
-  (setq highlight-indentation-offset 2)
+  (highlight-indentation-set-offset 2)
   (highlight-indentation-mode)
   (highlight-indentation-current-column-mode)
   (setq whitespace-action (quote (auto-cleanup)))
diff --git a/siren-modules.el b/siren-modules.el
index c7ee12a..f1b7367 100644
--- a/siren-modules.el
+++ b/siren-modules.el
@@ -9,7 +9,6 @@
 ;; Modules
 (require 'siren-aliases)
 (require 'siren-avy)
-;; (require 'siren-auto-complete)
 (require 'siren-company)
 (require 'siren-dired)
 (require 'siren-exec-path-from-shell)