From 0dcc0cd290d0bae62f8f78b0620d0c069118cff0 Mon Sep 17 00:00:00 2001
From: James Nguyen <james@jojojames.com>
Date: Mon, 6 Nov 2017 17:39:23 -0800
Subject: [PATCH] Change 'set-keys' to 'setup' in function names

---
 evil-ag.el           | 2 +-
 evil-bookmark.el     | 2 +-
 evil-calendar.el     | 2 +-
 evil-cider.el        | 2 +-
 evil-collection.el   | 4 ++--
 evil-compile.el      | 2 +-
 evil-custom.el       | 2 +-
 evil-debbugs.el      | 2 +-
 evil-debugger.el     | 2 +-
 evil-diff-mode.el    | 2 +-
 evil-dired.el        | 2 +-
 evil-edebug.el       | 2 +-
 evil-elfeed.el       | 2 +-
 evil-elisp-refs.el   | 2 +-
 evil-emms.el         | 2 +-
 evil-eshell.el       | 6 +++---
 evil-flycheck.el     | 2 +-
 evil-ggtags.el       | 2 +-
 evil-helm.el         | 2 +-
 evil-help.el         | 2 +-
 evil-ibuffer.el      | 2 +-
 evil-image+.el       | 2 +-
 evil-image.el        | 2 +-
 evil-info.el         | 2 +-
 evil-ivy.el          | 2 +-
 evil-macrostep.el    | 2 +-
 evil-man.el          | 2 +-
 evil-occur.el        | 2 +-
 evil-outline.el      | 2 +-
 evil-p4.el           | 2 +-
 evil-package-menu.el | 2 +-
 evil-pass.el         | 2 +-
 evil-pdf.el          | 2 +-
 evil-proced.el       | 2 +-
 evil-prodigy.el      | 2 +-
 evil-profiler.el     | 2 +-
 evil-slime.el        | 2 +-
 evil-term.el         | 2 +-
 evil-transmission.el | 2 +-
 evil-vlf.el          | 2 +-
 evil-woman.el        | 2 +-
 evil-xref.el         | 2 +-
 readme.org           | 2 +-
 43 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/evil-ag.el b/evil-ag.el
