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: Split the function notmuch-show-clean-address

Browse source 
This function is also used by pick so split it out in preperation for
moving to lib. In fact, pick and show want a slightly different
combination of name and email on return so make the separated function
return them as a pair, and let show or pick extract the combination
they want from that.
This commit is contained in:
Mark Walters 2012-07-31 17:29:39 +01:00 committed by David Bremner
parent 5505d55515
commit e504b56f24
1 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
emacs/notmuch-show.el
View file

@ -366,9 +366,10 @@ operation on the contents of the current buffer."
'face 'notmuch-tag-face) 'face 'notmuch-tag-face)
")")))))) ")"))))))
(defun notmuch-show-clean-address (address) (defun notmuch-clean-address (address)
"Try to clean a single email ADDRESS for display. Return "Try to clean a single email ADDRESS for display. Return a cons
unchanged ADDRESS if parsing fails." cell of (AUTHOR_EMAIL AUTHOR_NAME). Return (ADDRESS nil) if
parsing fails."
(condition-case nil (condition-case nil
(let (p-name p-address) (let (p-name p-address)
;; It would be convenient to use `mail-header-parse-address', ;; It would be convenient to use `mail-header-parse-address',
@ -416,12 +417,20 @@ unchanged ADDRESS if parsing fails."
(when (string= p-name p-address) (when (string= p-name p-address)
(setq p-name nil)) (setq p-name nil))
;; If no name results, return just the address. (cons p-address p-name))
(if (not p-name) (error (cons address nil))))
p-address
;; Otherwise format the name and address together. (defun notmuch-show-clean-address (address)
(concat p-name " <" p-address ">"))) "Try to clean a single email ADDRESS for display. Return
(error address))) unchanged ADDRESS if parsing fails."
(let* ((clean-address (notmuch-clean-address address))
(p-address (car clean-address))
(p-name (cdr clean-address)))
;; If no name, return just the address.
(if (not p-name)
p-address
;; Otherwise format the name and address together.
(concat p-name " <" p-address ">"))))
(defun notmuch-show-insert-headerline (headers date tags depth) (defun notmuch-show-insert-headerline (headers date tags depth)
"Insert a notmuch style headerline based on HEADERS for a "Insert a notmuch style headerline based on HEADERS for a