forked from mirrors/org-mode
Backport commit 4b2f5425d from Emacs
* lisp/ob-clojure.el (ob-clojure-babashka-command, ob-clojure-nbb-command): Account for the possibility of nil (commands absent). * lisp/org.el (org-safe-remote-resources): * lisp/ox-md.el (org-md-toplevel-hlevel): Fix incorrect or invalid types. Fix types in various defcustom declarations 4b2f5425d7af1a6f992ad8ce0a4452a2e778815a Mattias Engdegård Thu Dec 1 13:03:19 2022 +0100 [km] The natnum change will be adjusted in an upcoming commit because natnum not available until Emacs 28.
This commit is contained in:
parent
c8ad9e4b28
commit
9b856c273f
|
@ -101,13 +101,13 @@
|
||||||
|
|
||||||
(defcustom ob-clojure-babashka-command (executable-find "bb")
|
(defcustom ob-clojure-babashka-command (executable-find "bb")
|
||||||
"Path to the babashka executable."
|
"Path to the babashka executable."
|
||||||
:type 'file
|
:type '(choice file (const nil))
|
||||||
:group 'org-babel
|
:group 'org-babel
|
||||||
:package-version '(Org . "9.6"))
|
:package-version '(Org . "9.6"))
|
||||||
|
|
||||||
(defcustom ob-clojure-nbb-command (executable-find "nbb")
|
(defcustom ob-clojure-nbb-command (executable-find "nbb")
|
||||||
"Path to the nbb executable."
|
"Path to the nbb executable."
|
||||||
:type 'file
|
:type '(choice file (const nil))
|
||||||
:group 'org-babel
|
:group 'org-babel
|
||||||
:package-version '(Org . "9.6"))
|
:package-version '(Org . "9.6"))
|
||||||
|
|
||||||
|
|
|
@ -1408,7 +1408,7 @@ URI regexps are applied to both URLs and Org files requesting
|
||||||
remote resources."
|
remote resources."
|
||||||
:group 'org
|
:group 'org
|
||||||
:package-version '(Org . "9.6")
|
:package-version '(Org . "9.6")
|
||||||
:type '(list regexp))
|
:type '(repeat regexp))
|
||||||
|
|
||||||
(defcustom org-open-non-existing-files nil
|
(defcustom org-open-non-existing-files nil
|
||||||
"Non-nil means `org-open-file' opens non-existing files.
|
"Non-nil means `org-open-file' opens non-existing files.
|
||||||
|
|
|
@ -87,7 +87,7 @@ included into another document or application that reserves top-level
|
||||||
headings for its own use."
|
headings for its own use."
|
||||||
:group 'org-export-md
|
:group 'org-export-md
|
||||||
:package-version '(Org . "9.6")
|
:package-version '(Org . "9.6")
|
||||||
:type 'string)
|
:type 'natnum)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue