summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2017-12-13 23:51:10 +0100
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2017-12-13 23:51:10 +0100
commit08fa2ae056e4f34bf6960098cafadd72aa811bfa (patch)
tree8696a327d3e4c37fb57b01ac2feeeaea8c1247f7
parent0dde39ccd35414da7c210ac97633a21f63e903fe (diff)
downloadorg-mode-08fa2ae056e4f34bf6960098cafadd72aa811bfa.tar.gz
Fix some defcustoms types
* lisp/ob-stan.el (org-babel-stan-cmdstan-directory): * lisp/org.el (org-latex-default-packages-alist): * lisp/ox-odt.el (org-odt-with-latex): Fix type mismatch. Fixes: 29695
-rw-r--r--lisp/ob-stan.el9
-rw-r--r--lisp/org.el5
-rw-r--r--lisp/ox-odt.el7
3 files changed, 13 insertions, 8 deletions
diff --git a/lisp/ob-stan.el b/lisp/ob-stan.el
index 40fd8d9..d2775f6 100644
--- a/lisp/ob-stan.el
+++ b/lisp/ob-stan.el
@@ -49,11 +49,12 @@
(defcustom org-babel-stan-cmdstan-directory nil
"CmdStan source directory.
-'make' will be called from this directory to compile the Stan
-block. When nil, executing Stan blocks dumps the content to a
-plain text file."
+Call \"make\" from this directory to compile the Stan block.
+When nil, executing Stan blocks dumps the content to a file."
:group 'org-babel
- :type 'string)
+ :type '(choice
+ (directory :tag "Compilation directory")
+ (const :tag "Dump to a file" nil)))
(defvar org-babel-default-header-args:stan
'((:results . "file")))
diff --git a/lisp/org.el b/lisp/org.el
index 4b4ce40..93c75cd 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -4167,7 +4167,10 @@ A string will be inserted as-is in the header of the document."
(list :tag "options/package pair"
(string :tag "options")
(string :tag "package")
- (boolean :tag "Snippet"))
+ (boolean :tag "Snippet")
+ (choice
+ (const :tag "For all compilers" nil)
+ (repeat :tag "Allowed compiler" string)))
(string :tag "A line of LaTeX"))))
(defcustom org-latex-packages-alist nil
diff --git a/lisp/ox-odt.el b/lisp/ox-odt.el
index a19bab2..4386631 100644
--- a/lisp/ox-odt.el
+++ b/lisp/ox-odt.el
@@ -721,16 +721,17 @@ nil Ignore math snippets.
imagemagick to convert pdf files to png files.
`mathjax' Do MathJax preprocessing and arrange for MathJax.js to
be loaded.
-t Synonym for `mathjax'."
+
+Any other symbol is a synonym for `mathjax'."
:group 'org-export-odt
:version "24.4"
:package-version '(Org . "8.0")
:type '(choice
(const :tag "Do not process math in any way" nil)
+ (const :tag "Leave math verbatim" verbatim)
(const :tag "Use dvipng to make images" dvipng)
(const :tag "Use imagemagick to make images" imagemagick)
- (const :tag "Use MathJax to display math" mathjax)
- (const :tag "Leave math verbatim" verbatim)))
+ (other :tag "Use MathJax to display math" mathjax)))
;;;; Links