From ae451ff754b975d27de05a114095c815c644d295 Mon Sep 17 00:00:00 2001 From: 45mm <45mm@no.mail> Date: Thu, 18 Jan 2024 16:18:44 +0530 Subject: [PATCH 1/5] docs(vertico): mention `:args` option in docstring --- modules/completion/vertico/autoload/vertico.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/completion/vertico/autoload/vertico.el b/modules/completion/vertico/autoload/vertico.el index 0bfd9e00f..0199d431d 100644 --- a/modules/completion/vertico/autoload/vertico.el +++ b/modules/completion/vertico/autoload/vertico.el @@ -13,7 +13,9 @@ :in PATH Sets what directory to base the search out of. Defaults to the current project's root. :recursive BOOL - Whether or not to search files recursively from the base directory." + Whether or not to search files recursively from the base directory. +:args LIST + Arguments to be appended to `consult-ripgrep-args'." (declare (indent defun)) (unless (executable-find "rg") (user-error "Couldn't find ripgrep in your PATH")) From acb5af177b0a57ca4b05d00d5055d109198e2984 Mon Sep 17 00:00:00 2001 From: 45mm <45mm@no.mail> Date: Thu, 18 Jan 2024 16:20:15 +0530 Subject: [PATCH 2/5] fix(vertico): don't shell-quote consult-ripgrep-args We were using `shell-quote-argument`, which is meant for passing file names, strings and so on, not command-line arguments. For example, `(shell-quote-argument "--foo=bar")` yields "--foo\\=bar", which is obviiously invalid unless we're trying to pass an option named '--foo\'. At any rate, there is no quoting/escaping for shells in the default value of `consult-ripgrep-args`, so it doesn't look like this is something we need to do. --- modules/completion/vertico/autoload/vertico.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/completion/vertico/autoload/vertico.el b/modules/completion/vertico/autoload/vertico.el index 0199d431d..0b4219eaf 100644 --- a/modules/completion/vertico/autoload/vertico.el +++ b/modules/completion/vertico/autoload/vertico.el @@ -31,7 +31,7 @@ "--path-separator / --smart-case --no-heading " "--with-filename --line-number --search-zip " "--hidden -g !.git -g !.svn -g !.hg " - (mapconcat #'shell-quote-argument args " "))) + (mapconcat #'identity args " "))) (prompt (if (stringp prompt) (string-trim prompt) "Search")) (query (or query (when (doom-region-active-p) From 6275ed7e8f67d4633ee83c80336603ee48fff772 Mon Sep 17 00:00:00 2001 From: George Thomas Date: Sat, 27 Jan 2024 09:14:35 +0100 Subject: [PATCH 3/5] bump: :ui modeline seagle0128/doom-modeline@93f240f7a0bf -> seagle0128/doom-modeline@bf880ae56f3f --- modules/ui/modeline/packages.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/ui/modeline/packages.el b/modules/ui/modeline/packages.el index 274df912a..c95d740be 100644 --- a/modules/ui/modeline/packages.el +++ b/modules/ui/modeline/packages.el @@ -2,7 +2,7 @@ ;;; ui/modeline/packages.el (unless (modulep! +light) - (package! doom-modeline :pin "93f240f7a0bf35511cfc0a8dd75786744b4bcf77")) + (package! doom-modeline :pin "bf880ae56f3f6aab7bd334de9bd9b455c63a24c0")) (package! anzu :pin "5abb37455ea44fa401d5f4c1bdc58adb2448db67") (when (modulep! :editor evil) (package! evil-anzu :pin "d1e98ee6976437164627542909a25c6946497899")) From f9137b40e73ab9054d5500da2759d45e48dc4aa9 Mon Sep 17 00:00:00 2001 From: ncihnegn Date: Sat, 27 Jan 2024 00:16:06 -0800 Subject: [PATCH 4/5] docs(idris): add doctor.el --- modules/lang/idris/doctor.el | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 modules/lang/idris/doctor.el diff --git a/modules/lang/idris/doctor.el b/modules/lang/idris/doctor.el new file mode 100644 index 000000000..882cebbc1 --- /dev/null +++ b/modules/lang/idris/doctor.el @@ -0,0 +1,5 @@ +;;; lang/idris/doctor.el -*- lexical-binding: t; -*- + +(when (require 'idris-mode nil t) + (unless (executable-find idris-interpreter-path) + (warn! "Cannot find the idris interpreter. Most features will not work."))) From d87c181aea740a5a628d5689c4e5d034ec640656 Mon Sep 17 00:00:00 2001 From: Oscar Marshall Date: Sat, 27 Jan 2024 00:17:57 -0800 Subject: [PATCH 5/5] fix(upload): ssh-deploy-on-explicit-save = 1 #7513 changed the expected value of `ssh-deploy-on-explicit-save` to be #an integer, but the default value was still `t`. This commit changes it #to be `1`. Amend: #7513 --- modules/tools/upload/config.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/tools/upload/config.el b/modules/tools/upload/config.el index 25e2829be..6592e4331 100644 --- a/modules/tools/upload/config.el +++ b/modules/tools/upload/config.el @@ -7,7 +7,7 @@ ;; Example: ;; ((nil . ((ssh-deploy-root-local . "/local/path/to/project") ;; (ssh-deploy-root-remote . "/ssh:user@server:/remote/project/") -;; (ssh-deploy-on-explicit-save . t)))) +;; (ssh-deploy-on-explicit-save . 1)))) ;; ;; Note: `ssh-deploy-root-local' is optional, and will resort to ;; `doom-project-root' if unspecified. @@ -20,7 +20,7 @@ ssh-deploy-remote-changes-handler) :init (setq ssh-deploy-revision-folder (concat doom-cache-dir "ssh-revisions/") - ssh-deploy-on-explicit-save t + ssh-deploy-on-explicit-save 1 ssh-deploy-automatically-detect-remote-changes nil) ;; Make these safe as file-local variables