Prefer the defcustom :risky property in gnus

* lisp/gnus/gnus-art.el (gnus-button-alist)
(gnus-header-button-alist):
* lisp/gnus/gnus-group.el (gnus-group-highlight)
(gnus-group-icon-list):
* lisp/gnus/gnus-sum.el (gnus-summary-highlight):
* lisp/gnus/mm-util.el (mm-charset-eval-alist): Prefer the
defcustom :risky property to setting 'risky-local-variable
manually.

diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 3b3564fc30a9ab57a26984f1f8fc9c23a8f6074e..545b55bbea57eb72006c7748181d729f9dcb0567 100644 (file)
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -7935,8 +7935,8 @@ variable is the real callback function."
                       (function :tag "Callback")
                       (repeat :tag "Par"
                               :inline t
-                              (integer :tag "Regexp group")))))
-(put 'gnus-button-alist 'risky-local-variable t)
+                               (integer :tag "Regexp group"))))
+  :risky t)
 
 (defcustom gnus-header-button-alist
   '(("^\\(References\\|Message-I[Dd]\\|^In-Reply-To\\):" "<[^<>]+>"
@@ -7975,8 +7975,8 @@ HEADER is a regexp to match a header.  For a fuller explanation, see
                       (function :tag "Callback")
                       (repeat :tag "Par"
                               :inline t
-                              (integer :tag "Regexp group")))))
-(put 'gnus-header-button-alist 'risky-local-variable t)
+                               (integer :tag "Regexp group"))))
+  :risky t)
 
 ;;; Commands:
 

diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index 2ec001faee743745c49a2cbde092b4a6a93d16ab..b04293067c8554dc9e511e9255ebe20ffa69e80d 100644 (file)
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -380,8 +380,8 @@ variables in the Lisp expression:
 `group-age': Time in seconds since the group was last read
            (see info node `(gnus)Group Timestamp')."
   :group 'gnus-group-visual
-  :type '(repeat (cons (sexp :tag "Form") face)))
-(put 'gnus-group-highlight 'risky-local-variable t)
+  :type '(repeat (cons (sexp :tag "Form") face))
+  :risky t)
 
 (defcustom gnus-new-mail-mark ?%
   "Mark used for groups with new mail."
@@ -409,8 +409,8 @@ requires an understanding of Lisp expressions.  Hopefully this will
 change in a future release.  For now, you can use the same
 variables in the Lisp expression as in `gnus-group-highlight'."
   :group 'gnus-group-icons
-  :type '(repeat (cons (sexp :tag "Form") file)))
-(put 'gnus-group-icon-list 'risky-local-variable t)
+  :type '(repeat (cons (sexp :tag "Form") file))
+  :risky t)
 
 (defcustom gnus-group-name-charset-method-alist nil
   "Alist of method and the charset for group names.

diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index adcc0dbd7b218dbb5c5926adddb7c21fd45e18e2..cda6712f0d813e00c84983c946e062eb12be922c 100644 (file)
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -1182,8 +1182,8 @@ mark:         The article's mark.
 uncached:     Non-nil if the article is uncached."
   :group 'gnus-summary-visual
   :type '(repeat (cons (sexp :tag "Form" nil)
-                      face)))
-(put 'gnus-summary-highlight 'risky-local-variable t)
+                       face))
+  :risky t)
 
 (defcustom gnus-alter-header-function nil
   "Function called to allow alteration of article header structures.

diff --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el
index ddc228e49005343fe8fbc45bb7a2ec70ab74c6ca..a0b3288f13fec69c4c2f6539e6551efbc7709cc8 100644 (file)
--- a/lisp/gnus/mm-util.el
+++ b/lisp/gnus/mm-util.el
@@ -101,9 +101,9 @@ version, you could use `autoload-coding-system' here."
   :type '(list (repeat :inline t
                       :tag "Other options"
                       (cons (symbol :tag "charset")
-                            (symbol :tag "form"))))
+                             (symbol :tag "form"))))
+  :risky t
   :group 'mime)
-(put 'mm-charset-eval-alist 'risky-local-variable t)
 
 (defvar mm-charset-override-alist)