[PATCH 1/3] emacs: Don't overload same-window-regexps

diff --git a/2c/30e1034066ebdfd95d4c3c5eaf4d9531cd513f b/2c/30e1034066ebdfd95d4c3c5eaf4d9531cd513f
new file mode 100644 (file)
index 0000000..920706a
--- /dev/null
+++ b/2c/30e1034066ebdfd95d4c3c5eaf4d9531cd513f
@@ -0,0 +1,88 @@
+Return-Path: <aneesh.kumar@linux.vnet.ibm.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 5A37840D152\r
+       for <notmuch@notmuchmail.org>; Wed, 27 Oct 2010 10:27:18 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -4.2\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-4.2 tagged_above=-999 required=5\r
+       tests=[BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3] autolearn=unavailable\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 HIdn2PwG5Z2S for <notmuch@notmuchmail.org>;\r
+       Wed, 27 Oct 2010 10:27:18 -0700 (PDT)\r
+Received: from e23smtp03.au.ibm.com (e23smtp03.au.ibm.com [202.81.31.145])\r
+       (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 0216C40D158\r
+       for <notmuch@notmuchmail.org>; Wed, 27 Oct 2010 10:27:08 -0700 (PDT)\r
+Received: from d23relay04.au.ibm.com (d23relay04.au.ibm.com [202.81.31.246])\r
+       by e23smtp03.au.ibm.com (8.14.4/8.13.1) with ESMTP id o9RHMwNf028760\r
+       for <notmuch@notmuchmail.org>; Thu, 28 Oct 2010 04:22:58 +1100\r
+Received: from d23av02.au.ibm.com (d23av02.au.ibm.com [9.190.235.138])\r
+       by d23relay04.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id\r
+       o9RHR1sU1077398\r
+       for <notmuch@notmuchmail.org>; Thu, 28 Oct 2010 04:27:01 +1100\r
+Received: from d23av02.au.ibm.com (loopback [127.0.0.1])\r
+       by d23av02.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id\r
+       o9RHR05c031157\r
+       for <notmuch@notmuchmail.org>; Thu, 28 Oct 2010 04:27:01 +1100\r
+Received: from skywalker.in.ibm.com ([9.77.207.27])\r
+       by d23av02.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id\r
+       o9RHQxk5031146; Thu, 28 Oct 2010 04:26:59 +1100\r
+From: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>\r
+To: cworth@cworth.org\r
+Subject: [PATCH 1/3] emacs: Don't overload same-window-regexps\r
+Date: Wed, 27 Oct 2010 22:56:55 +0530\r
+Message-Id: <1288200417-6584-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com>\r
+X-Mailer: git-send-email 1.7.1\r
+Cc: "Aneesh Kumar K.V" <aneesh.kumar@gmail.com>, notmuch@notmuchmail.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, 27 Oct 2010 17:27:18 -0000\r
+\r
+From: Aneesh Kumar K.V <aneesh.kumar@gmail.com>\r
+\r
+Also add unset mail to the regexps. Recent emacs changes change the buffer name\r
+\r
+Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@gmail.com>\r
+---\r
+ emacs/notmuch-mua.el |    7 +++++--\r
+ 1 files changed, 5 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el\r
+index 0ad079f..23ffd96 100644\r
+--- a/emacs/notmuch-mua.el\r
++++ b/emacs/notmuch-mua.el\r
+@@ -85,10 +85,13 @@ list."\r
+             (setq headers (mail-header-extract)))))\r
+       (forward-line 1)\r
+       (setq body (buffer-substring (point) (point-max))))\r
+-    (let\r
++    (progn\r
+       ;; Overlay the composition window on that being used to read\r
+       ;; the original message.\r
+-      ((same-window-regexps '("\\*mail .*")))\r
++      (add-hook 'same-window-regexps\r
++              (purecopy "\\*unsent mail.*"))\r
++      (add-hook 'same-window-regexps\r
++              (purecopy "\\*mail .*"))\r
+       (notmuch-mua-mail (mail-header 'to headers)\r
+                       (mail-header 'subject headers)\r
+                       (message-headers-to-generate headers t '(to subject))))\r
+-- \r
+1.7.1\r
+\r