diff options
| author | Gnus developers <[email protected]> | 2012-01-30 23:30:22 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <[email protected]> | 2012-01-30 23:30:22 +0000 |
| commit | ba775afe0d3ba12dbb7ff94b6be0bbed9285e9d9 (patch) | |
| tree | e605bd871ca95dea7189c939866710582cf695b1 /lisp/gnus/rfc2047.el | |
| parent | d2859a4a2e0d19082f82fc899bb812d7ca9d1c35 (diff) | |
Merge changes made in Gnus trunk
gnus.texi (Agent Basics): Fix outdated description of `gnus-agent-auto-agentize-methods'.
rfc2047.el (rfc2047-encode-region): Allow not folding the encoded words.
(rfc2047-encode-string): Ditto.
(rfc2047-encode-parameter): Don't fold parameters. Some MUAs do not understand folded filename="..." parameters, for instance.
gnus-agent.el (gnus-agent-auto-agentize-methods): Point to the Agent section in the manual.
Diffstat (limited to 'lisp/gnus/rfc2047.el')
| -rw-r--r-- | lisp/gnus/rfc2047.el | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lisp/gnus/rfc2047.el b/lisp/gnus/rfc2047.el index a275df7701..e881256f38 100644 --- a/lisp/gnus/rfc2047.el +++ b/lisp/gnus/rfc2047.el @@ -362,7 +362,7 @@ The buffer may be narrowed." (modify-syntax-entry ?@ "." table) table)) -(defun rfc2047-encode-region (b e) +(defun rfc2047-encode-region (b e &optional dont-fold) "Encode words in region B to E that need encoding. By default, the region is treated as containing RFC2822 addresses. Dynamically bind `rfc2047-encoding-type' to change that." @@ -546,16 +546,17 @@ Dynamically bind `rfc2047-encoding-type' to change that." (signal (car err) (cdr err)) (error "Invalid data for rfc2047 encoding: %s" (mm-replace-in-string orig-text "[ \t\n]+" " ")))))))) - (rfc2047-fold-region b (point)) + (unless dont-fold + (rfc2047-fold-region b (point))) (goto-char (point-max)))) -(defun rfc2047-encode-string (string) +(defun rfc2047-encode-string (string &optional dont-fold) "Encode words in STRING. By default, the string is treated as containing addresses (see `rfc2047-encoding-type')." (mm-with-multibyte-buffer (insert string) - (rfc2047-encode-region (point-min) (point-max)) + (rfc2047-encode-region (point-min) (point-max) dont-fold) (buffer-string))) ;; From RFC 2047: @@ -850,7 +851,7 @@ This is a substitution for the `rfc2231-encode-string' function, that is the standard but many mailers don't support it." (let ((rfc2047-encoding-type 'mime) (rfc2047-encode-max-chars nil)) - (rfc2045-encode-string param (rfc2047-encode-string value)))) + (rfc2045-encode-string param (rfc2047-encode-string value t)))) ;;; ;;; Functions for decoding RFC2047 messages |