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: use plist to pass message info to n-s-insert-headerline

Browse source 
This should allow calling notmuch-show-insert-headerline from other
places without duplicating the set of plist accesses.
This commit is contained in:
David Bremner 2022-11-11 16:48:29 -05:00
parent 82aa1acc0c
commit 2b842a1d8c
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
emacs/notmuch-show.el
View file

@ -530,11 +530,17 @@ Return unchanged ADDRESS if parsing fails."
(plist-put msg :height height) (plist-put msg :height height)
height)))) height))))
(defun notmuch-show-insert-headerline (headers date tags depth duplicate file-count) (defun notmuch-show-insert-headerline (msg-plist depth tags)
"Insert a notmuch style headerline based on HEADERS for a "Insert a notmuch style headerline based on HEADERS for a
message at DEPTH in the current thread." message at DEPTH in the current thread."
(let ((start (point)) (let* ((start (point))
(from (notmuch-sanitize (headers (plist-get msg-plist :headers))
(duplicate (or (plist-get msg-plist :duplicate) 0))
(file-count (length (plist-get msg-plist :filename)))
(date (or (and notmuch-show-relative-dates
(plist-get msg-plist :date_relative))
(plist-get headers :Date)))
(from (notmuch-sanitize
(notmuch-show-clean-address (plist-get headers :From))))) (notmuch-show-clean-address (plist-get headers :From)))))
(when (string-match "\\cR" from) (when (string-match "\\cR" from)
;; If the From header has a right-to-left character add ;; If the From header has a right-to-left character add
@ -1171,8 +1177,6 @@ is out of range."
(defun notmuch-show-insert-msg (msg depth) (defun notmuch-show-insert-msg (msg depth)
"Insert the message MSG at depth DEPTH in the current thread." "Insert the message MSG at depth DEPTH in the current thread."
(let* ((headers (plist-get msg :headers)) (let* ((headers (plist-get msg :headers))
(duplicate (or (plist-get msg :duplicate) 0))
(files (length (plist-get msg :filename)))
;; Indentation causes the buffer offset of the start/end ;; Indentation causes the buffer offset of the start/end
;; points to move, so we must use markers. ;; points to move, so we must use markers.
message-start message-end message-start message-end
@ -1180,11 +1184,7 @@ is out of range."
headers-start headers-end headers-start headers-end
(bare-subject (notmuch-show-strip-re (plist-get headers :Subject)))) (bare-subject (notmuch-show-strip-re (plist-get headers :Subject))))
(setq message-start (point-marker)) (setq message-start (point-marker))
(notmuch-show-insert-headerline headers (notmuch-show-insert-headerline msg depth (plist-get msg :tags))
(or (and notmuch-show-relative-dates
(plist-get msg :date_relative))
(plist-get headers :Date))
(plist-get msg :tags) depth duplicate files)
(setq content-start (point-marker)) (setq content-start (point-marker))
;; Set `headers-start' to point after the 'Subject:' header to be ;; Set `headers-start' to point after the 'Subject:' header to be
;; compatible with the existing implementation. This just sets it ;; compatible with the existing implementation. This just sets it