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

diff --git a/5a/71d4222143f1d3be7f5601f5fadbcc9017f078 b/5a/71d4222143f1d3be7f5601f5fadbcc9017f078
new file mode 100644 (file)
index 0000000..4e87b8d
--- /dev/null
+++ b/5a/71d4222143f1d3be7f5601f5fadbcc9017f078
@@ -0,0 +1,92 @@
+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 694CE429E44\r
+       for <notmuch@notmuchmail.org>; Thu, 22 Aug 2013 10:11:33 -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 xWTQ1MBxi07o for <notmuch@notmuchmail.org>;\r
+       Thu, 22 Aug 2013 10:11:27 -0700 (PDT)\r
+Received: from mail-wi0-f173.google.com (mail-wi0-f173.google.com\r
+       [209.85.212.173]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id B6EA8429E33\r
+       for <notmuch@notmuchmail.org>; Thu, 22 Aug 2013 10:10:52 -0700 (PDT)\r
+Received: by mail-wi0-f173.google.com with SMTP id en1so970847wid.6\r
+       for <notmuch@notmuchmail.org>; Thu, 22 Aug 2013 10:10:51 -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:in-reply-to:references;\r
+       bh=2fMCcO4z5e+SXgJsS3B5qAj04M7QP3Zoanq4OBs13a4=;\r
+       b=TXZejCGsq+BixTX8eJkiV9TnSUKVjRSUj0j1THArHX8c+a8am+ZgE2oN6btgOSJKND\r
+       XbHZ7w3Ofj72v42pcs84NfLOY7OFaeFDZ0CBBMqT2H+Twki9vh2AnS3rMX16hwaDvxIF\r
+       NsfBbRj3Ri2vyk0h4EelzYeieFrogzolcJSBQ+VZwHXHJ+7aN2f05dZLOqUrxACWtwEh\r
+       uPEE4rPYVUPpjpSejaZ+bha9XBmOOmQo23Nj+t3CMGFLo/KZciQLZR1X0Yzan2qU+wzp\r
+       GOT/PFMfef3bRHXLQDIVeNd4Efva15DfL4prTyOyERiRa1wBtJv/O0oiILt8Uh7ReT/1\r
+       xU5g==\r
+X-Received: by 10.180.182.15 with SMTP id ea15mr21564908wic.16.1377191451632; \r
+       Thu, 22 Aug 2013 10:10:51 -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
+       fu13sm18213212wic.7.1969.12.31.16.00.00\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Thu, 22 Aug 2013 10:10:51 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v3 09/11] contrib: pick: make help close the message pane\r
+ first\r
+Date: Thu, 22 Aug 2013 18:10:24 +0100\r
+Message-Id: <1377191427-6821-10-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1377191427-6821-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1377191427-6821-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: Thu, 22 Aug 2013 17:11:34 -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 6d73269..344609f 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 "e" (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