[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/org 06578d7 8/8: Merge branch 'bugfix'
From: |
ELPA Syncer |
Subject: |
[elpa] externals/org 06578d7 8/8: Merge branch 'bugfix' |
Date: |
Sat, 2 Oct 2021 13:57:34 -0400 (EDT) |
branch: externals/org
commit 06578d7450abcc6472b8fa349d6b163deecd6db4
Merge: a46cf53 df7b0ea
Author: Kyle Meyer <kyle@kyleam.com>
Commit: Kyle Meyer <kyle@kyleam.com>
Merge branch 'bugfix'
---
doc/doc-setup.org | 19 ++++++++++++++++++-
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 ++--
9 files changed, 36 insertions(+), 19 deletions(-)
diff --git a/doc/doc-setup.org b/doc/doc-setup.org
index b83d16e..f59660e 100644
--- a/doc/doc-setup.org
+++ b/doc/doc-setup.org
@@ -1,4 +1,21 @@
-# SETUPFILE for manuals
+# SETUPFILE for Org manual
+
+# Copyright (C) 2021 Free Software Foundation, Inc.
+#
+# This file is part of GNU Emacs.
+#
+# GNU Emacs is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# GNU Emacs is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
# XXX: We cannot use TODO keyword as a node starts with "TODO".
#+todo: REVIEW FIXME | DONE
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 4378ab5..a7f9e8e 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 13cc11c..3546e7e 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -3635,7 +3635,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/org updated (20630fc -> 06578d7), ELPA Syncer, 2021/10/02
- [elpa] externals/org 47e0cdd 2/8: manfull.pl: Avoid silent failures, ELPA Syncer, 2021/10/02
- [elpa] externals/org ffdf727 1/8: manfull.pl: Adjust pattern for current makeinfo, ELPA Syncer, 2021/10/02
- [elpa] externals/org fac96da 3/8: org-attach.el: Fix checkdoc warnings, ELPA Syncer, 2021/10/02
- [elpa] externals/org 50e6ccf 5/8: org-manual.org: Mention org-contrib NonGNU ELPA package, ELPA Syncer, 2021/10/02
- [elpa] externals/org aaa184f 6/8: org-manual.org: Another way to run version from git, ELPA Syncer, 2021/10/02
- [elpa] externals/org 06578d7 8/8: Merge branch 'bugfix',
ELPA Syncer <=
- [elpa] externals/org a46cf53 7/8: Revert "org-manual.org: Another way to run version from git", ELPA Syncer, 2021/10/02
- [elpa] externals/org 749368f 4/8: org-manual.el: Restore `load-path' for git version, ELPA Syncer, 2021/10/02