1 Return-Path: <too@guru.guru-group.fi>
\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 C2526429E39
\r
6 for <notmuch@notmuchmail.org>; Wed, 25 Jan 2012 13:37:47 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
\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 MA+4ZPos7qyk for <notmuch@notmuchmail.org>;
\r
16 Wed, 25 Jan 2012 13:37:47 -0800 (PST)
\r
17 Received: from guru.guru-group.fi (guru-group.fi [87.108.86.66])
\r
18 by olra.theworths.org (Postfix) with ESMTP id E873C429E36
\r
19 for <notmuch@notmuchmail.org>; Wed, 25 Jan 2012 13:37:46 -0800 (PST)
\r
20 Received: by guru.guru-group.fi (Postfix, from userid 501)
\r
21 id 683F968056; Wed, 25 Jan 2012 23:37:47 +0200 (EET)
\r
22 From: Tomi Ollila <tomi.ollila@iki.fi>
\r
23 To: <notmuch@notmuchmail.org>
\r
24 Subject: [PATCH] uncrustify.cfg: comments and more types
\r
25 Date: Wed, 25 Jan 2012 23:37:45 +0200
\r
26 Message-Id: <1327527465-10321-1-git-send-email-tomi.ollila@iki.fi>
\r
27 X-Mailer: git-send-email 1.7.6.1
\r
28 Cc: Tomi Ollila <tomi.ollila@iki.fi>
\r
29 X-BeenThere: notmuch@notmuchmail.org
\r
30 X-Mailman-Version: 2.1.13
\r
32 List-Id: "Use and development of the notmuch mail system."
\r
33 <notmuch.notmuchmail.org>
\r
34 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
35 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
36 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
37 List-Post: <mailto:notmuch@notmuchmail.org>
\r
38 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
39 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
40 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
41 X-List-Received-Date: Wed, 25 Jan 2012 21:37:47 -0000
\r
43 Changes to devel/uncrustify.cfg:
\r
45 * Updated header comment to state this is config file for *notmuch*.
\r
46 * Mentioned in header commit that uncrustify version 0.59 required.
\r
47 * Use tabs to indent/align comments.
\r
48 * Added comment about the reason of 'type' keyword used.
\r
49 * Added some more custom types woth 'type' keyword.
\r
50 * Have (every) multiline comment lines start with '*'.
\r
52 devel/uncrustify.cfg | 23 +++++++++++++++--------
\r
53 1 files changed, 15 insertions(+), 8 deletions(-)
\r
55 diff --git a/devel/uncrustify.cfg b/devel/uncrustify.cfg
\r
56 index d8075ba..92bb29b 100644
\r
57 --- a/devel/uncrustify.cfg
\r
58 +++ b/devel/uncrustify.cfg
\r
61 -# uncrustify config file for the linux kernel
\r
62 +# Uncrustify config file for notmuch.
\r
63 +# Based on uncrustify config file for the linux kernel
\r
65 # $Id: linux-indent.cfg 488 2006-09-09 12:44:38Z bengardner $
\r
66 # Taken from the uncrustify distribution under license (GPL2+)
\r
70 # uncrustify --replace -c uncrustify.cfg foo.c
\r
73 +# Note: for proper output, uncrustify version 0.59 is required.
\r
74 +# (without indent_cmt_with_tabs this may work ok with 0.58 (and possibly older)
\r
76 indent_with_tabs = 2 # 1=indent to level only, 2=indent with tabs
\r
77 align_with_tabs = TRUE # use tabs to align
\r
78 @@ -18,6 +20,8 @@ indent_columns = 4
\r
80 indent_label = -2 # pos: absolute col, neg: relative column
\r
82 +indent_cmt_with_tabs = true # use tabs to indent/align comments
\r
85 # inter-symbol newlines
\r
87 @@ -54,11 +58,14 @@ nl_after_struct = 0
\r
88 # mod_full_brace_do = remove # "do a--; while ();" vs "do { a--; } while ();"
\r
89 # mod_full_brace_while = remove # "while (a) a--;" vs "while (a) { a--; }"
\r
92 -# Extra types used in notmuch source.
\r
93 -# (add more on demand)
\r
95 -type GMimeObject mime_node_t
\r
96 +# In case some custom types aren't detected properly by uncrustify
\r
97 +# add those to this section below. For example there are cases where
\r
98 +# uncrustify doesn't know whether a 'token' is part of pointer type
\r
99 +# or left operand of a binary multiplication operation.
\r
101 +type GMimeObject GMimeCryptoContext GMimeCipherContext
\r
102 +type mime_node_t notmuch_message_t
\r
105 # inter-character spacing options
\r
106 @@ -107,7 +114,6 @@ align_right_cmt_span = 8 # align comments span this much in func
\r
107 # align_pp_define_span = 8;
\r
108 # align_pp_define_gap = 4;
\r
110 -# cmt_star_cont = FALSE
\r
111 +cmt_star_cont = true
\r