dev: merge branch 'pr7002' into emenel

lisp/cli/env.el

@@ -33,7 +33,8 @@
     "^SSH_\\(AUTH_SOCK\\|AGENT_PID\\)$" "^\\(SSH\\|GPG\\)_TTY$"
     "^GPG_AGENT_INFO$"
     ;; Internal Doom envvars
-    "^DEBUG$" "^INSECURE$" "^\\(EMACS\\|DOOM\\)DIR$" "^DOOMPROFILE$" "^__")
+    "^DEBUG$" "^INSECURE$" "^\\(EMACS\\|DOOM\\)DIR$"
+    "^DOOM\\(PATH\\|PROFILE\\)$" "^__")
   "Environment variables to omit from envvar files.
 
 Each string is a regexp, matched against variable names to omit from

lisp/doom-cli.el

@@ -92,15 +92,14 @@
   :group 'doom)
 
 (defvar doom-cli-load-path
-  (let ((paths (split-string (or (getenv "DOOMPATH") "") path-separator)))
-    (if (member "" paths)
-        (cl-substitute (doom-path (dir!) "cli/") "" paths :test #'equal)
-      paths))
+  (append (when-let ((doompath (getenv "DOOMPATH")))
+            (cl-loop for dir in (split-string doompath path-separator)
+                     collect (expand-file-name dir)))
+          (list (file-name-concat (dir!) "cli")))
   "A list of paths to search for autoloaded Doom CLIs.
 
 It is prefilled by the DOOMPATH envvar (a colon-separated list on Linux/macOS,
-semicolon otherwise). Empty entries in DOOMPATH are replaced with the
-$EMACSDIR/cli/.")
+semicolon otherwise).")
 
 ;;; CLI definition variables
 (defvar doom-cli-argument-types

lisp/lib/projects.el

@@ -149,14 +149,11 @@ If DIR is not a project, it will be indexed (but not cached)."
             (if (doom-module-p :completion 'ivy)
                 #'counsel-projectile-find-file
               #'projectile-find-file)))
-          ((and (bound-and-true-p vertico-mode)
-                (fboundp '+vertico/consult-fd-or-find))
-           (+vertico/consult-fd-or-find default-directory))
           ((and (bound-and-true-p ivy-mode)
                 (fboundp 'counsel-file-jump))
            (call-interactively #'counsel-file-jump))
-          ((project-current nil dir)
-           (project-find-file-in nil nil dir))
+          ((when-let ((pr (project-current nil dir)))
+             (project-find-file-in nil nil pr)))
           ((and (bound-and-true-p helm-mode)
                 (fboundp 'helm-find-files))
            (call-interactively #'helm-find-files))

modules/editor/file-templates/templates/text-mode/__license-lgpl3

@@ -2,7 +2,7 @@
 # name: GNU LGPL v3 License
 # uuid: __license-lgpl3
 # group: Licenses
-# contribuer: https://choosealicense.com/licenses/lgpl-3.0/
+# contributor: https://choosealicense.com/licenses/lgpl-3.0/
 # expand-env: ((yas-indent-line 'fixed))
 # --
                    GNU LESSER GENERAL PUBLIC LICENSE

modules/lang/fortran/README.org

@@ -97,20 +97,28 @@ your Bash Profile, etc., and log out and in again._ Now Doom will be able to use
 
 Good luck and happy computing!
 
-** efmt
+** Auto-formatting
 When [[doom-module::editor format]] is enabled and [[doom-executable:fprettify]] is installed, buffers can be formatted with [[fn:apheleia-format-buffer]].
 
 Enable [[doom-module::editor format +onsave]] to format the buffer on save.
 
+See below for advanced configuration.
+
 * TODO Usage
 #+begin_quote
  󱌣 This module has no usage documentation yet. [[doom-contrib-module:][Write some?]]
 #+end_quote
 
-* TODO Configuration
-#+begin_quote
- 󱌣 This module has no configuration documentation yet. [[doom-contrib-module:][Write some?]]
-#+end_quote
+* Configuration
+
+** Customising fprettier
+
+If you want different arguments to be passed to =fprettier=, follow this example:
+
+#+begin_src emacs-lisp
+(after! f90
+  (set-formatter! 'fprettify '("fprettify" "--enable-decl" "-w" "4" "-") :modes '(f90-mode fortran-mode)))
+#+end_src
 
 * Troubleshooting
 /There are no known problems with this module./ [[doom-report:][Report one?]]

modules/ui/popup/autoload/popup.el

@@ -139,6 +139,8 @@ the buffer is visible, then set another timer and try again later."
 (defun +popup--maybe-select-window (window origin)
   "Select a window based on `+popup--inhibit-select' and this window's `select' parameter."
   (unless +popup--inhibit-select
+    ;; REVIEW: Once our minimum version is bumped up to Emacs 30.x, replace this
+    ;;   with `post-command-select-window' window parameter.
     (let ((select (+popup-parameter 'select window)))
       (if (functionp select)
           (funcall select window origin)