[PATCH v2] emacs: show: change emacs interactive pipe message.

diff --git a/e5/c374889bf93ccb681709f7b51c2b2ca1362945 b/e5/c374889bf93ccb681709f7b51c2b2ca1362945
new file mode 100644 (file)
index 0000000..0dfcfc3
--- /dev/null
+++ b/e5/c374889bf93ccb681709f7b51c2b2ca1362945
@@ -0,0 +1,98 @@
+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 1DD4F431FBC\r
+       for <notmuch@notmuchmail.org>; Sun,  9 Jun 2013 01:42:01 -0700 (PDT)\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 4xZ0f+oz5ngp for <notmuch@notmuchmail.org>;\r
+       Sun,  9 Jun 2013 01:41:55 -0700 (PDT)\r
+Received: from mail-ea0-f180.google.com (mail-ea0-f180.google.com\r
+       [209.85.215.180]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 74AF2431FAE\r
+       for <notmuch@notmuchmail.org>; Sun,  9 Jun 2013 01:41:55 -0700 (PDT)\r
+Received: by mail-ea0-f180.google.com with SMTP id k10so4674106eaj.25\r
+       for <notmuch@notmuchmail.org>; Sun, 09 Jun 2013 01:41:54 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+       h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;\r
+       bh=s9FqC0hgcvDAyHEbayfO0pvedbgetKjDCgB6rRP4JFM=;\r
+       b=T5lA79Yvndc8qMVyzj7egsnJuDpJsYwiMoZY127upQ73X9co6C2RYG9GOl8O2nDKS+\r
+       QJWD0KYHb81o68IzBnKD9UxG3Qsmw+13wyKkahdrUVaAgBt2BnDP1FQ8f4Xs6KWXR0Pt\r
+       opENrRIt93gXsTw+E8H/HlTcflCi5yq3d3uS/pXX1NLjWW/7bhDfuXQD57822xVG6ftm\r
+       fRRGTHVPNrdAJebiClySU6zepZgDIAIal1hmkcKryBXDK8Qo3ApGNELJM6D1ZbzqnIwp\r
+       mLOgA8Mnx9SUU9z7Ndg2GbvWueqn8nFRV/PKIjBxqHLRru6EEMeyF+5wiq5Eb4+CdL1V\r
+       BfEQ==\r
+X-Received: by 10.14.215.5 with SMTP id d5mr50999eep.143.1370767312949;\r
+       Sun, 09 Jun 2013 01:41:52 -0700 (PDT)\r
+Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31])\r
+       by mx.google.com with ESMTPSA id\r
+       p43sm13085628eem.11.2013.06.09.01.41.51 for <multiple recipients>\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Sun, 09 Jun 2013 01:41:52 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2] emacs: show: change emacs interactive pipe message.\r
+Date: Sun,  9 Jun 2013 09:41:48 +0100\r
+Message-Id: <1370767308-1636-1-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1369944667-22705-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1369944667-22705-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: Sun, 09 Jun 2013 08:42:01 -0000\r
+\r
+Previously the query string for piping a message to a command was\r
+"Pipe message to command: " regardless of whether the function was\r
+called with a prefix argument (which pipes all open messages to the\r
+command). This patch modifies the `interactive' command to reflect\r
+this.\r
+---\r
+This has the whitespace fix Tomi mentioned but is otherwise unchanged.\r
+\r
+Best wishes\r
+\r
+Mark\r
+\r
+\r
+ emacs/notmuch-show.el |    5 ++++-\r
+ 1 files changed, 4 insertions(+), 1 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+index 83bb9ad..d863f2b 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -1702,7 +1702,10 @@ to stdout or stderr will appear in the *notmuch-pipe* buffer.\r
+ When invoked with a prefix argument, the command will receive all\r
+ open messages in the current thread (formatted as an mbox) rather\r
+ than only the current message."\r
+-  (interactive "P\nsPipe message to command: ")\r
++  (interactive (let ((query-string (if current-prefix-arg\r
++                                     "Pipe all open messages to command: "\r
++                                   "Pipe message to command: ")))\r
++               (list current-prefix-arg (read-string query-string))))\r
+   (let (shell-command)\r
+     (if entire-thread\r
+       (setq shell-command\r
+-- \r
+1.7.9.1\r
+\r