Mercurial > emacs
comparison lisp/gnus/mm-view.el @ 68762:970bf6e6463b
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-62
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 22-26)
- Update from CVS
- Merge from emacs--devo--0
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Fri, 10 Feb 2006 05:08:29 +0000 |
| parents | e1843613ecb8 |
| children | 12d289b6e5de 4b3d39451150 |
comparison
equal
deleted
inserted
replaced
| 68761:35eb90d9d028 | 68762:970bf6e6463b |
|---|---|
| 484 (mm-insert-part handle) | 484 (mm-insert-part handle) |
| 485 (let (gnus-article-mime-handles | 485 (let (gnus-article-mime-handles |
| 486 ;; disable prepare hook | 486 ;; disable prepare hook |
| 487 gnus-article-prepare-hook | 487 gnus-article-prepare-hook |
| 488 (gnus-newsgroup-charset | 488 (gnus-newsgroup-charset |
| 489 (or charset gnus-newsgroup-charset))) | 489 (unless (eq charset 'gnus-decoded) ;; mm-uu might set it. |
| 490 (or charset gnus-newsgroup-charset)))) | |
| 490 (let ((gnus-original-article-buffer (mm-handle-buffer handle))) | 491 (let ((gnus-original-article-buffer (mm-handle-buffer handle))) |
| 491 (run-hooks 'gnus-article-decode-hook)) | 492 (run-hooks 'gnus-article-decode-hook)) |
| 492 (gnus-article-prepare-display) | 493 (gnus-article-prepare-display) |
| 493 (setq handles gnus-article-mime-handles)) | 494 (setq handles gnus-article-mime-handles)) |
| 494 (goto-char (point-min)) | 495 (goto-char (point-min)) |