From f86ec8005b97fb528a7a0d5843e8c734253f9f21 Mon Sep 17 00:00:00 2001
From: James Nguyen <james@jojojames.com>
Date: Thu, 16 Nov 2017 18:05:37 -0800
Subject: [PATCH] Namespace functions

---
 evil-bookmark.el        |  2 +-
 evil-collection-util.el |  4 ++--
 evil-compile.el         |  2 +-
 evil-edebug.el          |  2 +-
 evil-flycheck.el        |  2 +-
 evil-ggtags.el          | 10 +++++-----
 evil-ibuffer.el         |  2 +-
 evil-p4.el              |  2 +-
 evil-pass.el            |  2 +-
 evil-slime.el           |  4 ++--
 evil-vlf.el             |  2 +-
 11 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/evil-bookmark.el b/evil-bookmark.el
index 43a7a30..22f12d4 100644
--- a/evil-bookmark.el
+++ b/evil-bookmark.el
@@ -31,7 +31,7 @@
 (require 'evil-collection-util)
 
 (defun evil-bookmark-setup ()
-  (+evilify-map
+  (evil-collection-util-evilify-map
    bookmark-bmenu-mode-map
    :mode bookmark-bmenu-mode))
 
diff --git a/evil-collection-util.el b/evil-collection-util.el
index 8194f02..42b1086 100644
--- a/evil-collection-util.el
+++ b/evil-collection-util.el
@@ -31,7 +31,7 @@
 (require 'evil)
 (require 'evil-evilified-state)
 
-(defmacro +evil-set-default-state-for-mode (mode state)
+(defmacro evil-collection-util-set-initial-state (mode state)
   "Set the default STATE for MODE."
   (let* ((mode-str (symbol-name mode))
          (state-str (symbol-name state))
@@ -46,7 +46,7 @@
            (evil-normal-state)))
        (advice-add #',mode :after #',defun-name))))
 
-(defmacro +evilify-map (map &rest props)
+(defmacro evil-collection-util-evilify-map (map &rest props)
   "`evilified-state-evilify-map' with additional bindings.
 This assumes the :bindings key is at the end."
   (let ((contains-bindings (plist-get props :bindings)))
diff --git a/evil-compile.el b/evil-compile.el
index c66c7ee..b5831b5 100644
--- a/evil-compile.el
+++ b/evil-compile.el
@@ -31,7 +31,7 @@
 (require 'compile)
 
 (defun evil-compile-setup ()
-  (+evilify-map
+  (evil-collection-util-evilify-map
    compilation-mode-map
    :mode compilation-mode
    :bindings
diff --git a/evil-edebug.el b/evil-edebug.el
index bdc575d..9b801a6 100644
--- a/evil-edebug.el
+++ b/evil-edebug.el
@@ -30,7 +30,7 @@
 (require 'edebug)
 (require 'evil-collection-util)
 
-(+evil-set-default-state-for-mode edebug-mode motion)
+(evil-collection-util-set-initial-state edebug-mode motion)
 
 (defun evil-edebug-setup ()
 
diff --git a/evil-flycheck.el b/evil-flycheck.el
index 0155e21..6158e30 100644
--- a/evil-flycheck.el
+++ b/evil-flycheck.el
@@ -33,7 +33,7 @@
 (defvar flycheck-error-list-mode-map)
 
 (defun evil-flycheck-setup ()
-  (+evilify-map
+  (evil-collection-util-evilify-map
    flycheck-error-list-mode-map
    :mode flycheck-error-list-mode
    :bindings
diff --git a/evil-ggtags.el b/evil-ggtags.el
index 56d8065..811d867 100644
--- a/evil-ggtags.el
+++ b/evil-ggtags.el
@@ -36,11 +36,11 @@
 (defvar ggtags-navigation-map)
 
 (defun evil-ggtags-setup ()
-  (+evilify-map
+  (evil-collection-util-evilify-map
    ggtags-global-mode-map
    :mode ggtags-global-mode)
 
-  (+evilify-map
+  (evil-collection-util-evilify-map
    ggtags-view-search-history-mode-map
    :bindings
    "j" 'ggtags-view-search-history-prev
@@ -53,7 +53,7 @@
    "e" 'evil-forward-word-end
    "E" 'evil-forward-WORD-end)
 
-  (+evilify-map
+  (evil-collection-util-evilify-map
    ggtags-view-tag-history-mode-map
    :bindings
    "\C-j" 'next-error-no-select
@@ -61,7 +61,7 @@
    "e" 'evil-forward-word-end
    "E" 'evil-forward-WORD-end)
 
-  (+evilify-map
+  (evil-collection-util-evilify-map
    ggtags-view-tag-history-mode-map
    :bindings
    "\C-j" 'next-error-no-select
@@ -69,7 +69,7 @@
    "e" 'evil-forward-word-end
    "E" 'evil-forward-WORD-end)
 
-  (+evilify-map
+  (evil-collection-util-evilify-map
    ggtags-navigation-map
    :bindings
    "\C-j" 'next-error
diff --git a/evil-ibuffer.el b/evil-ibuffer.el
index ffd0976..6d4fa5e 100644
--- a/evil-ibuffer.el
+++ b/evil-ibuffer.el
@@ -31,7 +31,7 @@
 (require 'ibuffer)
 
 (defun evil-ibuffer-setup ()
-  (+evilify-map
+  (evil-collection-util-evilify-map
    ibuffer-mode-map
    :mode ibuffer-mode
    :bindings
diff --git a/evil-p4.el b/evil-p4.el
index de3f450..b414f1c 100644
--- a/evil-p4.el
+++ b/evil-p4.el
@@ -33,7 +33,7 @@
 (defvar p4-basic-mode-map)
 
 (defun evil-p4-setup ()
-  (+evilify-map
+  (evil-collection-util-evilify-map
    p4-basic-mode-map
    :mode p4-basic-mode
    :bindings
diff --git a/evil-pass.el b/evil-pass.el
index f5d543d..6d04350 100644
--- a/evil-pass.el
+++ b/evil-pass.el
@@ -33,7 +33,7 @@
 (defvar pass-mode-map)
 
 (defun evil-pass-setup ()
-  (+evilify-map
+  (evil-collection-util-evilify-map
    pass-mode-map
    :mode pass-mode
    :bindings
diff --git a/evil-slime.el b/evil-slime.el
index 3aba0ac..7654001 100644
--- a/evil-slime.el
+++ b/evil-slime.el
@@ -34,7 +34,7 @@
 (defvar slime-inspector-mode-map)
 
 (defun evil-slime-setup ()
-  (+evilify-map
+  (evil-collection-util-evilify-map
    sldb-mode-map
    :mode sldb-mode
    :bindings
@@ -46,7 +46,7 @@
    "gb" 'sldb-break-on-return
    "gB" 'sldb-break-with-default-debugger)
 
-  (+evilify-map
+  (evil-collection-util-evilify-map
    slime-inspector-mode-map
    :mode slime-inspector-mode
    :bindings
diff --git a/evil-vlf.el b/evil-vlf.el
index cbdf5fd..fcab885 100644
--- a/evil-vlf.el
+++ b/evil-vlf.el
@@ -34,7 +34,7 @@
 
 ;;; Code:
 (defun evil-vlf-setup ()
-  (+evilify-map
+  (evil-collection-util-evilify-map
    vlf-mode-map
    :mode vlf-mode
    :bindings