On Thu, 13 Dec 2012, Mark Walters <markwalters1009@gmail.com> wrote: > This makes notmuch-show-insert-bodypart add an overlay for any > non-trivial part with a button header (currently the first text/plain > part does not have a button). At this point the overlay is available > to the button but there is no action using it yet. > > In addition the argument HIDE is passed down to > notmuch-show-insert-part-overlays to request that the part be hidden > by default but this is not acted on yet. > --- > emacs/notmuch-show.el | 61 +++++++++++++++++++++++++++++++++++++------------ > 1 files changed, 46 insertions(+), 15 deletions(-) > > diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el > index 06f7ca5..3f2f277 100644 > --- a/emacs/notmuch-show.el > +++ b/emacs/notmuch-show.el > @@ -567,11 +567,10 @@ message at DEPTH in the current thread." > ;; but it's not clear that this is the wrong thing to do - which > ;; should be chosen if there are more than one that match? > (mapc (lambda (inner-part) > - (let ((inner-type (plist-get inner-part :content-type))) > - (if (or notmuch-show-all-multipart/alternative-parts > - (string= chosen-type inner-type)) > - (notmuch-show-insert-bodypart msg inner-part depth) > - (notmuch-show-insert-part-header (plist-get inner-part :id) inner-type inner-type nil " (not shown)")))) > + (let* ((inner-type (plist-get inner-part :content-type)) > + (hide (not (or notmuch-show-all-multipart/alternative-parts > + (string= chosen-type inner-type))))) > + (notmuch-show-insert-bodypart msg inner-part depth hide))) > inner-parts) > > (when notmuch-show-indent-multipart > @@ -839,17 +838,49 @@ message at DEPTH in the current thread." > (setq handlers (cdr handlers)))) > t) > > -(defun notmuch-show-insert-bodypart (msg part depth) > - "Insert the body part PART at depth DEPTH in the current thread." > +(defun notmuch-show-insert-part-overlays (msg beg end hide) notmuch-show-create-part-overlays? The other show-insert functions actually insert text into the buffer. > + "Add an overlay to the part between BEG and END" > + (let* ((button (button-at beg)) > + (part-beg (and button (1+ (button-end button))))) > + > + ;; If the part contains no text we do not make it toggleable. > + (when (and button (/= part-beg end)) > + (let ((base-label (button-get button :base-label)) > + (overlay (make-overlay part-beg end)) > + (message-invis-spec (plist-get msg :message-invis-spec)) > + (invis-spec (make-symbol "notmuch-part-region"))) > + > + (overlay-put overlay 'invisible (list invis-spec message-invis-spec)) > + (overlay-put overlay 'priority 10) > + (overlay-put overlay 'type "part") Since you're not actually using notmuch-wash, you don't need this 'type property. > + ;; Now we have to add invis-spec to every overlay this > + ;; overlay contains, otherwise these inner overlays will > + ;; override this one. > + (dolist (inner (overlays-in part-beg end)) > + (when (and (>= (overlay-start inner) part-beg) > + (<= (overlay-end inner) end)) > + (overlay-put inner 'invisible > + (cons invis-spec (overlay-get inner 'invisible))))) > + > + (button-put button 'invisibility-spec invis-spec) > + (button-put button 'overlay overlay))))) > + > +(defun notmuch-show-insert-bodypart (msg part depth &optional hide) > + "Insert the body part PART at depth DEPTH in the current thread. > + > +If HIDE is non-nil then initially hide this part." > (let ((content-type (downcase (plist-get part :content-type))) > - (nth (plist-get part :id))) > - (notmuch-show-insert-bodypart-internal msg part content-type nth depth content-type)) > - ;; Some of the body part handlers leave point somewhere up in the > - ;; part, so we make sure that we're down at the end. > - (goto-char (point-max)) > - ;; Ensure that the part ends with a carriage return. > - (unless (bolp) > - (insert "\n"))) > + (nth (plist-get part :id)) > + (beg (point))) > + > + (notmuch-show-insert-bodypart-internal msg part content-type nth depth content-type) > + ;; Some of the body part handlers leave point somewhere up in the > + ;; part, so we make sure that we're down at the end. > + (goto-char (point-max)) > + ;; Ensure that the part ends with a carriage return. > + (unless (bolp) > + (insert "\n")) > + (notmuch-show-insert-part-overlays msg beg (point) hide))) > > (defun notmuch-show-insert-body (msg body depth) > "Insert the body BODY at depth DEPTH in the current thread." > -- > 1.7.9.1 > > _______________________________________________ > notmuch mailing list > notmuch@notmuchmail.org > http://notmuchmail.org/mailman/listinfo/notmuch