diff options
author | Miles Bader <miles@gnu.org> | 2006-12-30 15:34:42 +0000 |
---|---|---|
committer | Miles Bader <miles@gnu.org> | 2006-12-30 15:34:42 +0000 |
commit | 11e95b020010b5f1dbaad98975b750ec4721e36d (patch) | |
tree | 83674460606f55cefdccc8655cae6af4c9265ffc /lisp/gnus/nnrss.el | |
parent | 84f1b4544ba27e301ef49659b8634f0321fa70de (diff) | |
download | emacs-11e95b020010b5f1dbaad98975b750ec4721e36d.tar.gz |
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 179-183)
- Update from CVS
2006-12-25 Daiki Ueno <ueno@unixuser.org>
* lisp/pgg-def.el (pgg-passphrase-coding-system): Default to nil instead of
locale-coding-system.
* lisp/pgg-gpg.el (pgg-gpg-process-region): Encode passphrase with eol-type
LF.
2006-12-29 Jouni K. Sepp,Ad(Bnen <jks@iki.fi>
* lisp/gnus/nnimap.el (nnimap-expunge-search-string): Mention
nnimap-search-uids-not-since-is-evil in docstring.
2006-12-28 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/spam.el: Revert to make-obsolete-variable because
define-obsolete-variable-alias is not supported in Emacs 21.
2006-12-28 Daiki Ueno <ueno@unixuser.org>
* lisp/gnus/gnus-sum.el (gnus-summary-next-article): Make sure we are in the
summary buffer.
2006-12-27 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/spam.el (spam-ifile-path, spam-ifile-database-path)
(spam-bogofilter-path): Use define-obsolete-variable-alias instead of
make-obsolete-variable.
2006-12-26 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/message.el (message-make-fqdn): Fix comment.
(message-bogus-system-names): Add ".local".
* lisp/gnus/spam.el (spam-ifile-path, spam-ifile-program)
(spam-ifile-database-path, spam-ifile-database)
(spam-bogofilter-path, spam-bogofilter-program): Rename variables.
Don't use "path" inappropriately.
(spam-spamoracle-database, spam-get-ifile-database-parameter): Fix doc
strings.
(spam-check-ifile, spam-ifile-register-with-ifile)
(spam-check-bogofilter, spam-bogofilter-register-with-bogofilter): Use
new variable names.
* lisp/gnus/gnus-art.el (gnus-treat-display-x-face, gnus-treat-display-face)
(gnus-treat-display-smileys): Simplify using
gnus-image-type-available-p.
* lisp/gnus/gnus-ems.el (gnus-image-type-available-p): Use display-images-p if
available.
2006-12-22 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/nnrss.el (nnrss-fetch): Replace buffer's contents with the decoded
one after turning on the buffer's multibyteness instead of decoding
them directly in the unibyte buffer that causes unexpected conversion
in Emacs 23 (unicode).
2006-12-29 Reiner Steib <Reiner.Steib@gmx.de>
* man/gnus.texi (Customizing Articles): Add index entries for all
gnus-treat-* variables.
2006-12-29 Jouni K. Sepp,Ad(Bnen <jks@iki.fi>
* man/gnus.texi (IMAP): Fix incorrect explanation of
nnimap-search-uids-not-since-is-evil in documentation for
nnimap-expunge-search-string.
2006-12-27 Reiner Steib <Reiner.Steib@gmx.de>
* man/gnus.texi (ifile spam filtering): Rename spam-ifile-database-path to
spam-ifile-database.
2006-12-26 Reiner Steib <Reiner.Steib@gmx.de>
* man/gnus.texi (Spam Package Configuration Examples): Don't encourage to
rebind C-s.
2006-12-26 Jouni K. Sepp,Ad(Bnen <jks@iki.fi>
* man/gnus.texi (Group Parameters, Group Maintenance, Topic Commands)
(Mail Group Commands, Expiring Mail, IMAP): Add index entries for
"expiring mail".
(IMAP): Document nnimap-search-uids-not-since-is-evil and
nnimap-nov-is-evil.
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-576
Diffstat (limited to 'lisp/gnus/nnrss.el')
-rw-r--r-- | lisp/gnus/nnrss.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/gnus/nnrss.el b/lisp/gnus/nnrss.el index 318560179f5..f21fd74d138 100644 --- a/lisp/gnus/nnrss.el +++ b/lisp/gnus/nnrss.el @@ -418,8 +418,10 @@ otherwise return nil." (nnheader-remove-cr-followed-by-lf) ;; Decode text according to the encoding attribute. (when (setq cs (nnrss-get-encoding)) - (mm-decode-coding-region (point-min) (point-max) cs) - (mm-enable-multibyte)) + (insert (prog1 + (mm-decode-coding-string (buffer-string) cs) + (erase-buffer) + (mm-enable-multibyte)))) (goto-char (point-min)) ;; Because xml-parse-region can't deal with anything that isn't |