[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals-release/org 10dc9de 3/3: Merge branch 'km/from-emacs-28
From: |
ELPA Syncer |
Subject: |
[elpa] externals-release/org 10dc9de 3/3: Merge branch 'km/from-emacs-28' into bugfix |
Date: |
Sat, 2 Oct 2021 14:57:24 -0400 (EDT) |
branch: externals-release/org
commit 10dc9debb99f2e1d00e03ccf881fd1fad3c6a387
Merge: df7b0ea 41e67cf
Author: Kyle Meyer <kyle@kyleam.com>
Commit: Kyle Meyer <kyle@kyleam.com>
Merge branch 'km/from-emacs-28' into bugfix
---
lisp/oc-csl.el | 11 +++++++----
lisp/oc-natbib.el | 3 +--
lisp/oc.el | 21 +++++++--------------
lisp/ol.el | 18 ++++++------------
lisp/org-keys.el | 3 +--
lisp/org-num.el | 3 +--
6 files changed, 23 insertions(+), 36 deletions(-)
diff --git a/lisp/oc-csl.el b/lisp/oc-csl.el
index a7f9e8e..3d13880 100644
--- a/lisp/oc-csl.el
+++ b/lisp/oc-csl.el
@@ -127,7 +127,9 @@ If nil then only the fallback en-US locale will be
available."
:type '(choice
(directory :tag "Locales directory")
(const :tag "Use en-US locale only" nil))
- :safe t)
+ ;; It's not obvious to me that arbitrary locations are safe.
+;;; :safe #'string-or-null-p
+ )
(defcustom org-cite-csl-styles-dir nil
"Directory of CSL style files.
@@ -138,7 +140,9 @@ directory. This variable is ignored when style file is
absolute."
:type '(choice
(directory :tag "Styles directory")
(const :tag "Use absolute file names" nil))
- :safe t)
+ ;; It's not obvious to me that arbitrary locations are safe.
+;;; :safe #'string-or-null-p
+ )
;;;; Citelinks
(defcustom org-cite-csl-link-cites t
@@ -154,8 +158,7 @@ Cite linking for export back-ends derived from any of the
back-ends listed here,
is also disabled."
:group 'org-cite
:package-version '(Org . "9.5")
- :type '(repeat symbol)
- :safe t)
+ :type '(repeat symbol))
;;;; Output-specific variables
(defcustom org-cite-csl-html-hanging-indent "1.5em"
diff --git a/lisp/oc-natbib.el b/lisp/oc-natbib.el
index c012ff1..13cac9e 100644
--- a/lisp/oc-natbib.el
+++ b/lisp/oc-natbib.el
@@ -71,8 +71,7 @@ If \"natbib\" package is already required in the document,
e.g., through
(const :tag "order as above, but numerical citations are compressed if
possible" sort&compress)
(const :tag "display full author list on first citation, abbreviate the
others" longnamesfirst)
(const :tag "redefine \\thebibliography to issue \\section* instead of
\\chapter*" sectionbib)
- (const :tag "keep all the authors' names in a citation on one line"
nonamebreak))
- :safe t)
+ (const :tag "keep all the authors' names in a citation on one line"
nonamebreak)))
;;; Internal functions
diff --git a/lisp/oc.el b/lisp/oc.el
index 5562753..bbf2195 100644
--- a/lisp/oc.el
+++ b/lisp/oc.el
@@ -127,16 +127,14 @@ File names must be absolute."
:package-version '(Org . "9.5")
:type '(choice (const :tag "No global bibliography" nil)
(repeat :tag "List of bibliography files"
- (file :tag "Bibliography")))
- :safe t)
+ (file :tag "Bibliography"))))
(defcustom org-cite-activate-processor 'basic
"Processor used for activating citations, as a symbol."
:group 'org-cite
:package-version '(Org . "9.5")
:type '(choice (const :tag "Default fontification" nil)
- (symbol :tag "Citation processor"))
- :safe nil)
+ (symbol :tag "Citation processor")))
(defcustom org-cite-export-processors '((t basic))
"Processor used for exporting citations, as a triplet, or nil.
@@ -200,24 +198,21 @@ back-end."
(string :tag "Use specific bibliography style"))
(choice
(const :tag "Default citation style" nil)
- (string :tag "Use specific citation style")))))
- :safe nil)
+ (string :tag "Use specific citation style"))))))
(defcustom org-cite-follow-processor 'basic
"Processor used for following citations, as a symbol."
:group 'org-cite
:package-version '(Org . "9.5")
:type '(choice (const :tag "No following" nil)
- (symbol :tag "Citation processor"))
- :safe nil)
+ (symbol :tag "Citation processor")))
(defcustom org-cite-insert-processor 'basic
"Processor used for inserting citations, as a symbol."
:group 'org-cite
:package-version '(Org . "9.5")
:type '(choice (const :tag "No insertion" nil)
- (symbol :tag "Citation processor"))
- :safe nil)
+ (symbol :tag "Citation processor")))
(defcustom org-cite-adjust-note-numbers t
"When non-nil, allow process to modify location of note numbers.
@@ -299,8 +294,7 @@ This roughly follows the Oxford Guide to Style
recommendations."
(const :tag "Citation next to punctuation" same))
(choice :tag "Order of citation and punctuation"
(const :tag "Citation first" before)
- (const :tag "Citation last" after))))
- :safe t)
+ (const :tag "Citation last" after)))))
(defcustom org-cite-punctuation-marks '("." "," ";" ":" "!" "?")
"List of strings that can be moved around when placing note numbers.
@@ -310,8 +304,7 @@ allowed to shuffle punctuation marks specified in this list
in order to
place note numbers according to rules defined in `org-cite-note-rules'."
:group 'org-cite
:package-version '(Org . "9.5")
- :type '(repeat string)
- :safe t)
+ :type '(repeat string))
;;; Citation processors
diff --git a/lisp/ol.el b/lisp/ol.el
index e4a5a27..aa18497 100644
--- a/lisp/ol.el
+++ b/lisp/ol.el
@@ -178,8 +178,7 @@ link.
:group 'org-link
:package-version '(Org . "9.1")
:type '(alist :tag "Link display parameters"
- :value-type plist)
- :safe nil)
+ :value-type plist))
(defcustom org-link-descriptive t
"Non-nil means Org displays descriptive links.
@@ -335,8 +334,7 @@ another window."
(cons (const wl)
(choice
(const wl)
- (const wl-other-frame))))
- :safe nil)
+ (const wl-other-frame)))))
(defcustom org-link-search-must-match-exact-headline 'query-to-create
"Non-nil means internal fuzzy links can only match headlines.
@@ -385,15 +383,13 @@ single keystroke rather than having to type \"yes\"."
:type '(choice
(const :tag "with yes-or-no (safer)" yes-or-no-p)
(const :tag "with y-or-n (faster)" y-or-n-p)
- (const :tag "no confirmation (dangerous)" nil))
- :safe nil)
+ (const :tag "no confirmation (dangerous)" nil)))
(defcustom org-link-shell-skip-confirm-regexp ""
"Regexp to skip confirmation for shell links."
:group 'org-link-follow
:version "24.1"
- :type 'regexp
- :safe nil)
+ :type 'regexp)
(defcustom org-link-elisp-confirm-function 'yes-or-no-p
"Non-nil means ask for confirmation before executing Emacs Lisp links.
@@ -410,15 +406,13 @@ single keystroke rather than having to type \"yes\"."
:type '(choice
(const :tag "with yes-or-no (safer)" yes-or-no-p)
(const :tag "with y-or-n (faster)" y-or-n-p)
- (const :tag "no confirmation (dangerous)" nil))
- :safe nil)
+ (const :tag "no confirmation (dangerous)" nil)))
(defcustom org-link-elisp-skip-confirm-regexp ""
"A regexp to skip confirmation for Elisp links."
:group 'org-link-follow
:version "24.1"
- :type 'regexp
- :safe nil)
+ :type 'regexp)
(defgroup org-link-store nil
"Options concerning storing links in Org mode."
diff --git a/lisp/org-keys.el b/lisp/org-keys.el
index 8fa551a..a10db7e 100644
--- a/lisp/org-keys.el
+++ b/lisp/org-keys.el
@@ -279,8 +279,7 @@ before org.el is loaded."
:type '(choice
(const :tag "A double click follows the link" double)
(const :tag "Unconditionally follow the link with mouse-1" t)
- (integer :tag "mouse-1 click does not follow the link if longer than
N ms" 450))
- :safe t)
+ (integer :tag "mouse-1 click does not follow the link if longer than
N ms" 450)))
(defcustom org-tab-follows-link nil
"Non-nil means on links TAB will follow the link.
diff --git a/lisp/org-num.el b/lisp/org-num.el
index 408b86f..f00e6c4 100644
--- a/lisp/org-num.el
+++ b/lisp/org-num.el
@@ -99,8 +99,7 @@ Any `face' text property on the returned string overrides
`org-num-face'."
:group 'org-appearance
:package-version '(Org . "9.3")
- :type 'function
- :safe nil)
+ :type 'function)
(defcustom org-num-max-level nil
"Level below which headlines are not numbered.