[gnus git] branch master updated: m0-9-65-gfeb3810 =1= * lisp/mml.el (mml-insert-mime-headers): Allow `recipient-filename'.
Lars Ingebrigtsen <[email protected]> Wed, 05 Mar 2014 14:30:18 +0100
| Newsgroups | gmane.emacs.gnus.cvs |
|---|---|
| Message-ID | <[email protected]> |
via feb38102d8dc1ca5d2278b53d7e799a0ee2c450d (commit)
from 4bcb31e125bc370f94de1759a17f393c030918c5 (commit)
- Log -----------------------------------------------------------------
commit feb38102d8dc1ca5d2278b53d7e799a0ee2c450d
Author: Lars Ingebrigtsen <[email protected]>
Date: Wed Mar 5 14:28:19 2014 +0100
* lisp/mml.el (mml-insert-mime-headers): Allow `recipient-filename'.
* texi/emacs-mime.texi (MML Definition): Document recipient-filename.
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1d7adeb..dd7625f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2014-03-05 Lars Ingebrigtsen <[email protected]>
+
+ * mml.el (mml-insert-mime-headers): Allow `recipient-filename'.
+
2014-02-23 David Engster <[email protected]>
* auth-source.el (auth-source-netrc-saver): Do not depend on `cl-lib'
diff --git a/lisp/mml.el b/lisp/mml.el
index cf90257..b7e22d4 100644
--- a/lisp/mml.el
+++ b/lisp/mml.el
@@ -804,7 +804,10 @@ be \"related\" or \"alternate\"."
parameters)
(insert "Content-Disposition: "
(or disposition
- (mml-content-disposition type (cdr (assq 'filename cont)))))
+ (mml-content-disposition
+ type
+ (or (cdr (assq 'recipient-filename cont))
+ (cdr (assq 'filename cont))))))
(when parameters
(mml-insert-parameter-string
cont mml-content-disposition-parameters))
diff --git a/texi/ChangeLog b/texi/ChangeLog
index 3ea04be..35b1ee0 100644
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,7 @@
+2014-03-05 Lars Ingebrigtsen <[email protected]>
+
+ * emacs-mime.texi (MML Definition): Document recipient-filename.
+
2014-02-10 Katsumi Yamaoka <[email protected]>
* epa.texi (Caching Passphrases): Don't give argument to @item used in
diff --git a/texi/emacs-mime.texi b/texi/emacs-mime.texi
index 94968ef..7edb1f9 100644
--- a/texi/emacs-mime.texi
+++ b/texi/emacs-mime.texi
@@ -648,6 +648,12 @@ The @acronym{MIME} type of the part (@code{Content-Type}).
Use the contents of the file in the body of the part
(@code{Content-Disposition}).
+@item recipient-filename
+Use this as the file name in the generated @acronym{MIME} message for
+the recipient. That is, even if the file is called @file{foo.txt}
+locally, use this name instead in the @code{Content-Disposition} in
+the sent message.
+
@item charset
The contents of the body of the part are to be encoded in the character
set specified (@code{Content-Type}). @xref{Charset Translation}.
-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.
Summary of changes:
lisp/ChangeLog | 4 ++++
lisp/mml.el | 5 ++++-
texi/ChangeLog | 4 ++++
texi/emacs-mime.texi | 6 ++++++
4 files changed, 18 insertions(+), 1 deletion(-)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".
The branch, master has been updated
hooks/post-receive
--
Gnus Project