Mercurial > emacs
diff lisp/gnus/nnrss.el @ 78125:f0705c4da65a
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 235-236)
- Update from CVS
2007-07-13 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/gnus-srvr.el (gnus-server-agent-face, gnus-server-opened-face)
(gnus-server-closed-face, gnus-server-denied-face)
(gnus-server-offline-face): Remove variable.
(gnus-server-font-lock-keywords): Use faces that are not aliases.
* lisp/gnus/mm-util.el (mm-decode-coding-string, mm-encode-coding-string)
(mm-decode-coding-region, mm-encode-coding-region): Don't modify string
if the coding-system argument is nil for XEmacs.
* lisp/gnus/nnrss.el (nnrss-compatible-encoding-alist): Inherit the value of
mm-charset-override-alist.
* lisp/gnus/rfc2047.el: Don't require base64; require rfc2045 for the function
rfc2045-encode-string.
(rfc2047-encode-parameter): Use rfc2045-encode-string to quote or not
to quote the parameter value.
Revision: emacs@sv.gnu.org/emacs--rel--22--patch-58
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Sun, 15 Jul 2007 04:45:41 +0000 |
| parents | e3694f1cb928 |
| children | 24202b793a08 |
line wrap: on
line diff
--- a/lisp/gnus/nnrss.el Sun Jul 15 01:23:15 2007 +0000 +++ b/lisp/gnus/nnrss.el Sun Jul 15 04:45:41 2007 +0000 @@ -85,7 +85,12 @@ (defvar nnrss-file-coding-system mm-universal-coding-system "Coding system used when reading and writing files.") -(defvar nnrss-compatible-encoding-alist '((iso-8859-1 . windows-1252)) +(defvar nnrss-compatible-encoding-alist + (delq nil (mapcar (lambda (elem) + (if (and (mm-coding-system-p (car elem)) + (mm-coding-system-p (cdr elem))) + elem)) + mm-charset-override-alist)) "Alist of encodings and those supersets. The cdr of each element is used to decode data if it is available when the car is what the data specify as the encoding. Or, the car is used