emacs: eval-after-load -> with-eval-after-load

Signed-off-by: Miquel Sabaté Solà <msabate@suse.com>

6 files changed, 50 insertions, 58 deletions

diff --git a/emacs/settings/init-calendar.el b/emacs/settings/init-calendar.el
index a5b80c5..433a3ec 100644
--- a/emacs/settings/init-calendar.el
+++ b/emacs/settings/init-calendar.el
@@ -24,23 +24,22 @@
 (defvar calendar-week-start-day 1)
 (global-set-key (kbd "C-c c") 'calendar)
 
-(eval-after-load "evil"
-  '(progn
-     (evil-set-initial-state 'calendar-mode 'normal)
-     (evil-define-key 'normal calendar-mode-map
-       "j" 'calendar-forward-week
-       "k" 'calendar-backward-week
-       "b" 'calendar-backward-day
-       "h" 'calendar-backward-day
-       "l" 'calendar-forward-day
-       "w" 'calendar-forward-day
-       "q" 'calendar-exit
-       "\C-h" 'evil-window-left
-       "\C-l" 'evil-window-right
-       "\C-j" 'evil-window-down
-       "\C-k" 'evil-window-up
-       "\C-n" 'calendar-scroll-left-three-months
-       "\C-p" 'calendar-scroll-right-three-months)))
+(with-eval-after-load "evil"
+  (evil-set-initial-state 'calendar-mode 'normal)
+  (evil-define-key 'normal calendar-mode-map
+    "j" 'calendar-forward-week
+    "k" 'calendar-backward-week
+    "b" 'calendar-backward-day
+    "h" 'calendar-backward-day
+    "l" 'calendar-forward-day
+    "w" 'calendar-forward-day
+    "q" 'calendar-exit
+    "\C-h" 'evil-window-left
+    "\C-l" 'evil-window-right
+    "\C-j" 'evil-window-down
+    "\C-k" 'evil-window-up
+    "\C-n" 'calendar-scroll-left-three-months
+    "\C-p" 'calendar-scroll-right-three-months))
 
 (provide 'init-calendar)
 ;;; init-calendar.el ends here
diff --git a/emacs/settings/init-edit.el b/emacs/settings/init-edit.el
index 5d8dd7f..1948dca 100644
--- a/emacs/settings/init-edit.el
+++ b/emacs/settings/init-edit.el
@@ -69,10 +69,9 @@
   ; Set C-e as the expand command (mnemonic: expand). This command will
   ; supercede the evil binding for "move one line", which I never use anyways.
   (global-set-key (kbd "\C-e") 'er/expand-region)
-  (eval-after-load 'evil
-    '(progn
-       (define-key evil-normal-state-map (kbd "\C-e") 'er/expand-region)
-       (define-key evil-visual-state-map (kbd "\C-e") 'er/expand-region))))
+  (with-eval-after-load 'evil
+    (define-key evil-normal-state-map (kbd "\C-e") 'er/expand-region)
+    (define-key evil-visual-state-map (kbd "\C-e") 'er/expand-region)))
 
 ; Directly taken from: https://github.com/magnars/expand-region.el. This way we
 ; can also expand the region into paragraphs and pages in text mode.
diff --git a/emacs/settings/init-evil.el b/emacs/settings/init-evil.el
index d0e8e91..49c8c48 100644
--- a/emacs/settings/init-evil.el
+++ b/emacs/settings/init-evil.el
@@ -44,10 +44,9 @@
   (fset 'help-command help-map)
 
   ; Helm + Projectile shortcuts.
-  (eval-after-load 'helm-projectile
-    '(progn
-       (define-key evil-normal-state-map (kbd "M-p")
-         'helm-projectile-switch-project)))
+  (with-eval-after-load 'helm-projectile
+    (define-key evil-normal-state-map (kbd "M-p")
+      'helm-projectile-switch-project))
 
   ; I use the Super key in combination with j & k to move around i3. Let's unset
   ; M- combos for these two fellows for whenever I misstype them.
diff --git a/emacs/settings/init-magit.el b/emacs/settings/init-magit.el
index 7ddbc3c..2adc3c6 100644
--- a/emacs/settings/init-magit.el
+++ b/emacs/settings/init-magit.el
@@ -36,21 +36,20 @@
                    'hide
                  'show)))
 
-  (eval-after-load 'evil-leader
-    '(progn
-       (evil-leader/set-key "s" 'magit-status)
-
-       (use-package evil-magit
-         :ensure t
-         :config
-
-         ; The magit + evil-magit combo messes up some chords, let's fix this.
-         (evil-define-key 'normal magit-mode-map
-           "\C-h" 'evil-window-left
-           "\C-l" 'evil-window-right
-           "\C-j" 'evil-window-down
-           "\C-k" 'evil-window-up
-           "\M-p"  'helm-projectile-switch-project)))))
+  (with-eval-after-load 'evil-leader
+    (evil-leader/set-key "s" 'magit-status)
+
+    (use-package evil-magit
+      :ensure t
+      :config
+
+      ; The magit + evil-magit combo messes up some chords, let's fix this.
+      (evil-define-key 'normal magit-mode-map
+        "\C-h" 'evil-window-left
+        "\C-l" 'evil-window-right
+        "\C-j" 'evil-window-down
+        "\C-k" 'evil-window-up
+        "\M-p"  'helm-projectile-switch-project))))
 
 (provide 'init-magit)
 ;;; init-magit.el ends here
diff --git a/emacs/settings/init-mu4e.el b/emacs/settings/init-mu4e.el
index b008af5..31ba514 100644
--- a/emacs/settings/init-mu4e.el
+++ b/emacs/settings/init-mu4e.el
@@ -249,11 +249,10 @@
     (setq mu4e-alert-email-notification-types '(count)))
 
   ; Evil mode in mu4e
-  (eval-after-load 'evil
-    '(progn
-       (use-package evil-mu4e
-         :ensure t
-         :config))))
+  (with-eval-after-load 'evil
+    (use-package evil-mu4e
+      :ensure t
+      :config)))
 
 (setq mu4e-update-interval 120)
 
diff --git a/emacs/settings/init-project.el b/emacs/settings/init-project.el
index 36b9199..c3f7a03 100644
--- a/emacs/settings/init-project.el
+++ b/emacs/settings/init-project.el
@@ -27,13 +27,12 @@
   :ensure t
   :config
 
-  (eval-after-load 'evil
-    '(progn
-       (add-hook 'ag-mode-hook
-                 (lambda ()
-                   (define-key ag-mode-map (kbd "n") 'evil-search-next)
-                   (define-key ag-mode-map (kbd "N") 'evil-search-previous)
-                   (define-key ag-mode-map (kbd "gg") 'evil-goto-first-line)))))
+  (with-eval-after-load 'evil
+    (add-hook 'ag-mode-hook
+              (lambda ()
+                (define-key ag-mode-map (kbd "n") 'evil-search-next)
+                (define-key ag-mode-map (kbd "N") 'evil-search-previous)
+                (define-key ag-mode-map (kbd "gg") 'evil-goto-first-line))))
   (setq ag-reuse-buffers t)
   (setq ag-reuse-window t))
 
@@ -107,13 +106,11 @@
     (error
      (helm-find-files nil))))
 
-(eval-after-load 'evil
-  '(progn
-     (define-key evil-normal-state-map (kbd "C-p") 'mssola-find-file)))
+(with-eval-after-load 'evil
+  (define-key evil-normal-state-map (kbd "C-p") 'mssola-find-file))
 
-(eval-after-load 'evil-leader
-  '(progn
-     (evil-leader/set-key "a" 'mssola-helm-ag)))
+(with-eval-after-load 'evil-leader
+  (evil-leader/set-key "a" 'mssola-helm-ag))
 
 (provide 'init-project)
 ;;; init-project.el ends here