1 Return-Path: <jrollins@finestructure.net>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 0E3F2429E21
\r
6 for <notmuch@notmuchmail.org>; Mon, 2 Jan 2012 14:23:06 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5
\r
12 tests=[RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id CVe-yXmhmuWV for <notmuch@notmuchmail.org>;
\r
16 Mon, 2 Jan 2012 14:23:05 -0800 (PST)
\r
17 Received: from outgoing-mail.its.caltech.edu (outgoing-mail.its.caltech.edu
\r
19 by olra.theworths.org (Postfix) with ESMTP id 53791431FD0
\r
20 for <notmuch@notmuchmail.org>; Mon, 2 Jan 2012 14:23:05 -0800 (PST)
\r
21 Received: from fire-doxen.imss.caltech.edu (localhost [127.0.0.1])
\r
22 by fire-doxen-postvirus (Postfix) with ESMTP id 007C02E50D8C
\r
23 for <notmuch@notmuchmail.org>; Mon, 2 Jan 2012 14:23:04 -0800 (PST)
\r
24 X-Spam-Scanned: at Caltech-IMSS on fire-doxen by amavisd-new
\r
25 Received: from finestructure.net (cpe-76-174-137-84.socal.res.rr.com
\r
26 [76.174.137.84]) (Authenticated sender: jrollins)
\r
27 by fire-doxen-submit (Postfix) with ESMTP id EB5502E50D86
\r
28 for <notmuch@notmuchmail.org>; Mon, 2 Jan 2012 14:23:02 -0800 (PST)
\r
29 Received: by finestructure.net (Postfix, from userid 1000)
\r
30 id 8BBA9C9F; Mon, 2 Jan 2012 14:23:02 -0800 (PST)
\r
31 From: Jameson Graef Rollins <jrollins@finestructure.net>
\r
32 To: Notmuch Mail <notmuch@notmuchmail.org>
\r
33 Subject: [PATCH] emacs: fix notmuch-show-indent-messages-width customization
\r
35 Date: Mon, 2 Jan 2012 14:23:02 -0800
\r
36 Message-Id: <1325542982-1964-1-git-send-email-jrollins@finestructure.net>
\r
37 X-Mailer: git-send-email 1.7.7.3
\r
38 In-Reply-To: <1325542611-20511-2-git-send-email-jrollins@finestructure.net>
\r
39 References: <1325542611-20511-2-git-send-email-jrollins@finestructure.net>
\r
40 X-BeenThere: notmuch@notmuchmail.org
\r
41 X-Mailman-Version: 2.1.13
\r
43 List-Id: "Use and development of the notmuch mail system."
\r
44 <notmuch.notmuchmail.org>
\r
45 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
46 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
47 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
48 List-Post: <mailto:notmuch@notmuchmail.org>
\r
49 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
50 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
51 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
52 X-List-Received-Date: Mon, 02 Jan 2012 22:23:06 -0000
\r
54 The name was originally notmuch-indent-messages-width, which is
\r
55 inconsistent with our variable naming convention.
\r
57 Sorry, I forgot to fix the tests in the original patch.
\r
59 emacs/notmuch-show.el | 6 +++---
\r
60 test/emacs | 6 +++---
\r
61 2 files changed, 6 insertions(+), 6 deletions(-)
\r
63 diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
\r
64 index eee4da9..82d11c9 100644
\r
65 --- a/emacs/notmuch-show.el
\r
66 +++ b/emacs/notmuch-show.el
\r
67 @@ -91,7 +91,7 @@ any given message."
\r
71 -(defcustom notmuch-indent-messages-width 1
\r
72 +(defcustom notmuch-show-indent-messages-width 1
\r
73 "Width of message indentation in threads.
\r
75 Messages are shown indented according to their depth in a thread.
\r
76 @@ -248,7 +248,7 @@ unchanged ADDRESS if parsing fails."
\r
77 "Insert a notmuch style headerline based on HEADERS for a
\r
78 message at DEPTH in the current thread."
\r
79 (let ((start (point)))
\r
80 - (insert (notmuch-show-spaces-n (* notmuch-indent-messages-width depth))
\r
81 + (insert (notmuch-show-spaces-n (* notmuch-show-indent-messages-width depth))
\r
82 (notmuch-show-clean-address (plist-get headers :From))
\r
85 @@ -739,7 +739,7 @@ current buffer, if possible."
\r
86 (setq content-end (point-marker))
\r
88 ;; Indent according to the depth in the thread.
\r
89 - (indent-rigidly content-start content-end (* notmuch-indent-messages-width depth))
\r
90 + (indent-rigidly content-start content-end (* notmuch-show-indent-messages-width depth))
\r
92 (setq message-end (point-max-marker))
\r
94 diff --git a/test/emacs b/test/emacs
\r
95 index ca82445..f36718e 100755
\r
98 @@ -52,21 +52,21 @@ test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-thread-maildir-storage
\r
100 test_begin_subtest "Basic notmuch-show view in emacs default indentation"
\r
101 maildir_storage_thread=$(notmuch search --output=threads id:20091117190054.GU3165@dottiness.seas.harvard.edu)
\r
102 -test_emacs "(let ((notmuch-indent-messages-width 1))
\r
103 +test_emacs "(let ((notmuch-show-indent-messages-width 1))
\r
104 (notmuch-show \"$maildir_storage_thread\")
\r
106 test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-thread-maildir-storage
\r
108 test_begin_subtest "Basic notmuch-show view in emacs without indentation"
\r
109 maildir_storage_thread=$(notmuch search --output=threads id:20091117190054.GU3165@dottiness.seas.harvard.edu)
\r
110 -test_emacs "(let ((notmuch-indent-messages-width 0))
\r
111 +test_emacs "(let ((notmuch-show-indent-messages-width 0))
\r
112 (notmuch-show \"$maildir_storage_thread\")
\r
114 test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-thread-maildir-storage-without-indentation
\r
116 test_begin_subtest "Basic notmuch-show view in emacs with fourfold indentation"
\r
117 maildir_storage_thread=$(notmuch search --output=threads id:20091117190054.GU3165@dottiness.seas.harvard.edu)
\r
118 -test_emacs "(let ((notmuch-indent-messages-width 4))
\r
119 +test_emacs "(let ((notmuch-show-indent-messages-width 4))
\r
120 (notmuch-show \"$maildir_storage_thread\")
\r
122 test_expect_equal_file OUTPUT $EXPECTED/notmuch-show-thread-maildir-storage-with-fourfold-indentation
\r