diff options
author | Katsumi Yamaoka <yamaoka@jpl.org> | 2010-06-10 05:33:55 +0000 |
---|---|---|
committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2010-06-10 05:33:55 +0000 |
commit | 3e3ab3ab4750226611eb7071b0554f4e74336e5a (patch) | |
tree | 75a3405b9cfceb0739c6d11fc6f95042a17235e3 /lisp/gnus/gnus-art.el | |
parent | cb4bfcb5daa4faa12e7dd52b2c4fde2e20c90c09 (diff) | |
download | emacs-3e3ab3ab4750226611eb7071b0554f4e74336e5a.tar.gz |
Synch with Gnus trunk.
(gnus-mime-buttonized-part-id): New internal variable.
(gnus-article-edit-part): Bind it to make last part that is substituted
or deleted visible.
(gnus-mime-display-single): Buttonize part of which id equals to
gnus-mime-buttonized-part-id.
Diffstat (limited to 'lisp/gnus/gnus-art.el')
-rw-r--r-- | lisp/gnus/gnus-art.el | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el index 2707b51134c..6b20fa678d0 100644 --- a/lisp/gnus/gnus-art.el +++ b/lisp/gnus/gnus-art.el @@ -4896,6 +4896,10 @@ General format specifiers can also be used. See Info node (t (gnus-article-goto-part n))))) +(defvar gnus-mime-buttonized-part-id nil + "ID of a mime part that should be buttonized. +`gnus-mime-save-part-and-strip' and `gnus-mime-delete-part' bind it.") + (eval-when-compile (defsubst gnus-article-edit-part (handles &optional current-id) "Edit an article in order to delete a mime part. @@ -4938,10 +4942,15 @@ and `gnus-mime-delete-part', and not provided at run-time normally." ,(gnus-group-read-only-p) ,gnus-summary-buffer no-highlight)) t) - (gnus-article-edit-done) + ;; Force buttonizing this part. + (let ((gnus-mime-buttonized-part-id current-id)) + (gnus-article-edit-done)) (gnus-configure-windows 'article) (when (and current-id (integerp gnus-auto-select-part)) - (gnus-article-jump-to-part (+ current-id gnus-auto-select-part))))) + (gnus-article-jump-to-part + (min (max (+ current-id gnus-auto-select-part) 1) + (with-current-buffer gnus-article-buffer + (length gnus-article-mime-handle-alist))))))) (defun gnus-mime-replace-part (file) "Replace MIME part under point with an external body." @@ -5844,7 +5853,8 @@ If displaying \"text/html\" is discouraged \(see ((or (bobp) (eq (char-before (1- (point))) ?\n)) 0) (t 1)))) (when (or (not display) - (not (gnus-unbuttonized-mime-type-p type))) + (not (gnus-unbuttonized-mime-type-p type)) + (eq id gnus-mime-buttonized-part-id)) (gnus-insert-mime-button handle id (list (or display (and not-attachment text)))) (gnus-article-insert-newline) |