branch: externals-release/org
commit 7dcdf98f1d760186d92b0790c111af56e27128f6
Author: Glenn Morris <r...@gnu.org>
Commit: Kyle Meyer <k...@kyleam.com>
Backport commit f1f57a541 from Emacs
* lisp/oc-csl.el (org-cite-csl-locales-dir)
(org-cite-csl-styles-dir):
* lisp/org-plot.el (org-plot/preset-plot-types): Fix :type.
Fix some custom types
f1f57a541e4c74eec68a27c47c7416ed6c7d75dd
Glenn Morris
Fri Oct 1 08:33:32 2021 -0700
---
lisp/oc-csl.el | 4 ++--
lisp/org-plot.el | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lisp/oc-csl.el b/lisp/oc-csl.el
index 50df121..5623efc 100644
--- a/lisp/oc-csl.el
+++ b/lisp/oc-csl.el
@@ -123,7 +123,7 @@ If nil then only the fallback en-US locale will be
available."
:group 'org-cite
:package-version '(Org . "9.5")
:type '(choice
- (dir :tag "Locales directory")
+ (directory :tag "Locales directory")
(const :tag "Use en-US locale only" nil))
:safe t)
@@ -134,7 +134,7 @@ directory. This variable is ignored when style file is
absolute."
:group 'org-cite
:package-version '(Org . "9.5")
:type '(choice
- (dir :tag "Styles directory")
+ (directory :tag "Styles directory")
(const :tag "Use absolute file names" nil))
:safe t)
diff --git a/lisp/org-plot.el b/lisp/org-plot.el
index 63176fc..4f14c7d 100644
--- a/lisp/org-plot.el
+++ b/lisp/org-plot.el
@@ -392,7 +392,7 @@ be set.
Accepts string, nil, or lambda function which returns string
or nil. Defaults to nil."
:group 'org-plot
- :type '(alist :value-type (symbol group)))
+ :type 'alist)
(defvar org--plot/radar-template
"### spider plot/chart with gnuplot
