From afc5b622bbc8173003869034bf5d7a524717160a Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Mon, 20 Feb 2017 20:55:21 -0500
Subject: [PATCH] Refactor :electric setting

---
 modules/lang/cc/config.el               | 2 +-
 modules/lang/data/config.el             | 4 ++--
 modules/lang/lua/config.el              | 2 +-
 modules/lang/markdown/config.el         | 2 +-
 modules/lang/ruby/config.el             | 2 +-
 modules/lang/sh/config.el               | 2 +-
 modules/lang/typescript/config.el       | 2 +-
 modules/tools/electric-indent/config.el | 4 ++--
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/lang/cc/config.el b/modules/lang/cc/config.el
index 0fe9bdf3b..be7f2ad88 100644
--- a/modules/lang/cc/config.el
+++ b/modules/lang/cc/config.el
@@ -33,7 +33,7 @@
   (add-hook 'c++-mode-hook '+cc|extra-fontify-c++)
 
   (@set :electric '(c-mode c++-mode objc-mode java-mode)
-        :chars ?\n ?\})
+        :chars '(?\n ?\}))
 
   (@set :company-backend
         '(c-mode c++-mode objc-mode)
diff --git a/modules/lang/data/config.el b/modules/lang/data/config.el
index bb5868b96..c865e95e5 100644
--- a/modules/lang/data/config.el
+++ b/modules/lang/data/config.el
@@ -15,12 +15,12 @@
 (@def-package yaml-mode
   :mode "\\.ya?ml$"
   :config
-  (@set :electric 'yaml-mode :chars ?\n ?\: ?\-))
+  (@set :electric 'yaml-mode :chars '(?\n ?\: ?\-)))
 
 
 (@def-package json-mode :mode "\\.js\\(on\\|[hl]int\\(rc\\)?\\)$"
   :config
-  (@set :electric 'json-mode :chars ?\n ?: ?{ ?}))
+  (@set :electric 'json-mode :chars '(?\n ?: ?{ ?})))
 
 
 (@def-package vimrc-mode
diff --git a/modules/lang/lua/config.el b/modules/lang/lua/config.el
index 703f9ff53..90adb8ee9 100644
--- a/modules/lang/lua/config.el
+++ b/modules/lang/lua/config.el
@@ -7,7 +7,7 @@
   (add-hook 'lua-mode-hook 'flycheck-mode)
   :config
   (@set :company-backend 'lua-mode '(company-lua company-yasnippet))
-  (@set :electric 'lua-mode :words "else" "end")
+  (@set :electric 'lua-mode :words '("else" "end"))
   (@set :repl 'lua-mode '+lua/repl)
 
   ;; sp's lua-specific rules are obnoxious, so we disable them
diff --git a/modules/lang/markdown/config.el b/modules/lang/markdown/config.el
index 32ae568e1..331d3779b 100644
--- a/modules/lang/markdown/config.el
+++ b/modules/lang/markdown/config.el
@@ -11,7 +11,7 @@
         markdown-gfm-additional-languages '("sh"))
 
   :config
-  (@set :electric 'markdown-mode :chars "+" "#")
+  (@set :electric 'markdown-mode :chars '(?+ ?#))
 
   (@add-hook markdown-mode
     (auto-fill-mode +1)
diff --git a/modules/lang/ruby/config.el b/modules/lang/ruby/config.el
index 7d9bb716e..9c41b2888 100644
--- a/modules/lang/ruby/config.el
+++ b/modules/lang/ruby/config.el
@@ -9,7 +9,7 @@
   :config
   (@set :build 'rake 'ruby-mode '+ruby/rake)
   (@set :company-backend 'ruby-mode '(company-dabbrev-code))
-  (@set :electric 'ruby-mode :words "else" "end" "elseif")
+  (@set :electric 'ruby-mode :words '("else" "end" "elseif"))
   (@set :repl 'ruby-mode 'inf-ruby)
   (setq ruby-deep-indent-paren t)
   ;; Don't interfere with my custom RET behavior
diff --git a/modules/lang/sh/config.el b/modules/lang/sh/config.el
index f1ff5cfdb..6e5166287 100644
--- a/modules/lang/sh/config.el
+++ b/modules/lang/sh/config.el
@@ -7,7 +7,7 @@
   (@add-hook sh-mode '(flycheck-mode highlight-numbers-mode +sh|extra-fontify))
   :config
   (@set :company-backend 'sh-mode '(company-shell))
-  (@set :electric 'sh-mode :words "else" "elif" "fi" "done" "then" "do" "esac" ";;")
+  (@set :electric 'sh-mode :words '("else" "elif" "fi" "done" "then" "do" "esac" ";;"))
   (@set :repl 'sh-mode '+sh/repl)
   (setq sh-indent-after-continuation 'always)
 
diff --git a/modules/lang/typescript/config.el b/modules/lang/typescript/config.el
index 31f644633..59b361ef3 100644
--- a/modules/lang/typescript/config.el
+++ b/modules/lang/typescript/config.el
@@ -6,7 +6,7 @@
   (add-hook 'typescript-mode-hook 'rainbow-delimiters-mode)
   :config
   (@set :company-backend 'typescript-mode '(company-tide))
-  (@set :electric 'typescript-mode :chars ?\} ?\) :words "||" "&&")
+  (@set :electric 'typescript-mode :chars '(?\} ?\)) :words '("||" "&&"))
 
   ;; TODO emr definitions for:
   ;; + tide-jump-back
diff --git a/modules/tools/electric-indent/config.el b/modules/tools/electric-indent/config.el
index dce6e27ad..f74715aa1 100644
--- a/modules/tools/electric-indent/config.el
+++ b/modules/tools/electric-indent/config.el
@@ -23,8 +23,8 @@
 trigger electric indentation."
   (declare (indent 1))
   (let ((modes (if (listp modes) modes (list modes)))
-        (chars (doom-mplist-get plist :chars))
-        (words (doom-mplist-get plist :words)))
+        (chars (plist-get plist :chars))
+        (words (plist-get plist :words)))
     (when (or chars words)
       (let ((fn-name (intern (format "doom--electric-%s" (s-join "-" (mapcar 'symbol-name modes))))))
         `(progn