From af82aec60146a44771902dabef5a9da2404a82cd Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Thu, 20 Feb 2014 22:36:15 +0000 Subject: [PATCH] Re: [PATCH 4/4] emacs: Simplify and fix `notmuch-mua-prompt-for-sender' --- 95/b4e829b95411859b81836999b095185a50e173 | 178 ++++++++++++++++++++++ 1 file changed, 178 insertions(+) create mode 100644 95/b4e829b95411859b81836999b095185a50e173 diff --git a/95/b4e829b95411859b81836999b095185a50e173 b/95/b4e829b95411859b81836999b095185a50e173 new file mode 100644 index 000000000..6b5cc3bb4 --- /dev/null +++ b/95/b4e829b95411859b81836999b095185a50e173 @@ -0,0 +1,178 @@ +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 3C73C431FB6 + for ; Thu, 20 Feb 2014 14:36:33 -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 us8IoMzp-yR7 for ; + Thu, 20 Feb 2014 14:36: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 11EB4431FAE + for ; Thu, 20 Feb 2014 14:36:29 -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 1WGcE5-0002az-PI; Thu, 20 Feb 2014 22:36:23 +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 1WGcE5-0001hE-CG; Thu, 20 Feb 2014 22:36:17 +0000 +From: Mark Walters +To: Austin Clements , notmuch@notmuchmail.org +Subject: Re: [PATCH 4/4] emacs: Simplify and fix + `notmuch-mua-prompt-for-sender' +In-Reply-To: <1392923797-17045-5-git-send-email-amdragon@mit.edu> +References: <1392923797-17045-1-git-send-email-amdragon@mit.edu> + <1392923797-17045-5-git-send-email-amdragon@mit.edu> +User-Agent: Notmuch/0.15.2+484~gfb59956 (http://notmuchmail.org) Emacs/23.4.1 + (x86_64-pc-linux-gnu) +Date: Thu, 20 Feb 2014 22:36:15 +0000 +Message-ID: <87fvndfm3k.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: 16e9f3dc22b4143d09fb5c5221c09767 (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 +Cc: bjonnh-nm@bjonnh.net +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: Thu, 20 Feb 2014 22:36:33 -0000 + + +Patches 1-3 look fine +1. + +This one I am less sure about. I agree with the principle but for my use +case it is a little annoying: + +I only use one name for all my addresses (Mark Walters), some addresses +are mark@.. and some walters@.. + +ido-completing-read is definitely less nice to use when all the addresses +match mark and walters. + +I wonder if we could get the old behaviour in a more robust fashion. Two +possibilities we could consider are + +1) if getting the information from the config file (when there is +necessarily a single name) then only complete the addresses. + +2) make notmuch-identities a list of cons cells (name . email). Then +there is no parsing and the old method could be robust. + +OTOH I can get used to the change. + +Best wishes + +Mark + + + +On Thu, 20 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, but this has +> several problems. First, 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 " ". Second, though less serious, the +> prompt specialization means the user can't enter a different name like +> they can if their identities have different names. +> +> This patch rewrites `notmuch-mua-prompt-for-sender' to simply prompt +> for a full identity, where the list of identities is derived from +> either notmuch-identities or the user's Notmuch configuration. +> +> 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. +> --- +> emacs/notmuch-mua.el | 33 +++++++++------------------------ +> 1 file changed, 9 insertions(+), 24 deletions(-) +> +> diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el +> index f2df770..4a485a4 100644 +> --- a/emacs/notmuch-mua.el +> +++ b/emacs/notmuch-mua.el +> @@ -286,30 +286,15 @@ 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." +> + (let ((identities (or notmuch-identities +> + (let ((name (notmuch-user-name))) +> + (mapcar (lambda (addr) (concat name " <" addr ">")) +> + (cons (notmuch-user-primary-email) +> + (notmuch-user-other-email))))))) +> + (ido-completing-read "Send mail from: " identities +> + nil nil nil 'notmuch-mua-sender-history +> + (car identities)))) +> +> (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 +> +> _______________________________________________ +> notmuch mailing list +> notmuch@notmuchmail.org +> http://notmuchmail.org/mailman/listinfo/notmuch -- 2.26.2