Return-Path: X-Original-To: notmuch@notmuchmail.org Delivered-To: notmuch@notmuchmail.org Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 9F0BD431FAF for ; Tue, 31 Jul 2012 00:47:14 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: 0 X-Spam-Level: X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vXrjVQMBqqCq for ; Tue, 31 Jul 2012 00:47:13 -0700 (PDT) Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34]) by olra.theworths.org (Postfix) with ESMTP id B73F1431FAE for ; Tue, 31 Jul 2012 00:47:13 -0700 (PDT) Received: by guru.guru-group.fi (Postfix, from userid 501) id 76F4710036F; Tue, 31 Jul 2012 10:47:22 +0300 (EEST) From: Tomi Ollila To: Mark Walters , notmuch@notmuchmail.org Subject: Re: [PATCH] emacs: Split the function notmuch-show-clean-address In-Reply-To: <87ehnw84e5.fsf@qmul.ac.uk> References: <87ehnw84e5.fsf@qmul.ac.uk> User-Agent: Notmuch/0.13.2+103~g9610d35 (http://notmuchmail.org) Emacs/23.1.1 (x86_64-redhat-linux-gnu) X-Face: HhBM'cA~ MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Jul 2012 07:47:14 -0000 On Sat, Jul 28 2012, Mark Walters wrote: > This function is also used by pick so split it out. Since, pick and show > want a slightly different combination of name and email make the > separated function return them as a pair, and let show or pick extract > the combination they want from that. > --- Put notmuch-clean-address before notmuch-show-clean-address so that byte compilation don't complain about missing function. (or move it to another file --- maybe later if it is sensible thing to do) You could return the name-address pair as cons cell instead of list (?). (If you continue to use list you can replace (car (cdr ...)) with (cadr ...)) Anyway, LGTM. Tomi > > This change allows the removal of about 50 lines of duplicated code from > notmuch-pick. Later, we may want to move the split out function to lib. > > emacs/notmuch-show.el | 19 ++++++++++++++----- > 1 files changed, 14 insertions(+), 5 deletions(-) > > diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el > index 6335d45..0d8569d 100644 > --- a/emacs/notmuch-show.el > +++ b/emacs/notmuch-show.el > @@ -354,6 +354,19 @@ operation on the contents of the current buffer." > (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 (car (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-clean-address (address) > + "Try to clean a single email ADDRESS for display. > +Return (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', > @@ -401,11 +414,7 @@ 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 ">"))) > + (list p-address p-name)) > (error address))) > > (defun notmuch-show-insert-headerline (headers date tags depth) > -- > 1.7.9.1 > > _______________________________________________ > notmuch mailing list > notmuch@notmuchmail.org > http://notmuchmail.org/mailman/listinfo/notmuch