[PATCH] contrib: pick: update notmuch-show calls

diff --git a/b5/ba5246c7d8ed67692e666c562f04f5f34bd32d b/b5/ba5246c7d8ed67692e666c562f04f5f34bd32d
new file mode 100644 (file)
index 0000000..e7df937
--- /dev/null
+++ b/b5/ba5246c7d8ed67692e666c562f04f5f34bd32d
@@ -0,0 +1,96 @@
+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 26841431FAF\r
+       for <notmuch@notmuchmail.org>; Sun, 13 Oct 2013 00:49:17 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 2.7\r
+X-Spam-Level: **\r
+X-Spam-Status: No, score=2.7 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
+       FREEMAIL_REPLY=2.499, 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 t4rGe+m9NNrX for <notmuch@notmuchmail.org>;\r
+       Sun, 13 Oct 2013 00:49:09 -0700 (PDT)\r
+Received: from mail-wi0-f170.google.com (mail-wi0-f170.google.com\r
+       [209.85.212.170]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id DF08F431FAE\r
+       for <notmuch@notmuchmail.org>; Sun, 13 Oct 2013 00:49:08 -0700 (PDT)\r
+Received: by mail-wi0-f170.google.com with SMTP id l12so2830847wiv.3\r
+       for <notmuch@notmuchmail.org>; Sun, 13 Oct 2013 00:49:07 -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;\r
+       bh=bzlygm81kARafdLkAG7ryTZP9NmeyaH576rQPhBTWlE=;\r
+       b=MFnKlJSP3Kvt3R3Pu1FAqLf9tlsQzcfWdmbLrIN+tm0QI/PNMXwaDJGA3CAUB/8ID2\r
+       fKElN+lLtf7z/GA2kfNpk14x+Es1byrYjKkSK3Buj0i+9zs5s3bv58CcmIRHHlbB+iW2\r
+       FiqzIaz/l9Shoj1X004BDpxxzUCoa8PbC+NdweqC5pgOX3WF20/jaTcsds1nVvSvUc4W\r
+       /kXL2J/FZ0cnCmFAgQHl66WntTkof8bwl+CrxyVeA8JhKNrflcO+q57tRL5NLlT3pN3V\r
+       tDfdztKXpyu5XFfRc+Ap9zXHdmXiKbtWDcldQZHP0wSeUVZoy5XYKb86lzNtkvP44Naz\r
+       qrLw==\r
+X-Received: by 10.194.23.73 with SMTP id k9mr25286718wjf.24.1381650547809;\r
+       Sun, 13 Oct 2013 00:49:07 -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 pi6sm12321503wic.3.1969.12.31.16.00.00\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Sun, 13 Oct 2013 00:49:07 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] contrib: pick: update notmuch-show calls\r
+Date: Sun, 13 Oct 2013 08:49:00 +0100\r
+Message-Id: <1381650540-24058-1-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\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, 13 Oct 2013 07:49:17 -0000\r
+\r
+Remove some unneeded nil arguments in notmuch-show calls.\r
+---\r
+This is really a patch on top of\r
+id:1381649952-23122-1-git-send-email-markwalters1009@gmail.com as\r
+passing three nil optional arguments out of four seems untidy. Since\r
+these arguments are superfluous in any case just remove them.\r
+\r
+\r
+ contrib/notmuch-pick/notmuch-pick.el |    4 ++--\r
+ 1 files changed, 2 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/contrib/notmuch-pick/notmuch-pick.el b/contrib/notmuch-pick/notmuch-pick.el\r
+index 0aa651e..a492214 100644\r
+--- a/contrib/notmuch-pick/notmuch-pick.el\r
++++ b/contrib/notmuch-pick/notmuch-pick.el\r
+@@ -461,7 +461,7 @@ Does NOT change the database."\r
+       ;; Since we are only displaying one message do not indent.\r
+       (let ((notmuch-show-indent-messages-width 0)\r
+             (notmuch-show-only-matching-messages t))\r
+-        (setq buffer (notmuch-show id nil nil nil))))\r
++        (setq buffer (notmuch-show id))))\r
+       ;; We need the `let' as notmuch-pick-message-window is buffer local.\r
+       (let ((window notmuch-pick-message-window))\r
+       (with-current-buffer buffer\r
+@@ -480,7 +480,7 @@ Does NOT change the database."\r
+     (when id\r
+       ;; We close the window to kill off un-needed buffers.\r
+       (notmuch-pick-close-message-window)\r
+-      (notmuch-show id nil nil nil))))\r
++      (notmuch-show id))))\r
+ \r
+ (defun notmuch-pick-show-message (arg)\r
+   "Show the current message.\r
+-- \r
+1.7.9.1\r
+\r