From daba5e96718e728fe64bd9886a7bf8e6f60b02ce Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Sat, 1 Dec 2012 18:02:02 +0000 Subject: [PATCH] [PATCH v2] contrib: pick: use notmuch-clean-address --- 97/e8125b65feca7a033e64d6320c631a9fc53aec | 156 ++++++++++++++++++++++ 1 file changed, 156 insertions(+) create mode 100644 97/e8125b65feca7a033e64d6320c631a9fc53aec diff --git a/97/e8125b65feca7a033e64d6320c631a9fc53aec b/97/e8125b65feca7a033e64d6320c631a9fc53aec new file mode 100644 index 000000000..82651f413 --- /dev/null +++ b/97/e8125b65feca7a033e64d6320c631a9fc53aec @@ -0,0 +1,156 @@ +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 DA119431FBC + for ; Sat, 1 Dec 2012 10:02:32 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0.201 +X-Spam-Level: +X-Spam-Status: No, score=0.201 tagged_above=-999 required=5 + tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, + FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001, + RCVD_IN_DNSWL_LOW=-0.7] 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 n8icWqiga9Pr for ; + Sat, 1 Dec 2012 10:02:28 -0800 (PST) +Received: from mail-wi0-f175.google.com (mail-wi0-f175.google.com + [209.85.212.175]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id AEA2F431FAF + for ; Sat, 1 Dec 2012 10:02:28 -0800 (PST) +Received: by mail-wi0-f175.google.com with SMTP id hm11so311437wib.2 + for ; Sat, 01 Dec 2012 10:02:26 -0800 (PST) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; + h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; + bh=ympdeC/o4fZ6SmBzltIHNjNZqD4u6/PHfobJlLeV5K0=; + b=KRq9XB2NfRpZ6B6FyQBypOjqEnFsbat5s97ILqWHFp0pbFqQpTR99FEaw4fb2MYaRC + fCuS8RQHDB00w5BYOdLtLTlQq/aTtsfmbEu0dLtyYdbiUaukzqXqdXR7tgrzCQVr+vU2 + s/124DzCt9LMfAOBWuhva9+hx6H4bnzbIE8JRWP0i5w9/yhZMTF99wZH+K5Zf/rqWXl7 + Nl1MGGbYH2ivXuxw/IHH9X/ppQdAh+9pZoLWkWFsxy7vG5ZYvcmpGYj82+YVoloDMWSX + o3MpLvWfJuIk+F0GilHwKxmMXDTaArQ7PVa5j8OfANxQ21jetCvUOJnYZ5mp26eOgTxp + hcww== +Received: by 10.216.143.232 with SMTP id l82mr1658662wej.181.1354384946185; + Sat, 01 Dec 2012 10:02:26 -0800 (PST) +Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31]) + by mx.google.com with ESMTPS id p2sm4388286wic.7.2012.12.01.10.02.24 + (version=TLSv1/SSLv3 cipher=OTHER); + Sat, 01 Dec 2012 10:02:25 -0800 (PST) +From: Mark Walters +To: notmuch@notmuchmail.org +Subject: [PATCH v2] contrib: pick: use notmuch-clean-address +Date: Sat, 1 Dec 2012 18:02:02 +0000 +Message-Id: <1354384922-14237-1-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.9.1 +In-Reply-To: +References: +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: Sat, 01 Dec 2012 18:02:33 -0000 + +Now notmuch-clean-address is split out in show pick can use that (with a small +wrapper). +--- +A neater version following Tomi's suggestion. + + contrib/notmuch-pick/notmuch-pick.el | 63 ++++----------------------------- + 1 files changed, 8 insertions(+), 55 deletions(-) + +diff --git a/contrib/notmuch-pick/notmuch-pick.el b/contrib/notmuch-pick/notmuch-pick.el +index eca1cba..a5005be 100644 +--- a/contrib/notmuch-pick/notmuch-pick.el ++++ b/contrib/notmuch-pick/notmuch-pick.el +@@ -35,7 +35,6 @@ + (declare-function notmuch-show "notmuch-show" (&rest args)) + (declare-function notmuch-tag "notmuch" (query &rest tags)) + (declare-function notmuch-show-strip-re "notmuch-show" (subject)) +-(declare-function notmuch-show-clean-address "notmuch-show" (parsed-address)) + (declare-function notmuch-show-spaces-n "notmuch-show" (n)) + (declare-function notmuch-read-query "notmuch" (prompt)) + (declare-function notmuch-read-tag-changes "notmuch" (&optional initial-input &rest search-terms)) +@@ -528,62 +527,16 @@ than only the current message." + (message (format "Command '%s' exited abnormally with code %d" + shell-command exit-code))))))) + +-;; Shamelessly stolen from notmuch-show.el: should be unified. + (defun notmuch-pick-clean-address (address) +- "Try to clean a single email ADDRESS for display. Return ++ "Try to clean a single email ADDRESS for display. Return ++AUTHOR_NAME if present, otherwise return AUTHOR_EMAIL. Return + unchanged ADDRESS if parsing fails." +- (condition-case nil +- (let (p-name p-address) +- ;; It would be convenient to use `mail-header-parse-address', +- ;; but that expects un-decoded mailbox parts, whereas our +- ;; mailbox parts are already decoded (and hence may contain +- ;; UTF-8). Given that notmuch should handle most of the awkward +- ;; cases, some simple string deconstruction should be sufficient +- ;; here. +- (cond +- ;; "User " style. +- ((string-match "\\(.*\\) <\\(.*\\)>" address) +- (setq p-name (match-string 1 address) +- p-address (match-string 2 address))) +- +- ;; "" style. +- ((string-match "<\\(.*\\)>" address) +- (setq p-address (match-string 1 address))) +- +- ;; Everything else. +- (t +- (setq p-address address))) +- +- (when p-name +- ;; Remove elements of the mailbox part that are not relevant for +- ;; display, even if they are required during transport: +- ;; +- ;; Backslashes. +- (setq p-name (replace-regexp-in-string "\\\\" "" p-name)) +- +- ;; Outer single and double quotes, which might be nested. +- (loop +- with start-of-loop +- do (setq start-of-loop p-name) +- +- when (string-match "^\"\\(.*\\)\"$" p-name) +- do (setq p-name (match-string 1 p-name)) +- +- when (string-match "^'\\(.*\\)'$" p-name) +- do (setq p-name (match-string 1 p-name)) +- +- until (string= start-of-loop p-name))) +- +- ;; If the address is 'foo@bar.com ' then show just +- ;; 'foo@bar.com'. +- (when (string= p-name p-address) +- (setq p-name nil)) +- +- ;; If we have a name return that otherwise return the address. +- (if (not p-name) +- p-address +- p-name)) +- (error address))) ++ (let* ((clean-address (notmuch-clean-address address)) ++ (p-address (car clean-address)) ++ (p-name (cdr clean-address))) ++ ++ ;; If we have a name return that otherwise return the address. ++ (or p-name p-address))) + + (defun notmuch-pick-insert-field (field format-string msg) + (let* ((headers (plist-get msg :headers)) +-- +1.7.9.1 + -- 2.26.2