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 BF9F7431FBC for ; Sat, 4 Feb 2012 10:03:23 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: 0 X-Spam-Level: X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] 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 nRjwZx43vaCt for ; Sat, 4 Feb 2012 10:03:23 -0800 (PST) Received: from mail-lpp01m020-f181.google.com (mail-lpp01m020-f181.google.com [209.85.217.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id B00CA431FAF for ; Sat, 4 Feb 2012 10:03:22 -0800 (PST) Received: by lbbgn5 with SMTP id gn5so1113434lbb.26 for ; Sat, 04 Feb 2012 10:03:21 -0800 (PST) Received: by 10.112.82.197 with SMTP id k5mr3004630lby.83.1328378601057; Sat, 04 Feb 2012 10:03:21 -0800 (PST) Received: from localhost (dsl-hkibrasgw4-fe50f800-253.dhcp.inet.fi. [84.248.80.253]) by mx.google.com with ESMTPS id os5sm8063565lab.13.2012.02.04.10.03.18 (version=SSLv3 cipher=OTHER); Sat, 04 Feb 2012 10:03:19 -0800 (PST) From: Jani Nikula To: Mark Walters , notmuch@notmuchmail.org Subject: Re: [PATCH 2/2] emacs: Improve prompting for user address when replying. In-Reply-To: <1328375350-10352-3-git-send-email-markwalters1009@gmail.com> References: <1328375350-10352-1-git-send-email-markwalters1009@gmail.com> <1328375350-10352-3-git-send-email-markwalters1009@gmail.com> User-Agent: Notmuch/0.11+139~g4340989 (http://notmuchmail.org) Emacs/23.3.1 (i686-pc-linux-gnu) Date: Sat, 04 Feb 2012 20:03:13 +0200 Message-ID: <87ipjmo4ri.fsf@nikula.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii 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, 04 Feb 2012 18:03:23 -0000 On Sat, 4 Feb 2012 17:09:10 +0000, Mark Walters wrote: > This patch uses the new --from option to notmuch reply to allow it to > prompt the user for the From: address in cases when the cli does not > know the "correct" from address. If the cli does not it either uses > the users default address or, if notmuch-always-prompt-for-sender > is set, prompts the user. > --- > emacs/notmuch-mua.el | 47 ++++++++++++++++++++++++++++------------------- > 1 files changed, 28 insertions(+), 19 deletions(-) > > diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el > index 41f82c2..36e62f9 100644 > --- a/emacs/notmuch-mua.el > +++ b/emacs/notmuch-mua.el > @@ -51,6 +51,24 @@ list." > > ;; > > +(defcustom notmuch-identities nil > + "Identities that can be used as the From: address when composing a new message. > + > +If this variable is left unset, then a list will be constructed from the > +name and addresses configured in the notmuch configuration file." > + :type '(repeat string) > + :group 'notmuch-send) > + > +(defcustom notmuch-always-prompt-for-sender nil > + "Always prompt for the From: address when composing or forwarding a message. > + > +This is not taken into account when replying to a message, because in that case > +the From: header is already filled in by notmuch." > + :type 'boolean > + :group 'notmuch-send) > + > +(defvar notmuch-mua-sender-history nil) > + > (defun notmuch-mua-user-agent-full () > "Generate a `User-Agent:' string suitable for notmuch." > (concat (notmuch-mua-user-agent-notmuch) > @@ -75,7 +93,7 @@ list." > (defun notmuch-mua-reply (query-string &optional sender reply-all) > (let (headers > body > - (args '("reply"))) > + (args '("reply" "--from=fallback-received"))) There are better reviewers for the rest of the emacs bits, but wouldn't it be better to just use the "notmuch reply" default when the user wants the current behaviour? BR, Jani. > (if notmuch-show-process-crypto > (setq args (append args '("--decrypt")))) > (if reply-all > @@ -99,6 +117,15 @@ list." > ;; If sender is non-nil, set the From: header to its value. > (when sender > (mail-header-set 'from sender headers)) > + ;; If we do not have a From: header yet it means that > + ;; notmuch-reply.c was not able to make a useful guess so we fill > + ;; it in ourselves. > + (when (string= "" (mail-header 'from headers)) > + (if notmuch-always-prompt-for-sender > + (setq sender (notmuch-mua-prompt-for-sender)) > + (setq sender (concat > + (notmuch-user-name) " <" (notmuch-user-primary-email) ">"))) > + (mail-header-set 'from sender headers)) > (let > ;; Overlay the composition window on that being used to read > ;; the original message. > @@ -153,24 +180,6 @@ OTHER-ARGS are passed through to `message-mail'." > > (message-goto-to)) > > -(defcustom notmuch-identities nil > - "Identities that can be used as the From: address when composing a new message. > - > -If this variable is left unset, then a list will be constructed from the > -name and addresses configured in the notmuch configuration file." > - :type '(repeat string) > - :group 'notmuch-send) > - > -(defcustom notmuch-always-prompt-for-sender nil > - "Always prompt for the From: address when composing or forwarding a message. > - > -This is not taken into account when replying to a message, because in that case > -the From: header is already filled in by notmuch." > - :type 'boolean > - :group 'notmuch-send) > - > -(defvar notmuch-mua-sender-history nil) > - > (defun notmuch-mua-prompt-for-sender () > (interactive) > (let (name addresses one-name-only) > -- > 1.7.2.3 > > _______________________________________________ > notmuch mailing list > notmuch@notmuchmail.org > http://notmuchmail.org/mailman/listinfo/notmuch