[PATCH 1/2] emacs: fix notmuch-show-indent-messages-width customization variable...

diff --git a/3e/3659645acd2da225a9e7092b7cc99bbd9ee185 b/3e/3659645acd2da225a9e7092b7cc99bbd9ee185
new file mode 100644 (file)
index 0000000..dccbe81
--- /dev/null
+++ b/3e/3659645acd2da225a9e7092b7cc99bbd9ee185
@@ -0,0 +1,94 @@
+Return-Path: <jrollins@finestructure.net>\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 0359C429E21\r
+       for <notmuch@notmuchmail.org>; Mon,  2 Jan 2012 14:17:02 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -2.3\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_MED=-2.3] 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 itUEWEUsDsWH for <notmuch@notmuchmail.org>;\r
+       Mon,  2 Jan 2012 14:16:59 -0800 (PST)\r
+Received: from outgoing-mail.its.caltech.edu (outgoing-mail.its.caltech.edu\r
+       [131.215.239.19])\r
+       by olra.theworths.org (Postfix) with ESMTP id 6314E431FD0\r
+       for <notmuch@notmuchmail.org>; Mon,  2 Jan 2012 14:16:59 -0800 (PST)\r
+Received: from fire-doxen.imss.caltech.edu (localhost [127.0.0.1])\r
+       by fire-doxen-postvirus (Postfix) with ESMTP id C38772E50CB6\r
+       for <notmuch@notmuchmail.org>; Mon,  2 Jan 2012 14:16:58 -0800 (PST)\r
+X-Spam-Scanned: at Caltech-IMSS on fire-doxen by amavisd-new\r
+Received: from finestructure.net (cpe-76-174-137-84.socal.res.rr.com\r
+       [76.174.137.84]) (Authenticated sender: jrollins)\r
+       by fire-doxen-submit (Postfix) with ESMTP id EE7B92E50C72\r
+       for <notmuch@notmuchmail.org>; Mon,  2 Jan 2012 14:16:56 -0800 (PST)\r
+Received: by finestructure.net (Postfix, from userid 1000)\r
+       id 87C9B172; Mon,  2 Jan 2012 14:16:56 -0800 (PST)\r
+From: Jameson Graef Rollins <jrollins@finestructure.net>\r
+To: Notmuch Mail <notmuch@notmuchmail.org>\r
+Subject: [PATCH 1/2] emacs: fix notmuch-show-indent-messages-width\r
+       customization variable name\r
+Date: Mon,  2 Jan 2012 14:16:50 -0800\r
+Message-Id: <1325542611-20511-2-git-send-email-jrollins@finestructure.net>\r
+X-Mailer: git-send-email 1.7.7.3\r
+In-Reply-To: <1325542611-20511-1-git-send-email-jrollins@finestructure.net>\r
+References: <8739byiaef.fsf@zancas.localnet>\r
+       <1325542611-20511-1-git-send-email-jrollins@finestructure.net>\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: Mon, 02 Jan 2012 22:17:02 -0000\r
+\r
+The name was originally notmuch-indent-messages-width, which is\r
+inconsistent with our variable naming convention.\r
+---\r
+ emacs/notmuch-show.el |    6 +++---\r
+ 1 files changed, 3 insertions(+), 3 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el\r
+index eee4da9..82d11c9 100644\r
+--- a/emacs/notmuch-show.el\r
++++ b/emacs/notmuch-show.el\r
+@@ -91,7 +91,7 @@ any given message."\r
+   :group 'notmuch\r
+   :type 'boolean)\r
+ \r
+-(defcustom notmuch-indent-messages-width 1\r
++(defcustom notmuch-show-indent-messages-width 1\r
+   "Width of message indentation in threads.\r
+ \r
+ Messages are shown indented according to their depth in a thread.\r
+@@ -248,7 +248,7 @@ unchanged ADDRESS if parsing fails."\r
+   "Insert a notmuch style headerline based on HEADERS for a\r
+ message at DEPTH in the current thread."\r
+   (let ((start (point)))\r
+-    (insert (notmuch-show-spaces-n (* notmuch-indent-messages-width depth))\r
++    (insert (notmuch-show-spaces-n (* notmuch-show-indent-messages-width depth))\r
+           (notmuch-show-clean-address (plist-get headers :From))\r
+           " ("\r
+           date\r
+@@ -739,7 +739,7 @@ current buffer, if possible."\r
+     (setq content-end (point-marker))\r
+ \r
+     ;; Indent according to the depth in the thread.\r
+-    (indent-rigidly content-start content-end (* notmuch-indent-messages-width depth))\r
++    (indent-rigidly content-start content-end (* notmuch-show-indent-messages-width depth))\r
+ \r
+     (setq message-end (point-max-marker))\r
+ \r
+-- \r
+1.7.7.3\r
+\r