branch: externals/org
commit 4b5abdd6dedcac0ad1e191b95310b73592fe38aa
Author: Ihor Radchenko <[email protected]>
Commit: Ihor Radchenko <[email protected]>
Add missing :safe for defcustoms added/changed in Org 9.8
* lisp/ob-csharp.el (org-babel-csharp-compiler):
(org-babel-csharp-default-target-framework):
(org-babel-csharp-generate-compile-command):
(org-babel-csharp-generate-restore-command):
(org-babel-csharp-additional-project-flags):
* lisp/ob-ditaa.el (org-ditaa-default-exec-mode):
(org-ditaa-exec):
(org-ditaa-java-exec):
* lisp/ob-latex.el (org-babel-latex-preamble):
(org-babel-latex-process-alist):
* lisp/ob-lisp.el (org-babel-lisp-dir-fmt):
* lisp/ob-tangle.el (org-babel-tangle-lang-exts):
* lisp/oc-bibtex.el (org-cite-bibtex-bibliography-style):
* lisp/ol.el (org-link-parameters):
(org-link-frame-setup):
(org-link-preview-delay):
(org-link-preview-batch-size):
(org-image-max-width):
* lisp/org-archive.el (org-archive-save-context-info):
(org-archive-hook):
(org-archive-finalize-hook):
* lisp/org-capture.el (org-capture-templates):
* lisp/org-cycle.el (org-cycle-link-previews-display):
* lisp/org-id.el (org-id-completion-targets):
* lisp/org-keys.el (org-speed-commands):
* lisp/org-plot.el (org-plot/preset-plot-types):
* lisp/org-src.el (org-src-lang-modes):
* lisp/org.el (org-edit-keep-region):
(org-priority-highest):
(org-priority-lowest):
(org-priority-default):
(org-timestamp-custom-formats):
(org-tags-sort-function):
(org-preview-latex-process-alist):
(org-latex-mathml-directory):
* lisp/ox-html.el (org-html-style-default):
(org-html-datetime-formats):
(org-html-head):
(org-html-head-extra):
* lisp/ox-md.el (org-md-link-org-files-as-md):
* lisp/ox-odt.el (org-odt-with-forbidden-chars):
(org-odt-with-latex):
* lisp/ox.el (org-export-replace-macros):
---
lisp/ob-csharp.el | 17 +++++++++++------
lisp/ob-ditaa.el | 9 ++++++---
lisp/ob-latex.el | 6 ++++--
lisp/ob-lisp.el | 3 ++-
lisp/ob-tangle.el | 3 ++-
lisp/oc-bibtex.el | 3 ++-
lisp/ol.el | 15 ++++++++++-----
lisp/org-archive.el | 9 ++++++---
lisp/org-capture.el | 3 ++-
lisp/org-cycle.el | 3 ++-
lisp/org-id.el | 3 ++-
lisp/org-keys.el | 3 ++-
lisp/org-plot.el | 3 ++-
lisp/org-src.el | 3 ++-
lisp/org.el | 24 ++++++++++++++++--------
lisp/ox-html.el | 12 ++++++++----
lisp/ox-md.el | 3 ++-
lisp/ox-odt.el | 7 ++++---
lisp/ox.el | 3 ++-
19 files changed, 87 insertions(+), 45 deletions(-)
diff --git a/lisp/ob-csharp.el b/lisp/ob-csharp.el
index 2a5cc7c272..93227dc55f 100644
--- a/lisp/ob-csharp.el
+++ b/lisp/ob-csharp.el
@@ -51,7 +51,8 @@
"The program to call for compiling a csharp project."
:group 'org-babel
:package-version '(Org. "9.8")
- :type 'string)
+ :type 'string
+ :safe nil)
(defun org-babel-csharp--default-compile-command (dir-proj-sln bin-dir)
"Construct the default compilation command for C#.
@@ -86,11 +87,12 @@ takes effect."
(format "net%s.0"
(let ((net-sdks (org-babel-csharp--find-dotnet-version)))
(when net-sdks
- (apply #'max net-sdks))))
+ (apply #'max net-sdks))))
"The desired target framework to use."
:group 'org-babel
:package-version '(Org. "9.8")
- :type 'string)
+ :type 'string
+ :safe t)
(defcustom org-babel-csharp-generate-compile-command
#'org-babel-csharp--default-compile-command
@@ -100,7 +102,8 @@ It must take two parameters intended for the target binary
directory and
a .sln file, .csproj file, or a base directory where either can be found."
:group 'org-babel
:package-version '(Org. "9.8")
- :type 'function)
+ :type 'function
+ :safe nil)
(defcustom org-babel-csharp-generate-restore-command
#'org-babel-csharp--default-restore-command
@@ -109,7 +112,8 @@ a .sln file, .csproj file, or a base directory where either
can be found."
It must take one parameter defining the project to perform a restore on."
:group 'org-babel
:package-version '(Org. "9.8")
- :type 'function)
+ :type 'function
+ :safe nil)
(defcustom org-babel-csharp-additional-project-flags nil
"Will be passed in the \"PropertyGroup\" defining the project.
@@ -117,7 +121,8 @@ It must take one parameter defining the project to perform
a restore on."
This is taken as-is. It should be a string in XML-format."
:group 'org-babel
:package-version '(Org. "9.8")
- :type 'string)
+ :type 'string
+ :safe t)
(defun org-babel-csharp--generate-project-file (refs framework)
"Generate the file content to be used in a csproj-file.
diff --git a/lisp/ob-ditaa.el b/lisp/ob-ditaa.el
index c8483d49d8..839e4c2529 100644
--- a/lisp/ob-ditaa.el
+++ b/lisp/ob-ditaa.el
@@ -97,19 +97,22 @@ The executable can be configured via `org-ditaa-exec'."
:group 'org-babel
:package-version '(Org . "9.8")
:type '(choice (const :tag "Use java together with a JAR file." jar)
- (const :tag "Use ditaa executable." ditaa)))
+ (const :tag "Use ditaa executable." ditaa))
+ :safe t)
(defcustom org-ditaa-exec "ditaa"
"File name of the ditaa executable."
:group 'org-babel
:package-version '(Org . "9.8")
- :type 'string)
+ :type 'string
+ :safe nil)
(define-obsolete-variable-alias 'org-babel-ditaa-java-cmd 'org-ditaa-java-exec
"9.8")
(defcustom org-ditaa-java-exec "java"
"Java executable to use when evaluating ditaa blocks using a JAR."
:group 'org-babel
- :type 'string)
+ :type 'string
+ :safe nil)
(defcustom org-ditaa-jar-path (expand-file-name
"ditaa.jar"
diff --git a/lisp/ob-latex.el b/lisp/ob-latex.el
index 4136efb598..7fcb76cd09 100644
--- a/lisp/ob-latex.el
+++ b/lisp/ob-latex.el
@@ -83,7 +83,8 @@
It takes 1 argument which is the parameters of the source block."
:group 'org-babel
:package-version '(Org . "9.8")
- :type 'function)
+ :type 'function
+ :safe nil)
(defcustom org-babel-latex-begin-env
(lambda (_)
@@ -148,7 +149,8 @@ The following process symbols are recognized:
:group 'org-babel
:package-version '(Org . "9.8")
:type '(alist :tag "LaTeX to image backends"
- :value-type (plist)))
+ :value-type (plist))
+ :safe nil)
(defun org-babel-expand-body:latex (body params)
"Expand BODY according to PARAMS, return the expanded body."
diff --git a/lisp/ob-lisp.el b/lisp/ob-lisp.el
index 0b4d741b7a..90aedd4e72 100644
--- a/lisp/ob-lisp.el
+++ b/lisp/ob-lisp.el
@@ -67,7 +67,8 @@ For example a value of \"(progn ;; %s\\n %%s)\" would
ignore the
current directory string."
:group 'org-babel
:package-version '(Org . "9.8")
- :type 'string)
+ :type 'string
+ :safe nil)
(defun org-babel-expand-body:lisp (body params)
"Expand BODY according to PARAMS, return the expanded body."
diff --git a/lisp/ob-tangle.el b/lisp/ob-tangle.el
index 9f2a0270bc..6fe553469c 100644
--- a/lisp/ob-tangle.el
+++ b/lisp/ob-tangle.el
@@ -68,7 +68,8 @@ then the name of the language is used."
:type '(repeat
(cons
(string "Language name")
- (string "File Extension"))))
+ (string "File Extension")))
+ :safe t)
(defcustom org-babel-tangle-use-relative-file-links t
"Use relative path names in links from tangled source back the Org file."
diff --git a/lisp/oc-bibtex.el b/lisp/oc-bibtex.el
index 8b20b2706f..0e54967319 100644
--- a/lisp/oc-bibtex.el
+++ b/lisp/oc-bibtex.el
@@ -70,7 +70,8 @@ BibTeX provides the following default styles:
(const :tag "APA-like" "apalike")
(const :tag "IEEE" "ieeetr")
(const :tag "SIAM" "siam")
- (string :tag "Other")))
+ (string :tag "Other"))
+ :safe t)
;;; Export capability
diff --git a/lisp/ol.el b/lisp/ol.el
index c83316cbe6..5fdff1de88 100644
--- a/lisp/ol.el
+++ b/lisp/ol.el
@@ -213,7 +213,8 @@ link.
:group 'org-link
:package-version '(Org . "9.8")
:type '(alist :tag "Link display parameters"
- :value-type plist))
+ :value-type plist)
+ :safe nil)
(defun org-link--set-link-display (symbol value)
"Set `org-link-descriptive' (SYMBOL) to VALUE.
@@ -386,7 +387,8 @@ another window."
(cons (const wl)
(choice
(const wl)
- (const wl-other-frame)))))
+ (const wl-other-frame))))
+ :safe nil)
(defcustom org-link-search-must-match-exact-headline 'query-to-create
"Control fuzzy link behavior when specific matches not found.
@@ -549,7 +551,8 @@ this to a small number for more immediate previews, but at
the
expense of higher lag."
:group 'org-link
:package-version '(Org . "9.8")
- :type 'number)
+ :type 'number
+ :safe t)
(defcustom org-link-preview-batch-size 6
"Number of links that are previewed at once with `org-link-preview'.
@@ -559,7 +562,8 @@ this to a large integer for more immediate previews, but at
the
expense of higher lag."
:group 'org-link
:package-version '(Org . "9.8")
- :type 'natnum)
+ :type 'natnum
+ :safe t)
(defcustom org-display-remote-inline-images 'skip
"How to display remote inline images.
@@ -597,7 +601,8 @@ Possible values:
(const :tag "Limit to `fill-column'" fill-column)
(const :tag "Limit to window width" window)
(integer :tag "Limit to a number of pixels")
- (float :tag "Limit to a fraction of window width")))
+ (float :tag "Limit to a fraction of window width"))
+ :safe t)
(defcustom org-image-align 'left
"How to align images previewed using `org-link-preview-region'.
diff --git a/lisp/org-archive.el b/lisp/org-archive.el
index 8d8f68dcc2..783a9d878e 100644
--- a/lisp/org-archive.el
+++ b/lisp/org-archive.el
@@ -145,7 +145,8 @@ information."
(const :tag "Inherited tags" itags)
(const :tag "Outline path" olpath)
(const :tag "Outline parent id" olid)
- (const :tag "Local tags" ltags)))
+ (const :tag "Local tags" ltags))
+ :safe t)
(defcustom org-archive-hook nil
"Hook run after successfully archiving a subtree.
@@ -153,7 +154,8 @@ Hook functions are called with point on the subtree in the
original file. At this stage, the subtree has been added to the
archive location, but not yet deleted from the original file."
:group 'org-archive
- :type 'hook)
+ :type 'hook
+ :safe nil)
(defcustom org-archive-finalize-hook nil
"Hook run after successfully archiving a subtree in final location.
@@ -164,7 +166,8 @@ added to the archive location, but not yet deleted from the
original file."
:group 'org-archive
:package-version '(Org . "9.8")
- :type 'hook)
+ :type 'hook
+ :safe nil)
;;;###autoload
(defun org-add-archive-files (files)
diff --git a/lisp/org-capture.el b/lisp/org-capture.el
index 3fc99cd13e..705fdc902f 100644
--- a/lisp/org-capture.el
+++ b/lisp/org-capture.el
@@ -534,7 +534,8 @@ you can escape ambiguous cases with a backward slash, e.g.,
\\%i."
((const :format "%v " :tree-type) (const
week))
((const :format "%v " :unnarrowed) (const
t))
((const :format "%v " :table-line-pos)
(string))
- ((const :format "%v " :kill-buffer) (const
t)))))))))
+ ((const :format "%v " :kill-buffer) (const
t))))))))
+ :safe nil)
(defcustom org-capture-before-finalize-hook nil
"Hook that is run right before a capture process is finalized.
diff --git a/lisp/org-cycle.el b/lisp/org-cycle.el
index ac5e37dd5f..9f9f44ee99 100644
--- a/lisp/org-cycle.el
+++ b/lisp/org-cycle.el
@@ -245,7 +245,8 @@ normal outline commands like `show-all', but not with the
cycling commands."
:group 'org-startup
:group 'org-cycle
:package-version '(Org . "9.8")
- :type 'boolean)
+ :type 'boolean
+ :safe t)
(defvaralias 'org-tab-first-hook 'org-cycle-tab-first-hook)
(defvar org-cycle-tab-first-hook nil
diff --git a/lisp/org-id.el b/lisp/org-id.el
index 057c692af6..6935a5115c 100644
--- a/lisp/org-id.el
+++ b/lisp/org-id.el
@@ -300,7 +300,8 @@ This variable is only relevant when `org-id-track-globally'
is set."
This variable has the same form as `org-refile-targets', which see."
:group 'org-id
:type (get 'org-refile-targets 'custom-type)
- :package-version '(Org . "9.8"))
+ :package-version '(Org . "9.8")
+ :safe t)
;;; The API functions
diff --git a/lisp/org-keys.el b/lisp/org-keys.el
index 014d64fb53..56f276e13e 100644
--- a/lisp/org-keys.el
+++ b/lisp/org-keys.el
@@ -797,7 +797,8 @@ command."
(string :tag "Command letter")
(choice
(function)
- (sexp))))))
+ (sexp)))))
+ :safe nil)
(defun org--print-speed-command (speed-command)
"Print information about SPEED-COMMAND in help buffer.
diff --git a/lisp/org-plot.el b/lisp/org-plot.el
index 0199cd4658..2a436a1009 100644
--- a/lisp/org-plot.el
+++ b/lisp/org-plot.el
@@ -406,7 +406,8 @@ be set.
or nil. Defaults to nil."
:group 'org-plot
:package-version '(Org . "9.8")
- :type 'alist)
+ :type 'alist
+ :safe nil)
(defvar org--plot/radar-template
"### spider plot/chart with gnuplot
diff --git a/lisp/org-src.el b/lisp/org-src.el
index 181dc5fd36..d19687d976 100644
--- a/lisp/org-src.el
+++ b/lisp/org-src.el
@@ -245,7 +245,8 @@ but the mode to use is `tuareg-mode'."
:type '(repeat
(cons
(string :tag "Language name")
- (symbol :tag "Major mode"))))
+ (symbol :tag "Major mode")))
+ :safe t)
(defcustom org-src-block-faces nil
"Alist of faces to be used for source-block.
diff --git a/lisp/org.el b/lisp/org.el
index 1b7b45daf5..ea7f38a7b1 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -1074,7 +1074,8 @@ This variable can be nil, t, or an a list of entries like
(choice (const :tag "Keep region" t)
(const :tag "Deactivate region" nil))))
:package-version '(Org . "9.8")
- :group 'org-edit-structure)
+ :group 'org-edit-structure
+ :safe t)
(defun org--deactivate-mark ()
"Return non-nil when `this-command' should deactivate mark upon completion.
@@ -2496,7 +2497,8 @@ highest priority, it is smaller than the lowest \"C\"
priority:
:group 'org-priorities
:package-version '(Org . "9.8")
:type '( restricted-sexp :tag "Number 0-64 or uppercase character A-Z"
- :match-alternatives ((lambda (val) (org-priority-valid-value-p val
t)))))
+ :match-alternatives ((lambda (val) (org-priority-valid-value-p val
t))))
+ :safe t)
(defvaralias 'org-lowest-priority 'org-priority-lowest)
(defcustom org-priority-lowest ?C
@@ -2518,7 +2520,8 @@ priority, it is greater than the highest \"A\" priority:
67 >
:group 'org-priorities
:package-version '(Org . "9.8")
:type '( restricted-sexp :tag "Number 0-64 or uppercase character A-Z"
- :match-alternatives ((lambda (val) (org-priority-valid-value-p val
t)))))
+ :match-alternatives ((lambda (val) (org-priority-valid-value-p val
t))))
+ :safe t)
(defvaralias 'org-default-priority 'org-priority-default)
(defcustom org-priority-default ?B
@@ -2534,7 +2537,8 @@ first step refuses to set the default and the second will
fall back on
:group 'org-priorities
:package-version '(Org . "9.8")
:type '( restricted-sexp :tag "Number 0-64 or uppercase character A-Z"
- :match-alternatives ((lambda (val) (org-priority-valid-value-p val
t)))))
+ :match-alternatives ((lambda (val) (org-priority-valid-value-p val
t))))
+ :safe t)
(defcustom org-priority-start-cycle-with-default t
"Non-nil means start with default priority when starting to cycle.
@@ -2626,7 +2630,8 @@ stripped from the format strings in Emacs buffers. The
brackets
will be preserved on export."
:group 'org-time
:package-version '(Org . "9.8")
- :type '(cons string string))
+ :type '(cons string string)
+ :safe t)
(defun org-time-stamp-format (&optional with-time inactive custom)
"Get timestamp format for a time string.
@@ -3076,7 +3081,8 @@ For an example of a function that uses this advanced
sorting system, see
(const :tag "Reverse alphabetical" org-string>)
(const :tag "Sort by hierarchy" org-tags-sort-hierarchy)
(function :tag "Custom function" nil)
- (repeat function)))
+ (repeat function))
+ :safe nil)
(defvar org-tags-history nil
"History of minibuffer reads for tags.")
@@ -3547,7 +3553,8 @@ Place-holders only used by `:image-converter':
:group 'org-latex
:package-version '(Org . "9.8")
:type '(alist :tag "LaTeX to image backends"
- :value-type (plist)))
+ :value-type (plist))
+ :safe nil)
(defcustom org-preview-latex-image-directory "ltximg/"
"Path to store latex preview images.
@@ -3566,7 +3573,8 @@ processed Org files paths. An absolute path puts all
files
in the same place."
:group 'org-latex
:package-version '(Org . "9.8")
- :type 'string)
+ :type 'string
+ :safe nil)
(defun org-format-latex-mathml-available-p ()
"Return t if `org-latex-to-mathml-convert-command' is usable."
diff --git a/lisp/ox-html.el b/lisp/ox-html.el
index 0393c01f96..73d981fa07 100644
--- a/lisp/ox-html.el
+++ b/lisp/ox-html.el
@@ -456,7 +456,8 @@ this style. If you don't want to include this default
style,
customize `org-html-head-include-default-style'."
:group 'org-export-html
:package-version '(Org . "9.8")
- :type 'string)
+ :type 'string
+ :safe t)
;;; User Configuration Variables
@@ -1175,7 +1176,8 @@ attribute. See `format-time-string' for more information
on its
components."
:type '(cons string string)
:group 'org-export-html
- :package-version '(Org . "9.8"))
+ :package-version '(Org . "9.8")
+ :safe t)
;;;; Template :: Mathjax
@@ -1566,7 +1568,8 @@ or for publication projects using the :html-head
property."
:group 'org-export-html
:package-version '(Org . "9.8")
:type '(choice (string :tag "Literal text to insert")
- (function :tag "Function evaluating to a string")))
+ (function :tag "Function evaluating to a string"))
+ :safe t)
;;;###autoload
(put 'org-html-head 'safe-local-variable 'stringp)
@@ -1580,7 +1583,8 @@ a string."
:group 'org-export-html
:package-version '(Org . "9.8")
:type '(choice (string :tag "Literal text to insert")
- (function :tag "Function evaluating to a string")))
+ (function :tag "Function evaluating to a string"))
+ :safe t)
;;;###autoload
(put 'org-html-head-extra 'safe-local-variable 'stringp)
diff --git a/lisp/ox-md.el b/lisp/ox-md.el
index 244523c56d..ae4224b3f2 100644
--- a/lisp/ox-md.el
+++ b/lisp/ox-md.el
@@ -106,7 +106,8 @@ converted to markdown.
When nil, the links still point to the plain \".org\" file."
:group 'org-export-md
:package-version '(Org . "9.8")
- :type 'boolean)
+ :type 'boolean
+ :safe t)
diff --git a/lisp/ox-odt.el b/lisp/ox-odt.el
index d63888fa25..36c8342ef3 100644
--- a/lisp/ox-odt.el
+++ b/lisp/ox-odt.el
@@ -383,7 +383,8 @@ replacements. See info node `(org)Advanced Export
Configuration'."
:package-version '(Org . "9.8")
:type '(choice (const :tag "Leave forbidden characters as-is" t)
(const :tag "Err when forbidden characters encountered" nil)
- (string :tag "Replacement string")))
+ (string :tag "Replacement string"))
+ :safe t)
;;;; Debugging
@@ -731,7 +732,6 @@ SYMBOL Convert the LaTeX fragments to images using
any symbol
If the desired converter is not available or any other symbol is
provided, process as `verbatim'."
- :version "24.4"
:package-version '(Org . "9.8")
:type `(choice
(const :tag "Do not process math in any way" nil)
@@ -743,7 +743,8 @@ provided, process as `verbatim'."
:match-alternatives
(,(lambda (v)
(assq v org-preview-latex-process-alist))))
- (const :tag "Leave math verbatim" verbatim)))
+ (const :tag "Leave math verbatim" verbatim))
+ :safe t)
;;;; Links
diff --git a/lisp/ox.el b/lisp/ox.el
index e582ff1f94..8f7c9bbfa1 100644
--- a/lisp/ox.el
+++ b/lisp/ox.el
@@ -886,7 +886,8 @@ This variable does not affect {{{results}}} macros when
processing
code block results."
:group 'org-export-general
:package-version '(Org . "9.8")
- :type 'boolean)
+ :type 'boolean
+ :safe (lambda (obj) (null obj)))
(defcustom org-export-snippet-translation-alist nil
"Alist between export snippets backends and exporter backends.
