emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactor: deprecate featurep! for modulep!

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

4
modules/email/mu4e/autoload/email.el
View file

@ -56,7 +56,7 @@ default/fallback account."
"Start email client."
(interactive)
(require 'mu4e)
(if (featurep! :ui workspaces)
(if (modulep! :ui workspaces)
;; delete current workspace if empty
;; this is useful when mu4e is in the daemon
;; as otherwise you can accumulate empty workspaces
@ -326,7 +326,7 @@ When otherwise called, open a dired buffer and enable `dired-mu4e-attach-ctrl-c-
(defun +mu4e-kill-mu4e-h ()
;; (prolusion-mail-hide)
(cond
((and (featurep! :ui workspaces) (+workspace-exists-p +mu4e-workspace-name))
((and (modulep! :ui workspaces) (+workspace-exists-p +mu4e-workspace-name))
(+workspace/delete +mu4e-workspace-name))
(+mu4e--old-wconf

2
modules/email/mu4e/autoload/evil.el
View file

@ -1,5 +1,5 @@
;; email/mu4e/autoload/evil.el -*- lexical-binding: t; -*-
;;;###if (featurep! :editor evil)
;;;###if (modulep! :editor evil)
;;;###autoload
(defun +mu4e/mark (&optional beg end)

18
modules/email/mu4e/config.el
View file

@ -86,9 +86,9 @@ is non-nil."
mu4e-compose-context-policy 'ask-if-none
;; use helm/ivy/vertico
mu4e-completing-read-function
(cond ((featurep! :completion ivy) #'ivy-completing-read)
((featurep! :completion helm) #'completing-read)
((featurep! :completion vertico) #'completing-read)
(cond ((modulep! :completion ivy) #'ivy-completing-read)
((modulep! :completion helm) #'completing-read)
((modulep! :completion vertico) #'completing-read)
(t #'ido-completing-read))
mu4e-attachment-dir
(concat
@ -252,7 +252,7 @@ is non-nil."
(when (fboundp 'imagemagick-register-types)
(imagemagick-register-types))
(when (featurep! :ui workspaces)
(when (modulep! :ui workspaces)
(map! :map mu4e-main-mode-map
:ne "h" #'+workspace/other))
@ -337,7 +337,7 @@ Acts like a singular `mu4e-view-save-attachments', without the saving."
;; Due to evil, none of the marking commands work when making a visual selection in
;; the headers view of mu4e. Without overriding any evil commands we may actually
;; want to use in and evil selection, this can be easily fixed.
(when (featurep! :editor evil)
(when (modulep! :editor evil)
(map! :map mu4e-headers-mode-map
:v "*" #'mu4e-headers-mark-for-something
:v "!" #'mu4e-headers-mark-for-read
@ -362,7 +362,7 @@ This is enacted by `+mu4e~main-action-str-prettier-a' and
(advice-add #'mu4e--key-val :filter-return #'+mu4e~main-keyval-str-prettier-a)
(advice-add #'mu4e--main-action-str :override #'+mu4e~main-action-str-prettier-a)
(when (featurep! :editor evil)
(when (modulep! :editor evil)
;; As +mu4e~main-action-str-prettier replaces [k]ey with key q]uit should become quit
(setq evil-collection-mu4e-end-region-misc "quit"))
@ -376,7 +376,7 @@ This is enacted by `+mu4e~main-action-str-prettier-a' and
(advice-add 'mu4e--start :around #'+mu4e-lock-start)
(advice-add 'mu4e-quit :after #'+mu4e-lock-file-delete-maybe))
(unless (featurep! +org)
(unless (modulep! +org)
(after! mu4e
(defun org-msg-mode (&optional _)
"Dummy function."
@ -388,7 +388,7 @@ Ignores all arguments and returns nil."
(use-package! org-msg
:after mu4e
:when (featurep! +org)
:when (modulep! +org)
:config
(setq org-msg-options "html-postamble:nil H:5 num:nil ^:{} toc:nil author:nil email:nil tex:dvipng"
org-msg-startup "hidestars indent inlineimages"
@ -583,7 +583,7 @@ Must be set before org-msg is loaded to take effect.")
;;
;;; Gmail integration
(when (featurep! +gmail)
(when (modulep! +gmail)
(after! mu4e
(defvar +mu4e-gmail-accounts nil
"Gmail accounts that do not contain \"gmail\" in address and maildir.

2
modules/email/mu4e/doctor.el
View file

@ -8,7 +8,7 @@
(warn! "Couldn't find mbsync or offlineimap command. \
You may not have a way of fetching mail."))
(when (and (featurep! +org)
(when (and (modulep! +org)
(not IS-WINDOWS))
(unless (executable-find "identify")
(warn! "Couldn't find the identify command from imagemagick. \

2
modules/email/mu4e/packages.el
View file

@ -1,7 +1,7 @@
;; -*- no-byte-compile: t; -*-
;;; email/mu4e/packages.el
(when (featurep! +org)
(when (modulep! +org)
(package! org-msg :pin "60e22e446325a9b3387396459d98be7c1c52579d"))
(package! mu4e-alert :pin "b34d0ea7b75709cc25d842a783cebea855dc9f7d")

8
modules/email/notmuch/autoload.el
View file

@ -6,13 +6,13 @@
(interactive)
(condition-case-unless-debug e
(progn
(when (featurep! :ui workspaces)
(when (modulep! :ui workspaces)
(+workspace-switch "*MAIL*" t))
(if-let* ((win (cl-find-if (lambda (it) (string-match-p "^\\*notmuch" (buffer-name (window-buffer it))))
(doom-visible-windows))))
(select-window win)
(funcall +notmuch-home-function))
(when (featurep! :ui workspaces)
(when (modulep! :ui workspaces)
(+workspace/display)))
('error
(+notmuch/quit)
@ -28,7 +28,7 @@
(interactive)
;; (+popup/close (get-buffer-window "*notmuch-hello*"))
(doom-kill-matching-buffers "^\\*notmuch")
(when (featurep! :ui workspaces)
(when (modulep! :ui workspaces)
(+workspace/delete "*MAIL*")))
(defun +notmuch-get-sync-command ()
@ -52,7 +52,7 @@
((and (pred stringp) it) it)
(_ (user-error "Invalid notmuch backend specified: %S"
+notmuch-sync-backend)))))
(if (featurep! +afew)
(if (modulep! +afew)
(format "%s && %s" sync-cmd afew-cmd)
sync-cmd)))

8
modules/email/notmuch/config.el
View file

@ -106,24 +106,24 @@ variable accordingly.")
(use-package! org-mime
:when (featurep! +org)
:when (modulep! +org)
:after (org notmuch)
:config (setq org-mime-library 'mml))
(use-package! counsel-notmuch
:when (featurep! :completion ivy)
:when (modulep! :completion ivy)
:commands counsel-notmuch
:after notmuch)
(use-package! helm-notmuch
:when (featurep! :completion helm)
:when (modulep! :completion helm)
:commands helm-notmuch
:after notmuch)
(use-package! consult-notmuch
:when (featurep! :completion vertico)
:when (modulep! :completion vertico)
:commands consult-notmuch
:after notmuch)

10
modules/email/notmuch/packages.el
View file

@ -19,13 +19,13 @@
t t)))
:pin "bd243b65a9709bfd61ba80e80cc41ae3a23ea524")
(when (featurep! +org)
(when (modulep! +org)
(package! org-mime :pin "cf96f585c68ad14751a3f73d937cbfcb890171b9"))
(when (featurep! :lang org)
(when (modulep! :lang org)
(package! ol-notmuch :pin "1a53d6c707514784cabf33d865b577bf77f45913"))
(when (featurep! :completion ivy)
(when (modulep! :completion ivy)
(package! counsel-notmuch :pin "a4a1562935e4180c42524c51609d1283e9be0688"))
(when (featurep! :completion helm)
(when (modulep! :completion helm)
(package! helm-notmuch :pin "97a01497e079a7b6505987e9feba6b603bbec288"))
(when (featurep! :completion vertico)
(when (modulep! :completion vertico)
(package! consult-notmuch :pin "4138855cddee0ef126cff6a5fc5ca9c49fd2682d"))

4
modules/email/wanderlust/config.el
View file

@ -47,7 +47,7 @@
"^X-Mailer:"
"^X-Face:"))
(when (featurep! +gmail)
(when (modulep! +gmail)
(setq elmo-imap4-default-server "imap.gmail.com"
elmo-imap4-default-port 993
elmo-imap4-default-authenticate-type 'clear ; CRAM-MD5
@ -70,7 +70,7 @@
(setq wl-message-id-domain wl-local-domain)
(when (featurep! :editor evil)
(when (modulep! :editor evil)
;; Neither `wl-folder-mode' nor `wl-summary-mode' are correctly defined as
;; major modes, so we cannot use `set-evil-initial-state!' here.
;; In addition, `wl-folder-mode' won't start in `evil-emacs-state' through