Mercurial > emacs
changeset 112404:2b0d6f7bbb80
Merge: src/config.in: shrink slightly
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Fri, 21 Jan 2011 16:13:42 -0800 |
| parents | e80422318be4 (diff) c81ff7082a9a (current diff) |
| children | c04fdfa95f79 |
| files | |
| diffstat | 2 files changed, 6 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/gnus/ChangeLog Fri Jan 21 16:12:10 2011 -0800 +++ b/lisp/gnus/ChangeLog Fri Jan 21 16:13:42 2011 -0800 @@ -3,6 +3,11 @@ * gnus-art.el (gnus-button-alist, gnus-button-handle-info-keystrokes): Don't confuse the "ret" of "retrograde" with RET. +2011-01-21 Julien Danjou <julien@danjou.info> + + * gnus-art.el (gnus-mime-display-single): Use mm-display-inline rather + than mm-insert-inline. + 2011-01-21 Katsumi Yamaoka <yamaoka@jpl.org> * gnus-art.el (gnus-article-remove-images, gnus-article-show-images):
--- a/lisp/gnus/gnus-art.el Fri Jan 21 16:12:10 2011 -0800 +++ b/lisp/gnus/gnus-art.el Fri Jan 21 16:13:42 2011 -0800 @@ -5897,18 +5897,7 @@ (forward-line -1) (setq beg (point))) (gnus-article-insert-newline) - (mm-insert-inline - handle - (let ((charset (or (mail-content-type-get (mm-handle-type handle) - 'charset) - (and (equal type "text/calendar") 'utf-8)))) - (cond ((not charset) - (mm-string-as-multibyte (mm-get-part handle))) - ((eq charset 'gnus-decoded) - (with-current-buffer (mm-handle-buffer handle) - (buffer-string))) - (t - (mm-decode-string (mm-get-part handle) charset))))) + (mm-display-inline handle) (goto-char (point-max)))) ;; Do highlighting. (save-excursion