index 81c7798..39620fd 100644
--- a/evil-ag.el
+++ b/evil-ag.el
@@ -31,7 +31,7 @@
 (require 'ag)
 (require 'evil)
 
-(defun evil-ag-set-keys ()
+(defun evil-ag-setup ()
   (evil-add-hjkl-bindings ag-mode-map 'normal
     "gg" #'evil-goto-first-line
     "gr" #'recompile
diff --git a/evil-bookmark.el b/evil-bookmark.el
index 8a3229d..9e342a1 100644
--- a/evil-bookmark.el
+++ b/evil-bookmark.el
@@ -30,7 +30,7 @@
 (require 'bookmark)
 (require 'evil-collection-util)
 
-(defun evil-bookmark-set-keys ()
+(defun evil-bookmark-setup ()
   (+evilify-map
    bookmark-bmenu-mode-map
    :mode bookmark-bmenu-mode))
diff --git a/evil-calendar.el b/evil-calendar.el
index 27061c9..d11c7f0 100644
--- a/evil-calendar.el
+++ b/evil-calendar.el
@@ -29,7 +29,7 @@
 (require 'calendar)
 
 ;;;###autoload
-(defun evil-calendar-set-keys ()
+(defun evil-calendar-setup ()
   (evil-define-key 'motion calendar-mode-map
     ;; motion
     "h" 'calendar-backward-day
diff --git a/evil-cider.el b/evil-cider.el
index 5e37d24..a3b687d 100644
--- a/evil-cider.el
+++ b/evil-cider.el
@@ -31,7 +31,7 @@
 (require 'cider)
 (require 'evil-collection-util)
 
-(defun evil-cider-set-keys ()
+(defun evil-cider-setup ()
   (+evil-bind-key (normal visual)
                   (cider-mode-map)
                   (kbd "gz") 'cider-switch-to-repl-buffer
diff --git a/evil-collection.el b/evil-collection.el
index 14b51be..ea05193 100644
--- a/evil-collection.el
+++ b/evil-collection.el
@@ -93,7 +93,7 @@ instance:
 
   (with-eval-after-load 'calendar
     (require 'evil-calendar)
-    (evil-calendar-set-keys))"
+    (evil-calendar-setup))"
   (interactive)
   (dolist (mode evil-collection-mode-list)
     (let ((m mode)
@@ -104,7 +104,7 @@ instance:
       (dolist (req reqs)
         (with-eval-after-load req
           (require (intern (concat "evil-" (symbol-name m))))
-          (funcall (intern (concat "evil-" (symbol-name m) "-set-keys"))))))))
+          (funcall (intern (concat "evil-" (symbol-name m) "-setup"))))))))
 
 (provide 'evil-collection)
 ;;; evil-collection.el ends here
diff --git a/evil-compile.el b/evil-compile.el
index 9fa6219..91810f2 100644
--- a/evil-compile.el
+++ b/evil-compile.el
@@ -30,7 +30,7 @@
 (require 'evil-collection-util)
 (require 'compile)
 
-(defun evil-compile-set-keys ()
+(defun evil-compile-setup ()
   (+evilify-map
    compilation-mode-map
    :mode compilation-mode
diff --git a/evil-custom.el b/evil-custom.el
index 482d4d0..2b0d153 100644
--- a/evil-custom.el
+++ b/evil-custom.el
@@ -29,7 +29,7 @@
 (require 'cus-edit)
 
 ;;;###autoload
-(defun evil-custom-set-keys ()
+(defun evil-custom-setup ()
   (evil-set-initial-state 'Custom-mode 'normal)
 
   (evil-define-key 'normal custom-mode-map
diff --git a/evil-debbugs.el b/evil-debbugs.el
index 78876a0..faa7713 100644
--- a/evil-debbugs.el
+++ b/evil-debbugs.el
@@ -30,7 +30,7 @@
 (require 'evil)
 (require 'debbugs)
 
-(defun evil-diff-mode-set-keys ()
+(defun evil-diff-mode-setup ()
   (evil-set-initial-state 'debbugs-gnu-mode 'motion)
 
   (evil-define-key 'motion debbugs-gnu-mode-map
diff --git a/evil-debugger.el b/evil-debugger.el
index 522c266..7f97986 100644
--- a/evil-debugger.el
+++ b/evil-debugger.el
@@ -29,7 +29,7 @@
 (require 'debug)
 
 ;;;###autoload
-(defun evil-debugger-set-keys ()
+(defun evil-debugger-setup ()
   (evil-set-initial-state 'debugger-mode 'motion)
 
   (evil-define-key 'motion debugger-mode-map
diff --git a/evil-diff-mode.el b/evil-diff-mode.el
index ea31555..bf15321 100644
--- a/evil-diff-mode.el
+++ b/evil-diff-mode.el
@@ -89,7 +89,7 @@ current file instead."
     (diff-restrict-view arg)))
 
 ;;;###autoload
-(defun evil-diff-mode-set-keys ()
+(defun evil-diff-mode-setup ()
   (evil-define-key 'normal diff-mode-map
     ;; motion
     (kbd "SPC") 'scroll-up-command
diff --git a/evil-dired.el b/evil-dired.el
index 63fbcd6..d0c6173 100644
--- a/evil-dired.el
+++ b/evil-dired.el
@@ -31,7 +31,7 @@
 (require 'dired)
 (require 'evil-collection-util)
 
-(defun evil-dired-set-keys ()
+(defun evil-dired-setup ()
   (evil-define-key 'normal dired-mode-map
     "j" 'evil-next-line
     "k" 'evil-previous-line
diff --git a/evil-edebug.el b/evil-edebug.el
index b90555a..997bdba 100644
--- a/evil-edebug.el
+++ b/evil-edebug.el
@@ -31,7 +31,7 @@
 (require 'edebug)
 (require 'evil-collection-util)
 
-(defun evil-edebug-set-keys ()
+(defun evil-edebug-setup ()
   (+evil-set-default-state-for-mode edebug-mode motion)
 
   (evil-define-key 'motion 'edebug-mode-map
diff --git a/evil-elfeed.el b/evil-elfeed.el
index eae7a67..7089e33 100644
--- a/evil-elfeed.el
+++ b/evil-elfeed.el
@@ -30,7 +30,7 @@
 (require 'evil)
 (require 'elfeed)
 
-(defun evil-elfeed-set-keys ()
+(defun evil-elfeed-setup ()
   (evil-set-initial-state 'elfeed-search-mode 'motion)
 
   (evil-define-key 'motion elfeed-search-mode-map
diff --git a/evil-elisp-refs.el b/evil-elisp-refs.el
index 2068efb..34c7634 100644
--- a/evil-elisp-refs.el
+++ b/evil-elisp-refs.el
@@ -29,7 +29,7 @@
 (require 'evil-collection-util)
 (require 'elisp-refs)
 
-(defun evil-elisp-refs-set-keys ()
+(defun evil-elisp-refs-setup ()
   (evil-define-key 'normal elisp-refs-mode-map
     (kbd "<tab>") #'elisp-refs-next-match
     (kbd "<backtab>") #'elisp-refs-prev-match
diff --git a/evil-emms.el b/evil-emms.el
index 0143383..de71079 100644
--- a/evil-emms.el
+++ b/evil-emms.el
@@ -74,7 +74,7 @@ The return value is the yanked text."
   (evil-next-line)
   (evil-emms-playlist-mode-paste-before))
 
-(defun evil-emms-set-keys ()
+(defun evil-emms-setup ()
   (advice-add 'emms-browser :after 'evil-emms-browser)
   (evil-set-initial-state 'emms-playlist-mode 'motion)
 
diff --git a/evil-eshell.el b/evil-eshell.el
index 6ae5e41..64f7bb6 100644
--- a/evil-eshell.el
+++ b/evil-eshell.el
@@ -47,7 +47,7 @@
 
 ;;; `eshell-mode-map' is reset when Eshell is initialized in `eshell-mode'. We
 ;;; need to add bindings to `eshell-first-time-mode-hook'.
-(defun evil-eshell-set-keys-function ()
+(defun evil-eshell-setup-function ()
   (evil-define-key 'normal eshell-mode-map
     ;; motion
     "[" 'eshell-previous-prompt
@@ -77,8 +77,8 @@
 
 ;; TODO: Compare this setup procedure with evil-ediff.
 ;;;###autoload
-(defun evil-eshell-set-keys ()
-  (add-hook 'eshell-first-time-mode-hook 'evil-eshell-set-keys-function))
+(defun evil-eshell-setup ()
+  (add-hook 'eshell-first-time-mode-hook 'evil-eshell-setup-function))
 
 (provide 'evil-eshell)
 ;;; evil-eshell.el ends here
diff --git a/evil-flycheck.el b/evil-flycheck.el
index 6973db2..3930936 100644
--- a/evil-flycheck.el
+++ b/evil-flycheck.el
@@ -30,7 +30,7 @@
 (require 'evil-collection-util)
 (require 'flycheck)
 
-(defun evil-flycheck-set-keys ()
+(defun evil-flycheck-setup ()
   (+evilify-map
    flycheck-error-list-mode-map
    :mode flycheck-error-list-mode
diff --git a/evil-ggtags.el b/evil-ggtags.el
index 47d7854..8c7d64c 100644
--- a/evil-ggtags.el
+++ b/evil-ggtags.el
@@ -30,7 +30,7 @@
 (require 'evil-collection-util)
 (require 'ggtags)
 
-(defun evil-ggtags-set-keys ()
+(defun evil-ggtags-setup ()
   (+evilify-map
    ggtags-global-mode-map
    :mode ggtags-global-mode)
diff --git a/evil-helm.el b/evil-helm.el
index dcb109d..dd733ab 100644
--- a/evil-helm.el
+++ b/evil-helm.el
@@ -38,7 +38,7 @@
 ;; down the file system hierarchy since we need them to use it to edit the
 ;; minibuffer content.
 
-(defun evil-helm-set-keys ()
+(defun evil-helm-setup ()
   ;; TODO: We should not modify helm-map in Emacs state but somehow it does not
   ;; work otherwise.
   (define-key helm-map (kbd "M-h") 'helm-next-source)
diff --git a/evil-help.el b/evil-help.el
index 23deb05..17e5be6 100644
--- a/evil-help.el
+++ b/evil-help.el
@@ -31,7 +31,7 @@
 (require 'help-mode)
 (require 'evil)
 
-(defun evil-help-set-keys ()
+(defun evil-help-setup ()
   (evil-define-key 'motion help-mode-map
     ;; motion
     (kbd "SPC") 'scroll-up-command
diff --git a/evil-ibuffer.el b/evil-ibuffer.el
index 1964f29..d4ec47f 100644
--- a/evil-ibuffer.el
+++ b/evil-ibuffer.el
@@ -31,7 +31,7 @@
 (require 'evil-collection-util)
 (require 'ibuffer)
 
-(defun evil-ibuffer-set-keys ()
+(defun evil-ibuffer-setup ()
   (+evilify-map
    ibuffer-mode-map
    :mode ibuffer-mode
diff --git a/evil-image+.el b/evil-image+.el
index 017238e..01ccd62 100644
--- a/evil-image+.el
+++ b/evil-image+.el
@@ -30,7 +30,7 @@
 (require 'evil)
 (require 'image+)
 
-(defun evil-image+-set-keys ()
+(defun evil-image+-setup ()
   (evil-define-key 'motion image-mode-map
     "+" 'imagex-sticky-zoom-in
     "-" 'imagex-sticky-zoom-out
diff --git a/evil-image.el b/evil-image.el
index 533ede8..ea60b4d 100644
--- a/evil-image.el
+++ b/evil-image.el
@@ -29,7 +29,7 @@
 (require 'image-mode)
 
 ;;;###autoload
-(defun evil-image-set-keys ()
+(defun evil-image-setup ()
   (evil-set-initial-state 'image-mode 'motion)
 
   (evil-define-key 'motion image-mode-map
diff --git a/evil-info.el b/evil-info.el
index 74b2077..bffeb2a 100644
--- a/evil-info.el
+++ b/evil-info.el
@@ -30,7 +30,7 @@
 (require 'info)
 
 ;;;###autoload
-(defun evil-info-set-keys ()
+(defun evil-info-setup ()
   (evil-define-key 'motion Info-mode-map
     ;; motion: Restore some Evil keys that got overriden.
     "w" 'evil-forward-word-begin
diff --git a/evil-ivy.el b/evil-ivy.el
index 7677d18..6c096ec 100644
--- a/evil-ivy.el
+++ b/evil-ivy.el
@@ -30,7 +30,7 @@
 (require 'evil)
 (require 'ivy)
 
-(defun evil-ivy-set-keys ()
+(defun evil-ivy-setup ()
   (evil-define-key 'normal ivy-occur-mode-map
     [mouse-1] 'ivy-occur-click
     (kbd "RET") 'ivy-occur-press-and-switch
diff --git a/evil-macrostep.el b/evil-macrostep.el
index b0e920e..47dc043 100644
--- a/evil-macrostep.el
+++ b/evil-macrostep.el
@@ -29,7 +29,7 @@
 (require 'evil-collection-util)
 (require 'macrostep)
 
-(defun evil-macrostep-set-keys ()
+(defun evil-macrostep-setup ()
   ;; Keymaps don't seem to be populated on first try.
   ;; Force `evil' to normalize keymaps.
   (add-hook 'macrostep-mode-hook #'evil-normalize-keymaps)
diff --git a/evil-man.el b/evil-man.el
index 2d7d659..f65893f 100644
--- a/evil-man.el
+++ b/evil-man.el
@@ -29,7 +29,7 @@
 (require 'man)
 
 ;;;###autoload
-(defun evil-man-set-keys ()
+(defun evil-man-setup ()
   (evil-define-key 'motion Man-mode-map
     ;; motion
     (kbd "SPC") 'scroll-up-command
diff --git a/evil-occur.el b/evil-occur.el
index 22e523d..90a9b29 100644
--- a/evil-occur.el
+++ b/evil-occur.el
@@ -32,7 +32,7 @@
 (when (> emacs-major-version 25)
   (require 'replace))
 
-(defun evil-occur-set-keys ()
+(defun evil-occur-setup ()
   (setq evil-emacs-state-modes
         (remove 'occur-mode evil-emacs-state-modes))
 
diff --git a/evil-outline.el b/evil-outline.el
index 9970ea0..3278105 100644
--- a/evil-outline.el
+++ b/evil-outline.el
@@ -29,7 +29,7 @@
 (require 'outline)
 
 ;;;###autoload
-(defun evil-outline-set-keys ()
+(defun evil-outline-setup ()
   (evil-define-key 'normal outline-mode-map
     ;; folding
     ;; Evil default keys:
diff --git a/evil-p4.el b/evil-p4.el
index 512c4bd..7ee6790 100644
--- a/evil-p4.el
+++ b/evil-p4.el
@@ -29,7 +29,7 @@
 (require 'evil-collection-util)
 (require 'p4)
 
-(defun evil-p4-set-keys ()
+(defun evil-p4-setup ()
   (+evilify-map
    p4-basic-mode-map
    :mode p4-basic-mode
diff --git a/evil-package-menu.el b/evil-package-menu.el
index b3166fd..035799e 100644
--- a/evil-package-menu.el
+++ b/evil-package-menu.el
@@ -32,7 +32,7 @@
 (require 'package)
 
 ;;;###autoload
-(defun evil-package-menu-set-keys ()
+(defun evil-package-menu-setup ()
   (evil-set-initial-state 'package-menu-mode 'motion)
 
   (evil-define-key 'motion package-menu-mode-map
diff --git a/evil-pass.el b/evil-pass.el
index ea32511..31898d3 100644
--- a/evil-pass.el
+++ b/evil-pass.el
@@ -30,7 +30,7 @@
 (require 'evil-collection-util)
 (require 'pass)
 
-(defun evil-pass-set-keys ()
+(defun evil-pass-setup ()
   (+evilify-map
    pass-mode-map
    :mode pass-mode
diff --git a/evil-pdf.el b/evil-pdf.el
index 51ba499..7a710a1 100644
--- a/evil-pdf.el
+++ b/evil-pdf.el
@@ -48,7 +48,7 @@
       (pdf-view-goto-page page)
     (pdf-view-first-page)))
 
-(defun evil-pdf-set-keys ()
+(defun evil-pdf-setup ()
   (evil-set-initial-state 'pdf-view-mode 'motion)
   (evil-define-key 'motion pdf-view-mode-map
     ;; motion
diff --git a/evil-proced.el b/evil-proced.el
index 3252286..4a37416 100644
--- a/evil-proced.el
+++ b/evil-proced.el
@@ -29,7 +29,7 @@
 (require 'proced)
 
 ;;;###autoload
-(defun evil-proced-set-keys ()
+(defun evil-proced-setup ()
   (evil-set-initial-state 'proced-mode 'motion)
 
   (evil-define-key 'motion proced-mode-map
diff --git a/evil-prodigy.el b/evil-prodigy.el
index 0bd0ed1..7cecb07 100644
--- a/evil-prodigy.el
+++ b/evil-prodigy.el
@@ -30,7 +30,7 @@
 (require 'evil-collection-util)
 (require 'prodigy)
 
-(defun evil-prodigy-set-keys ()
+(defun evil-prodigy-setup ()
   (+evilify-map
    prodigy-mode-map
    :mode prodigy-mode
diff --git a/evil-profiler.el b/evil-profiler.el
index e588237..4951667 100644
--- a/evil-profiler.el
+++ b/evil-profiler.el
@@ -29,7 +29,7 @@
 (require 'evil)
 (require 'profiler)
 
-(defun evil-profiler-set-keys ()
+(defun evil-profiler-setup ()
   (evil-set-initial-state 'profiler-report-mode 'motion)
 
   (evil-define-key 'motion profiler-report-mode-map
diff --git a/evil-slime.el b/evil-slime.el
index 12ab9e6..01a8b05 100644
--- a/evil-slime.el
+++ b/evil-slime.el
@@ -30,7 +30,7 @@
 (require 'evil-collection-util)
 (require 'slime)
 
-(defun evil-collection-set-keys ()
+(defun evil-collection-setup ()
   (+evilify-map
    sldb-mode-map
    :mode sldb-mode
diff --git a/evil-term.el b/evil-term.el
index c462ae7..7758833 100644
--- a/evil-term.el
+++ b/evil-term.el
@@ -66,7 +66,7 @@ it is not appropriate in some cases like terminals."
   (add-hook 'evil-insert-state-entry-hook 'evil-term-char-mode-entry-function)
   (add-hook 'evil-insert-state-exit-hook 'term-line-mode))
 
-(defun evil-term-set-keys ()
+(defun evil-term-setup ()
   (evil-set-initial-state 'term-mode 'insert)
   (add-hook 'term-mode-hook 'evil-term-sync-state-and-mode)
   (add-hook 'term-mode-hook 'evil-term-escape-stay)
diff --git a/evil-transmission.el b/evil-transmission.el
index 3e57893..81ff0aa 100644
--- a/evil-transmission.el
+++ b/evil-transmission.el
@@ -30,7 +30,7 @@
 (require 'evil)
 (require 'transmission)
 
-(defun evil-transmission-set-keys ()
+(defun evil-transmission-setup ()
   (evil-set-initial-state 'transmission-mode 'motion)
   (evil-define-key 'motion transmission-mode-map
     ;; motion
diff --git a/evil-vlf.el b/evil-vlf.el
index 9e931f9..1698f10 100644
--- a/evil-vlf.el
+++ b/evil-vlf.el
@@ -29,7 +29,7 @@
 (require 'vlf)
 
 ;;; Code:
-(defun evil-vlf-set-keys ()
+(defun evil-vlf-setup ()
   (+evilify-map
    vlf-mode-map
    :mode vlf-mode
diff --git a/evil-woman.el b/evil-woman.el
index 043235a..00c6ae2 100644
--- a/evil-woman.el
+++ b/evil-woman.el
@@ -30,7 +30,7 @@
 (require 'evil-man) ; WoMan's keymap inherits from Man.
 
 ;;;###autoload
-(defun evil-woman-set-keys ()
+(defun evil-woman-setup ()
   (evil-define-key 'motion woman-mode-map
     (kbd "]") 'WoMan-next-manpage
     (kbd "[") 'WoMan-previous-manpage
diff --git a/evil-xref.el b/evil-xref.el
index f852e2a..da05295 100644
--- a/evil-xref.el
+++ b/evil-xref.el
@@ -31,7 +31,7 @@
 (require 'evil-collection-util)
 (require 'xref)
 
-(defun evil-xref-set-keys ()
+(defun evil-xref-setup ()
   (+evilify-map
    xref--xref-buffer-mode-map
    :mode xref--xref-buffer-mode
diff --git a/readme.org b/readme.org
index a502aaa..e791c87 100644
--- a/readme.org
+++ b/readme.org
@@ -41,7 +41,7 @@ the default bindings to change in the future.
 
 or mode-by-mode, for instance:
 
-: (with-eval-after-load 'calendar (require 'evil-calendar) (evil-calendar-set-keys))
+: (with-eval-after-load 'calendar (require 'evil-calendar) (evil-calendar-setup))
 
 The list of supported modes is simply the list of files.