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 C411E431FBC
\r
6 for <notmuch@notmuchmail.org>; Tue, 24 Jan 2012 12:56:00 -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 t3KSaxq71Cl1 for <notmuch@notmuchmail.org>;
\r
16 Tue, 24 Jan 2012 12:56:00 -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 5126D431FB6
\r
19 for <notmuch@notmuchmail.org>; Tue, 24 Jan 2012 12:56:00 -0800 (PST)
\r
20 Received: by guru.guru-group.fi (Postfix, from userid 501)
\r
21 id 0BF0868056; Tue, 24 Jan 2012 22:56:01 +0200 (EET)
\r
22 From: Tomi Ollila <tomi.ollila@iki.fi>
\r
23 To: <notmuch@notmuchmail.org>
\r
24 Subject: [PATCH] uncrustify.cfg: label indent, some known types, not, # and ##
\r
25 Date: Tue, 24 Jan 2012 22:55:59 +0200
\r
26 Message-Id: <1327438559-22720-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: Tue, 24 Jan 2012 20:56:00 -0000
\r
43 Adjusted some uncrustify variables to get closer to prevailing style:
\r
45 * Label indent (for goto) relative to current indentation.
\r
46 * Eegistered GMimeObject and mime_node_t being as types.
\r
47 * Space after ! (not) operator.
\r
48 * No space after 'stringify' (#) preprosessor token.
\r
49 * No spacing change around ## (option not versatile enough).
\r
51 There are at least 3 cases where attention needs to be paid:
\r
53 * If there is newline between function name and open paren in function
\r
54 call, the paren (and args) are indented too far right.
\r
55 * #define HOUR (60 *MINUTE) -- i.e. no space after star (*).
\r
56 * void (*foo)(args) -- i.e no space between (name) and (args).
\r
58 devel/uncrustify.cfg | 11 +++++++++--
\r
59 1 files changed, 9 insertions(+), 2 deletions(-)
\r
61 diff --git a/devel/uncrustify.cfg b/devel/uncrustify.cfg
\r
62 index 1dbc5e4..d8075ba 100644
\r
63 --- a/devel/uncrustify.cfg
\r
64 +++ b/devel/uncrustify.cfg
\r
65 @@ -16,8 +16,7 @@ input_tab_size = 8 # original tab size
\r
66 output_tab_size = 8 # new tab size
\r
69 -indent_label = 2 # pos: absolute col, neg: relative column
\r
71 +indent_label = -2 # pos: absolute col, neg: relative column
\r
74 # inter-symbol newlines
\r
75 @@ -55,6 +54,11 @@ nl_after_struct = 0
\r
76 # mod_full_brace_do = remove # "do a--; while ();" vs "do { a--; } while ();"
\r
77 # mod_full_brace_while = remove # "while (a) a--;" vs "while (a) { a--; }"
\r
80 +# Extra types used in notmuch source.
\r
81 +# (add more on demand)
\r
83 +type GMimeObject mime_node_t
\r
86 # inter-character spacing options
\r
87 @@ -63,6 +67,9 @@ nl_after_struct = 0
\r
88 sp_before_ptr_star = force
\r
89 sp_between_ptr_star = remove
\r
90 sp_after_ptr_star = remove
\r
92 +sp_pp_concat = ignore # XXX 'remove' drops leading space also
\r
93 +sp_pp_stringify = remove
\r
95 # sp _return_paren = force # "return (1);" vs "return(1);"
\r
96 sp_sizeof_paren = force # "sizeof (int)" vs "sizeof(int)"
\r