debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-21 18:38:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

emacs: show: pass button to create-overlays

Browse source 
Now that the bodypart code has the button we can pass that to
create-overlays and simplify that.
This commit is contained in:
Mark Walters 2013-06-10 05:57:10 +01:00 committed by David Bremner
parent 702210b84d
commit 81c199c962
1 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
emacs/notmuch-show.el
View file

@ -793,21 +793,19 @@ message at DEPTH in the current thread."
(setq handlers (cdr handlers)))) (setq handlers (cdr handlers))))
t) t)
(defun notmuch-show-create-part-overlays (msg beg end hide) (defun notmuch-show-create-part-overlays (button beg end hide)
"Add an overlay to the part between BEG and END" "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. We ;; If there is no button (i.e., the part is text/plain and the first
;; also need to check that the button is a genuine part button not ;; part) or if the part has no content then we don't make the part
;; a notmuch-wash button. ;; toggleable.
(when (and button (/= part-beg end) (button-get button :base-label)) (when (and button (/= beg end))
(button-put button 'overlay (make-overlay part-beg end)) (button-put button 'overlay (make-overlay beg end))
;; We toggle the button for hidden parts as that gets the ;; We toggle the button for hidden parts as that gets the
;; button label right. ;; button label right.
(save-excursion (save-excursion
(when hide (when hide
(notmuch-show-toggle-part-invisibility button)))))) (notmuch-show-toggle-part-invisibility button)))))
(defun notmuch-show-insert-bodypart (msg part depth &optional hide) (defun notmuch-show-insert-bodypart (msg part depth &optional hide)
"Insert the body part PART at depth DEPTH in the current thread. "Insert the body part PART at depth DEPTH in the current thread.
@ -824,7 +822,8 @@ If HIDE is non-nil then initially hide this part."
(beg (point)) (beg (point))
;; We omit the part button for the first (or only) part if this is text/plain. ;; We omit the part button for the first (or only) part if this is text/plain.
(button (unless (and (string= mime-type "text/plain") (<= nth 1)) (button (unless (and (string= mime-type "text/plain") (<= nth 1))
(notmuch-show-insert-part-header nth mime-type content-type (plist-get part :filename))))) (notmuch-show-insert-part-header nth mime-type content-type (plist-get part :filename))))
(content-beg (point)))
(notmuch-show-insert-bodypart-internal msg part mime-type nth depth button) (notmuch-show-insert-bodypart-internal msg part mime-type nth depth button)
;; Some of the body part handlers leave point somewhere up in the ;; Some of the body part handlers leave point somewhere up in the
@ -833,7 +832,7 @@ If HIDE is non-nil then initially hide this part."
;; Ensure that the part ends with a carriage return. ;; Ensure that the part ends with a carriage return.
(unless (bolp) (unless (bolp)
(insert "\n")) (insert "\n"))
(notmuch-show-create-part-overlays msg beg (point) hide) (notmuch-show-create-part-overlays button content-beg (point) hide)
;; Record part information. Since we already inserted subparts, ;; Record part information. Since we already inserted subparts,
;; don't override existing :notmuch-part properties. ;; don't override existing :notmuch-part properties.
(notmuch-map-text-property beg (point) :notmuch-part (notmuch-map-text-property beg (point) :notmuch-part