From 077e0515ec4854159f0f4461756837c11b38f649 Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Sat, 1 Mar 2014 09:37:22 +0000 Subject: [PATCH] Re: [PATCH v2] emacs: Simplify and fix `notmuch-mua-prompt-for-sender' --- 86/01fd22d0fed4d71e3406397347f96842f5b2f1 | 155 ++++++++++++++++++++++ 1 file changed, 155 insertions(+) create mode 100644 86/01fd22d0fed4d71e3406397347f96842f5b2f1 diff --git a/86/01fd22d0fed4d71e3406397347f96842f5b2f1 b/86/01fd22d0fed4d71e3406397347f96842f5b2f1 new file mode 100644 index 000000000..d44bd2075 --- /dev/null +++ b/86/01fd22d0fed4d71e3406397347f96842f5b2f1 @@ -0,0 +1,155 @@ +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 0D3DA431FBF + for ; Sat, 1 Mar 2014 01:37:34 -0800 (PST) +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 4Gh0fp-L97fV for ; + Sat, 1 Mar 2014 01:37:29 -0800 (PST) +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 B7210431FAF + for ; Sat, 1 Mar 2014 01:37:28 -0800 (PST) +Received: from smtp.qmul.ac.uk ([138.37.6.40]) + by mail2.qmul.ac.uk with esmtp (Exim 4.71) + (envelope-from ) + id 1WJgMG-0000S6-2P; Sat, 01 Mar 2014 09:37:24 +0000 +Received: from 93-97-24-31.zone5.bethere.co.uk ([93.97.24.31] helo=localhost) + by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.71) + (envelope-from ) + id 1WJgMF-000554-NF; Sat, 01 Mar 2014 09:37:23 +0000 +From: Mark Walters +To: Austin Clements , notmuch@notmuchmail.org +Subject: Re: [PATCH v2] emacs: Simplify and fix + `notmuch-mua-prompt-for-sender' +In-Reply-To: <1393524654-20502-1-git-send-email-amdragon@mit.edu> +References: <87fvndfm3k.fsf@qmul.ac.uk> + <1393524654-20502-1-git-send-email-amdragon@mit.edu> +User-Agent: Notmuch/0.15.2+562~g339f306 (http://notmuchmail.org) Emacs/23.4.1 + (x86_64-pc-linux-gnu) +Date: Sat, 01 Mar 2014 09:37:22 +0000 +Message-ID: <87ob1q2ral.fsf@qmul.ac.uk> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +X-Sender-Host-Address: 93.97.24.31 +X-QM-Geographic: According to ripencc, + this message was delivered by a machine in Britain (UK) (GB). +X-QM-SPAM-Info: Sender has good ham record. :) +X-QM-Body-MD5: d9e6958e205d01ceeae768d0b26ac86f (of first 20000 bytes) +X-SpamAssassin-Score: 0.0 +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 0.0 points. Summary of the scoring: + * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail + provider * (markwalters1009[at]gmail.com) + * 0.0 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: Sat, 01 Mar 2014 09:37:34 -0000 + + +This version is fine (thanks!). And the patch looks good to me too +1. + +Best wishes + +Mark + + +On Thu, 27 Feb 2014, Austin Clements wrote: +> `notmuch-mua-prompt-for-sender' is over-engineered and often wrong. +> It attempts to detect when all identities have the same name and +> specialize the prompt to just the email address part. However, to do +> this it uses `mail-extract-address-components', which is meant for +> displaying email addresses, not general-purpose parsing, and hence +> performs many canonicalizations that can interfere with this use. For +> example, configuring notmuch-identities to ("Austin +> "), will cause `notmuch-mua-prompt-for-sender' to +> lose the name part entirely and return " ". +> +> This patch rewrites `notmuch-mua-prompt-for-sender' to simply prompt +> for a full identity when notmuch-identities is configured, or to +> prompt for a sender address when it isn't. +> +> The original code also did several strange things, like using `eval' +> and specifying that this function was interactive. As a side-effect, +> this patch fixes these problems. And it adds a docstring. +> --- +> +> Mark, is this better? +> +> emacs/notmuch-mua.el | 37 +++++++++++++------------------------ +> 1 file changed, 13 insertions(+), 24 deletions(-) +> +> diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el +> index f2df770..b16a10e 100644 +> --- a/emacs/notmuch-mua.el +> +++ b/emacs/notmuch-mua.el +> @@ -286,30 +286,19 @@ the From: header is already filled in by notmuch." +> (ad-activate 'ido-completing-read))) +> +> (defun notmuch-mua-prompt-for-sender () +> - (interactive) +> - (let (name addresses one-name-only) +> - ;; If notmuch-identities is non-nil, check if there is a fixed user name. +> - (if notmuch-identities +> - (let ((components (mapcar 'mail-extract-address-components notmuch-identities))) +> - (setq name (caar components) +> - addresses (mapcar 'cadr components) +> - one-name-only (eval +> - (cons 'and +> - (mapcar (lambda (identity) +> - (string-equal name (car identity))) +> - components))))) +> - ;; If notmuch-identities is nil, use values from the notmuch configuration file. +> - (setq name (notmuch-user-name) +> - addresses (cons (notmuch-user-primary-email) (notmuch-user-other-email)) +> - one-name-only t)) +> - ;; Now prompt the user, either for an email address only or for a full identity. +> - (if one-name-only +> - (let ((address +> - (ido-completing-read (concat "Sender address for " name ": ") addresses +> - nil nil nil 'notmuch-mua-sender-history (car addresses)))) +> - (concat name " <" address ">")) +> - (ido-completing-read "Send mail From: " notmuch-identities +> - nil nil nil 'notmuch-mua-sender-history (car notmuch-identities))))) +> + "Prompt for a sender from the user's configured identities." +> + (if notmuch-identities +> + (ido-completing-read "Send mail from: " notmuch-identities +> + nil nil nil 'notmuch-mua-sender-history +> + (car notmuch-identities)) +> + (let* ((name (notmuch-user-name)) +> + (addrs (cons (notmuch-user-primary-email) +> + (notmuch-user-other-email))) +> + (address +> + (ido-completing-read (concat "Sender address for " name ": ") addrs +> + nil nil nil 'notmuch-mua-sender-history +> + (car addrs)))) +> + (concat name " <" address ">")))) +> +> (put 'notmuch-mua-new-mail 'notmuch-prefix-doc "... and prompt for sender") +> (defun notmuch-mua-new-mail (&optional prompt-for-sender) +> -- +> 1.8.4.rc3 -- 2.26.2