[PATCH v2] emacs: Split the function notmuch-show-clean-address

[Tomi Ollila]

On Tue, Jul 31 2012, Mark Walters <markwalters1009 at gmail.com> wrote:

> 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.
> ---
>  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 6335d45..4ab6f92 100644
> --- a/emacs/notmuch-show.el
> +++ b/emacs/notmuch-show.el
> @@ -351,9 +351,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."

Looks good to me.

It took a few iterations to understand that the error case in expression
below can be experimented with:

(condition-case nil (error "caught") (error (cons "car" "cdr"))) c-x c-e

Tomi

>    (condition-case nil
>      (let (p-name p-address)
>        ;; It would be convenient to use `mail-header-parse-address',
> @@ -401,12 +402,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
> -- 
> 1.7.9.1
>
> _______________________________________________
> notmuch mailing list
> notmuch at notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch