summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2021-10-01 08:33:32 -0700
committerGlenn Morris <rgm@gnu.org>2021-10-01 08:33:32 -0700
commitf1f57a541e4c74eec68a27c47c7416ed6c7d75dd (patch)
tree9d3e06dab3f3c5101f245e2dc12b34e654107447
parent5ee5a90213f6a6cac31fc849af6bf152756292e3 (diff)
downloademacs-f1f57a541e4c74eec68a27c47c7416ed6c7d75dd.tar.gz
Fix some custom types
* lisp/mpc.el (mpc-cover-image-re): * lisp/org/oc-csl.el (org-cite-csl-locales-dir) (org-cite-csl-styles-dir): * lisp/org/org-plot.el (org-plot/preset-plot-types): Fix :type.
-rw-r--r--lisp/mpc.el2
-rw-r--r--lisp/org/oc-csl.el4
-rw-r--r--lisp/org/org-plot.el2
3 files changed, 4 insertions, 4 deletions
diff --git a/lisp/mpc.el b/lisp/mpc.el
index 913146415e8..c47d4336e5e 100644
--- a/lisp/mpc.el
+++ b/lisp/mpc.el
@@ -964,7 +964,7 @@ If PLAYLIST is t or nil or missing, use the main playlist."
(defcustom mpc-cover-image-re nil ; (rx (or ".jpg" ".jpeg" ".png") string-end)
"If non-nil, it is a regexp that should match a valid cover image."
- :type '(regexp)
+ :type '(choice (const nil) regexp)
:version "28.1")
(defun mpc-secs-to-time (secs)
diff --git a/lisp/org/oc-csl.el b/lisp/org/oc-csl.el
index 50df12115a1..5623efcc1b3 100644
--- a/lisp/org/oc-csl.el
+++ b/lisp/org/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/org-plot.el b/lisp/org/org-plot.el
index 63176fce150..4f14c7d4c34 100644
--- a/lisp/org/org-plot.el
+++ b/lisp/org/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