[PATCH v5 6/6] emacs: Check that the parent buffer is alive before using it.

diff --git a/c0/3a771cccd66c836dd6c3533ec4cf3846243753 b/c0/3a771cccd66c836dd6c3533ec4cf3846243753
new file mode 100644 (file)
index 0000000..0d43ebd
--- /dev/null
+++ b/c0/3a771cccd66c836dd6c3533ec4cf3846243753
@@ -0,0 +1,76 @@
+Return-Path: <dme@dme.org>\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 ABE3D414BA1\r
+       for <notmuch@notmuchmail.org>; Wed,  1 Feb 2012 06:39:34 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[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 7Op372uBhhhs for <notmuch@notmuchmail.org>;\r
+       Wed,  1 Feb 2012 06:39:34 -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 3BE274196FF\r
+       for <notmuch@notmuchmail.org>; Wed,  1 Feb 2012 06:39:33 -0800 (PST)\r
+Received: by mail-we0-f181.google.com with SMTP id b10so1130037wer.26\r
+       for <notmuch@notmuchmail.org>; Wed, 01 Feb 2012 06:39:32 -0800 (PST)\r
+Received: by 10.216.133.141 with SMTP id q13mr2935575wei.1.1328107172885;\r
+       Wed, 01 Feb 2012 06:39:32 -0800 (PST)\r
+Received: from hotblack-desiato.hh.sledj.net\r
+       (host81-149-164-25.in-addr.btopenworld.com. [81.149.164.25])\r
+       by mx.google.com with ESMTPS id t6sm45188249wid.1.2012.02.01.06.39.30\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Wed, 01 Feb 2012 06:39:32 -0800 (PST)\r
+Received: by hotblack-desiato.hh.sledj.net (Postfix, from userid 30000)\r
+       id 41218A099D; Wed,  1 Feb 2012 14:39:26 +0000 (GMT)\r
+From: David Edmondson <dme@dme.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v5 6/6] emacs: Check that the parent buffer is alive before\r
+       using it.\r
+Date: Wed,  1 Feb 2012 14:39:24 +0000\r
+Message-Id: <1328107164-10520-7-git-send-email-dme@dme.org>\r
+X-Mailer: git-send-email 1.7.8.3\r
+In-Reply-To: <1328107164-10520-1-git-send-email-dme@dme.org>\r
+References: <1327486729-18052-1-git-send-email-dme@dme.org>\r
+       <1328107164-10520-1-git-send-email-dme@dme.org>\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: Wed, 01 Feb 2012 14:39:34 -0000\r
+\r
+---\r
+ emacs/notmuch-show.el |    2 +-\r
+ 1 files changed, 1 insertions(+), 1 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+index 1b31166..895feb5 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -1671,7 +1671,7 @@ added."\r
+   (interactive "P")\r
+   (let ((parent-buffer notmuch-show-parent-buffer))\r
+     (notmuch-kill-this-buffer)\r
+-    (when parent-buffer\r
++    (when (buffer-live-p parent-buffer)\r
+       (switch-to-buffer parent-buffer)\r
+       (notmuch-search-next-thread)\r
+       (if show-next\r
+-- \r
+1.7.8.3\r
+\r