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:
Henrik Lissner 2022-08-12 20:29:19 +02:00
parent 0407621aff
commit ad6a3d0f33
No known key found for this signature in database
GPG key ID: B60957CA074D39A3
316 changed files with 1109 additions and 1103 deletions

View file

@ -72,7 +72,7 @@ Fixes #3939: unsortable dired entries on Windows."
(use-package! ranger
:when (featurep! +ranger)
:when (modulep! +ranger)
:after dired
:init (setq ranger-override-dired t)
:config
@ -129,7 +129,7 @@ we have to clean it up ourselves."
(use-package! dirvish
:when (featurep! +dirvish)
:when (modulep! +dirvish)
:defer t
:init (after! dired (dirvish-override-dired-mode))
:hook (dired-mode . dired-omit-mode)
@ -138,7 +138,7 @@ we have to clean it up ourselves."
dirvish-hide-details nil
dirvish-attributes '(git-msg)
dired-omit-files (concat dired-omit-files "\\|^\\..*$"))
(when (featurep! +icons)
(when (modulep! +icons)
(push 'all-the-icons dirvish-attributes))
(map! :map dirvish-mode-map
:n "b" #'dirvish-goto-bookmark
@ -152,8 +152,8 @@ we have to clean it up ourselves."
(use-package! all-the-icons-dired
:when (featurep! +icons)
:unless (featurep! +dirvish)
:when (modulep! +icons)
:unless (modulep! +dirvish)
:hook (dired-mode . all-the-icons-dired-mode)
:config
;; HACK Fixes #1929: icons break file renaming in Emacs 27+, because the icon
@ -176,8 +176,8 @@ we have to clean it up ourselves."
(use-package! dired-x
:unless (featurep! +dirvish)
:unless (featurep! +ranger)
:unless (modulep! +dirvish)
:unless (modulep! +ranger)
:hook (dired-mode . dired-omit-mode)
:config
(setq dired-omit-verbose nil

View file

@ -4,11 +4,11 @@
(package! diredfl :pin "f9140b2c42151dca669003d685c9f079b2e3dc37")
(package! dired-git-info :pin "9461476a28a5fec0784260f6e318237c662c3430")
(package! dired-rsync :pin "7940d9154d0a908693999b0e1ea351a6d365c93d")
(when (featurep! +ranger)
(when (modulep! +ranger)
(package! ranger :pin "2498519cb21dcd5791d240607a72a204d1761668"))
(when (featurep! +dirvish)
(when (modulep! +dirvish)
(package! dirvish :pin "73dcaa404da9ab84d25f2919e6e3af4b1f8e7f37"))
(when (and (featurep! +icons)
(not (featurep! +dirvish)))
(when (and (modulep! +icons)
(not (modulep! +dirvish)))
(package! all-the-icons-dired :pin "5e9b097f9950cc9f86de922b07903a4e5fefc733"))
(package! fd-dired :pin "458464771bb220b6eb87ccfd4c985c436e57dc7e")

View file

@ -1,5 +1,5 @@
;;; emacs/ibuffer/autoload/workspaces.el -*- lexical-binding: t; -*-
;;;###if (featurep! :ui workspaces)
;;;###if (modulep! :ui workspaces)
;;;###autoload
(defun +ibuffer-workspace (workspace-name)

View file

@ -7,7 +7,7 @@
ibuffer-filter-group-name-face '(:inherit (success bold))
ibuffer-formats
`((mark modified read-only locked
,@(if (featurep! +icons)
,@(if (modulep! +icons)
`(;; Here you may adjust by replacing :right with :center
;; or :left According to taste, if you want the icon
;; further from the name
@ -39,7 +39,7 @@
:header-mouse-map ibuffer-size-header-map)
(file-size-human-readable (buffer-size)))
(when (featurep! :ui workspaces)
(when (modulep! :ui workspaces)
(define-ibuffer-filter workspace-buffers
"Filter for workspace buffers"
(:reader (+workspace-get (read-string "workspace name: "))
@ -48,7 +48,7 @@
(define-key ibuffer-mode-map [remap ibuffer-visit-buffer] #'+ibuffer/visit-workspace-buffer))
(when (featurep! :completion ivy)
(when (modulep! :completion ivy)
(defadvice! +ibuffer--use-counsel-maybe-a (_file &optional _wildcards)
"Use `counsel-find-file' instead of `find-file'."
:override #'ibuffer-find-file
@ -71,7 +71,7 @@
:hook (ibuffer . ibuffer-projectile-set-filter-groups)
:config
(setq ibuffer-projectile-prefix
(if (featurep! +icons)
(if (modulep! +icons)
(concat (all-the-icons-octicon
"file-directory"
:face ibuffer-filter-group-name-face

View file

@ -1,7 +1,7 @@
;;; emacs/undo/config.el -*- lexical-binding: t; -*-
(use-package! undo-fu
:unless (featurep! +tree)
:unless (modulep! +tree)
:hook (doom-first-buffer . undo-fu-mode)
:config
;; Increase undo history limits to reduce likelihood of data loss
@ -25,7 +25,7 @@
(use-package! undo-fu-session
:unless (featurep! +tree)
:unless (modulep! +tree)
:hook (undo-fu-mode . global-undo-fu-session-mode)
:custom (undo-fu-session-directory (concat doom-cache-dir "undo-fu-session/"))
:config
@ -52,7 +52,7 @@
(use-package! undo-tree
:when (featurep! +tree)
:when (modulep! +tree)
;; Branching & persistent undo
:hook (doom-first-buffer . global-undo-tree-mode)
:custom (undo-tree-history-directory-alist `(("." . ,(concat doom-cache-dir "undo-tree-hist/"))))

View file

@ -1,7 +1,7 @@
;; -*- no-byte-compile: t; -*-
;;; emacs/undo/packages.el
(if (featurep! +tree)
(if (modulep! +tree)
(package! undo-tree :pin "e326c6135e62f5fe8536528d3acd5e798f847407")
(package! undo-fu :pin "ab8bc10e424bccc847800c31ab41888db789d55d")
(package! undo-fu-session :pin "3e810c7c9ab75d2b6f92c7c876290abbc164e750"))

View file

@ -1,5 +1,5 @@
;;; emacs/vc/autoload/hydra.el -*- lexical-binding: t; -*-
;;;###if (featurep! :ui hydra)
;;;###if (modulep! :ui hydra)
;;;###autoload (autoload '+vc/smerge-hydra/body "emacs/vc/autoload/hydra" nil t)
(defhydra +vc/smerge-hydra (:hint nil

View file

@ -93,7 +93,7 @@ info in the `header-line-format' is a more visible indicator."
;; Rehash evil keybindings so they are recognized
(add-hook 'git-timemachine-mode-hook #'evil-normalize-keymaps))
(when (featurep! :tools magit)
(when (modulep! :tools magit)
(add-transient-hook! #'git-timemachine-blame (require 'magit-blame)))
(map! :map git-timemachine-mode-map