From 0253e34f03ccac96a215ff9c8bec32da5cfe2da7 Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Fri, 21 Feb 2014 21:17:15 +1900 Subject: [PATCH] Re: [PATCH 4/4] emacs: Simplify and fix `notmuch-mua-prompt-for-sender' --- 4d/fb594699a34f1dcb71e2b96effb4ee8f22fccf | 203 ++++++++++++++++++++++ 1 file changed, 203 insertions(+) create mode 100644 4d/fb594699a34f1dcb71e2b96effb4ee8f22fccf diff --git a/4d/fb594699a34f1dcb71e2b96effb4ee8f22fccf b/4d/fb594699a34f1dcb71e2b96effb4ee8f22fccf new file mode 100644 index 000000000..88066f6a8 --- /dev/null +++ b/4d/fb594699a34f1dcb71e2b96effb4ee8f22fccf @@ -0,0 +1,203 @@ +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 C26C3431FB6 + for ; Thu, 20 Feb 2014 18:17:31 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[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 7pc84SoFkpcG for ; + Thu, 20 Feb 2014 18:17:24 -0800 (PST) +Received: from dmz-mailsec-scanner-2.mit.edu (dmz-mailsec-scanner-2.mit.edu + [18.9.25.13]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 309AA431FAE + for ; Thu, 20 Feb 2014 18:17:24 -0800 (PST) +X-AuditID: 1209190d-f79776d000000ce9-42-5306b732ddd5 +Received: from mailhub-auth-3.mit.edu ( [18.9.21.43]) + (using TLS with cipher AES256-SHA (256/256 bits)) + (Client did not present a certificate) + by dmz-mailsec-scanner-2.mit.edu (Symantec Messaging Gateway) with SMTP + id 25.7C.03305.237B6035; Thu, 20 Feb 2014 21:17:22 -0500 (EST) +Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11]) + by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id s1L2HKJu012769; + Thu, 20 Feb 2014 21:17:21 -0500 +Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91]) + (authenticated bits=0) + (User authenticated as amdragon@ATHENA.MIT.EDU) + by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id s1L2HIsR005680 + (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT); + Thu, 20 Feb 2014 21:17:19 -0500 +Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.80) + (envelope-from ) + id 1WGffw-0002xS-Th; Thu, 20 Feb 2014 21:17:17 -0500 +Date: Thu, 20 Feb 2014 21:17:15 -0500 +From: Austin Clements +To: Mark Walters +Subject: Re: [PATCH 4/4] emacs: Simplify and fix + `notmuch-mua-prompt-for-sender' +Message-ID: <20140221021715.GB4620@mit.edu> +References: <1392923797-17045-1-git-send-email-amdragon@mit.edu> + <1392923797-17045-5-git-send-email-amdragon@mit.edu> + <87fvndfm3k.fsf@qmul.ac.uk> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +Content-Disposition: inline +In-Reply-To: <87fvndfm3k.fsf@qmul.ac.uk> +User-Agent: Mutt/1.5.21 (2010-09-15) +X-Brightmail-Tracker: + H4sIAAAAAAAAA+NgFprJKsWRmVeSWpSXmKPExsUixCmqrWu0nS3Y4ESniMXrBZPYLFbP5bG4 + fnMmswOzx+q1nSweO2fdZfd4tuoWcwBzFJdNSmpOZllqkb5dAldG78LJbAUHtSsWz5/H2MD4 + WLGLkYNDQsBEYtplpi5GTiBTTOLCvfVsXYxcHEICs5kkzp7qg3I2Mkr8e7wByjnNJLHv8Xdm + CGcJo0Rz3wNGkH4WAVWJnh1XmEFsNgENiW37l4PFRQR0JG4fWsAOYjMLGEqcPbQfrEZYIEji + ftNkVhCbV0Bb4sCVTywQQ6cySvQ07WODSAhKnJz5hAWiWUvixr+XTCB3MwtISyz/xwES5gTa + dWPJdLCZogIqElNObmObwCg0C0n3LCTdsxC6FzAyr2KUTcmt0s1NzMwpTk3WLU5OzMtLLdI1 + 0svNLNFLTSndxAgOdUneHYzvDiodYhTgYFTi4T0hxRYsxJpYVlyZe4hRkoNJSZQ3djNQiC8p + P6UyI7E4I76oNCe1+BCjBAezkghvzlqgHG9KYmVValE+TEqag0VJnLfW4leQkEB6Yklqdmpq + QWoRTFaGg0NJgrd9G1CjYFFqempFWmZOCUKaiYMTZDgP0PD5IDW8xQWJucWZ6RD5U4y6HO8X + /P3EKMSSl5+XKiXOm7IVqEgApCijNA9uDixFvWIUB3pLmHcRyCgeYHqDm/QKaAkT0JKSjawg + S0oSEVJSDYxqLpa5z2s8fq6rSq/IsZHR9p+RceNtSlzvog27D3T6Tjyy7v+NKbEbk14ZnVV8 + /vDAWZY9Vg9dzyxPyVz9ottcsuvuvK+f6w7J/8ifwm8r73A/gsFgjfTz/IKrO9cnqred/tPz + qHxm8J3HB+f2/v5jfnzFAwknl27v4+6Jm+6E5Akx/qrb/dpHiaU4I9FQi7moOBEAi6H6gCwD AAA= +Cc: bjonnh-nm@bjonnh.net, notmuch@notmuchmail.org +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: Fri, 21 Feb 2014 02:17:32 -0000 + +Quoth Mark Walters on Feb 20 at 10:36 pm: +> +> 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. + +Ah, interesting. I'd figured ido would make this change *less* +jarring because you could enter just the email substring. + +> 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. + +This would be easy enough. I'd chosen not to do this partly because I +thought the user may want to enter an address in "Name " form +to override the name, especially if they only have one configured +identity (and since Emacs somehow lacks a address parser that can +extract the name without also transforming it to death, this is hard +to detect). But I'm happy to ignore that situation. + +> 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) +> > +> > _______________________________________________ +> > notmuch mailing list +> > notmuch@notmuchmail.org +> > http://notmuchmail.org/mailman/listinfo/notmuch + +-- +Austin Clements MIT/'06/PhD/CSAIL +amdragon@mit.edu http://web.mit.edu/amdragon + Somewhere in the dream we call reality you will find me, + searching for the reality we call dreams. -- 2.26.2