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

dev: merge branch 'pr7002' into emenel

Browse source
This commit is contained in:
Matt Nish-Lapidus 2024-02-09 14:35:15 -05:00
commit 46ede70b9e
6 changed files with 25 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lisp/cli/env.el
View file

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

11
lisp/doom-cli.el
View file

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

7
lisp/lib/projects.el
View file

@ -149,14 +149,11 @@ If DIR is not a project, it will be indexed (but not cached)."
(if (doom-module-p :completion 'ivy) (if (doom-module-p :completion 'ivy)
#'counsel-projectile-find-file #'counsel-projectile-find-file
#'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) ((and (bound-and-true-p ivy-mode)
(fboundp 'counsel-file-jump)) (fboundp 'counsel-file-jump))
(call-interactively #'counsel-file-jump)) (call-interactively #'counsel-file-jump))
((project-current nil dir) ((when-let ((pr (project-current nil dir)))
(project-find-file-in nil nil dir)) (project-find-file-in nil nil pr)))
((and (bound-and-true-p helm-mode) ((and (bound-and-true-p helm-mode)
(fboundp 'helm-find-files)) (fboundp 'helm-find-files))
(call-interactively #'helm-find-files)) (call-interactively #'helm-find-files))

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

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

18
modules/lang/fortran/README.org
View file

@ -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! 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]]. 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. Enable [[doom-module::editor format +onsave]] to format the buffer on save.
See below for advanced configuration.
* TODO Usage * TODO Usage
#+begin_quote #+begin_quote
󱌣 This module has no usage documentation yet. [[doom-contrib-module:][Write some?]] 󱌣 This module has no usage documentation yet. [[doom-contrib-module:][Write some?]]
#+end_quote #+end_quote
* TODO Configuration * Configuration
#+begin_quote
󱌣 This module has no configuration documentation yet. [[doom-contrib-module:][Write some?]] ** Customising fprettier
#+end_quote
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 * Troubleshooting
/There are no known problems with this module./ [[doom-report:][Report one?]] /There are no known problems with this module./ [[doom-report:][Report one?]]

2
modules/ui/popup/autoload/popup.el
View file

@ -139,6 +139,8 @@ the buffer is visible, then set another timer and try again later."
(defun +popup--maybe-select-window (window origin) (defun +popup--maybe-select-window (window origin)
"Select a window based on `+popup--inhibit-select' and this window's `select' parameter." "Select a window based on `+popup--inhibit-select' and this window's `select' parameter."
(unless +popup--inhibit-select (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))) (let ((select (+popup-parameter 'select window)))
(if (functionp select) (if (functionp select)
(funcall select window origin) (funcall select window origin)