Mercurial > emacs
comparison lisp/gnus/gnus-art.el @ 69949:d0312c3f2374
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-214
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 83)
- Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Wed, 12 Apr 2006 05:23:27 +0000 |
parents | a87e26272828 |
children | 027c07dcdee5 |
comparison
equal
deleted
inserted
replaced
69948:6b919f4beee5 | 69949:d0312c3f2374 |
---|---|
4475 (defun gnus-mime-view-part-as-charset (&optional handle arg) | 4475 (defun gnus-mime-view-part-as-charset (&optional handle arg) |
4476 "Insert the MIME part under point into the current buffer using the | 4476 "Insert the MIME part under point into the current buffer using the |
4477 specified charset." | 4477 specified charset." |
4478 (interactive (list nil current-prefix-arg)) | 4478 (interactive (list nil current-prefix-arg)) |
4479 (gnus-article-check-buffer) | 4479 (gnus-article-check-buffer) |
4480 (let* ((handle (or handle (get-text-property (point) 'gnus-data))) | 4480 (let ((handle (or handle (get-text-property (point) 'gnus-data))) |
4481 contents charset | 4481 (fun (get-text-property (point) 'gnus-callback)) |
4482 (b (point)) | 4482 (gnus-newsgroup-ignored-charsets 'gnus-all) |
4483 (inhibit-read-only t)) | 4483 gnus-newsgroup-charset type charset) |
4484 (when handle | 4484 (when handle |
4485 (if (mm-handle-undisplayer handle) | 4485 (if (mm-handle-undisplayer handle) |
4486 (mm-remove-part handle)) | 4486 (mm-remove-part handle)) |
4487 (let ((gnus-newsgroup-charset | 4487 (when fun |
4488 (or (cdr (assq arg | 4488 (setq gnus-newsgroup-charset |
4489 gnus-summary-show-article-charset-alist)) | 4489 (or (cdr (assq arg gnus-summary-show-article-charset-alist)) |
4490 (mm-read-coding-system "Charset: "))) | 4490 (mm-read-coding-system "Charset: "))) |
4491 (gnus-newsgroup-ignored-charsets 'gnus-all)) | 4491 ;; Strip the charset parameter from `handle'. |
4492 (gnus-article-press-button))))) | 4492 (setq type (mm-handle-type |
4493 (if (equal (mm-handle-media-type handle) | |
4494 "message/external-body") | |
4495 (progn | |
4496 (unless (mm-handle-cache handle) | |
4497 (mm-extern-cache-contents handle)) | |
4498 (mm-handle-cache handle)) | |
4499 handle)) | |
4500 charset (assq 'charset (cdr type))) | |
4501 (delq charset type) | |
4502 (funcall fun handle))))) | |
4493 | 4503 |
4494 (defun gnus-mime-view-part-externally (&optional handle) | 4504 (defun gnus-mime-view-part-externally (&optional handle) |
4495 "View the MIME part under point with an external viewer." | 4505 "View the MIME part under point with an external viewer." |
4496 (interactive) | 4506 (interactive) |
4497 (gnus-article-check-buffer) | 4507 (gnus-article-check-buffer) |