diff options
| author |  Mark Walters <markwalters1009@gmail.com> | 2012-07-31 17:29:39 +0100 |
|---|---|---|
| committer |  David Bremner <bremner@debian.org> | 2012-12-01 08:15:28 -0400 |
| commit | e504b56f24c291199d835aefcdb7bbb6809e8266 (patch) | |
| tree | 23c25b18461e4b7775616770a0e94a58eee1d4bb /emacs | |
| parent | 5505d55515594025fe319c5150fdb360b0ffcd60 (diff) | |
emacs: Split the function notmuch-show-clean-address
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.
Diffstat (limited to 'emacs')
| -rw-r--r-- | emacs/notmuch-show.el | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el index 489e32c8..4d6c014b 100644 --- a/emacs/notmuch-show.el +++ b/emacs/notmuch-show.el @@ -366,9 +366,10 @@ operation on the contents of the current buffer." 'face 'notmuch-tag-face) ")")))))) -(defun notmuch-show-clean-address (address) - "Try to clean a single email ADDRESS for display. Return -unchanged ADDRESS if parsing fails." +(defun notmuch-clean-address (address) + "Try to clean a single email ADDRESS for display. Return a cons +cell of (AUTHOR_EMAIL AUTHOR_NAME). Return (ADDRESS nil) if +parsing fails." (condition-case nil (let (p-name p-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) (setq p-name nil)) - ;; If no name results, return just the address. - (if (not p-name) - p-address - ;; Otherwise format the name and address together. - (concat p-name " <" p-address ">"))) - (error address))) + (cons p-address p-name)) + (error (cons address nil)))) + +(defun notmuch-show-clean-address (address) + "Try to clean a single email ADDRESS for display. Return +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) "Insert a notmuch style headerline based on HEADERS for a |