From 0375cd032888b1f04649483ac038750b96fb9d30 Mon Sep 17 00:00:00 2001
From: Jim Myhrberg <contact@jimeh.me>
Date: Sat, 17 Aug 2019 17:00:35 +0100
Subject: [PATCH] Ensure module names cannot collide with core setup files

The core setup files for Emacs Siren which lives in the core directory
followed a `siren-*.el` naming convention, which is the same as the
naming convention for modules.

This means that the `modules/core/siren-packages.el` module for adding
packages for Emacs package development, was not being loaded due to it's
name conflicting with `core/siren-packages.el` which sets up and
configures the packaging system.

So all files under the root `core` directory now follow a
`siren-core-*.el` naming scheme, meaning modules should no longer
conflict with core files.
---
 .../{siren-custom.el => siren-core-custom.el} |  9 +++---
 .../{siren-editor.el => siren-core-editor.el} |  6 ++--
 core/{siren-env.el => siren-core-env.el}      |  6 ++--
 core/{siren-core.el => siren-core-funcs.el}   |  6 ++--
 core/{siren-init.el => siren-core-init.el}    | 32 +++++++++----------
 core/{siren-linux.el => siren-core-linux.el}  |  6 ++--
 ...siren-modules.el => siren-core-modules.el} |  6 ++--
 core/{siren-osx.el => siren-core-osx.el}      |  6 ++--
 ...ren-packages.el => siren-core-packages.el} |  6 ++--
 core/{siren-theme.el => siren-core-theme.el}  |  6 ++--
 ...sparency.el => siren-core-transparency.el} |  6 ++--
 core/{siren-ui.el => siren-core-ui.el}        | 12 +++----
 .../{siren-vendor.el => siren-core-vendor.el} |  6 ++--
 init.el                                       |  2 +-
 14 files changed, 58 insertions(+), 57 deletions(-)
 rename core/{siren-custom.el => siren-core-custom.el} (83%)
 rename core/{siren-editor.el => siren-core-editor.el} (97%)
 rename core/{siren-env.el => siren-core-env.el} (63%)
 rename core/{siren-core.el => siren-core-funcs.el} (94%)
 rename core/{siren-init.el => siren-core-init.el} (68%)
 rename core/{siren-linux.el => siren-core-linux.el} (79%)
 rename core/{siren-modules.el => siren-core-modules.el} (96%)
 rename core/{siren-osx.el => siren-core-osx.el} (81%)
 rename core/{siren-packages.el => siren-core-packages.el} (93%)
 rename core/{siren-theme.el => siren-core-theme.el} (67%)
 rename core/{siren-transparency.el => siren-core-transparency.el} (92%)
 rename core/{siren-ui.el => siren-core-ui.el} (82%)
 rename core/{siren-vendor.el => siren-core-vendor.el} (62%)

diff --git a/core/siren-custom.el b/core/siren-core-custom.el
similarity index 83%
rename from core/siren-custom.el
rename to core/siren-core-custom.el
index 6948fe6..1204bc7 100644
--- a/core/siren-custom.el
+++ b/core/siren-core-custom.el
@@ -1,4 +1,4 @@
-;;; siren-custom.el --- jimeh's Emacs Siren: Siren's customizable variables.
+;;; siren-core-custom.el --- jimeh's Emacs Siren: Siren's customizable variables.
 
 ;;; Commentary:
 
@@ -18,7 +18,8 @@
   :group 'siren)
 
 (defcustom siren-indent-sensitive-modes
-  '(conf-mode coffee-mode haml-mode python-mode slim-mode yaml-mode)
+  '(conf-mode coffee-mode haml-mode python-mode slim-mode yaml-mode
+              makefile-mode)
   "Modes for which auto-indenting is suppressed."
   :type 'list
   :group 'siren)
@@ -34,5 +35,5 @@ Only modes that don't derive from `prog-mode' should be listed here."
   :type 'number
   :group 'siren)
 
