From: Mattias Engdegård <mattiase@acm.org>
Date: Thu, 1 Dec 2022 11:40:28 +0000 (+0100)
Subject: Fix types in various defcustom declarations
X-Git-Tag: emacs-29.0.90~1402
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4b2f5425d7;p=emacs.git

Fix types in various defcustom declarations

* lisp/org/ob-clojure.el
(ob-clojure-babashka-command, ob-clojure-nbb-command):
Account for the possibility of nil (commands absent).
* lisp/org/org.el (org-safe-remote-resources):
* lisp/org/ox-md.el (org-md-toplevel-hlevel):
* lisp/progmodes/project.el (project-vc-extra-root-markers):
Fix incorrect or invalid types.
---

diff --git a/lisp/org/ob-clojure.el b/lisp/org/ob-clojure.el
index 6f1425a842b..b424cf48ff9 100644
--- a/lisp/org/ob-clojure.el
+++ b/lisp/org/ob-clojure.el
@@ -101,13 +101,13 @@
 
 (defcustom ob-clojure-babashka-command (executable-find "bb")
   "Path to the babashka executable."
-  :type 'file
+  :type '(choice file (const nil))
   :group 'org-babel
   :package-version '(Org . "9.6"))
 
 (defcustom ob-clojure-nbb-command (executable-find "nbb")
   "Path to the nbb executable."
-  :type 'file
+  :type '(choice file (const nil))
   :group 'org-babel
   :package-version '(Org . "9.6"))
 
diff --git a/lisp/org/org.el b/lisp/org/org.el
index be922a5da0f..ab6212daccd 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -1408,7 +1408,7 @@ URI regexps are applied to both URLs and Org files requesting
 remote resources."
   :group 'org
   :package-version '(Org . "9.6")
-  :type '(list regexp))
+  :type '(repeat regexp))
 
 (defcustom org-open-non-existing-files nil
   "Non-nil means `org-open-file' opens non-existing files.
diff --git a/lisp/org/ox-md.el b/lisp/org/ox-md.el
index dee6dbf1fc3..01e0aa0491b 100644
--- a/lisp/org/ox-md.el
+++ b/lisp/org/ox-md.el
@@ -87,7 +87,7 @@ included into another document or application that reserves top-level
 headings for its own use."
   :group 'org-export-md
   :package-version '(Org . "9.6")
-  :type 'string)
+  :type 'natnum)
 
 
 
diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el
index dfd3d5c7ab3..1cf50df0366 100644
--- a/lisp/progmodes/project.el
+++ b/lisp/progmodes/project.el
@@ -453,7 +453,7 @@ repositories.
 
 In either case, their behavior will still obey the relevant
 variables, such as `project-vc-ignores' or `project-vc-name'."
-  :type 'list
+  :type '(repeat string)
   :version "29.1"
   :package-version '(project . "0.9.0")
   :safe (lambda (val) (and (listp val) (cl-every #'stringp val))))