From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/68434 Path: news.gmane.org!not-for-mail From: Daniel Dehennin Newsgroups: gmane.emacs.gnus.general Subject: [PATCH] Factor spliting mail addresses. Date: Mon, 13 Apr 2009 22:32:15 +0200 Message-ID: <87ws9o5m7k.fsf@hati.baby-gnu.org> References: <87r62n3aj7.fsf@hati.baby-gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: ger.gmane.org 1239654767 13271 80.91.229.12 (13 Apr 2009 20:32:47 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 13 Apr 2009 20:32:47 +0000 (UTC) To: ding@gnus.org Original-X-From: ding-owner+M16873@lists.math.uh.edu Mon Apr 13 22:34:06 2009 Return-path: Envelope-to: ding-account@gmane.org Original-Received: from util0.math.uh.edu ([129.7.128.18]) by lo.gmane.org with esmtp (Exim 4.50) id 1LtSr0-00039D-0J for ding-account@gmane.org; Mon, 13 Apr 2009 22:34:06 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.math.uh.edu) by util0.math.uh.edu with smtp (Exim 4.63) (envelope-from ) id 1LtSpK-00026l-Rt; Mon, 13 Apr 2009 15:32:22 -0500 Original-Received: from mx2.math.uh.edu ([129.7.128.33]) by util0.math.uh.edu with esmtps (TLSv1:AES256-SHA:256) (Exim 4.63) (envelope-from ) id 1LtSpH-000261-KZ for ding@lists.math.uh.edu; Mon, 13 Apr 2009 15:32:19 -0500 Original-Received: from quimby.gnus.org ([80.91.231.51]) by mx2.math.uh.edu with esmtp (Exim 4.69) (envelope-from ) id 1LtSpF-0000Sa-4w for ding@lists.math.uh.edu; Mon, 13 Apr 2009 15:32:19 -0500 Original-Received: from zion.asgardr.info ([82.233.222.74]) by quimby.gnus.org with esmtp (Exim 3.36 #1 (Debian)) id 1LtSpe-00064P-00 for ; Mon, 13 Apr 2009 22:32:42 +0200 Original-Received: from hati.asgardr.info ([192.168.1.2] helo=hati.baby-gnu.org) by zion.asgardr.info with esmtp (Exim 4.69) (envelope-from ) id 1LtSpD-00015f-Ug for ding@gnus.org; Mon, 13 Apr 2009 22:32:15 +0200 Original-Received: from dad by hati.baby-gnu.org with local (Exim 4.69) (envelope-from ) id 1LtSpD-0005Ji-U0 for ding@gnus.org; Mon, 13 Apr 2009 22:32:15 +0200 Organisation: Dark Church of Emacs User-Agent: Gnus/5.110011 (No Gnus v0.11) Emacs/23.0.92 (gnu/linux) X-Spam-Score: -1.7 (-) List-ID: Precedence: bulk Xref: news.gmane.org gmane.emacs.gnus.general:68434 Archived-At: --=-=-= ------------------------------------------------------------ revno: 136 committer: Daniel Dehennin branch nick: mml2015 timestamp: Mon 2009-04-13 20:07:37 +0200 message: Factor spliting mail addresses. * lisp/mml2015.el (mml2015-epg-split-addresses): Split a string of addresses. (mml2015-epg-encrypt): Use it to set recipients. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=Gnus-mm2015-136.patch # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: daniel.dehennin@baby-gnu.org-20090413180737-\ # rj1gz47cn7iha9zu # target_branch: ../../gnus.head # testament_sha1: 951a8dc52109b188478c54a7a6afb0eae4c80017 # timestamp: 2009-04-13 20:58:52 +0200 # source_branch: . # base_revision_id: daniel.dehennin@baby-gnu.org-20090412231027-\ # rhtvglq3r87nljez # # Begin patch === modified file 'lisp/mml2015.el' --- lisp/mml2015.el 2009-01-22 07:02:15 +0000 +++ lisp/mml2015.el 2009-04-13 18:07:37 +0000 @@ -1025,6 +1025,18 @@ (setq pointer (cdr pointer)))) (setq keys (cdr keys))))) +(defun mml2015-epg-split-addresses (config addresses) + "Split a string of addresses delimited by [ \f\t\n\r\v,]+." + (apply #'nconc + (mapcar + (lambda (recipient) + (or (epg-expand-group config recipient) + (list (concat "<" recipient ">")))) + (split-string + (or addresses + (read-string "Addresses: ")) + "[ \f\t\n\r\v,]+")))) + (defun mml2015-epg-decrypt (handle ctl) (catch 'error (let ((inhibit-redisplay t) @@ -1182,6 +1194,7 @@ (let* ((inhibit-redisplay t) (context (epg-make-context)) (boundary (mml-compute-boundary cont)) + (sender (message-options-get 'message-sender)) signer-key (signers (or (message-options-get 'mml2015-epg-signers) @@ -1191,8 +1204,8 @@ (epa-select-keys context "\ Select keys for signing. If no one is selected, default secret key is used. " - mml2015-signers t) - (if mml2015-signers + (cons sender mml2015-signers) t) + (if (or sender mml2015-signers) (delq nil (mapcar (lambda (signer) @@ -1206,7 +1219,7 @@ signer))) (error "No secret key for %s" signer)) signer-key) - mml2015-signers))))))) + (cons sender mml2015-signers)))))))) signature micalg) (epg-context-set-armor context t) (epg-context-set-textmode context t) @@ -1249,26 +1262,20 @@ (let ((inhibit-redisplay t) (context (epg-make-context)) (config (epg-configuration)) + (sender (message-options-get 'message-sender)) (recipients (message-options-get 'mml2015-epg-recipients)) cipher signers (boundary (mml-compute-boundary cont)) recipient-key signer-key) (unless recipients (setq recipients - (apply #'nconc - (mapcar - (lambda (recipient) - (or (epg-expand-group config recipient) - (list (concat "<" recipient ">")))) - (split-string - (or (message-options-get 'message-recipients) - (message-options-set 'message-recipients - (read-string "Recipients: "))) - "[ \f\t\n\r\v,]+")))) + (mml2015-epg-split-addresses + config + (message-options-get 'message-recipients))) (when mml2015-encrypt-to-self - (unless mml2015-signers - (error "mml2015-signers not set")) - (setq recipients (nconc recipients mml2015-signers))) + (unless (or sender mml2015-signers) + (error "Message sender and mml2015-signers not set")) + (setq recipients (nconc recipients (cons sender mml2015-signers)))) (if mml2015-verbose (setq recipients (epa-select-keys context "\ @@ -1301,8 +1308,8 @@ (epa-select-keys context "\ Select keys for signing. If no one is selected, default secret key is used. " - mml2015-signers t) - (if mml2015-signers + (cons sender mml2015-signers) t) + (if (or sender mml2015-signers) (delq nil (mapcar (lambda (signer) @@ -1316,7 +1323,7 @@ signer))) (error "No secret key for %s" signer)) signer-key) - mml2015-signers))))))) + (cons sender mml2015-signers)))))))) (epg-context-set-signers context signers)) (epg-context-set-armor context t) (epg-context-set-textmode context t) --=-=-=--