[PATCH 09/11] contrib: pick: make help close the message pane first

diff --git a/ef/9e710c64b04df4ef6b1c29fcc2b4ed0fa71ce5 b/ef/9e710c64b04df4ef6b1c29fcc2b4ed0fa71ce5
new file mode 100644 (file)
index 0000000..627f225
--- /dev/null
+++ b/ef/9e710c64b04df4ef6b1c29fcc2b4ed0fa71ce5
@@ -0,0 +1,91 @@
+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 AF1EA429E3C\r
+       for <notmuch@notmuchmail.org>; Fri,  5 Jul 2013 11:12:35 -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 i1jNs6wC4X9P for <notmuch@notmuchmail.org>;\r
+       Fri,  5 Jul 2013 11:12:30 -0700 (PDT)\r
+Received: from mail-ea0-f178.google.com (mail-ea0-f178.google.com\r
+       [209.85.215.178]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 0295B431FBD\r
+       for <notmuch@notmuchmail.org>; Fri,  5 Jul 2013 11:11:49 -0700 (PDT)\r
+Received: by mail-ea0-f178.google.com with SMTP id l15so1651476eak.9\r
+       for <notmuch@notmuchmail.org>; Fri, 05 Jul 2013 11:11:48 -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=SNhOy0XIAIv2MndcVsE3JYr+XNapWgcN2KXrPkOV3HI=;\r
+       b=WqrOFN793dY2RjUvLmbmy1Ja961ZXoA4Cw4Z7k6jOy6oxP9gAI4RaOpbuCsMfehKyZ\r
+       LbDKWgq+0Uq1UkAg8sHehDX95rnh2GbN5EoVYEoEkX12NHD2umHCD6KTvZDL+zf1N8n/\r
+       0wUqUt8Aah3Lz+uSLhn/OqnSFPEJUMJIXd4ueRlLRkpTzKDv9DToluotX491nX8cYD6o\r
+       OZek41uGGiRon6nUPvubnOjy4aq4PCEeakUBBfCpMdkA30Vp2y9E+Kzip7Ff+gGmyCam\r
+       KfE+2DlQsgpzSZAnNVDh5ii2UXfr7TSFYMf1UG80ee518/799RHqupbRmWnkHx2E1sbf\r
+       FmLw==\r
+X-Received: by 10.15.34.77 with SMTP id d53mr13346671eev.95.1373047908874;\r
+       Fri, 05 Jul 2013 11:11:48 -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 a4sm16049655eez.0.2013.07.05.11.11.47\r
+       for <multiple recipients>\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Fri, 05 Jul 2013 11:11:48 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 09/11] contrib: pick: make help close the message pane first\r
+Date: Fri,  5 Jul 2013 19:11:16 +0100\r
+Message-Id: <1373047878-20822-10-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1373047878-20822-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1373047878-20822-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: Fri, 05 Jul 2013 18:12:36 -0000\r
+\r
+Previously pressing "?" for help when the message pane was open meant\r
+the help window was very small. Close the message pane before\r
+displaying help.\r
+---\r
+ contrib/notmuch-pick/notmuch-pick.el |    4 +++-\r
+ 1 files changed, 3 insertions(+), 1 deletions(-)\r
+\r
+diff --git a/contrib/notmuch-pick/notmuch-pick.el b/contrib/notmuch-pick/notmuch-pick.el\r
+index 4ad6ef6..c3c8b20 100644\r
+--- a/contrib/notmuch-pick/notmuch-pick.el\r
++++ b/contrib/notmuch-pick/notmuch-pick.el\r
+@@ -235,10 +235,12 @@ FUNC."\r
+     (define-key map (kbd "TAB") (notmuch-pick-to-message-pane #'notmuch-show-next-button))\r
+     (define-key map "/" (notmuch-pick-to-message-pane #'notmuch-pick-button-activate))\r
+ \r
++    ;; bindings from show (or elsewhere) but we close the message pane first.\r
++    (define-key map "?" (notmuch-pick-close-message-pane-and #'notmuch-help))\r
++\r
+     ;; The main pick bindings\r
+     (define-key map "q" 'notmuch-pick-quit)\r
+     (define-key map "x" 'notmuch-pick-quit)\r
+-    (define-key map "?" 'notmuch-help)\r
+     (define-key map "a" 'notmuch-pick-archive-message-then-next)\r
+     (define-key map "=" 'notmuch-pick-refresh-view)\r
+     (define-key map "s" 'notmuch-pick-to-search)\r
+-- \r
+1.7.9.1\r
+\r