alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1236 from mhcerri/mu4e-orphan-thread-prefix

Browse Source 
mu4e: orphan thread prefix
This commit is contained in:
Dirk-Jan C. Binnema
2018-05-11 14:50:01 +03:00
committed by GitHub
parent 35951da4b5 94e9795d9d
commit c2c5dd5939
1 changed files with 25 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
mu4e/mu4e-headers.el
View File

@ -233,38 +233,29 @@ one of: `:date', `:subject', `:size', `:prio', `:from', `:to.',
;; thread prefix marks ;; thread prefix marks
(defvar mu4e-headers-thread-child-prefix '("├>" . "┣▶ ") (defvar mu4e-headers-thread-child-prefix '("├>" . "┣▶ ")
"Prefix for messages in sub threads that do have a following sibling. "Prefix for messages in sub threads that do have a following sibling.")
This variable is only used when mu4e-headers-new-thread-style is non-nil.")
(defvar mu4e-headers-thread-last-child-prefix '("└>" . "┗▶ ") (defvar mu4e-headers-thread-last-child-prefix '("└>" . "┗▶ ")
"Prefix for messages in sub threads that do not have a following sibling. "Prefix for messages in sub threads that do not have a following sibling.")
This variable is only used when mu4e-headers-new-thread-style is non-nil.")
(defvar mu4e-headers-thread-connection-prefix '("│" . "┃ ") (defvar mu4e-headers-thread-connection-prefix '("│" . "┃ ")
"Prefix to connect sibling messages that do not follow each other. "Prefix to connect sibling messages that do not follow each other.
This prefix should have the same length as `mu4e-headers-thread-blank-prefix'. This prefix should have the same length as `mu4e-headers-thread-blank-prefix'.")
This variable is only used when mu4e-headers-new-thread-style is non-nil.")
(defvar mu4e-headers-thread-blank-prefix '(" " . " ") (defvar mu4e-headers-thread-blank-prefix '(" " . " ")
"Prefix to separate non connected messages. "Prefix to separate non connected messages.
This prefix should have the same length as `mu4e-headers-thread-connection-prefix'. This prefix should have the same length as `mu4e-headers-thread-connection-prefix'.")
This variable is only used when mu4e-headers-new-thread-style is non-nil.") (defvar mu4e-headers-thread-orphan-prefix '("┬>" . "┳▶ ")
"Prefix for orphan messages with siblings.")
(defvar mu4e-headers-thread-orphan-prefix '("" . "") (defvar mu4e-headers-thread-single-orphan-prefix '("─>" . "━▶ ")
"Prefix for orphan messages. "Prefix for orphan messages with no siblings.")
This variable is only used when mu4e-headers-new-thread-style is non-nil.")
(defvar mu4e-headers-thread-duplicate-prefix '("=" . "≡ ") (defvar mu4e-headers-thread-duplicate-prefix '("=" . "≡ ")
"Prefix for duplicate messages. "Prefix for duplicate messages.")
This variable is only used when mu4e-headers-new-thread-style is non-nil.")
(defvar mu4e-headers-actions (defvar mu4e-headers-actions
'( ("capture message" . mu4e-action-capture-message) '( ("capture message" . mu4e-action-capture-message)
@ -445,13 +436,14 @@ into a string."
(lambda (cell) (lambda (cell)
(if mu4e-use-fancy-chars (cdr cell) (car cell))))) (if mu4e-use-fancy-chars (cdr cell) (car cell)))))
(case type (case type
('child (funcall get-prefix mu4e-headers-thread-child-prefix)) ('child (funcall get-prefix mu4e-headers-thread-child-prefix))
('last-child (funcall get-prefix mu4e-headers-thread-last-child-prefix)) ('last-child (funcall get-prefix mu4e-headers-thread-last-child-prefix))
('connection (funcall get-prefix mu4e-headers-thread-connection-prefix)) ('connection (funcall get-prefix mu4e-headers-thread-connection-prefix))
('blank (funcall get-prefix mu4e-headers-thread-blank-prefix)) ('blank (funcall get-prefix mu4e-headers-thread-blank-prefix))
('orphan (funcall get-prefix mu4e-headers-thread-orphan-prefix)) ('orphan (funcall get-prefix mu4e-headers-thread-orphan-prefix))
('duplicate (funcall get-prefix mu4e-headers-thread-duplicate-prefix)) ('single-orphan (funcall get-prefix mu4e-headers-thread-single-orphan-prefix))
(t "?")))) ('duplicate (funcall get-prefix mu4e-headers-thread-duplicate-prefix))
(t "?"))))
;; In order to print a thread tree with all the message connections, ;; In order to print a thread tree with all the message connections,
;; it's necessary to keep track of all sub levels that still have ;; it's necessary to keep track of all sub levels that still have
@ -470,7 +462,7 @@ into a string."
(last-child (plist-get thread :last-child)) (last-child (plist-get thread :last-child))
(duplicate (plist-get thread :duplicate))) (duplicate (plist-get thread :duplicate)))
;; Do not prefix root messages. ;; Do not prefix root messages.
(if (or (= level 0) empty-parent) (if (= level 0)
(setq mu4e~headers-thread-state '())) (setq mu4e~headers-thread-state '()))
(if (> level 0) (if (> level 0)
(let* ((length (length mu4e~headers-thread-state)) (let* ((length (length mu4e~headers-thread-state))
@ -490,12 +482,14 @@ into a string."
;; connections or blanks. ;; connections or blanks.
(mapconcat (mapconcat
(lambda (s) (lambda (s)
(if s (mu4e~headers-thread-prefix-map 'connection) (mu4e~headers-thread-prefix-map
(mu4e~headers-thread-prefix-map 'blank))) (if s 'connection 'blank)))
mu4e~headers-thread-state "") mu4e~headers-thread-state "")
;; Current entry. ;; Current entry.
(if last-child (mu4e~headers-thread-prefix-map 'last-child) (mu4e~headers-thread-prefix-map
(mu4e~headers-thread-prefix-map 'child)))))) (if (and empty-parent first-child)
(if last-child 'single-orphan 'orphan)
(if last-child 'last-child 'child)))))))
;; If a new sub-thread will follow (has-child) and the current ;; If a new sub-thread will follow (has-child) and the current
;; one is still not done (not last-child), then a new ;; one is still not done (not last-child), then a new
;; connection needs to be added to the tree-state. It's not ;; connection needs to be added to the tree-state. It's not
@ -505,10 +499,8 @@ into a string."
(setq mu4e~headers-thread-state (setq mu4e~headers-thread-state
(append mu4e~headers-thread-state '(t)))) (append mu4e~headers-thread-state '(t))))
;; Return the thread prefix. ;; Return the thread prefix.
(format "%s%s%s" (format "%s%s"
prefix prefix
(if empty-parent
(mu4e~headers-thread-prefix-map 'orphan) "")
(if duplicate (if duplicate
(mu4e~headers-thread-prefix-map 'duplicate) ""))))) (mu4e~headers-thread-prefix-map 'duplicate) "")))))