mirror of
https://github.com/doomemacs/doomemacs
synced 2025-08-01 12:17:25 -05:00
refactor: deprecate featurep! for modulep!
featurep! will be renamed modulep! in the future, so it's been deprecated. They have identical interfaces, and can be replaced without issue. featurep! was never quite the right name for this macro. It implied that it had some connection to featurep, which it doesn't (only that it was similar in purpose; still, Doom modules are not features). To undo such implications and be consistent with its namespace (and since we're heading into a storm of breaking changes with the v3 release anyway), now was the best opportunity to begin the transition.
This commit is contained in:
@ -18,7 +18,7 @@
|
||||
:after avy
|
||||
:config (avy-migemo-mode 1))
|
||||
|
||||
(when (featurep! :completion helm)
|
||||
(when (modulep! :completion helm)
|
||||
(after! helm (helm-migemo-mode +1)))))
|
||||
|
||||
|
||||
|
@ -15,10 +15,10 @@
|
||||
(map!
|
||||
:leader
|
||||
:desc "Window" "z" 'evil-window-map
|
||||
(:when (featurep! :ui popup)
|
||||
(:when (modulep! :ui popup)
|
||||
:desc "Toggle last popup" "é" #'+popup/toggle)
|
||||
:desc "Switch to last buffer" "²" #'evil-switch-to-windows-last-buffer
|
||||
(:when (featurep! :ui workspaces)
|
||||
(:when (modulep! :ui workspaces)
|
||||
(:prefix-map ("TAB" . "workspace")
|
||||
:desc "Switch to last workspace" "²" #'+workspace/other
|
||||
:desc "Previous workspace" "é" #'+workspace/switch-left
|
||||
@ -27,14 +27,14 @@
|
||||
:desc "Previous buffer" "é" #'previous-buffer
|
||||
:desc "Next buffer" "è" #'next-buffer)
|
||||
(:prefix-map ("g" . "git")
|
||||
(:when (featurep! :ui vc-gutter)
|
||||
(:when (modulep! :ui vc-gutter)
|
||||
:desc "Jump to previous hunk" "é" #'git-gutter:previous-hunk
|
||||
:desc "Jump to next hunk" "è" #'git-gutter:next-hunk))))
|
||||
|
||||
(defun +layout-remap-evil-keys-for-azerty-h ()
|
||||
(map! :nv "à" #'evil-execute-macro
|
||||
:nv "²" #'evil-goto-mark
|
||||
(:when (featurep! :checkers spell)
|
||||
(:when (modulep! :checkers spell)
|
||||
:m "és" #'+spell/previous-error
|
||||
:m "ès" #'+spell/next-error)
|
||||
:n "è SPC" #'+evil/insert-newline-below
|
||||
@ -47,13 +47,13 @@
|
||||
:m "éu" #'+evil:url-decode
|
||||
:m "èy" #'+evil:c-string-encode
|
||||
:m "éy" #'+evil:c-string-decode
|
||||
(:when (featurep! :ui vc-gutter)
|
||||
(:when (modulep! :ui vc-gutter)
|
||||
:m "èd" #'git-gutter:next-hunk
|
||||
:m "éd" #'git-gutter:previous-hunk)
|
||||
(:when (featurep! :ui hl-todo)
|
||||
(:when (modulep! :ui hl-todo)
|
||||
:m "èt" #'hl-todo-next
|
||||
:m "ét" #'hl-todo-previous)
|
||||
(:when (featurep! :ui workspaces)
|
||||
(:when (modulep! :ui workspaces)
|
||||
:n "èw" #'+workspace/switch-right
|
||||
:n "éw" #'+workspace/switch-left)
|
||||
:m "è#" #'+evil/next-preproc-directive
|
||||
@ -77,5 +77,5 @@
|
||||
:nv "gà" #'+evil:apply-macro))
|
||||
|
||||
(+layout-remap-keys-for-azerty-h)
|
||||
(when (featurep! :editor evil)
|
||||
(when (modulep! :editor evil)
|
||||
(+layout-remap-evil-keys-for-azerty-h))
|
||||
|
@ -37,12 +37,12 @@ In all cases, 'h' functions go to 'c' and 'l' ones go to 'r' so the navigation k
|
||||
(map! "C-é" 'evil-window-map)
|
||||
(map! :leader
|
||||
:desc "Window" "é" evil-window-map
|
||||
(:when (featurep! :ui popup)
|
||||
(:when (modulep! :ui popup)
|
||||
:desc "Toggle last popup" "#" #'+popup/toggle)
|
||||
(:when (featurep! :ui workspaces)
|
||||
(:when (modulep! :ui workspaces)
|
||||
:desc "Switch buffer" "«" #'switch-to-buffer)
|
||||
:desc "Switch to last buffer" "$" #'evil-switch-to-windows-last-buffer
|
||||
(:when (featurep! :ui workspaces)
|
||||
(:when (modulep! :ui workspaces)
|
||||
(:prefix-map ("TAB" . "workspace")
|
||||
:desc "Switch to last workspace" "$" #'+workspace/other
|
||||
:desc "Next workspace" ")" #'+workspace/switch-right
|
||||
@ -53,7 +53,7 @@ In all cases, 'h' functions go to 'c' and 'l' ones go to 'r' so the navigation k
|
||||
(:prefix-map ("c" . "code")
|
||||
:desc "Jump to documentation" "S" #'+lookup/documentation)
|
||||
(:prefix-map ("g" . "git")
|
||||
(:when (featurep! :ui vc-gutter)
|
||||
(:when (modulep! :ui vc-gutter)
|
||||
:desc "Jump to next hunk" ")" #'git-gutter:next-hunk
|
||||
:desc "Jump to previous hunk" "(" #'git-gutter:previous-hunk))
|
||||
(:prefix-map ("p" . "project")
|
||||
@ -92,7 +92,7 @@ In all cases, 'h' functions go to 'c' and 'l' ones go to 'r' so the navigation k
|
||||
:m "V" #'evil-visual-screen-line)))
|
||||
|
||||
(map! :i "C-t" #'+default-newline
|
||||
(:when (featurep! :editor multiple-cursors)
|
||||
(:when (modulep! :editor multiple-cursors)
|
||||
:prefix "gz"
|
||||
:nv "t" #'evil-mc-make-cursor-move-next-line
|
||||
:nv "s" #'evil-mc-make-cursor-move-prev-line
|
||||
@ -100,7 +100,7 @@ In all cases, 'h' functions go to 'c' and 'l' ones go to 'r' so the navigation k
|
||||
;; mnemonics and "j" as a "classic" rotation
|
||||
:nv "T" #'+multiple-cursors/evil-mc-toggle-cursors
|
||||
:nv "j" #'+multiple-cursors/evil-mc-toggle-cursors)
|
||||
(:when (featurep! :ui popup)
|
||||
(:when (modulep! :ui popup)
|
||||
:n "C-$" #'+popup/toggle
|
||||
:n "C-#" #'+popup/raise))
|
||||
(after! treemacs
|
||||
@ -262,7 +262,7 @@ In all cases, 'h' functions go to 'c' and 'l' ones go to 'r' so the navigation k
|
||||
;;; Bootstrap
|
||||
|
||||
(+layout-remap-keys-for-bepo-h)
|
||||
(when (featurep! :editor evil)
|
||||
(when (modulep! :editor evil)
|
||||
(+layout-remap-evil-keys-for-bepo-h)
|
||||
(add-hook! 'evil-collection-setup-hook
|
||||
(defun +layout-bepo-rotate-evil-collection-keymap (_mode mode-keymaps &rest _rest)
|
||||
|
@ -1,5 +1,5 @@
|
||||
;;; input/layout/autoload/bepo.el -*- lexical-binding: t; -*-
|
||||
;;;###if (featurep! +bepo)
|
||||
;;;###if (modulep! +bepo)
|
||||
|
||||
;;;###autoload
|
||||
(defun +layout-bepo-rotate-ts-bare-keymap (keymaps)
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
(add-hook! 'doom-init-modules-hook
|
||||
(defun +layout-init-h ()
|
||||
(cond ((featurep! +bepo)
|
||||
(cond ((modulep! +bepo)
|
||||
(load! "+bepo"))
|
||||
((featurep! +azerty)
|
||||
((modulep! +azerty)
|
||||
(load! "+azerty")))))
|
||||
|
Reference in New Issue
Block a user