[Emacs-diffs] trunk r116268: * lisp/epa.el (epa-mail-aliases): Fic custom type. Doc tweak.

[Glenn Morris]

------------------------------------------------------------
revno: 116268
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2014-02-05 00:37:39 -0800
message:
  * lisp/epa.el (epa-mail-aliases): Fic custom type.  Doc tweak.
  
  * etc/NEWS: Related edit.
modified:
  etc/NEWS                       news-20100311060928-aoit31wvzf25yr1z-1
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/epa.el                    epa.el-20091113204419-o5vbwnq5f7feedwu-8557

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2014-02-05 07:46:40 +0000
+++ b/etc/NEWS  2014-02-05 08:37:39 +0000
@@ -518,17 +518,8 @@
 strings and comments.
 
 ** New EPA option `epa-mail-aliases'.
-You can set this to a list of alias expansions for keys to use
-in `epa-mail-encrypt'.
-
-If one element of the variable's value is ("address@hidden" "address@hidden"),
-that means: when one of the recipients of the message being encrypted
-is address@hidden', encrypt the message for address@hidden' instead.
-
-If one element of the variable's value is ("address@hidden"),
-that means: when one of the recipients of the message being encrypted
-is address@hidden', ignore that name as regards encryption.
-This is useful to avoid a query when you have no key for that name.
+You can set this to a list of email address aliases for keys to use
+`epa-mail-encrypt'.
 
 ---
 ** New ERC option `erc-accidental-paste-threshold-seconds'.

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-02-04 19:35:52 +0000
+++ b/lisp/ChangeLog    2014-02-05 08:37:39 +0000
@@ -1,3 +1,7 @@
+2014-02-05  Glenn Morris  <address@hidden>
+
+       * epa.el (epa-mail-aliases): Fic custom type.  Doc tweak.
+
 2014-02-04  Fabián Ezequiel Gallina  <address@hidden>
 
        * progmodes/python.el (python-shell-send-string):

=== modified file 'lisp/epa.el'
--- a/lisp/epa.el       2014-01-25 19:15:42 +0000
+++ b/lisp/epa.el       2014-02-05 08:37:39 +0000
@@ -51,13 +51,14 @@
 
 (defcustom epa-mail-aliases nil
   "Alist of aliases of email addresses that stand for encryption keys.
-Each element is (ALIAS EXPANSIONS...).
-It means that when a message is addressed to ALIAS,
+Each element is a list of email addresses (ALIAS EXPANSIONS...).
+When one of the recipients of a message being encrypted is ALIAS,
 instead of encrypting it for ALIAS, encrypt it for EXPANSIONS...
+
 If EXPANSIONS is empty, ignore ALIAS as regards encryption.
-That is a handy way to avoid warnings about addresses
-that you don't have any key for."
-  :type '(repeat (cons (string :tag "Alias") (repeat '(string :tag 
"Expansion"))))
+This is a handy way to avoid warnings about addresses that you don't
+have any key for."
+  :type '(repeat (cons (string :tag "Alias") (repeat (string :tag 
"Expansion"))))
   :group 'epa
   :version "24.4")