[PATCH] contrib: pick: close message pane when quitting from show in the message...

diff --git a/a1/e092f6a84334c9db435e7d906e7ac47aeb07f1 b/a1/e092f6a84334c9db435e7d906e7ac47aeb07f1
new file mode 100644 (file)
index 0000000..917d7dd
--- /dev/null
+++ b/a1/e092f6a84334c9db435e7d906e7ac47aeb07f1
@@ -0,0 +1,128 @@
+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 CF919431FC2\r
+       for <notmuch@notmuchmail.org>; Sun, 16 Dec 2012 01:30:47 -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 UtAoBCWBM8el for <notmuch@notmuchmail.org>;\r
+       Sun, 16 Dec 2012 01:30:47 -0800 (PST)\r
+Received: from mail-wi0-f175.google.com (mail-wi0-f175.google.com\r
+       [209.85.212.175]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 2EAE2431FB6\r
+       for <notmuch@notmuchmail.org>; Sun, 16 Dec 2012 01:30:46 -0800 (PST)\r
+Received: by mail-wi0-f175.google.com with SMTP id hm11so1351241wib.2\r
+       for <notmuch@notmuchmail.org>; Sun, 16 Dec 2012 01:30:44 -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:in-reply-to:references;\r
+       bh=bst34kfln3z5t1lBP8Rmkjk/Qld78nML4zWKE18xYsg=;\r
+       b=Cqx4SrFYFv+21fTYDMp6kuY0UHQ3ip3NuHDXulQvciY1NDp87ejDe/ptqGwo+yrhwv\r
+       N13lAN94RrHhwC1iEtTucSMNZxkVeSJco3KkzQWfO7jzmOd+92e2hnuoosJdUl4dzZu4\r
+       Bi8CUMRZRc7GWKL510q6Z30HF9l43+1eN2+kfa2JZLXPHBdWVD5/D+sKaBvvsUEl4gcU\r
+       h5ArtlRz8hgaayBZispst79bH0yk1KWmbSsBK1CJSsWuFUBct35jNe2Ibqho7wNWWT3z\r
+       Rw82QhKYaYV26RJHxbmhbsQGl3vR7XMeJjrTIbVPQIkdI8ZzpSzggAz3rmi8DhFFjNtL\r
+       x+HA==\r
+Received: by 10.194.86.72 with SMTP id n8mr11374134wjz.19.1355650243204;\r
+       Sun, 16 Dec 2012 01:30:43 -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 p3sm5649301wic.8.2012.12.16.01.30.41\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Sun, 16 Dec 2012 01:30:42 -0800 (PST)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] contrib: pick: close message pane when quitting from show in\r
+       the message pane\r
+Date: Sun, 16 Dec 2012 09:30:41 +0000\r
+Message-Id: <1355650241-27196-1-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1355391109-4150-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1355391109-4150-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, 16 Dec 2012 09:30:47 -0000\r
+\r
+We add a hook to the show buffer in the message window to close the\r
+message window when that buffer quits.  It checks that the\r
+message-window is still displaying the show-message buffer and then\r
+closes it.\r
+---\r
+\r
+This is (probably) a rather better version than the previous\r
+attempt. It uses hooks rather than redefining notmuch-kill-this-buffer\r
+and it avoids errors if the user has made the message pane the whole\r
+frame.\r
+\r
+Best wishes\r
+\r
+Mark\r
+\r
+\r
+ contrib/notmuch-pick/notmuch-pick.el |   18 ++++++++++++++++++\r
+ 1 files changed, 18 insertions(+), 0 deletions(-)\r
+\r
+diff --git a/contrib/notmuch-pick/notmuch-pick.el b/contrib/notmuch-pick/notmuch-pick.el\r
+index 043e9e7..8383589 100644\r
+--- a/contrib/notmuch-pick/notmuch-pick.el\r
++++ b/contrib/notmuch-pick/notmuch-pick.el\r
+@@ -160,6 +160,9 @@\r
+ (defvar notmuch-pick-message-window nil)\r
+ (make-variable-buffer-local 'notmuch-pick-message-window)\r
+ (put 'notmuch-pick-message-window 'permanent-local t)\r
++(defvar notmuch-show-message-window nil)\r
++(make-variable-buffer-local 'notmuch-show-message-window)\r
++(put 'notmuch-show-message-window 'permanent-local t)\r
+ (defvar notmuch-pick-message-buffer nil)\r
+ (make-variable-buffer-local 'notmuch-pick-message-buffer-name)\r
+ (put 'notmuch-pick-message-buffer-name 'permanent-local t)\r
+@@ -389,6 +392,16 @@ Does NOT change the database."\r
+                 (notmuch-prettify-subject (notmuch-search-find-subject)))\r
+   (notmuch-pick-show-match-message-with-wait))\r
+ \r
++(defun notmuch-pick-message-window-kill-hook ()\r
++  (let ((buffer (current-buffer)))\r
++    (when (and (window-live-p notmuch-show-message-window)\r
++             (eq (window-buffer notmuch-show-message-window) buffer))\r
++      ;; We do not want an error if this is the sole window in the\r
++      ;; frame and I do not know how to test for that in emacs pre\r
++      ;; 24. Hence we just ignore-errors.\r
++      (ignore-errors\r
++      (delete-window notmuch-show-message-window)))))\r
++\r
+ (defun notmuch-pick-show-message ()\r
+   "Show the current message (in split-pane)."\r
+   (interactive)\r
+@@ -406,6 +419,11 @@ Does NOT change the database."\r
+       (let ((notmuch-show-indent-messages-width 0))\r
+         (setq current-prefix-arg '(4))\r
+         (setq buffer (notmuch-show id nil nil nil))))\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
++        (setq notmuch-show-message-window window)\r
++        (add-hook 'kill-buffer-hook 'notmuch-pick-message-window-kill-hook)))\r
+       (notmuch-pick-tag-update-display (list "-unread"))\r
+       (setq notmuch-pick-message-buffer buffer))))\r
+ \r
+-- \r
+1.7.9.1\r
+\r