Fix insertion of edited servers in the dribble file

[gnu-emacs] / lisp / gnus / mml-sec.el

diff --git a/lisp/gnus/mml-sec.el b/lisp/gnus/mml-sec.el
index 0a5f472079d359b7e2adba44a3add40a18dea64c..3ac3da0127d1c45e105c09cc92295e0e5ca2532d 100644 (file)
--- a/lisp/gnus/mml-sec.el
+++ b/lisp/gnus/mml-sec.el
@@ -432,15 +432,18 @@ If called with a prefix argument, only encrypt (do NOT sign)."
 
 ;;; Common functionality for mml1991.el, mml2015.el, mml-smime.el
 
-(define-obsolete-variable-alias 'mml1991-signers 'mml-secure-openpgp-signers)
-(define-obsolete-variable-alias 'mml2015-signers 'mml-secure-openpgp-signers)
+(define-obsolete-variable-alias 'mml1991-signers 'mml-secure-openpgp-signers
+  "25.1")
+(define-obsolete-variable-alias 'mml2015-signers 'mml-secure-openpgp-signers
+  "25.1")
 (defcustom mml-secure-openpgp-signers nil
   "A list of your own key ID(s) which will be used to sign OpenPGP messages.
 If set, it is added to the setting of `mml-secure-openpgp-sign-with-sender'."
   :group 'mime-security
   :type '(repeat (string :tag "Key ID")))
 
-(define-obsolete-variable-alias 'mml-smime-signers 'mml-secure-smime-signers)
+(define-obsolete-variable-alias 'mml-smime-signers 'mml-secure-smime-signers
+  "25.1")
 (defcustom mml-secure-smime-signers nil
   "A list of your own key ID(s) which will be used to sign S/MIME messages.
 If set, it is added to the setting of `mml-secure-smime-sign-with-sender'."
@@ -448,9 +451,9 @@ If set, it is added to the setting of `mml-secure-smime-sign-with-sender'."
   :type '(repeat (string :tag "Key ID")))
 
 (define-obsolete-variable-alias
-  'mml1991-encrypt-to-self 'mml-secure-openpgp-encrypt-to-self)
+  'mml1991-encrypt-to-self 'mml-secure-openpgp-encrypt-to-self "25.1")
 (define-obsolete-variable-alias
-  'mml2015-encrypt-to-self 'mml-secure-openpgp-encrypt-to-self)
+  'mml2015-encrypt-to-self 'mml-secure-openpgp-encrypt-to-self "25.1")
 (defcustom mml-secure-openpgp-encrypt-to-self nil
   "List of own key ID(s) or t; determines additional recipients with OpenPGP.
 If t, also encrypt to key for message sender; if list, encrypt to those keys.
@@ -469,7 +472,7 @@ https://debbugs.gnu.org/cgi/bugreport.cgi?bug=18718"
                 (repeat (string :tag "Key ID"))))
 
 (define-obsolete-variable-alias
-  'mml-smime-encrypt-to-self 'mml-secure-smime-encrypt-to-self)
+  'mml-smime-encrypt-to-self 'mml-secure-smime-encrypt-to-self "25.1")
 (defcustom mml-secure-smime-encrypt-to-self nil
   "List of own key ID(s) or t; determines additional recipients with S/MIME.
 If t, also encrypt to key for message sender; if list, encrypt to those keys.
@@ -488,7 +491,7 @@ https://debbugs.gnu.org/cgi/bugreport.cgi?bug=18718"
                 (repeat (string :tag "Key ID"))))
 
 (define-obsolete-variable-alias
-  'mml2015-sign-with-sender 'mml-secure-openpgp-sign-with-sender)
+  'mml2015-sign-with-sender 'mml-secure-openpgp-sign-with-sender "25.1")
 ;mml1991-sign-with-sender did never exist.
 (defcustom mml-secure-openpgp-sign-with-sender nil
   "If t, use message sender to find an OpenPGP key to sign with."
@@ -496,14 +499,14 @@ https://debbugs.gnu.org/cgi/bugreport.cgi?bug=18718"
   :type 'boolean)
 
 (define-obsolete-variable-alias
-  'mml-smime-sign-with-sender 'mml-secure-smime-sign-with-sender)
+  'mml-smime-sign-with-sender 'mml-secure-smime-sign-with-sender "25.1")
 (defcustom mml-secure-smime-sign-with-sender nil
   "If t, use message sender to find an S/MIME key to sign with."
   :group 'mime-security
   :type 'boolean)
 
 (define-obsolete-variable-alias
-  'mml2015-always-trust 'mml-secure-openpgp-always-trust)
+  'mml2015-always-trust 'mml-secure-openpgp-always-trust "25.1")
 ;mml1991-always-trust did never exist.
 (defcustom mml-secure-openpgp-always-trust t
   "If t, skip key validation of GnuPG on encryption."
@@ -513,6 +516,7 @@ https://debbugs.gnu.org/cgi/bugreport.cgi?bug=18718"
 (defcustom mml-secure-fail-when-key-problem nil
   "If t, raise an error if some key is missing or several keys exist.
 Otherwise, ask the user."
+  :version "25.1"
   :group 'mime-security
   :type 'boolean)
 
@@ -523,6 +527,7 @@ This variable is only relevant if a recipient owns multiple key pairs (for
 encryption) or you own multiple key pairs (for signing).  In such cases,
 you will be asked which key(s) should be used, and your choice can be
 customized in this variable."
+  :version "25.1"
   :group 'mime-security
   :type '(alist :key-type (symbol :tag "Protocol") :value-type
                (alist :key-type (symbol :tag "Usage") :value-type
@@ -650,10 +655,10 @@ The passphrase is read and cached."
     (catch 'break
       (dolist (uid uids nil)
        (if (and (stringp (epg-user-id-string uid))
-                (equal (car (mail-header-parse-address
-                             (epg-user-id-string uid)))
-                       (car (mail-header-parse-address
-                             recipient)))
+                (equal (downcase (car (mail-header-parse-address
+                                       (epg-user-id-string uid))))
+                       (downcase (car (mail-header-parse-address
+                                       recipient))))
                 (not (memq (epg-user-id-validity uid)
                            '(revoked expired))))
            (throw 'break t))))))