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

diff --git a/c3/efc07d5d63990f1897aac7f515be40a06b00a7 b/c3/efc07d5d63990f1897aac7f515be40a06b00a7
new file mode 100644 (file)
index 0000000..0618d1e
--- /dev/null
+++ b/c3/efc07d5d63990f1897aac7f515be40a06b00a7
@@ -0,0 +1,126 @@
+Return-Path: <m.walters@qmul.ac.uk>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id AA519431FAF\r
+       for <notmuch@notmuchmail.org>; Sat, 28 Jul 2012 05:19:16 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -1.098\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5\r
+       tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001,\r
+       NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id p98WDH-+n2+U for <notmuch@notmuchmail.org>;\r
+       Sat, 28 Jul 2012 05:19:16 -0700 (PDT)\r
+Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6])\r
+       (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 0E0B1431FAE\r
+       for <notmuch@notmuchmail.org>; Sat, 28 Jul 2012 05:19:16 -0700 (PDT)\r
+Received: from smtp.qmul.ac.uk ([138.37.6.40])\r
+       by mail2.qmul.ac.uk with esmtp (Exim 4.71)\r
+       (envelope-from <m.walters@qmul.ac.uk>)\r
+       id 1Sv5zG-00041H-JJ; Sat, 28 Jul 2012 13:19:14 +0100\r
+Received: from 94-192-233-223.zone6.bethere.co.uk ([94.192.233.223]\r
+       helo=localhost)\r
+       by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69)\r
+       (envelope-from <m.walters@qmul.ac.uk>)\r
+       id 1Sv5zG-0005gU-9C; Sat, 28 Jul 2012 13:19:14 +0100\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] emacs: Split the function notmuch-show-clean-address\r
+User-Agent: Notmuch/0.13.2+93~gf33b188 (http://notmuchmail.org) Emacs/23.4.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Sat, 28 Jul 2012 13:19:14 +0100\r
+Message-ID: <87ehnw84e5.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Sender-Host-Address: 94.192.233.223\r
+X-QM-SPAM-Info: Sender has good ham record.  :)\r
+X-QM-Body-MD5: c4b2f5ab97d6c89f18043d923b99556f (of first 20000 bytes)\r
+X-SpamAssassin-Score: -1.8\r
+X-SpamAssassin-SpamBar: -\r
+X-SpamAssassin-Report: The QM spam filters have analysed this message to\r
+       determine if it is\r
+       spam. We require at least 5.0 points to mark a message as spam.\r
+       This message scored -1.8 points.\r
+       Summary of the scoring: \r
+       * -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/,\r
+       *      medium trust\r
+       *      [138.37.6.40 listed in list.dnswl.org]\r
+       * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail\r
+       provider *      (markwalters1009[at]gmail.com)\r
+       * -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay\r
+       *      domain\r
+       *  0.5 AWL AWL: From: address is in the auto white-list\r
+X-QM-Scan-Virus: ClamAV says the message is clean\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sat, 28 Jul 2012 12:19:16 -0000\r
+\r
+\r
+This function is also used by pick so split it out. Since, pick and show\r
+want a slightly different combination of name and email make the\r
+separated function return them as a pair, and let show or pick extract\r
+the combination they want from that.\r
+---\r
+\r
+This change allows the removal of about 50 lines of duplicated code from\r
+notmuch-pick. Later, we may want to move the split out function to lib.\r
+\r
+ emacs/notmuch-show.el |   19 ++++++++++++++-----\r
+ 1 files changed, 14 insertions(+), 5 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+index 6335d45..0d8569d 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -354,6 +354,19 @@ operation on the contents of the current buffer."\r
+ (defun notmuch-show-clean-address (address)\r
+   "Try to clean a single email ADDRESS for display.  Return\r
+ unchanged ADDRESS if parsing fails."\r
++  (let* ((clean-address (notmuch-clean-address address))\r
++       (p-address (car clean-address))\r
++       (p-name (car (cdr clean-address))))\r
++    ;; If no name, return just the address.\r
++    (if (not p-name)\r
++      p-address\r
++      ;; Otherwise format the name and address together.\r
++      (concat p-name " <" p-address ">"))))\r
++\r
++(defun notmuch-clean-address (address)\r
++  "Try to clean a single email ADDRESS for display.\r
++Return (AUTHOR_EMAIL AUTHOR_NAME). Return (ADDRESS nil) if\r
++parsing fails."\r
+   (condition-case nil\r
+     (let (p-name p-address)\r
+       ;; It would be convenient to use `mail-header-parse-address',\r
+@@ -401,11 +414,7 @@ unchanged ADDRESS if parsing fails."\r
+       (when (string= p-name p-address)\r
+       (setq p-name nil))\r
+ \r
+-      ;; If no name results, return just the address.\r
+-      (if (not p-name)\r
+-        p-address\r
+-      ;; Otherwise format the name and address together.\r
+-      (concat p-name " <" p-address ">")))\r
++      (list p-address p-name))\r
+     (error address)))\r
+ \r
+ (defun notmuch-show-insert-headerline (headers date tags depth)\r
+-- \r
+1.7.9.1\r
+\r