[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals-release/org 9b856c273f 2/4: Backport commit 4b2f5425d f
From: |
ELPA Syncer |
Subject: |
[elpa] externals-release/org 9b856c273f 2/4: Backport commit 4b2f5425d from Emacs |
Date: |
Thu, 1 Dec 2022 17:58:04 -0500 (EST) |
branch: externals-release/org
commit 9b856c273f7c9844bb25a86223d942f62648c668
Author: Mattias EngdegÄrd <mattiase@acm.org>
Commit: Kyle Meyer <kyle@kyleam.com>
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.
---
lisp/ob-clojure.el | 4 ++--
lisp/org.el | 2 +-
lisp/ox-md.el | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/lisp/ob-clojure.el b/lisp/ob-clojure.el
index 6f1425a842..b424cf48ff 100644
--- a/lisp/ob-clojure.el
+++ b/lisp/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.el b/lisp/org.el
index be922a5da0..ab6212dacc 100644
--- a/lisp/org.el
+++ b/lisp/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/ox-md.el b/lisp/ox-md.el
index dee6dbf1fc..01e0aa0491 100644
--- a/lisp/ox-md.el
+++ b/lisp/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)