Even more lazy loading

1 files changed, 11 insertions, 11 deletions

diff --git a/lisp/ravi-init-navigation.el b/lisp/ravi-init-navigation.el
index b856767..31f06be 100644
--- a/lisp/ravi-init-navigation.el
+++ b/lisp/ravi-init-navigation.el
@@ -199,8 +199,7 @@
          ("M-}" . corral-braces-forward)
          ("M-\"" . corral-double-quotes-backward))
   :config
-  (progn
-    (setq corral-preserve-point t)))
+  (setq corral-preserve-point t))
 
 ;; Marking and moving lines
 
@@ -251,19 +250,19 @@
 
 ;; Use current line for region-based commands if no region selected
 (use-package whole-line-or-region
+  :hook ((prog-mode-hook . turn-on-whole-line-or-region-mode))
   :config
-  (progn
-    (defun turn-on-whole-line-or-region-mode()
-      (interactive)
-      (whole-line-or-region-local-mode 1))
-    (add-hook 'prog-mode-hook 'turn-on-whole-line-or-region-mode))
+  (defun turn-on-whole-line-or-region-mode()
+    (interactive)
+    (whole-line-or-region-local-mode 1))
   :diminish whole-line-or-region-local-mode)
 
 ;; This must be after enabling whole-line-or-region
 (use-package easy-kill
-  :config
-  (progn
-    (global-set-key [remap kill-ring-save] 'easy-kill)
+  :commands (easy-kill)
+  :bind (([remap kill-ring-save] . easy-kill))
+  :init
+  (with-eval-after-load "whole-line-or-region"
     (global-set-key [remap whole-line-or-region-kill-ring-save] 'easy-kill)))
 
 ;; grep and friends
@@ -295,7 +294,8 @@
       (bind-key "M-O" 'isearch-moccur-all isearch-mode-map))
 
     :config
-    (use-package moccur-edit)))
+    (use-package moccur-edit
+      :ensure nil)))
 
 ;; Delete via isearch
 (defun zap-to-isearch (rbeg rend)