[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals-release/org c3e8709 5/6: Backport commit f9111d878 from
From: |
ELPA Syncer |
Subject: |
[elpa] externals-release/org c3e8709 5/6: Backport commit f9111d878 from Emacs |
Date: |
Sat, 2 Oct 2021 13:57:30 -0400 (EDT) |
branch: externals-release/org
commit c3e8709e2d36145ab844a005c4e4439a8888e13a
Author: Glenn Morris <rgm@gnu.org>
Commit: Kyle Meyer <kyle@kyleam.com>
Backport commit f9111d878 from Emacs
* lisp/oc-basic.el (org-cite-basic-sorting-field)
(org-cite-basic-author-year-separator)
(org-cite-basic-max-key-distance)
(org-cite-basic-author-column-end)
(org-cite-basic-column-separator)
(org-cite-basic-mouse-over-key-face):
* lisp/oc-biblatex.el (org-cite-biblatex-options):
* lisp/oc-csl.el (org-cite-csl-link-cites)
(org-cite-csl-html-hanging-indent)
(org-cite-csl-html-label-width-per-char)
(org-cite-csl-latex-hanging-indent):
* lisp/oc.el (org-cite-adjust-note-numbers):
* lisp/org-keys.el (org-return-follows-link):
* lisp/org.el (org-fontify-todo-headline):
* lisp/ox-html.el (org-html-equation-reference-format)
(org-html-wrap-src-lines):
* lisp/ox-latex.el (org-latex-reference-command)
(org-latex-default-quote-environment): Fix :safe property.
The safe-local-variable property is a function (bug#50944)
f9111d8784bf12263abbe127cdfcbe5f409c9b3b
Glenn Morris
Sat Oct 2 10:37:42 2021 -0700
---
lisp/oc-basic.el | 12 ++++++------
lisp/oc-biblatex.el | 2 +-
lisp/oc-csl.el | 8 ++++----
lisp/oc.el | 2 +-
lisp/org-keys.el | 2 +-
lisp/org.el | 2 +-
lisp/ox-html.el | 4 ++--
lisp/ox-latex.el | 4 ++--
8 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/lisp/oc-basic.el b/lisp/oc-basic.el
index bf0153d..98242f3 100644
--- a/lisp/oc-basic.el
+++ b/lisp/oc-basic.el
@@ -89,42 +89,42 @@
:group 'org-cite
:package-version '(Org . "9.5")
:type 'symbol
- :safe t)
+ :safe #'symbolp)
(defcustom org-cite-basic-author-year-separator ", "
"String used to separate cites in an author-year configuration."
:group 'org-cite
:package-version '(Org . "9.5")
:type 'string
- :safe t)
+ :safe #'stringp)
(defcustom org-cite-basic-max-key-distance 2
"Maximum (Levenshtein) distance between a wrong key and its suggestions."
:group 'org-cite
:package-version '(Org . "9.5")
:type 'integer
- :safe t)
+ :safe #'integerp)
(defcustom org-cite-basic-author-column-end 25
"Column where author field ends in completion table, as an integer."
:group 'org-cite
:package-version '(Org . "9.5")
:type 'integer
- :safe t)
+ :safe #'integerp)
(defcustom org-cite-basic-column-separator " "
"Column separator in completion table, as a string."
:group 'org-cite
:package-version '(Org . "9.5")
:type 'string
- :safe t)
+ :safe #'stringp)
(defcustom org-cite-basic-mouse-over-key-face 'highlight
"Face used when mouse is over a citation key."
:group 'org-cite
:package-version '(Org . "9.5")
:type 'face
- :safe t)
+ :safe #'facep)
;;; Internal variables
diff --git a/lisp/oc-biblatex.el b/lisp/oc-biblatex.el
index 224abae..f517e39 100644
--- a/lisp/oc-biblatex.el
+++ b/lisp/oc-biblatex.el
@@ -80,7 +80,7 @@ If \"biblatex\" package is already required in the document,
e.g., through
:type '(choice
(string :tag "Options (key=value,key2=value2...)")
(const :tag "No option" nil))
- :safe t)
+ :safe #'string-or-null-p)
;;; Internal functions
diff --git a/lisp/oc-csl.el b/lisp/oc-csl.el
index cf3538b..1430779 100644
--- a/lisp/oc-csl.el
+++ b/lisp/oc-csl.el
@@ -146,7 +146,7 @@ directory. This variable is ignored when style file is
absolute."
:group 'org-cite
:package-version '(Org . "9.5")
:type 'boolean
- :safe t)
+ :safe #'booleanp)
(defcustom org-cite-csl-no-citelinks-backends '(ascii)
"List of export back-ends for which cite linking is disabled.
@@ -163,7 +163,7 @@ is also disabled."
:group 'org-cite
:package-version '(Org . "9.5")
:type 'string
- :safe t)
+ :safe #'stringp)
(defcustom org-cite-csl-html-label-width-per-char "0.6em"
"Character width in CSS units for calculating entry label widths.
@@ -171,14 +171,14 @@ Used only when `second-field-align' is activated by the
used CSL style."
:group 'org-cite
:package-version '(Org . "9.5")
:type 'string
- :safe t)
+ :safe #'stringp)
(defcustom org-cite-csl-latex-hanging-indent "1.5em"
"Size of hanging-indent for LaTeX output in valid LaTeX units."
:group 'org-cite
:package-version '(Org . "9.5")
:type 'string
- :safe t)
+ :safe #'stringp)
;;; Internal variables
diff --git a/lisp/oc.el b/lisp/oc.el
index bb2e04d..5562753 100644
--- a/lisp/oc.el
+++ b/lisp/oc.el
@@ -234,7 +234,7 @@ When nil, the note number is not moved."
:package-version '(Org . "9.5")
:type '(choice (const :tag "Automatic note number location" t)
(const :tag "Place note numbers manually" nil))
- :safe t)
+ :safe #'booleanp)
(defcustom org-cite-note-rules
'(("en-us" inside outside after)
diff --git a/lisp/org-keys.el b/lisp/org-keys.el
index 2984a4f..8fa551a 100644
--- a/lisp/org-keys.el
+++ b/lisp/org-keys.el
@@ -300,7 +300,7 @@ implementation is bad."
In tables, the special behavior of RET has precedence."
:group 'org-link-follow
:type 'boolean
- :safe t)
+ :safe #'booleanp)
;;; Functions
diff --git a/lisp/org.el b/lisp/org.el
index 2ec6566..723de64 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -3630,7 +3630,7 @@ When this is non-nil, the headline after the keyword is
set to the
:group 'org-appearance
:package-version '(Org . "9.4")
:type 'boolean
- :safe t)
+ :safe #'booleanp)
(defcustom org-fontify-done-headline t
"Non-nil means change the face of a headline if it is marked DONE.
diff --git a/lisp/ox-html.el b/lisp/ox-html.el
index 60bb77d..a150b1f 100644
--- a/lisp/ox-html.el
+++ b/lisp/ox-html.el
@@ -795,7 +795,7 @@ Most common values are:
:group 'org-export-html
:package-version '(Org . "9.4")
:type 'string
- :safe t)
+ :safe #'stringp)
(defcustom org-html-with-latex org-export-with-latex
"Non-nil means process LaTeX math snippets.
@@ -903,7 +903,7 @@ numbers are enabled."
:group 'org-export-html
:package-version '(Org . "9.3")
:type 'boolean
- :safe t)
+ :safe #'booleanp)
;;;; Table
diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el
index 993c2c6..3e39670 100644
--- a/lisp/ox-latex.el
+++ b/lisp/ox-latex.el
@@ -413,7 +413,7 @@ to \"\\autoref{%s}\" or \"\\cref{%s}\" for example."
:group 'org-export-latex
:type 'string
:package-version '(Org . "9.5")
- :safe t)
+ :safe #'stringp)
;;;; Preamble
@@ -793,7 +793,7 @@ default we use here encompasses both."
:group 'org-export-latex
:package-version '(Org . "9.5")
:type 'string
- :safe t)
+ :safe #'stringp)
(defcustom org-latex-default-table-mode 'table
"Default mode for tables.
- [elpa] externals-release/org updated (06ab36e -> df7b0ea), ELPA Syncer, 2021/10/02
- [elpa] externals-release/org e8b1aed 4/6: doc/doc-setup.org: Absorb header from Emacs repo, ELPA Syncer, 2021/10/02
- [elpa] externals-release/org df7b0ea 6/6: Merge branch 'km/from-emacs-28' into bugfix, ELPA Syncer, 2021/10/02
- [elpa] externals-release/org 439359b 3/6: manfull.pl: Avoid silent failures, ELPA Syncer, 2021/10/02
- [elpa] externals-release/org 881145f 1/6: Backport commit bd60fca2f from Emacs, ELPA Syncer, 2021/10/02
- [elpa] externals-release/org b7df830 2/6: manfull.pl: Adjust pattern for current makeinfo, ELPA Syncer, 2021/10/02
- [elpa] externals-release/org c3e8709 5/6: Backport commit f9111d878 from Emacs,
ELPA Syncer <=