diff options
| author | Miles Bader <miles@gnu.org> | 2004-12-26 23:33:51 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2004-12-26 23:33:51 +0000 |
| commit | aa0a8561bb79265b7e525f62a0a5e04221f78e15 (patch) | |
| tree | 1a87ba43201e1c9fd8ffdb4acee1f603e296f150 /lisp/gnus/rfc2231.el | |
| parent | f3e4c362ff4ce52d0103f1a3553f1efcb33463e7 (diff) | |
| download | emacs-aa0a8561bb79265b7e525f62a0a5e04221f78e15.tar.gz emacs-aa0a8561bb79265b7e525f62a0a5e04221f78e15.tar.bz2 emacs-aa0a8561bb79265b7e525f62a0a5e04221f78e15.zip | |
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-750
Merge from gnus--rel--5.10
Patches applied:
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-78
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-79
- miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-80
Update from CVS
2004-12-22 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/gnus-spec.el (gnus-spec-tab): Make a Lisp form which works
correctly even if there are wide characters.
2004-12-21 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/rfc2231.el (rfc2231-parse-string): Decode encoded value after
concatenating segments rather than before concatenating them.
Suggested by ARISAWA Akihiro <ari@mbf.ocn.ne.jp>.
2004-12-17 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/mm-util.el (mm-xemacs-find-mime-charset): New macro.
2004-12-17 Aidan Kehoe <kehoea@parhasard.net>
* lisp/gnus/mm-util.el (mm-xemacs-find-mime-charset-1): New function used to
unify Latin characters in XEmacs.
(mm-find-mime-charset-region): Use it.
2004-12-17 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/gnus-util.el (gnus-delete-directory): New function.
* lisp/gnus/gnus-agent.el (gnus-agent-delete-group): Use it.
* lisp/gnus/gnus-cache.el (gnus-cache-delete-group): Use it.
Diffstat (limited to 'lisp/gnus/rfc2231.el')
| -rw-r--r-- | lisp/gnus/rfc2231.el | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/lisp/gnus/rfc2231.el b/lisp/gnus/rfc2231.el index b08fe215196..8a20e19e8ad 100644 --- a/lisp/gnus/rfc2231.el +++ b/lisp/gnus/rfc2231.el @@ -88,7 +88,6 @@ The list will be on the form (point) (progn (forward-sexp 1) (point)))))) (error "Invalid header: %s" string)) (setq c (char-after)) - (setq encoded nil) (when (eq c ?*) (forward-char 1) (setq c (char-after)) @@ -126,16 +125,22 @@ The list will be on the form (point) (progn (forward-sexp) (point))))) (t (error "Invalid header: %s" string))) - (when encoded - (setq value (rfc2231-decode-encoded-string value))) (if number (setq prev-attribute attribute prev-value (concat prev-value value)) - (push (cons attribute value) parameters)))) + (push (cons attribute + (if encoded + (rfc2231-decode-encoded-string value) + value)) + parameters)))) ;; Take care of any final continuations. (when prev-attribute - (push (cons prev-attribute prev-value) parameters)) + (push (cons prev-attribute + (if encoded + (rfc2231-decode-encoded-string prev-value) + prev-value)) + parameters)) (when type `(,type ,@(nreverse parameters))))))) |