Backport commit 62d6cecfc from Emacs
* lisp/oc.el (org-cite-activate-processor) (org-cite-export-processors, org-cite-follow-processor) (org-cite-insert-processor): * lisp/ol.el (org-link-parameters, org-link-frame-setup) (org-link-shell-confirm-function) (org-link-shell-skip-confirm-regexp) (org-link-elisp-confirm-function) (org-link-elisp-skip-confirm-regexp): * lisp/org-num.el (org-num-format-function): Remove bogus ":safe nil" that do nothing but propagate a misunderstanding of the safe-local-variable property. Remove bogus ":safe nil" custom properties 62d6cecfcd1a67e15a436c5c2b975f327d9a8b50 Glenn Morris Sat Oct 2 10:46:29 2021 -0700
This commit is contained in:
parent
c3e8709e2d
commit
ec22cf0a53
12
lisp/oc.el
12
lisp/oc.el
|
@ -135,8 +135,7 @@ File names must be absolute."
|
|||
: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 +199,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.
|
||||
|
|
18
lisp/ol.el
18
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."
|
||||
|
|
|
@ -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.
|
||||
|
|
Loading…
Reference in New Issue