Merge remote-tracking branch 'savannah/master' into HEAD

1 files changed, 11 insertions, 17 deletions

diff --git a/lisp/gnus/gnus-sieve.el b/lisp/gnus/gnus-sieve.el
index 3b79d578644..5dcd079fb48 100644
--- a/lisp/gnus/gnus-sieve.el
+++ b/lisp/gnus/gnus-sieve.el
@@ -1,4 +1,4 @@
-;;; gnus-sieve.el --- Utilities to manage sieve scripts for Gnus
+;;; gnus-sieve.el --- Utilities to manage sieve scripts for Gnus  -*- lexical-binding: t; -*-
 
 ;; Copyright (C) 2001-2021 Free Software Foundation, Inc.
 
@@ -40,30 +40,25 @@
 
 (defcustom gnus-sieve-file "~/.sieve"
   "Path to your Sieve script."
-  :type 'file
-  :group 'gnus-sieve)
+  :type 'file)
 
 (defcustom gnus-sieve-region-start "\n## Begin Gnus Sieve Script\n"
   "Line indicating the start of the autogenerated region in your Sieve script."
-  :type 'string
-  :group 'gnus-sieve)
+  :type 'string)
 
 (defcustom gnus-sieve-region-end "\n## End Gnus Sieve Script\n"
   "Line indicating the end of the autogenerated region in your Sieve script."
-  :type 'string
-  :group 'gnus-sieve)
+  :type 'string)
 
 (defcustom gnus-sieve-select-method nil
   "Which select method we generate the Sieve script for.
 For example: \"nnimap:mailbox\""
   ;; FIXME? gnus-select-method?
-  :type '(choice (const nil) string)
-  :group 'gnus-sieve)
+  :type '(choice (const nil) string))
 
 (defcustom gnus-sieve-crosspost t
   "Whether the generated Sieve script should do crossposting."
-  :type 'boolean
-  :group 'gnus-sieve)
+  :type 'boolean)
 
 (defcustom gnus-sieve-update-shell-command "echo put %f | sieveshell %s"
   "Shell command to execute after updating your Sieve script.  The following
@@ -71,8 +66,7 @@ formatting characters are recognized:
 
 %f    Script's file name (gnus-sieve-file)
 %s    Server name (from gnus-sieve-select-method)"
-  :type 'string
-  :group 'gnus-sieve)
+  :type 'string)
 
 ;;;###autoload
 (defun gnus-sieve-update ()
@@ -140,7 +134,7 @@ For example:
 \(gnus-sieve-string-list \\='(\"to\" \"cc\"))
   => \"[\\\"to\\\", \\\"cc\\\"]\"
 "
-  (concat "[\"" (mapconcat 'identity list "\", \"") "\"]"))
+  (concat "[\"" (mapconcat #'identity list "\", \"") "\"]"))
 
 (defun gnus-sieve-test-list (list)
   "Convert an elisp test list to a Sieve test list.
@@ -148,7 +142,7 @@ For example:
 For example:
 \(gnus-sieve-test-list \\='((address \"sender\" \"boss@company.com\") (size :over 4K)))
   => \"(address \\\"sender\\\" \\\"boss@company.com\\\", size :over 4K)\""
-  (concat "(" (mapconcat 'gnus-sieve-test list ", ") ")"))
+  (concat "(" (mapconcat #'gnus-sieve-test list ", ") ")"))
 
 ;; FIXME: do proper quoting
 (defun gnus-sieve-test-token (token)
@@ -189,7 +183,7 @@ For example:
 			  (size :over 100K))))
   => \"anyof (header :contains [\\\"to\\\", \\\"cc\\\"] \\\"my@address.com\\\",
 	     size :over 100K)\""
-  (mapconcat 'gnus-sieve-test-token test " "))
+  (mapconcat #'gnus-sieve-test-token test " "))
 
 (defun gnus-sieve-script (&optional method crosspost)
   "Generate a Sieve script based on groups with select method METHOD
@@ -228,7 +222,7 @@ This is returned as a string."
 			    "\tstop;\n")
 			  "}")
 		  script)))))
-    (mapconcat 'identity script "\n")))
+    (mapconcat #'identity script "\n")))
 
 (provide 'gnus-sieve)