[PATCH] contrib: pick: bugfix for pick splitting the window excessively

diff --git a/d8/9ebcbf1325ba8995faabdadce7a03a34a8da1c b/d8/9ebcbf1325ba8995faabdadce7a03a34a8da1c
new file mode 100644 (file)
index 0000000..83310af
--- /dev/null
+++ b/d8/9ebcbf1325ba8995faabdadce7a03a34a8da1c
@@ -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 4705E431FB6\r
+       for <notmuch@notmuchmail.org>; Sun,  9 Dec 2012 12:17:32 -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 u-2zKxFn7v-g for <notmuch@notmuchmail.org>;\r
+       Sun,  9 Dec 2012 12:17:31 -0800 (PST)\r
+Received: from mail-we0-f181.google.com (mail-we0-f181.google.com\r
+       [74.125.82.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id B0F12431FAF\r
+       for <notmuch@notmuchmail.org>; Sun,  9 Dec 2012 12:17:31 -0800 (PST)\r
+Received: by mail-we0-f181.google.com with SMTP id t11so1053066wey.26\r
+       for <notmuch@notmuchmail.org>; Sun, 09 Dec 2012 12:17:30 -0800 (PST)\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;\r
+       bh=keMlBiqVDNYX2gxIMymOA4X0KeMUYQs6CtsJEvs9IDg=;\r
+       b=bQSArPQI0q6pYYL1M1WvfSmlhuWAK3VyczHKKMkBJyRVo3Zj1craM61uOAS9pvq+rH\r
+       kkniIjLQz9Q3G1CnaV9N0jjlfHqHmcl1Qq+XLF+Q/uFCNlj6+UjJ6VwS81agrJCzGo6Z\r
+       F19T/sZaCZyKBYOkl5L1DCxpIeNU67GJa67AmCEFOMu1OY9bAIjZPbsMD2/724jEjlHP\r
+       4cEcj+XbTeJK3o0qZsDiJuaIT2r64GznOeykXqTSVV5HVbE5DsmX9iDO4OkgaCMVdAdJ\r
+       ZtD6yhc4xiJi/T7id7GbMuVcrC4kD5YULHOCMdnBOYfseAKgM/h7rbodVawyu7Nr7Zmq\r
+       iGAw==\r
+Received: by 10.180.94.226 with SMTP id df2mr7505194wib.11.1355084250430;\r
+       Sun, 09 Dec 2012 12:17:30 -0800 (PST)\r
+Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31])\r
+       by mx.google.com with ESMTPS id hg17sm2598866wib.1.2012.12.09.12.17.28\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Sun, 09 Dec 2012 12:17:29 -0800 (PST)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] contrib: pick: bugfix for pick splitting the window\r
+       excessively\r
+Date: Sun,  9 Dec 2012 20:17:29 +0000\r
+Message-Id: <1355084249-17523-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, 09 Dec 2012 20:17:32 -0000\r
+\r
+Previously if you carried on past the last message in a pick view pick\r
+would get confused and `forget' about the split pane and would try and\r
+re-split when moving up again. This was due to faulty logic in\r
+notmuch-pick-show-message: something that should have been in the (when message)\r
+clause was not.\r
+\r
+Thanks to jrollins for the bug report.\r
+---\r
+\r
+A simple bugfix: I can reproduce the bug that jrollins found and this\r
+fixes it for both of us.\r
+\r
+Best wishes\r
+\r
+Mark\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 63776d5..a46ef6e 100644\r
+--- a/contrib/notmuch-pick/notmuch-pick.el\r
++++ b/contrib/notmuch-pick/notmuch-pick.el\r
+@@ -402,8 +402,8 @@ Does NOT change the database."\r
+       (with-selected-window notmuch-pick-message-window\r
+       (setq current-prefix-arg '(4))\r
+       (setq buffer (notmuch-show id nil nil nil)))\r
+-      (notmuch-pick-tag-update-display (list "-unread")))\r
+-    (setq notmuch-pick-message-buffer buffer)))\r
++      (notmuch-pick-tag-update-display (list "-unread"))\r
++      (setq notmuch-pick-message-buffer buffer))))\r
+ \r
+ (defun notmuch-pick-show-message-out ()\r
+   "Show the current message (in whole window)."\r
+-- \r
+1.7.9.1\r
+\r