From 904ce589afae74e6cc70a9163151563f64e6d6c0 Mon Sep 17 00:00:00 2001 From: Case Duckworth Date: Wed, 31 Mar 2021 23:07:28 -0500 Subject: Replace `:acdw/map' with `:global' My `acdw/map' bindings were shadowing things. Let's just try global bindings and see if that's /really/ that big of a deal. I'll keep acdw/mode around for kicks right now. --- init.el | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/init.el b/init.el index 1e2e586..dd655eb 100644 --- a/init.el +++ b/init.el @@ -286,7 +286,7 @@ (:also-load dired-x) (:hook dired-hide-details-mode hl-line-mode) - (:acdw/map "C-x C-j" dired-jump)) + (:global "C-x C-j" dired-jump)) ;;;; Web browsing (setup browse-url @@ -367,16 +367,16 @@ ;;;;; MWIM (setup (:straight mwim) - (:acdw/map "C-a" mwim-beginning + (:global "C-a" mwim-beginning "C-e" mwim-end)) ;;;;; Expand-region (setup (:straight expand-region) - (:acdw/map "C-=" er/expand-region)) + (:global "C-=" er/expand-region)) ;;;;; CRUX (setup (:straight crux) - (:acdw/map "M-o" crux-other-window-or-switch-buffer + (:global "M-o" crux-other-window-or-switch-buffer "C-k" crux-kill-and-join-forward "C-o" crux-smart-open-line-above "C-S-o" crux-smart-open-line @@ -386,7 +386,7 @@ ;;;;; AVY ... & friends (setup (:straight avy) - (:acdw/map "C-:" avy-goto-char + (:global "C-:" avy-goto-char "C-'" avy-goto-char-timer "M-g f" avy-goto-line "M-g w" avy-goto-word-1 @@ -403,7 +403,7 @@ call `zzz-to-char'." (if prefix (call-interactively #'zzz-to-char) (call-interactively #'zzz-up-to-char))) - (:acdw/map "M-z" acdw/zzz-up-to-char)) + (:global "M-z" acdw/zzz-up-to-char)) ;;;;; anzu (setup (:straight anzu) @@ -411,7 +411,7 @@ call `zzz-to-char'." anzu-cons-mode-line-p nil) (add-to-list 'mode-line-misc-info '(:eval (anzu--update-mode-line))) - (:acdw/map [remap query-replace] anzu-query-replace + (:global [remap query-replace] anzu-query-replace [remap query-replace-regexp] anzu-query-replace-regexp) (:with-map isearch-mode-map (:bind [remap isearch-query-replace] anzu-isearch-query-replace @@ -422,7 +422,7 @@ call `zzz-to-char'." ;;;;; smart hungry delete (setup (:straight smart-hungry-delete) - (:acdw/map "" smart-hungry-delete-backward-char + (:global "" smart-hungry-delete-backward-char "C-d" smart-hungry-delete-forward-char) (smart-hungry-delete-add-default-hooks)) @@ -435,7 +435,7 @@ call `zzz-to-char'." ;;;;; Undo-fu (setup (:straight undo-fu) - (:acdw/map "C-/" undo-fu-only-undo + (:global "C-/" undo-fu-only-undo "C-?" undo-fu-only-redo)) (setup (:straight undo-fu-session) @@ -465,7 +465,7 @@ call `zzz-to-char'." ;;;;; Consult (setup (:straight consult) - (:acdw/map + (:global ;; C-c bindings (`mode-specific-map') "C-c h" consult-history "C-c m" consult-mode-command -- cgit 1.4.1-21-gabe81