dev: merge branch 'pr7002' into emenel

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)