summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/align.el14
-rw-r--r--lisp/bindings.el5
-rw-r--r--lisp/filesets.el14
-rw-r--r--lisp/hi-lock.el5
-rw-r--r--lisp/mail/mailalias.el8
-rw-r--r--lisp/mail/rmail.el2
-rw-r--r--lisp/mail/sendmail.el4
-rw-r--r--lisp/mail/supercite.el16
-rw-r--r--lisp/progmodes/make-mode.el4
-rw-r--r--lisp/so-long.el2
-rw-r--r--lisp/textmodes/sgml-mode.el4
11 files changed, 36 insertions, 42 deletions
diff --git a/lisp/align.el b/lisp/align.el
index 1ee6bb0cacb..be70f8f9d4f 100644
--- a/lisp/align.el
+++ b/lisp/align.el
@@ -86,10 +86,9 @@
;; '((my-rule
;; (regexp . "Sample")))
;; :type align-rules-list-type
+;; :risky t
;; :group 'my-package)
;;
-;; (put 'my-align-rules-list 'risky-local-variable t)
-;;
;; (add-to-list 'align-dq-string-modes 'my-package-mode)
;; (add-to-list 'align-open-comment-modes 'my-package-mode)
;;
@@ -319,10 +318,9 @@ The possible settings for `align-region-separate' are:
; (const largest)
(regexp :tag "Regexp defines section boundaries")
(function :tag "Function defines section boundaries"))
+ :risky t
:group 'align)
-(put 'align-region-separate 'risky-local-variable t)
-
(defvar align-rules-list-type
'(repeat
(cons
@@ -699,10 +697,9 @@ The following attributes are meaningful:
(see the documentation of that variable for possible
values), and any separation argument passed to `align'."
:type align-rules-list-type
+ :risky t
:group 'align)
-(put 'align-rules-list 'risky-local-variable t)
-
(defvar align-exclude-rules-list-type
'(repeat
(cons
@@ -770,10 +767,9 @@ The following attributes are meaningful:
"A list describing text that should be excluded from alignment.
See the documentation for `align-rules-list' for more info."
:type align-exclude-rules-list-type
+ :risky t
:group 'align)
-(put 'align-exclude-rules-list 'risky-local-variable t)
-
;;; Internal Variables:
(defvar-local align-mode-rules-list nil
@@ -823,8 +819,8 @@ See the variable `align-exclude-rules-list' for more details.")
(regexp . "\\(\\s-+\\)use\\s-+entity")))
"Alignment rules for `vhdl-mode'. See `align-rules-list' for more info."
:type align-rules-list-type
+ :risky t
:group 'align)
-(put 'align-vhdl-rules-list 'risky-local-variable t)
(make-obsolete-variable 'align-vhdl-rules-list "no longer used." "27.1")
(defun align-set-vhdl-rules ()
diff --git a/lisp/bindings.el b/lisp/bindings.el
index 0cf1834a4fd..ec9b219fc09 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -1,7 +1,6 @@
;;; bindings.el --- define standard key bindings and some variables -*- lexical-binding: t; -*-
-;; Copyright (C) 1985-1987, 1992-1996, 1999-2022 Free Software
-;; Foundation, Inc.
+;; Copyright (C) 1985-2022 Free Software Foundation, Inc.
;; Maintainer: emacs-devel@gnu.org
;; Keywords: internal
@@ -458,8 +457,8 @@ displayed in `mode-line-position', a component of the default
(const :tag "\"%q\": Offsets of both top and bottom of window"
(6 "%q")))
:version "26.1"
+ :risky t
:group 'mode-line)
-(put 'mode-line-percent-position 'risky-local-variable t)
(defcustom mode-line-position-line-format '(" L%l")
"Format used to display line numbers in the mode line.
diff --git a/lisp/filesets.el b/lisp/filesets.el
index b1829793f11..a8d837e7e15 100644
--- a/lisp/filesets.el
+++ b/lisp/filesets.el
@@ -326,8 +326,8 @@ See `easy-menu-add-item' for documentation."
Set this to \"\", to disable caching of menus.
Don't forget to check out `filesets-menu-ensure-use-cached'."
:set #'filesets-set-default
- :type 'file)
-(put 'filesets-menu-cache-file 'risky-local-variable t)
+ :type 'file
+ :risky t)
(defcustom filesets-menu-cache-contents
'(filesets-be-docile-flag
@@ -546,6 +546,7 @@ function that returns one) to be run on a filesets' files.
The argument <file-name> or <<file-name>> (quoted) will be replaced with
the filename."
:set #'filesets-set-default+
+ :risky t
:type '(repeat :tag "Commands"
(list :tag "Definition" :value ("")
(string "Name")
@@ -561,8 +562,7 @@ the filename."
(string :tag "Quoted File Name"
:value "<<file-name>>")
(function :tag "Function"
- :value nil))))))
-(put 'filesets-commands 'risky-local-variable t)
+ :value nil))))))
(defcustom filesets-external-viewers
(let
@@ -651,6 +651,7 @@ In order to view pdf or rtf files in an Emacs buffer, you could use these:
(and (filesets-which-command-p \"rtf2htm\")
(filesets-which-command-p \"w3m\"))))))"
:set #'filesets-set-default
+ :risky t
:type '(repeat :tag "Viewer"
(list :tag "Definition"
:value ("^.+\\.suffix$" "")
@@ -707,7 +708,6 @@ In order to view pdf or rtf files in an Emacs buffer, you could use these:
(const :format ""
:value :capture-output)
(boolean :tag "Boolean")))))))
-(put 'filesets-external-viewers 'risky-local-variable t)
(defcustom filesets-ingroup-patterns
'(("^.+\\.tex$" t
@@ -848,6 +848,7 @@ With duplicates removed, it would be:
M + A - X
B"
:set #'filesets-set-default
+ :risky t
:type '(repeat
:tag "Include"
(list
@@ -894,7 +895,6 @@ With duplicates removed, it would be:
:value (:preprocess)
(const :format "" :value :preprocess)
(function :tag "Function"))))))))
-(put 'filesets-ingroup-patterns 'risky-local-variable t)
(defcustom filesets-data nil
"Fileset definitions.
@@ -965,6 +965,7 @@ is used.
Before using :ingroup, make sure that the file type is already
defined in `filesets-ingroup-patterns'."
:set #'filesets-data-set-default
+ :risky t
:type '(repeat
(cons :tag "Fileset"
(string :tag "Name" :value "")
@@ -1021,7 +1022,6 @@ defined in `filesets-ingroup-patterns'."
:value (:open)
(const :format "" :value :open)
(function :tag "Function")))))))
-(put 'filesets-data 'risky-local-variable t)
(defcustom filesets-query-user-limit 15
diff --git a/lisp/hi-lock.el b/lisp/hi-lock.el
index b56f26d5297..a45e74eca26 100644
--- a/lisp/hi-lock.el
+++ b/lisp/hi-lock.el
@@ -128,11 +128,10 @@ patterns."
(const :tag "Ask about file patterns" ask)
(function :tag "Function to check file patterns"))
:group 'hi-lock
+ ;; It can have a function value.
+ :risky t
:version "22.1")
-;; It can have a function value.
-(put 'hi-lock-file-patterns-policy 'risky-local-variable t)
-
(defcustom hi-lock-auto-select-face nil
"When nil, highlighting commands prompt for the face to use.
When non-nil, highlighting command determine the faces to use
diff --git a/lisp/mail/mailalias.el b/lisp/mail/mailalias.el
index c97786190c3..57fb1117b60 100644
--- a/lisp/mail/mailalias.el
+++ b/lisp/mail/mailalias.el
@@ -74,8 +74,8 @@ When t this still needs to be initialized.")
The expression may reference the variable `pattern'
which will hold the string being completed."
:type 'alist
+ :risky t
:group 'mailalias)
-(put 'mail-complete-alist 'risky-local-variable t)
;;;###autoload
(defcustom mail-complete-style 'angles
@@ -121,8 +121,8 @@ or like this:
(remote-shell-program \"HOST\" \"-n\" \"COMMAND \\='^\" pattern \"\\='\")"
:type 'sexp
+ :risky t
:group 'mailalias)
-(put 'mail-directory-process 'risky-local-variable t)
(defcustom mail-directory-stream nil
"List of (HOST SERVICE) for stream connection to mail directory."
@@ -132,8 +132,8 @@ or like this:
(string :tag "Service name"))
(plist :inline t
:tag "Additional open-network-stream parameters")))
+ :risky t
:group 'mailalias)
-(put 'mail-directory-stream 'risky-local-variable t)
(defcustom mail-directory-parser nil
"How to interpret the output of `mail-directory-function'.
@@ -143,8 +143,8 @@ Three types of values are possible:
- regexp means first \\(grouping\\) in successive matches is name
- function called at beginning of buffer that returns an alist of names"
:type '(choice (const nil) regexp function)
+ :risky t
:group 'mailalias)
-(put 'mail-directory-parser 'risky-local-variable t)
;; Internal variables.
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index a970ab2a760..71eda7cd2b0 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -448,8 +448,8 @@ as argument, to ask the user that question."
(const :tag "Confirm with y-or-n-p" y-or-n-p)
(const :tag "Confirm with yes-or-no-p" yes-or-no-p))
:version "21.1"
+ :risky t
:group 'rmail-files)
-(put 'rmail-confirm-expunge 'risky-local-variable t)
;;;###autoload
(defvar rmail-mode-hook nil
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 6afadca6bb3..8cb079f7fbe 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -372,8 +372,8 @@ and should insert whatever you want to insert."
:type '(choice (const :tag "None" nil)
(const :tag "Use `.signature' file" t)
(string :tag "String to insert")
- (sexp :tag "Expression to evaluate")))
-(put 'mail-signature 'risky-local-variable t)
+ (sexp :tag "Expression to evaluate"))
+ :risky t)
;;;###autoload
(defcustom mail-signature-file (purecopy "~/.signature")
diff --git a/lisp/mail/supercite.el b/lisp/mail/supercite.el
index 5dc5ee38ffd..f320246f2de 100644
--- a/lisp/mail/supercite.el
+++ b/lisp/mail/supercite.el
@@ -146,8 +146,8 @@ a variable whose value is a citation frame."
:type '(repeat (list symbol (repeat (cons regexp
(choice (repeat (repeat sexp))
symbol)))))
+ :risky t
:group 'supercite-frames)
-(put 'sc-cite-frame-alist 'risky-local-variable t)
(defcustom sc-uncite-frame-alist '()
"Alist for frame selection during unciting.
@@ -155,8 +155,8 @@ See the variable `sc-cite-frame-alist' for details."
:type '(repeat (list symbol (repeat (cons regexp
(choice (repeat (repeat sexp))
symbol)))))
+ :risky t
:group 'supercite-frames)
-(put 'sc-uncite-frame-alist 'risky-local-variable t)
(defcustom sc-recite-frame-alist '()
"Alist for frame selection during reciting.
@@ -164,8 +164,8 @@ See the variable `sc-cite-frame-alist' for details."
:type '(repeat (list symbol (repeat (cons regexp
(choice (repeat (repeat sexp))
symbol)))))
+ :risky t
:group 'supercite-frames)
-(put 'sc-recite-frame-alist 'risky-local-variable t)
(defcustom sc-default-cite-frame
'(;; initialize fill state and temporary variables when entering
@@ -211,8 +211,8 @@ See the variable `sc-cite-frame-alist' for details."
(end (sc-fill-if-different "")))
"Default REGI frame for citing a region."
:type '(repeat (repeat sexp))
+ :risky t
:group 'supercite-frames)
-(put 'sc-default-cite-frame 'risky-local-variable t)
(defcustom sc-default-uncite-frame
'(;; do nothing on a blank line
@@ -221,8 +221,8 @@ See the variable `sc-cite-frame-alist' for details."
((sc-cite-regexp) (sc-uncite-line)))
"Default REGI frame for unciting a region."
:type '(repeat (repeat sexp))
+ :risky t
:group 'supercite-frames)
-(put 'sc-default-uncite-frame 'risky-local-variable t)
(defcustom sc-default-recite-frame
'(;; initialize fill state when entering frame
@@ -237,8 +237,8 @@ See the variable `sc-cite-frame-alist' for details."
(end (sc-fill-if-different "")))
"Default REGI frame for reciting a region."
:type '(repeat (repeat sexp))
+ :risky t
:group 'supercite-frames)
-(put 'sc-default-recite-frame 'risky-local-variable t)
(defcustom sc-cite-region-limit t
"This variable controls automatic citation of yanked text.
@@ -428,8 +428,8 @@ to be consulted during attribution selection."
(repeat (cons regexp
(choice (sexp :tag "List to eval")
string)))))
+ :risky t
:group 'supercite-attr)
-(put 'sc-attrib-selection-list 'risky-local-variable t)
(defcustom sc-attribs-preselect-hook nil
"Hook to run before selecting an attribution."
@@ -483,8 +483,8 @@ The variable `sc-preferred-header-style' controls which function in
this list is chosen for automatic reference header insertions.
Electric reference mode will cycle through this list of functions."
:type '(repeat sexp)
+ :risky t
:group 'supercite)
-(put 'sc-rewrite-header-list 'risky-local-variable t)
(defcustom sc-titlecue-regexp "\\s +-+\\s +"
"Regular expression describing the separator between names and titles.
diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el
index bd01786e08c..cbbcf1c2b7c 100644
--- a/lisp/progmodes/make-mode.el
+++ b/lisp/progmodes/make-mode.el
@@ -220,8 +220,8 @@ to MODIFY A FILE WITHOUT YOUR CONFIRMATION when \"it seems necessary\"."
"List of special targets.
You will be offered to complete on one of those in the minibuffer whenever
you enter a \".\" at the beginning of a line in `makefile-mode'."
- :type '(repeat string))
-(put 'makefile-special-targets-list 'risky-local-variable t)
+ :type '(repeat string)
+ :risky t)
(defcustom makefile-runtime-macros-list
'(("@") ("&") (">") ("<") ("*") ("^") ("+") ("?") ("%") ("$"))
diff --git a/lisp/so-long.el b/lisp/so-long.el
index 4950f0adb50..82ce2e1755d 100644
--- a/lisp/so-long.el
+++ b/lisp/so-long.el
@@ -684,8 +684,8 @@ subsequently called."
(function :tag "Action")
(function :tag "Revert")))
:set #'so-long--action-alist-setter
+ :risky t
:package-version '(so-long . "1.0"))
-(put 'so-long-action-alist 'risky-local-variable t)
(defcustom so-long-action 'so-long-mode
"The action taken by `so-long' when long lines are detected.
diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el
index 13ff3dcab6a..8f9b603ef5f 100644
--- a/lisp/textmodes/sgml-mode.el
+++ b/lisp/textmodes/sgml-mode.el
@@ -480,8 +480,8 @@ The attribute alist is made up as
ATTRIBUTERULE is a list of optionally t (no value when no input) followed by
an optional alist of possible values."
:type '(repeat (cons (string :tag "Tag Name")
- (repeat :tag "Tag Rule" sexp))))
-(put 'sgml-tag-alist 'risky-local-variable t)
+ (repeat :tag "Tag Rule" sexp)))
+ :risky t)
(defcustom sgml-tag-help
'(("!" . "Empty declaration for comment")