0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-08-25 23:02:53 +00:00

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:
Mattias Engdegård 2022-12-01 12:40:28 +01:00 committed by Kyle Meyer
parent c8ad9e4b28
commit 9b856c273f
3 changed files with 4 additions and 4 deletions

View file

@ -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"))

View file

@ -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.

View file

@ -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)