[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r102103: Make epa-mail-encrypt expand
From: |
Daiki Ueno |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r102103: Make epa-mail-encrypt expand mail aliases. |
Date: |
Tue, 26 Oct 2010 10:31:27 +0900 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 102103
committer: Daiki Ueno <address@hidden>
branch nick: trunk
timestamp: Tue 2010-10-26 10:31:27 +0900
message:
Make epa-mail-encrypt expand mail aliases.
modified:
lisp/ChangeLog
lisp/epa-mail.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2010-10-26 01:02:08 +0000
+++ b/lisp/ChangeLog 2010-10-26 01:31:27 +0000
@@ -1,7 +1,7 @@
2010-10-26 Daiki Ueno <address@hidden>
* epa-mail.el (epa-mail-encrypt): Handle local-part only
- recipients (Bug#7280).
+ recipients; expand mail aliases (Bug#7280).
2010-10-25 Glenn Morris <address@hidden>
=== modified file 'lisp/epa-mail.el'
--- a/lisp/epa-mail.el 2010-10-26 01:02:08 +0000
+++ b/lisp/epa-mail.el 2010-10-26 01:31:27 +0000
@@ -117,23 +117,29 @@
(save-excursion
(let ((verbose current-prefix-arg)
(context (epg-make-context epa-protocol))
- recipients recipient-key)
+ recipients-string recipients recipient-key)
(goto-char (point-min))
(save-restriction
(narrow-to-region (point)
(if (search-forward mail-header-separator nil 0)
(match-beginning 0)
(point)))
+ (setq recipients-string
+ (mapconcat #'identity
+ (nconc (mail-fetch-field "to" nil nil t)
+ (mail-fetch-field "cc" nil nil t)
+ (mail-fetch-field "bcc" nil nil t))
+ ","))
(setq recipients
(mail-strip-quoted-names
- (mapconcat #'identity
- (nconc (mail-fetch-field "to" nil nil t)
- (mail-fetch-field "cc" nil nil t)
- (mail-fetch-field "bcc" nil nil t))
- ","))))
+ (with-temp-buffer
+ (insert "to: " recipients-string "\n")
+ (expand-mail-aliases (point-min) (point-max))
+ (car (mail-fetch-field "to" nil nil t))))))
(if recipients
(setq recipients (delete ""
- (split-string recipients "[ \t\n]+"))))
+ (split-string recipients
+ "[ \t\n]*,[ \t\n]*"))))
(goto-char (point-min))
(if (search-forward mail-header-separator nil t)
(forward-line))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r102103: Make epa-mail-encrypt expand mail aliases.,
Daiki Ueno <=