[PATCH 2/2] emacs: Improve prompting for user address when replying.

diff --git a/9d/e32cc4a783acf89381d2ad3e4e61493901715d b/9d/e32cc4a783acf89381d2ad3e4e61493901715d
new file mode 100644 (file)
index 0000000..e28d0cb
--- /dev/null
+++ b/9d/e32cc4a783acf89381d2ad3e4e61493901715d
@@ -0,0 +1,150 @@
+Return-Path: <markwalters1009@gmail.com>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 47DDA431FC3\r
+       for <notmuch@notmuchmail.org>; Sat,  4 Feb 2012 09:08:31 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.201\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.201 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,\r
+       RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id AF+z8u0e4Fma for <notmuch@notmuchmail.org>;\r
+       Sat,  4 Feb 2012 09:08:30 -0800 (PST)\r
+Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com\r
+       [209.85.212.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id E8AE6431FBF\r
+       for <notmuch@notmuchmail.org>; Sat,  4 Feb 2012 09:08:29 -0800 (PST)\r
+Received: by mail-wi0-f181.google.com with SMTP id hi8so3640758wib.26\r
+       for <notmuch@notmuchmail.org>; Sat, 04 Feb 2012 09:08:29 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;\r
+       h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;\r
+       bh=hdkgZUlD9Zrtxj6bogYYGvCVAH67HDTxhIxsZGhOnww=;\r
+       b=MOSCVPvnT2NoYjKz8tkZERmb+gbyFLIdDkppTE9BMh4XRQxJgnpZrWMx6X8q8dwDRQ\r
+       X2gt10DQ+G1juacJEv7/UvITH38BWBbOhaU6DVqIjAP/sbsHxIXCT7gY6+qrU+9pWKnt\r
+       scdNd8dg6THKKmylMbKQUkj4rtZTSxolJoVJE=\r
+Received: by 10.180.92.229 with SMTP id cp5mr1183901wib.8.1328375309799;\r
+       Sat, 04 Feb 2012 09:08:29 -0800 (PST)\r
+Received: from localhost (94-192-233-223.zone6.bethere.co.uk.\r
+ [94.192.233.223])     by mx.google.com with ESMTPS id\r
+ fv6sm28660983wib.8.2012.02.04.09.08.28        (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Sat, 04 Feb 2012 09:08:29 -0800 (PST)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/2] emacs: Improve prompting for user address when replying.\r
+Date: Sat,  4 Feb 2012 17:09:10 +0000\r
+Message-Id: <1328375350-10352-3-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.2.3\r
+In-Reply-To: <1328375350-10352-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1328375350-10352-1-git-send-email-markwalters1009@gmail.com>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sat, 04 Feb 2012 17:08:31 -0000\r
+\r
+This patch uses the new --from option to notmuch reply to allow it to\r
+prompt the user for the From: address in cases when the cli does not\r
+know the "correct" from address. If the cli does not it either uses\r
+the users default address or, if notmuch-always-prompt-for-sender\r
+is set, prompts the user.\r
+---\r
+ emacs/notmuch-mua.el |   47 ++++++++++++++++++++++++++++-------------------\r
+ 1 files changed, 28 insertions(+), 19 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el\r
+index 41f82c2..36e62f9 100644\r
+--- a/emacs/notmuch-mua.el\r
++++ b/emacs/notmuch-mua.el\r
+@@ -51,6 +51,24 @@ list."\r
+ \r
+ ;;\r
+ \r
++(defcustom notmuch-identities nil\r
++  "Identities that can be used as the From: address when composing a new message.\r
++\r
++If this variable is left unset, then a list will be constructed from the\r
++name and addresses configured in the notmuch configuration file."\r
++  :type '(repeat string)\r
++  :group 'notmuch-send)\r
++\r
++(defcustom notmuch-always-prompt-for-sender nil\r
++  "Always prompt for the From: address when composing or forwarding a message.\r
++\r
++This is not taken into account when replying to a message, because in that case\r
++the From: header is already filled in by notmuch."\r
++  :type 'boolean\r
++  :group 'notmuch-send)\r
++\r
++(defvar notmuch-mua-sender-history nil)\r
++\r
+ (defun notmuch-mua-user-agent-full ()\r
+   "Generate a `User-Agent:' string suitable for notmuch."\r
+   (concat (notmuch-mua-user-agent-notmuch)\r
+@@ -75,7 +93,7 @@ list."\r
+ (defun notmuch-mua-reply (query-string &optional sender reply-all)\r
+   (let (headers\r
+       body\r
+-      (args '("reply")))\r
++      (args '("reply" "--from=fallback-received")))\r
+     (if notmuch-show-process-crypto\r
+       (setq args (append args '("--decrypt"))))\r
+     (if reply-all\r
+@@ -99,6 +117,15 @@ list."\r
+     ;; If sender is non-nil, set the From: header to its value.\r
+     (when sender\r
+       (mail-header-set 'from sender headers))\r
++    ;; If we do not have a From: header yet it means that\r
++    ;; notmuch-reply.c was not able to make a useful guess so we fill\r
++    ;; it in ourselves.\r
++    (when (string= "" (mail-header 'from headers))\r
++      (if notmuch-always-prompt-for-sender\r
++        (setq sender (notmuch-mua-prompt-for-sender))\r
++      (setq sender (concat\r
++                    (notmuch-user-name) " <" (notmuch-user-primary-email) ">")))\r
++      (mail-header-set 'from sender headers))\r
+     (let\r
+       ;; Overlay the composition window on that being used to read\r
+       ;; the original message.\r
+@@ -153,24 +180,6 @@ OTHER-ARGS are passed through to `message-mail'."\r
+ \r
+   (message-goto-to))\r
+ \r
+-(defcustom notmuch-identities nil\r
+-  "Identities that can be used as the From: address when composing a new message.\r
+-\r
+-If this variable is left unset, then a list will be constructed from the\r
+-name and addresses configured in the notmuch configuration file."\r
+-  :type '(repeat string)\r
+-  :group 'notmuch-send)\r
+-\r
+-(defcustom notmuch-always-prompt-for-sender nil\r
+-  "Always prompt for the From: address when composing or forwarding a message.\r
+-\r
+-This is not taken into account when replying to a message, because in that case\r
+-the From: header is already filled in by notmuch."\r
+-  :type 'boolean\r
+-  :group 'notmuch-send)\r
+-\r
+-(defvar notmuch-mua-sender-history nil)\r
+-\r
+ (defun notmuch-mua-prompt-for-sender ()\r
+   (interactive)\r
+   (let (name addresses one-name-only)\r
+-- \r
+1.7.2.3\r
+\r