From: Mark Walters Date: Tue, 31 Jul 2012 16:29:39 +0000 (+0100) Subject: [PATCH v2] emacs: Split the function notmuch-show-clean-address X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=68a72cbba7e8ab391c9b35da9662a3e1bb04d673;p=notmuch-archives.git [PATCH v2] emacs: Split the function notmuch-show-clean-address --- diff --git a/b6/d71ad1317f2c6446a9614a28e4f10aea7c43cb b/b6/d71ad1317f2c6446a9614a28e4f10aea7c43cb new file mode 100644 index 000000000..6045705b6 --- /dev/null +++ b/b6/d71ad1317f2c6446a9614a28e4f10aea7c43cb @@ -0,0 +1,134 @@ +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 F1775431FAF + for ; Tue, 31 Jul 2012 09:29:41 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -1.098 +X-Spam-Level: +X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5 + tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001, + NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] 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 GxIgzi2P+zAf for ; + Tue, 31 Jul 2012 09:29:41 -0700 (PDT) +Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 49A29431FAE + for ; Tue, 31 Jul 2012 09:29:41 -0700 (PDT) +Received: from smtp.qmul.ac.uk ([138.37.6.40]) + by mail2.qmul.ac.uk with esmtp (Exim 4.71) + (envelope-from ) + id 1SwFKF-0006PE-OB; Tue, 31 Jul 2012 17:29:39 +0100 +Received: from 94-192-233-223.zone6.bethere.co.uk ([94.192.233.223] + helo=localhost) + by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69) + (envelope-from ) + id 1SwFKF-00030G-EL; Tue, 31 Jul 2012 17:29:39 +0100 +From: Mark Walters +To: Tomi Ollila , notmuch@notmuchmail.org +Subject: [PATCH v2] emacs: Split the function notmuch-show-clean-address +In-Reply-To: <87boivzyls.fsf@qmul.ac.uk> +References: <87ehnw84e5.fsf@qmul.ac.uk> + <87boivzyls.fsf@qmul.ac.uk> +User-Agent: Notmuch/0.13.2+96~g634443c (http://notmuchmail.org) Emacs/23.4.1 + (x86_64-pc-linux-gnu) +Date: Tue, 31 Jul 2012 17:29:39 +0100 +Message-ID: <878vdzzyfg.fsf@qmul.ac.uk> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +X-Sender-Host-Address: 94.192.233.223 +X-QM-SPAM-Info: Sender has good ham record. :) +X-QM-Body-MD5: cb6b5d3f83cd6a3c9f674b46315cc3a3 (of first 20000 bytes) +X-SpamAssassin-Score: -1.8 +X-SpamAssassin-SpamBar: - +X-SpamAssassin-Report: The QM spam filters have analysed this message to + determine if it is + spam. We require at least 5.0 points to mark a message as spam. + This message scored -1.8 points. + Summary of the scoring: + * -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, + * medium trust + * [138.37.6.40 listed in list.dnswl.org] + * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail + provider * (markwalters1009[at]gmail.com) + * -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay + * domain + * 0.5 AWL AWL: From: address is in the auto white-list +X-QM-Scan-Virus: ClamAV says the message is clean +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 16:29:42 -0000 + + +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." + (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 +