diff options
| author | David Bremner <david@tethera.net> | 2022-11-11 16:48:29 -0500 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2022-11-15 07:28:02 -0400 |
| commit | 2b842a1d8cb25981c19d9adb33fe962f4ebd2e9f (patch) | |
| tree | 08adf1a3842bc8ea024b774d5a8b6e7ecf475cb1 /emacs | |
| parent | 82aa1acc0c6a66eb3b771357e513eb4d16f9f276 (diff) | |
emacs/show: use plist to pass message info to n-s-insert-headerline
This should allow calling notmuch-show-insert-headerline from other
places without duplicating the set of plist accesses.
Diffstat (limited to 'emacs')
| -rw-r--r-- | emacs/notmuch-show.el | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el index ec998ede..765b88b9 100644 --- a/emacs/notmuch-show.el +++ b/emacs/notmuch-show.el @@ -530,11 +530,17 @@ Return unchanged ADDRESS if parsing fails." (plist-put msg :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 message at DEPTH in the current thread." - (let ((start (point)) - (from (notmuch-sanitize + (let* ((start (point)) + (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))))) (when (string-match "\\cR" from) ;; 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) "Insert the message MSG at depth DEPTH in the current thread." (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 ;; points to move, so we must use markers. message-start message-end @@ -1180,11 +1184,7 @@ is out of range." headers-start headers-end (bare-subject (notmuch-show-strip-re (plist-get headers :Subject)))) (setq message-start (point-marker)) - (notmuch-show-insert-headerline headers - (or (and notmuch-show-relative-dates - (plist-get msg :date_relative)) - (plist-get headers :Date)) - (plist-get msg :tags) depth duplicate files) + (notmuch-show-insert-headerline msg depth (plist-get msg :tags)) (setq content-start (point-marker)) ;; Set `headers-start' to point after the 'Subject:' header to be ;; compatible with the existing implementation. This just sets it |