-(provide 'siren-custom)
-;;; siren-custom.el ends here
+(provide 'siren-core-custom)
+;;; siren-core-custom.el ends here
diff --git a/core/siren-editor.el b/core/siren-core-editor.el
similarity index 97%
rename from core/siren-editor.el
rename to core/siren-core-editor.el
index d7c9874..16c8bce 100644
--- a/core/siren-editor.el
+++ b/core/siren-core-editor.el
@@ -1,4 +1,4 @@
-;;; siren-core.el --- jimeh's Emacs Siren: Editor settings.
+;;; siren-core-editor.el --- jimeh's Emacs Siren: Editor settings.
 
 ;;; Commentary:
 
@@ -189,5 +189,5 @@ indent yanked text (with prefix arg don't indent)."
 ;; (diminish 'hs-minor-mode)
 ;; (diminish 'subword-mode)
 
-(provide 'siren-editor)
-;;; siren-editor.el ends here
+(provide 'siren-core-editor)
+;;; siren-core-editor.el ends here
diff --git a/core/siren-env.el b/core/siren-core-env.el
similarity index 63%
rename from core/siren-env.el
rename to core/siren-core-env.el
index 8acdd7b..3db41d2 100644
--- a/core/siren-env.el
+++ b/core/siren-core-env.el
@@ -1,4 +1,4 @@
-;;; siren-env.el --- jimeh's Emacs Siren: Environment variable setup.
+;;; siren-core-env.el --- jimeh's Emacs Siren: Environment variable setup.
 
 ;;; Commentary:
 
@@ -11,5 +11,5 @@
 (when (memq window-system '(mac ns x))
   (exec-path-from-shell-initialize))
 
-(provide 'siren-env)
-;;; siren-env.el ends here
+(provide 'siren-core-env)
+;;; siren-core-env.el ends here
diff --git a/core/siren-core.el b/core/siren-core-funcs.el
similarity index 94%
rename from core/siren-core.el
rename to core/siren-core-funcs.el
index f030fe4..8ef8242 100644
--- a/core/siren-core.el
+++ b/core/siren-core-funcs.el
@@ -1,4 +1,4 @@
-;;; siren-core.el --- jimeh's Emacs Siren: Core Siren functions.
+;;; siren-core-funcs.el --- jimeh's Emacs Siren: Core Siren functions.
 
 ;;; Commentary:
 
@@ -76,5 +76,5 @@ Borrowed from: http://emacsredux.com/blog/2013/05/04/rename-file-and-buffer/"
       (interactive)
       (ignore-errors (funcall fn)))))
 
-(provide 'siren-core)
-;;; siren-core.el ends here
+(provide 'siren-core-funcs)
+;;; siren-core-funcs.el ends here
diff --git a/core/siren-init.el b/core/siren-core-init.el
similarity index 68%
rename from core/siren-init.el
rename to core/siren-core-init.el
index 6c816df..64393d6 100644
--- a/core/siren-init.el
+++ b/core/siren-core-init.el
@@ -1,4 +1,4 @@
-;;; siren-init.el --- jimeh's Emacs Siren: Initialize all the things
+;;; siren-core-init.el --- jimeh's Emacs Siren: Initialize all the things
 
 ;;; Commentary:
 
@@ -16,8 +16,8 @@
          (getenv (if (equal system-type 'windows-nt) "USERNAME" "USER")))
 
 ;; Check Emacs version.
-(when (version< emacs-version "24.1")
-  (error "Siren requires at least GNU Emacs 24.1, but you're running %s"
+(when (version< emacs-version "26.1")
+  (error "Siren requires at least GNU Emacs 26.1, but you're running %s"
          emacs-version))
 
 ;; Setup basic paths.
@@ -31,35 +31,35 @@
   (make-directory siren-cache-dir))
 
 ;; Core stuff
-(require 'siren-custom)
-(require 'siren-core)
+(require 'siren-core-custom)
+(require 'siren-core-funcs)
 
 ;; Ensure vendor directory load-paths are configured
-(require 'siren-vendor)
+(require 'siren-core-vendor)
 
 ;; Continue core stuff
-(require 'siren-packages)
-(require 'siren-env)
-(require 'siren-ui)
-(require 'siren-editor)
+(require 'siren-core-packages)
+(require 'siren-core-env)
+(require 'siren-core-ui)
+(require 'siren-core-editor)
 
 ;; OSX specific
 (when (eq system-type 'darwin)
-  (require 'siren-osx))
+  (require 'siren-core-osx))
 
 ;; Linux specific
 (when (eq system-type 'gnu/linux)
-  (require 'siren-linux))
+  (require 'siren-core-linux))
 
 ;; Config changes made through the customize UI will be store here
 (setq custom-file (expand-file-name "custom.el" siren-dir))
 (load-file custom-file)
 
 ;; The modules
-(require 'siren-modules)
+(require 'siren-core-modules)
 
 ;; The theme
-(require 'siren-theme)
+(require 'siren-core-theme)
 
-(provide 'siren-init)
-;;; siren-init.el ends here
+(provide 'siren-core-init)
+;;; siren-core-init.el ends here
diff --git a/core/siren-linux.el b/core/siren-core-linux.el
similarity index 79%
rename from core/siren-linux.el
rename to core/siren-core-linux.el
index 47232cc..46ea721 100644
--- a/core/siren-linux.el
+++ b/core/siren-core-linux.el
@@ -1,4 +1,4 @@
-;;; siren-linux.el --- jimeh's Emacs Siren: Linux specific settings.
+;;; siren-core-linux.el --- jimeh's Emacs Siren: Linux specific settings.
 
 ;;; Commentary:
 
@@ -22,5 +22,5 @@
      nil 'fullscreen
      (when (not (frame-parameter nil 'fullscreen)) 'fullboth))))
 
-(provide 'siren-linux)
-;;; siren-linux.el ends here
+(provide 'siren-core-linux)
+;;; siren-core-linux.el ends here
diff --git a/core/siren-modules.el b/core/siren-core-modules.el
similarity index 96%
rename from core/siren-modules.el
rename to core/siren-core-modules.el
index dd58263..8a1b7bb 100644
--- a/core/siren-modules.el
+++ b/core/siren-core-modules.el
@@ -1,4 +1,4 @@
-;;; siren-modules.el --- jimeh's Emacs Siren: Module loading.
+;;; siren-core-modules.el --- jimeh's Emacs Siren: Module loading.
 
 ;;; Commentary:
 
@@ -167,5 +167,5 @@
 (require 'siren-web-mode)
 (require 'siren-yaml)
 
-(provide 'siren-modules)
-;;; siren-modules.el ends here
+(provide 'siren-core-modules)
+;;; siren-core-modules.el ends here
diff --git a/core/siren-osx.el b/core/siren-core-osx.el
similarity index 81%
rename from core/siren-osx.el
rename to core/siren-core-osx.el
index 5c11047..b22f6c6 100644
--- a/core/siren-osx.el
+++ b/core/siren-core-osx.el
@@ -1,4 +1,4 @@
-;;; siren-osx.el --- jimeh's Emacs Siren: OS X specific settings.
+;;; siren-core-osx.el --- jimeh's Emacs Siren: OS X specific settings.
 
 ;;; Commentary:
 
@@ -23,5 +23,5 @@
 ;; Don't use OSX Native fullscreen mode
 (setq ns-use-native-fullscreen nil)
 
-(provide 'siren-osx)
-;;; siren-osx.el ends here
+(provide 'siren-core-osx)
+;;; siren-core-osx.el ends here
diff --git a/core/siren-packages.el b/core/siren-core-packages.el
similarity index 93%
rename from core/siren-packages.el
rename to core/siren-core-packages.el
index f660d0e..f65805c 100644
--- a/core/siren-packages.el
+++ b/core/siren-core-packages.el
@@ -1,4 +1,4 @@
-;;; siren-packages.el --- jimeh's Emacs Siren: Core package setup
+;;; siren-core-packages.el --- jimeh's Emacs Siren: Core package setup
 
 ;;; Commentary:
 
@@ -70,5 +70,5 @@ Missing packages are installed automatically."
 (require 'use-package)
 (setq use-package-always-ensure t)
 
-(provide 'siren-packages)
-;;; siren-packages.el ends here
+(provide 'siren-core-packages)
+;;; siren-core-packages.el ends here
diff --git a/core/siren-theme.el b/core/siren-core-theme.el
similarity index 67%
rename from core/siren-theme.el
rename to core/siren-core-theme.el
index d3ba500..4723c1f 100644
--- a/core/siren-theme.el
+++ b/core/siren-core-theme.el
@@ -1,4 +1,4 @@
-;;; siren-theme.el --- jimeh's Emacs Siren: Theme loading.
+;;; siren-core-theme.el --- jimeh's Emacs Siren: Theme loading.
 
 ;;; Commentary:
 
@@ -13,5 +13,5 @@
     (require 'siren-theme-doom-vibrant)
   (require 'siren-theme-tomorrow-night-paradise))
 
-(provide 'siren-theme)
-;;; siren-theme.el ends here
+(provide 'siren-core-theme)
+;;; siren-core-theme.el ends here
diff --git a/core/siren-transparency.el b/core/siren-core-transparency.el
similarity index 92%
rename from core/siren-transparency.el
rename to core/siren-core-transparency.el
index cb573e0..4b99c1e 100644
--- a/core/siren-transparency.el
+++ b/core/siren-core-transparency.el
@@ -1,4 +1,4 @@
-;;; siren-transparency.el --- jimeh's Emacs Siren: Emacs Frame transparency.
+;;; siren-core-transparency.el --- jimeh's Emacs Siren: Emacs Frame transparency.
 
 ;;; Commentary:
 
@@ -51,5 +51,5 @@
 (global-set-key (kbd "C-M-<") 'siren-transparency-increase)
 (global-set-key (kbd "C-M->") 'siren-transparency-decrease)
 
-(provide 'siren-transparency)
-;;; siren-transparency.el ends here
+(provide 'siren-core-transparency)
+;;; siren-core-transparency.el ends here
diff --git a/core/siren-ui.el b/core/siren-core-ui.el
similarity index 82%
rename from core/siren-ui.el
rename to core/siren-core-ui.el
index 89ba2ac..49bf58f 100644
--- a/core/siren-ui.el
+++ b/core/siren-core-ui.el
@@ -1,4 +1,4 @@
-;;; siren-ui.el --- jimeh's Emacs Siren: Emacs UI settings.
+;;; siren-core-ui.el --- jimeh's Emacs Siren: Emacs UI settings.
 
 ;;; Commentary:
 
@@ -6,7 +6,7 @@
 
 ;;; Code:
 
-(require 'siren-transparency)
+(require 'siren-core-transparency)
 
 ;; the toolbar is just a waste of valuable screen estate
 ;; in a tty tool-bar-mode does not properly auto-load, and is
@@ -45,8 +45,8 @@
 ;; buffer name (if the buffer isn't visiting a file)
 (setq frame-title-format
       '("Emacs - " (:eval (if (buffer-file-name)
-                                            (abbreviate-file-name (buffer-file-name))
-                                          "%b"))))
+                              (abbreviate-file-name (buffer-file-name))
+                            "%b"))))
 
 (require 'smart-mode-line)
 (setq sml/no-confirm-load-theme t)
@@ -54,5 +54,5 @@
 (setq sml/theme nil)
 (add-hook 'after-init-hook #'sml/setup)
 
-(provide 'siren-ui)
-;;; siren-ui.el ends here
+(provide 'siren-core-ui)
+;;; siren-core-ui.el ends here
diff --git a/core/siren-vendor.el b/core/siren-core-vendor.el
similarity index 62%
rename from core/siren-vendor.el
rename to core/siren-core-vendor.el
index e74e9d0..b269a1a 100644
--- a/core/siren-vendor.el
+++ b/core/siren-core-vendor.el
@@ -1,4 +1,4 @@
-;;; siren-vendor.el --- jimeh's Emacs Siren: Setup vendor load-paths
+;;; siren-core-vendor.el --- jimeh's Emacs Siren: Setup vendor load-paths
 
 ;;; Commentary:
 
@@ -11,5 +11,5 @@
 (add-to-list 'load-path siren-vendor-dir)
 (siren-add-subfolders-to-load-path siren-vendor-dir)
 
-(provide 'siren-vendor)
-;;; siren-vendor.el ends here
+(provide 'siren-core-vendor)
+;;; siren-core-vendor.el ends here
diff --git a/init.el b/init.el
index 9692f98..5ff03e2 100644
--- a/init.el
+++ b/init.el
@@ -14,7 +14,7 @@
 
 ;; Always load newest byte code
 (setq load-prefer-newer t)
-(load (expand-file-name "core/siren-init.el"
+(load (expand-file-name "core/siren-core-init.el"
                         (file-name-directory load-file-name)))
 
 ;;; init.el ends here