[PATCH] uncrustify.cfg: comments and more types

diff --git a/27/c4822cdd6930a4d980a1b06c70a066827a22c4 b/27/c4822cdd6930a4d980a1b06c70a066827a22c4
new file mode 100644 (file)
index 0000000..085f344
--- /dev/null
+++ b/27/c4822cdd6930a4d980a1b06c70a066827a22c4
@@ -0,0 +1,114 @@
+Return-Path: <too@guru.guru-group.fi>\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 BD6CB431FBC\r
+       for <notmuch@notmuchmail.org>; Tue,  7 Feb 2012 08:34:19 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       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 NX6IetVx8st0 for <notmuch@notmuchmail.org>;\r
+       Tue,  7 Feb 2012 08:34:19 -0800 (PST)\r
+Received: from guru.guru-group.fi (guru-group.fi [87.108.86.66])\r
+       by olra.theworths.org (Postfix) with ESMTP id 1FF6C431FAE\r
+       for <notmuch@notmuchmail.org>; Tue,  7 Feb 2012 08:34:19 -0800 (PST)\r
+Received: by guru.guru-group.fi (Postfix, from userid 501)\r
+       id 35EA168055; Tue,  7 Feb 2012 18:34:19 +0200 (EET)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] uncrustify.cfg: comments and more types\r
+Date: Tue,  7 Feb 2012 18:34:17 +0200\r
+Message-Id: <1328632457-26230-1-git-send-email-tomi.ollila@iki.fi>\r
+X-Mailer: git-send-email 1.7.6.1\r
+In-Reply-To: <id:"1327527465-10321-1-git-send-email-tomi.ollila@iki.fi">\r
+References: <id:"1327527465-10321-1-git-send-email-tomi.ollila@iki.fi">\r
+Cc: Tomi Ollila <tomi.ollila@iki.fi>\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: Tue, 07 Feb 2012 16:34:19 -0000\r
+\r
+Changes to devel/uncrustify.cfg:\r
+\r
+* Updated header comment to state this is config file for *notmuch*.\r
+* Added comment about the reason of 'type' keyword used.\r
+* Added some more custom types woth 'type' keyword.\r
+* Have (every) multiline comment lines start with '*'.\r
+---\r
+ devel/uncrustify.cfg |   21 +++++++++++++--------\r
+ 1 files changed, 13 insertions(+), 8 deletions(-)\r
+\r
+diff --git a/devel/uncrustify.cfg b/devel/uncrustify.cfg\r
+index d8075ba..bab9761 100644\r
+--- a/devel/uncrustify.cfg\r
++++ b/devel/uncrustify.cfg\r
+@@ -1,13 +1,13 @@\r
+ #\r
+-# uncrustify config file for the linux kernel\r
++# Uncrustify config file for notmuch.\r
++# Based on uncrustify config file for the linux kernel\r
+ #\r
+ # $Id: linux-indent.cfg 488 2006-09-09 12:44:38Z bengardner $\r
+ # Taken from the uncrustify distribution under license (GPL2+)\r
+ #\r
+-# sample usage:\r
++# Sample usage:\r
+ #        uncrustify --replace -c uncrustify.cfg foo.c\r
+ #\r
+-#\r
+ \r
+ indent_with_tabs      = 2             # 1=indent to level only, 2=indent with tabs\r
+ align_with_tabs               = TRUE          # use tabs to align\r
+@@ -18,6 +18,8 @@ indent_columns               = 4\r
+ \r
+ indent_label          = -2            # pos: absolute col, neg: relative column\r
+ \r
++indent_cmt_with_tabs  = false         # true would align to tabstop always...\r
++\r
+ #\r
+ # inter-symbol newlines\r
+ #\r
+@@ -54,11 +56,14 @@ nl_after_struct = 0\r
+ # mod_full_brace_do   = remove        # "do a--; while ();" vs "do { a--; } while ();"\r
+ # mod_full_brace_while        = remove        # "while (a) a--;" vs "while (a) { a--; }"\r
+ \r
+-#\r
+-# Extra types used in notmuch source.\r
+-# (add more on demand)\r
+ \r
+-type GMimeObject mime_node_t\r
++# In case some custom types aren't detected properly by uncrustify\r
++# add those to this section below. For example there are cases where\r
++# uncrustify doesn't know whether a 'token' is part of pointer type\r
++# or left operand of a binary multiplication operation.\r
++\r
++type GMimeObject GMimeCryptoContext GMimeCipherContext\r
++type mime_node_t notmuch_message_t\r
+ \r
+ #\r
+ # inter-character spacing options\r
+@@ -107,6 +112,6 @@ align_right_cmt_span       = 8             # align comments span this much in func\r
+ # align_pp_define_span        = 8;\r
+ # align_pp_define_gap = 4;\r
+ \r
+-# cmt_star_cont               = FALSE\r
++cmt_star_cont         = true\r
+ \r
+ # indent_brace                = 0\r
+-- \r
+1.7.6.5\r
+\r