diff options
| author | Gnus developers <ding@gnus.org> | 2010-10-12 22:18:24 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2010-10-12 22:18:24 +0000 |
| commit | ab67634f9dff508ec35159fc72d64c917c106305 (patch) | |
| tree | 16500dd2b09647d1a33067ae81b33239c67dec8b /lisp/gnus/rfc2231.el | |
| parent | fe239e8e52c9aa8e0e23790b4a7a12a5da49625a (diff) | |
| download | emacs-ab67634f9dff508ec35159fc72d64c917c106305.tar.gz | |
Merge changes made in Gnus trunk.
gnus-gravatar.el (gnus-art): Required.
shr.el (shr-tag-img): Add align attribute support for <img>.
gnus-gravatar.el (gnus-gravatar-insert): Check if buffer is alive.
shr.el (shr-tag-img): Encode URL properly when retrieving.
shr.el (shr-get-image-data): Encode URL properly when fetching from cache.
shr.el (shr-tag-img): Use aligned-to spaces to align correctly images.
nnimap.el (nnimap-request-rename-group): Unselect by selecting a mailbox that doesn't exist.
rfc2231.el (rfc2231-parse-string): Ignore repeated parts.
gnus-gravatar.el (gnus-gravatar-too-ugly): Don't test if gnus-article-x-face-too-ugly is bound.
Diffstat (limited to 'lisp/gnus/rfc2231.el')
| -rw-r--r-- | lisp/gnus/rfc2231.el | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/lisp/gnus/rfc2231.el b/lisp/gnus/rfc2231.el index 7cb1740c635..0b028a08b83 100644 --- a/lisp/gnus/rfc2231.el +++ b/lisp/gnus/rfc2231.el @@ -185,11 +185,19 @@ must never cause a Lisp error." in (sort parameters (lambda (e1 e2) (< (or (caddr e1) 0) (or (caddr e2) 0)))) - do (if (or (not (setq elem (assq attribute cparams))) - (and (numberp part) - (zerop part))) - (push (list attribute value encoded) cparams) - (setcar (cdr elem) (concat (cadr elem) value)))) + do (cond + ;; First part. + ((or (not (setq elem (assq attribute cparams))) + (and (numberp part) + (zerop part))) + (push (list attribute value encoded) cparams)) + ;; Repetition of a part; do nothing. + ((and elem + (null number)) + ) + ;; Concatenate continuation parts. + (t + (setcar (cdr elem) (concat (cadr elem) value))))) ;; Finally decode encoded values. (cons type (mapcar (lambda (elem) |