From c728b04da324710c20f472d2cdd6fec70f8e4869 Mon Sep 17 00:00:00 2001
From: Jonas Bernoulli <jonas@bernoul.li>
Date: Wed, 20 Sep 2023 16:03:53 +0200
Subject: [PATCH] fix(custom): fix custom type specifications

---
 dirvish.el                  | 4 ++--
 extensions/dirvish-icons.el | 8 ++++----
 extensions/dirvish-peek.el  | 4 ++--
 extensions/dirvish-vc.el    | 2 +-
 extensions/dirvish-yank.el  | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/dirvish.el b/dirvish.el
index 9d88161..095aaf4 100644
--- a/dirvish.el
+++ b/dirvish.el
@@ -187,8 +187,8 @@ and its ARGS is issued to open the file externally.  The special
 placeholder \"%f\" in the ARGS is replaced by the FILENAME at
 runtime.  Set it to nil disables this feature."
   :group 'dirvish
-  :type '(alist :key-type ((repeat string) :tag "File extensions")
-                :value-type ((repeat string) :tag "External command and args")))
+  :type '(alist :key-type (repeat :tag "File extensions" string)
+                :value-type (repeat :tag "External command and args" string)))
 
 (defcustom dirvish-reuse-session t
   "Whether to reuse the hidden sessions.
diff --git a/extensions/dirvish-icons.el b/extensions/dirvish-icons.el
index c228750..ce18cb6 100644
--- a/extensions/dirvish-icons.el
+++ b/extensions/dirvish-icons.el
@@ -53,18 +53,18 @@ Values are interpreted as follows:
 - all-the-icons, meaning let `all-the-icons.el' to do the coloring.
 - A face that is used for all the icons.
 - nil, inherit face at point."
-  :group 'dirvish :type '(choice face symbol nil))
+  :group 'dirvish :type '(choice face symbol (const nil)))
 
 (defcustom dirvish-nerd-icons-offset 0.00
   "Icon's vertical offset used for `nerd-icons' backend.
 Set it to nil to use the default offset from `nerd-icons'."
-  :group 'dirvish :type '(choice (float nil)))
+  :group 'dirvish :type '(choice float (const nil)))
 
 (defcustom dirvish-nerd-icons-height nil
   "Icon height used for `nerd-icons' backend.
 The height of the icon is scaled to this value (try 0.8).
 Set it to nil to use the default height from `nerd-icons'."
-  :group 'dirvish :type '(choice (float nil)))
+  :group 'dirvish :type '(choice float (const nil)))
 
 (defcustom dirvish-nerd-icons-palette 'nerd-icons
   "Coloring style used for file `nerd-icons' backend.
@@ -72,7 +72,7 @@ Values are interpreted as follows:
 - nerd-icons, meaning let `nerd-icons.el' to do the coloring.
 - A face that is used for all the icons.
 - nil, inherit face at point."
-  :group 'dirvish :type '(choice face symbol nil))
+  :group 'dirvish :type '(choice face symbol (const nil)))
 
 (defcustom dirvish-vscode-icon-size 32
   "Icon (image pixel) size used for `vscode-icon' backend.
diff --git a/extensions/dirvish-peek.el b/extensions/dirvish-peek.el
index a4ea423..61716ae 100644
--- a/extensions/dirvish-peek.el
+++ b/extensions/dirvish-peek.el
@@ -27,11 +27,11 @@
 If this value is nil, a candidate fetcher function is
 automatically choosed according to your completion framework
 being used at runtime."
-  :group 'dirvish :type '(choice function nil))
+  :group 'dirvish :type '(choice function (const nil)))
 
 (defcustom dirvish-peek-categories '(file project-file library)
   "Minibuffer metadata categories to show file preview."
-  :group 'dirvish :type 'list)
+  :group 'dirvish :type '(repeat symbol))
 
 (defvar dirvish-peek--cand-fetcher nil)
 (defun dirvish-peek--prepare-cand-fetcher ()
diff --git a/extensions/dirvish-vc.el b/extensions/dirvish-vc.el
index ad7b664..fa324ac 100644
--- a/extensions/dirvish-vc.el
+++ b/extensions/dirvish-vc.el
@@ -37,7 +37,7 @@ This value is consumed by `vc-state' attribute in Dirvish.  FACE
 is the face used for that VC-STATE.  See `vc-state' in (in
 vc-hooks.el) for detail explanation of these states."
   :group 'dirvish
-  :type '(alist :key-type symbol :value-type '(symbol :tag "Face")))
+  :type '(alist :key-type symbol :value-type (symbol :tag "Face")))
 
 (defface dirvish-vc-needs-merge-face
   '((((background dark)) (:background "#500f29"))
diff --git a/extensions/dirvish-yank.el b/extensions/dirvish-yank.el
index 3f9fe1a..6953aad 100644
--- a/extensions/dirvish-yank.el
+++ b/extensions/dirvish-yank.el
@@ -65,7 +65,7 @@ The value can be a symbol or a function that returns a fileset."
 
 (defcustom dirvish-yank-rsync-args '("--archive" "--verbose" "--compress" "--info=progress2")
   "The default options for the rsync command."
-  :type 'list :group 'dirvish)
+  :type '(repeat string) :group 'dirvish)
 
 (defcustom dirvish-yank-keep-success-log t
   "If non-nil then keep logs of all completed yanks.