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/lang/org/autoload/contrib-ipython.el
View file

@ -1,5 +1,5 @@
;;; lang/org/autoload/contrib-ipython.el -*- lexical-binding: t; -*-
;;;###if (featurep! +ipython)
;;;###if (modulep! +ipython)
;;;###autoload
(defun +org-ob-ipython-initiate-session-a (&optional session params)
@ -115,7 +115,7 @@ This function is called by `org-babel-execute-src-block'."
(cdr (assoc :pydir (nth 2 info))))))
(ob-ipython-mode 1)
;; hack on company mode to use company-capf rather than company-anaconda
(when (featurep! :completion company)
(when (modulep! :completion company)
(setq-local company-backends
'(company-capf
company-dabbrev

2
modules/lang/org/autoload/contrib-present.el
View file

@ -1,5 +1,5 @@
;;; lang/org/autoload/contrib-present.el -*- lexical-binding: t; -*-
;;;###if (featurep! +present)
;;;###if (modulep! +present)
;;
;;; Helpers

2
modules/lang/org/autoload/contrib-roam2.el
View file

@ -1,5 +1,5 @@
;;; lang/org/autoload/contrib-roam2.el -*- lexical-binding: t; -*-
;;;###if (featurep! +roam2)
;;;###if (modulep! +roam2)
;;; Custom node accessors
;;;###autoload (autoload 'org-roam-node-doom-filetitle "lang/org/autoload/contrib-roam2" nil t)

2
modules/lang/org/autoload/org.el
View file

@ -437,7 +437,7 @@ Made for `org-tab-first-hook' in evil-mode."
(defun +org-yas-expand-maybe-h ()
"Expand a yasnippet snippet, if trigger exists at point or region is active.
Made for `org-tab-first-hook'."
(when (and (featurep! :editor snippets)
(when (and (modulep! :editor snippets)
(require 'yasnippet nil t)
(bound-and-true-p yas-minor-mode))
(and (let ((major-mode (cond ((org-in-src-block-p t)

37
modules/lang/org/config.el
View file

@ -478,7 +478,7 @@ relative to `org-directory', unless it is an absolute path."
:after #'org-capture-refile
(+org-capture-cleanup-frame-h))
(when (featurep! :ui doom-dashboard)
(when (modulep! :ui doom-dashboard)
(add-hook '+doom-dashboard-inhibit-functions #'+org-capture-frame-p)))
@ -514,7 +514,8 @@ relative to `org-directory', unless it is an absolute path."
:face (lambda (path)
(if (or (file-remote-p path)
;; filter out network shares on windows (slow)
(and IS-WINDOWS (string-prefix-p "\\\\" path))
(and (featurep :os 'windows)
(string-prefix-p "\\\\" path))
(file-exists-p path))
'org-link
'(warning org-link))))
@ -599,15 +600,15 @@ relative to `org-directory', unless it is an absolute path."
org-html-validation-link nil
org-latex-prefer-user-labels t)
(when (featurep! :lang markdown)
(when (modulep! :lang markdown)
(add-to-list 'org-export-backends 'md))
(use-package! ox-hugo
:when (featurep! +hugo)
:when (modulep! +hugo)
:after ox)
(use-package! ox-pandoc
:when (featurep! +pandoc)
:when (modulep! +pandoc)
:when (executable-find "pandoc")
:after ox
:init
@ -847,7 +848,7 @@ between the two."
[C-return] #'+org/insert-item-below
[C-S-return] #'+org/insert-item-above
[C-M-return] #'org-insert-subheading
(:when IS-MAC
(:when (featurep :os 'macos)
[s-return] #'+org/insert-item-below
[s-S-return] #'+org/insert-item-above
[s-M-return] #'org-insert-subheading)
@ -863,13 +864,13 @@ between the two."
"," #'org-switchb
"." #'org-goto
"@" #'org-cite-insert
(:when (featurep! :completion ivy)
(:when (modulep! :completion ivy)
"." #'counsel-org-goto
"/" #'counsel-org-goto-all)
(:when (featurep! :completion helm)
(:when (modulep! :completion helm)
"." #'helm-org-in-buffer-headings
"/" #'helm-org-agenda-files-headings)
(:when (featurep! :completion vertico)
(:when (modulep! :completion vertico)
"." #'consult-org-heading
"/" #'consult-org-agenda)
"A" #'org-archive-subtree
@ -900,7 +901,7 @@ between the two."
"u" #'org-attach-url
"s" #'org-attach-set-directory
"S" #'org-attach-sync
(:when (featurep! +dragndrop)
(:when (modulep! +dragndrop)
"c" #'org-download-screenshot
"p" #'org-download-clipboard
"P" #'org-download-yank))
@ -926,7 +927,7 @@ between the two."
(:prefix ("t" . "toggle")
"f" #'org-table-toggle-formula-debugger
"o" #'org-table-toggle-coordinate-overlays)
(:when (featurep! +gnuplot)
(:when (modulep! +gnuplot)
"p" #'org-plot/gnuplot))
(:prefix ("c" . "clock")
"c" #'org-clock-cancel
@ -951,13 +952,13 @@ between the two."
"T" #'org-time-stamp-inactive)
(:prefix ("g" . "goto")
"g" #'org-goto
(:when (featurep! :completion ivy)
(:when (modulep! :completion ivy)
"g" #'counsel-org-goto
"G" #'counsel-org-goto-all)
(:when (featurep! :completion helm)
(:when (modulep! :completion helm)
"g" #'helm-org-in-buffer-headings
"G" #'helm-org-agenda-files-headings)
(:when (featurep! :completion vertico)
(:when (modulep! :completion vertico)
"g" #'consult-org-heading
"G" #'consult-org-agenda)
"c" #'org-clock-goto
@ -1107,7 +1108,7 @@ between the two."
(use-package! org-pdftools
:when (featurep! :tools pdf)
:when (modulep! :tools pdf)
:commands org-pdftools-export
:init
(after! org
@ -1137,7 +1138,7 @@ between the two."
(use-package! evil-org
:when (featurep! :editor evil +everywhere)
:when (modulep! :editor evil +everywhere)
:hook (org-mode . evil-org-mode)
:hook (org-capture-mode . evil-insert-state)
:hook (doom-docs-org-mode . evil-org-mode)
@ -1219,7 +1220,7 @@ between the two."
(use-package! evil-org-agenda
:when (featurep! :editor evil +everywhere)
:when (modulep! :editor evil +everywhere)
:hook (org-agenda-mode . evil-org-agenda-mode)
:config
(evil-org-agenda-set-keys)
@ -1304,7 +1305,7 @@ between the two."
"Advise `server-visit-files' to load `org-protocol' lazily."
:around #'server-visit-files
(if (not (cl-loop with protocol =
(if IS-WINDOWS
(if (featurep :os 'windows)
;; On Windows, the file arguments for `emacsclient'
;; get funnelled through `expand-file-path' by
;; `server-process-filter'. This substitutes

4
modules/lang/org/contrib/brain.el
View file

@ -1,5 +1,5 @@
;;; lang/org/contrib/brain.el -*- lexical-binding: t; -*-
;;;###if (featurep! +brain)
;;;###if (modulep! +brain)
(use-package! org-brain
:defer t
@ -18,7 +18,7 @@
org-capture-templates
:key #'car :test #'equal)
(when (featurep! :editor evil +everywhere)
(when (modulep! :editor evil +everywhere)
;; TODO Make a proper evil keybind scheme for org-brain
;; REVIEW This should be handled upstream by evil-collection
(set-evil-initial-state!

2
modules/lang/org/contrib/dragndrop.el
View file

@ -1,5 +1,5 @@
;;; lang/org/contrib/dragndrop.el -*- lexical-binding: t; -*-
;;;###if (featurep! +dragndrop)
;;;###if (modulep! +dragndrop)
(use-package! org-download
:commands

2
modules/lang/org/contrib/ipython.el
View file

@ -1,5 +1,5 @@
;;; lang/org/contrib/babel.el -*- lexical-binding: t; -*-
;;;###if (featurep! +ipython)
;;;###if (modulep! +ipython)
(use-package! ob-ipython
:defer t

2
modules/lang/org/contrib/journal.el
View file

@ -1,5 +1,5 @@
;;; lang/org/contrib/journal.el -*- lexical-binding: t; -*-
;;;###if (featurep! +journal)
;;;###if (modulep! +journal)
(use-package! org-journal
:defer t

2
modules/lang/org/contrib/jupyter.el
View file

@ -1,5 +1,5 @@
;;; lang/org/contrib/jupyter.el -*- lexical-binding: t; -*-
;;;###if (featurep! +jupyter)
;;;###if (modulep! +jupyter)
(use-package! ob-jupyter
:defer t

2
modules/lang/org/contrib/noter.el
View file

@ -1,5 +1,5 @@
;;; lang/org/contrib/noter.el -*- lexical-binding: t; -*-
;;;###if (featurep! +noter)
;;;###if (modulep! +noter)
(use-package! org-noter
:defer t

2
modules/lang/org/contrib/pomodoro.el
View file

@ -1,5 +1,5 @@
;;; lang/org/contrib/pomodoro.el -*- lexical-binding: t; -*-
;;;###if (featurep! +pomodoro)
;;;###if (modulep! +pomodoro)
(after! org-pomodoro
;; prefer PulseAudio to ALSA in $current_year

4
modules/lang/org/contrib/present.el
View file

@ -1,5 +1,5 @@
;;; lang/org/contrib/present.el -*- lexical-binding: t; -*-
;;;###if (featurep! +present)
;;;###if (modulep! +present)
(defvar +org-present-text-scale 5
"The `text-scale-amount' for `org-tree-slide-mode'.")
@ -40,7 +40,7 @@ headings as titles, and you have more freedom to place them wherever you like.")
(add-hook 'org-tree-slide-play-hook #'+org-present-hide-blocks-h)
(add-hook 'org-tree-slide-stop-hook #'+org-present-hide-blocks-h)
(when (featurep! :editor evil)
(when (modulep! :editor evil)
(map! :map org-tree-slide-mode-map
:n [C-right] #'org-tree-slide-move-next-tree
:n [C-left] #'org-tree-slide-move-previous-tree)

2
modules/lang/org/contrib/pretty.el
View file

@ -1,5 +1,5 @@
;;; lang/org/contrib/pretty.el -*- lexical-binding: t; -*-
;;;###if (featurep! +pretty)
;;;###if (modulep! +pretty)
(after! org
(setq org-highlight-latex-and-related '(native script entities)))

8
modules/lang/org/contrib/roam.el
View file

@ -1,5 +1,5 @@
;;; lang/org/contrib/roam.el -*- lexical-binding: t; -*-
;;;###if (featurep! +roam)
;;;###if (modulep! +roam)
(defvar +org-roam-open-buffer-on-find-file t
"If non-nil, open the org-roam buffer when opening an org roam file.")
@ -67,9 +67,9 @@
org-roam-link-use-custom-faces 'everywhere
org-roam-completion-everywhere t
org-roam-completion-system
(cond ((featurep! :completion helm) 'helm)
((featurep! :completion ivy) 'ivy)
((featurep! :completion ido) 'ido)
(cond ((modulep! :completion helm) 'helm)
((modulep! :completion ivy) 'ivy)
((modulep! :completion ido) 'ido)
('default)))
;; Normally, the org-roam buffer doesn't open until you explicitly call

4
modules/lang/org/contrib/roam2.el
View file

@ -1,5 +1,5 @@
;;; lang/org/contrib/roam2.el -*- lexical-binding: t; -*-
;;;###if (featurep! +roam2)
;;;###if (modulep! +roam2)
(defvar +org-roam-auto-backlinks-buffer nil
"If non-nil, open and close the org-roam backlinks buffer automatically.
@ -160,7 +160,7 @@ In case of failure, fail gracefully."
"r" #'org-roam-ref-add
"R" #'org-roam-ref-remove))
(when (featurep! :editor evil +everywhere)
(when (modulep! :editor evil +everywhere)
(add-hook! 'org-roam-mode-hook
(defun +org-roam-detach-magit-section-mode-map-h ()
"Detach `magit-section-mode-map' from `org-roam-mode-map'.

10
modules/lang/org/doctor.el
View file

@ -1,19 +1,19 @@
;; -*- lexical-binding: t; no-byte-compile: t; -*-
;;; lang/org/doctor.el
(when (featurep! +gnuplot)
(when (modulep! +gnuplot)
(unless (executable-find "gnuplot")
(warn! "Couldn't find gnuplot. org-plot/gnuplot will not work")))
(when (featurep! +roam)
(when (modulep! +roam)
(unless (executable-find "sqlite3")
(warn! "Couldn't find the sqlite3 executable. org-roam will not work.")))
(when (or (featurep! +roam)
(featurep! +roam2))
(when (or (modulep! +roam)
(modulep! +roam2))
(unless (executable-find "dot")
(warn! "Couldn't find the dot executable (from graphviz). org-roam will not be able to generate graph visualizations.")))
(when (featurep! +dragndrop)
(when (modulep! +dragndrop)
(when IS-MAC
(unless (executable-find "pngpaste")
(warn! "Couldn't find the pngpaste executable. org-download-clipboard will not work.")))

58
modules/lang/org/packages.el
View file

@ -42,38 +42,38 @@
(package! toc-org :pin "bf2e4b358efbd860ecafe6e74776de0885d9d100")
(package! org-cliplink :pin "13e0940b65d22bec34e2de4bc8cba1412a7abfbc")
(when (featurep! :editor evil +everywhere)
(when (modulep! :editor evil +everywhere)
(package! evil-org
:recipe (:host github :repo "hlissner/evil-org-mode")
:pin "a9706da260c45b98601bcd72b1d2c0a24a017700"))
(when (featurep! :tools pdf)
(when (modulep! :tools pdf)
(package! org-pdftools :pin "967f48fb5038bba32915ee9da8dc4e8b10ba3376"))
(when (featurep! :tools magit)
(when (modulep! :tools magit)
(package! orgit :pin "b33b916915db5f91d2c9da4cb1a2457ccbb09332")
(when (featurep! :tools magit +forge)
(when (modulep! :tools magit +forge)
(package! orgit-forge :pin "8baf1dee795f026d4555687022487fab89c9bcdf")))
(when (featurep! +brain)
(when (modulep! +brain)
(package! org-brain :pin "46ca9f766322cff31279ecdf02251ff24a0e9431"))
(when (featurep! +dragndrop)
(when (modulep! +dragndrop)
(package! org-download :pin "947ca223643d28e189480e607df68449c15786cb"))
(when (featurep! +gnuplot)
(when (modulep! +gnuplot)
(package! gnuplot :pin "7138b139d2dca9683f1a81325c643b2744aa1ea3")
(package! gnuplot-mode :pin "601f6392986f0cba332c87678d31ae0d0a496ce7"))
(when (featurep! +ipython) ; DEPRECATED
(when (modulep! +ipython) ; DEPRECATED
(package! ob-ipython :pin "7147455230841744fb5b95dcbe03320313a77124"))
(when (featurep! +jupyter)
(when (modulep! +jupyter)
(package! jupyter :pin "7d20c0aee2f9c896215f35232905b23532ef04c5"))
(when (featurep! +journal)
(when (modulep! +journal)
(package! org-journal :pin "839a2e19865a03bec30ef32431f981f33880a754"))
(when (featurep! +noter)
(when (modulep! +noter)
(package! org-noter :pin "9ead81d42dd4dd5074782d239b2efddf9b8b7b3d"))
(when (featurep! +pomodoro)
(when (modulep! +pomodoro)
(package! org-pomodoro :pin "3f5bcfb80d61556d35fc29e5ddb09750df962cc6"))
(when (featurep! +pretty)
(when (modulep! +pretty)
(package! org-appear :pin "60ba267c5da336e75e603f8c7ab3f44e6f4e4dac")
(package! org-superstar :pin "03be6c0a3081c46a59b108deb8479ee24a6d86c0")
(package! org-fancy-priorities :pin "7f677c6c14ecf05eab8e0efbfe7f1b00ae68eb1d"))
(when (featurep! +present)
(when (modulep! +present)
(package! centered-window
:recipe (:host github :repo "anler/centered-window-mode")
:pin "80965f6c6afe8d918481433984b493de72af5399")
@ -84,11 +84,11 @@
:files ("css" "dist" "js" "plugin"))
:pin "e219184f37a71c406e41d55ac3212eb79797f0aa"))
(cond
((featurep! +roam)
((modulep! +roam)
(package! org-roam
:recipe (:host github :repo "org-roam/org-roam-v1")
:pin "946a879a4a18756a0508afba1e0b0fe070c6a8b4"))
((featurep! +roam2)
((modulep! +roam2)
(package! org-roam
;; FIXME A :recipe isn't strictly necessary, but without it, our package
;; bumper fails to distinguish between org-roam v1 and v2.
@ -97,37 +97,37 @@
;;; Babel
(package! ob-async :pin "9aac486073f5c356ada20e716571be33a350a982")
(when (featurep! :lang crystal)
(when (modulep! :lang crystal)
(package! ob-crystal :pin "d84c1adee4b269cdba06a97caedb8071561a09af"))
(when (featurep! :lang elixir)
(when (modulep! :lang elixir)
(package! ob-elixir :pin "8990a8178b2f7bd93504a9ab136622aab6e82e32"))
(when (featurep! :lang fsharp)
(when (modulep! :lang fsharp)
(package! ob-fsharp
:recipe (:host github :repo "elken/ob-fsharp")
:pin "ca3d4568da6c82ff32a8d289743b059d9f909c67"))
(when (featurep! :lang go)
(when (modulep! :lang go)
(package! ob-go :pin "2067ed55f4c1d33a43cb3f6948609d240a8915f5"))
(when (featurep! :lang graphql)
(when (modulep! :lang graphql)
(package! ob-graphql :pin "7c35419f9eec5dc44967cbcfa13c7135b9a96bfc"))
(when (featurep! :lang hy)
(when (modulep! :lang hy)
(package! ob-hy :pin "a42ecaf440adc03e279afe43ee5ef6093ddd542a"))
(when (featurep! :lang nim)
(when (modulep! :lang nim)
(package! ob-nim :pin "6fd060a3ecd38be37e4ec2261cd65760a3c35a91"))
(when (featurep! :lang racket)
(when (modulep! :lang racket)
(package! ob-racket
:recipe (:host github :repo "DEADB17/ob-racket")
:pin "d8fd51bddb019b0eb68755255f88fc800cfe03cb"))
(when (featurep! :lang rest)
(when (modulep! :lang rest)
(package! ob-restclient :pin "3ac834b02b8276aae1b760312612c3b940598f90"))
(when (featurep! :lang scala)
(when (modulep! :lang scala)
(package! ob-ammonite :pin "39937dff395e70aff76a4224fa49cf2ec6c57cca"))
;;; Export
(when (featurep! +pandoc)
(when (modulep! +pandoc)
(package! ox-pandoc :pin "f8eac5e5692fc44a4724ada43191e7c28a1ccf30"))
(when (featurep! +hugo)
(when (modulep! +hugo)
(package! ox-hugo
:recipe (:host github :repo "kaushalmodi/ox-hugo" :nonrecursive t)
:pin "97ff24fe0b8d29c503b88eea69235b02ae71beb0"))
(when (featurep! :lang rst)
(when (modulep! :lang rst)
(package! ox-rst :pin "99fa790da55b57a3f2e9aa187493ba434a64250e"))