General refactor & cleanup

modules/feature/evil/config.el

@@ -282,7 +282,7 @@ the new algorithm is confusing, like in python or ruby."
   :commands (evil-mc-make-cursor-here evil-mc-make-all-cursors
              evil-mc-undo-all-cursors evil-mc-pause-cursors
              evil-mc-resume-cursors evil-mc-make-and-goto-first-cursor
-             evil-mc-make-and-goto-last-cursor evil-mc-make-cursor-here
+             evil-mc-make-and-goto-last-cursor
              evil-mc-make-cursor-move-next-line
              evil-mc-make-cursor-move-prev-line evil-mc-make-cursor-at-pos
              evil-mc-has-cursors-p evil-mc-make-and-goto-next-cursor

modules/feature/version-control/+git.el

@@ -33,7 +33,6 @@
         nil))
     (add-hook '+evil-esc-hook #'+version-control|update-git-gutter t))
 
-
   (when (featurep! :feature hydra)
     (defhydra +hydra-git-gutter (:body-pre (git-gutter-mode 1)
                                           :hint nil)

modules/feature/version-control/config.el

@@ -27,14 +27,12 @@
   (add-hook 'find-file-hook #'+vcs|enable-smerge-mode-maybe)
   :config
   (when (featurep! :feature hydra)
-    (require 'hydra)
-
     (when (version< emacs-version "26")
-      (defalias 'smerge-keep-upper 'smerge-keep-mine)
-      (defalias 'smerge-keep-lower 'smerge-keep-other)
-      (defalias 'smerge-diff-base-upper 'smerge-diff-base-mine)
-      (defalias 'smerge-diff-upper-lower 'smerge-diff-mine-other)
-      (defalias 'smerge-diff-base-lower 'smerge-diff-base-other))
+      (defalias #'smerge-keep-upper #'smerge-keep-mine)
+      (defalias #'smerge-keep-lower #'smerge-keep-other)
+      (defalias #'smerge-diff-base-upper #'smerge-diff-base-mine)
+      (defalias #'smerge-diff-upper-lower #'smerge-diff-mine-other)
+      (defalias #'smerge-diff-base-lower #'smerge-diff-base-other))
 
     (defhydra +hydra-smerge (:hint nil
                              :pre (smerge-mode 1)