From c22b3da9f94ff86854f4a34abf3a8441845cb9ee Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Fri, 15 Jun 2018 13:10:00 +0200
Subject: [PATCH] Move emacs/electric-indent to emacs/electric

This module will later be expanded to customize more of electric's
functionality.
---
 core/core-modules.el                                    | 3 ++-
 modules/emacs/{electric-indent => electric}/autoload.el | 2 +-
 modules/emacs/{electric-indent => electric}/config.el   | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)
 rename modules/emacs/{electric-indent => electric}/autoload.el (93%)
 rename modules/emacs/{electric-indent => electric}/config.el (89%)

diff --git a/core/core-modules.el b/core/core-modules.el
index 0485f1f77..b88d3d760 100644
--- a/core/core-modules.el
+++ b/core/core-modules.el
@@ -10,7 +10,8 @@
   (list (expand-file-name "modules/" doom-private-dir) doom-modules-dir)
   "A list of module root directories. Order determines priority.")
 
-(defconst doom-obsolete-modules ()
+(defconst doom-obsolete-modules
+  '(((:emacs . electric-indent) . (:emacs . electric)))
   "An alist of deprecated modules, mapping deprecated modules to an optional new
 location (which will create an alias). Each CAR and CDR is a (CATEGORY .
 MODULE). E.g.
diff --git a/modules/emacs/electric-indent/autoload.el b/modules/emacs/electric/autoload.el
similarity index 93%
rename from modules/emacs/electric-indent/autoload.el
rename to modules/emacs/electric/autoload.el
index f6a8e6838..9fd5b4443 100644
--- a/modules/emacs/electric-indent/autoload.el
+++ b/modules/emacs/electric/autoload.el
@@ -1,4 +1,4 @@
-;;; emacs/electric-indent/autoload.el -*- lexical-binding: t; -*-
+;;; emacs/electric/autoload.el -*- lexical-binding: t; -*-
 
 ;;;###autodef
 (defun set-electric! (modes &rest plist)
diff --git a/modules/emacs/electric-indent/config.el b/modules/emacs/electric/config.el
similarity index 89%
rename from modules/emacs/electric-indent/config.el
rename to modules/emacs/electric/config.el
index 2c0a9c3e4..2075d3c3a 100644
--- a/modules/emacs/electric-indent/config.el
+++ b/modules/emacs/electric/config.el
@@ -1,4 +1,4 @@
-;;; emacs/electric-indent/config.el -*- lexical-binding: t; -*-
+;;; emacs/electric/config.el -*- lexical-binding: t; -*-
 
 ;; Smarter, keyword-based electric-indent