From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id C2526429E39 for ; Wed, 25 Jan 2012 13:37:47 -0800 (PST) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: 0 X-Spam-Level: X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id MA+4ZPos7qyk for ; Wed, 25 Jan 2012 13:37:47 -0800 (PST) Received: from guru.guru-group.fi (guru-group.fi [87.108.86.66]) by olra.theworths.org (Postfix) with ESMTP id E873C429E36 for ; Wed, 25 Jan 2012 13:37:46 -0800 (PST) Received: by guru.guru-group.fi (Postfix, from userid 501) id 683F968056; Wed, 25 Jan 2012 23:37:47 +0200 (EET) From: Tomi Ollila To: Subject: [PATCH] uncrustify.cfg: comments and more types Date: Wed, 25 Jan 2012 23:37:45 +0200 Message-Id: <1327527465-10321-1-git-send-email-tomi.ollila@iki.fi> X-Mailer: git-send-email 1.7.6.1 Cc: Tomi Ollila X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Jan 2012 21:37:47 -0000 Changes to devel/uncrustify.cfg: * Updated header comment to state this is config file for *notmuch*. * Mentioned in header commit that uncrustify version 0.59 required. * Use tabs to indent/align comments. * Added comment about the reason of 'type' keyword used. * Added some more custom types woth 'type' keyword. * Have (every) multiline comment lines start with '*'. --- devel/uncrustify.cfg | 23 +++++++++++++++-------- 1 files changed, 15 insertions(+), 8 deletions(-) diff --git a/devel/uncrustify.cfg b/devel/uncrustify.cfg index d8075ba..92bb29b 100644 --- a/devel/uncrustify.cfg +++ b/devel/uncrustify.cfg @@ -1,13 +1,15 @@ # -# uncrustify config file for the linux kernel +# Uncrustify config file for notmuch. +# Based on uncrustify config file for the linux kernel # # $Id: linux-indent.cfg 488 2006-09-09 12:44:38Z bengardner $ # Taken from the uncrustify distribution under license (GPL2+) # -# sample usage: +# Sample usage: # uncrustify --replace -c uncrustify.cfg foo.c # -# +# Note: for proper output, uncrustify version 0.59 is required. +# (without indent_cmt_with_tabs this may work ok with 0.58 (and possibly older) indent_with_tabs = 2 # 1=indent to level only, 2=indent with tabs align_with_tabs = TRUE # use tabs to align @@ -18,6 +20,8 @@ indent_columns = 4 indent_label = -2 # pos: absolute col, neg: relative column +indent_cmt_with_tabs = true # use tabs to indent/align comments + # # inter-symbol newlines # @@ -54,11 +58,14 @@ nl_after_struct = 0 # mod_full_brace_do = remove # "do a--; while ();" vs "do { a--; } while ();" # mod_full_brace_while = remove # "while (a) a--;" vs "while (a) { a--; }" -# -# Extra types used in notmuch source. -# (add more on demand) -type GMimeObject mime_node_t +# In case some custom types aren't detected properly by uncrustify +# add those to this section below. For example there are cases where +# uncrustify doesn't know whether a 'token' is part of pointer type +# or left operand of a binary multiplication operation. + +type GMimeObject GMimeCryptoContext GMimeCipherContext +type mime_node_t notmuch_message_t # # inter-character spacing options @@ -107,7 +114,6 @@ align_right_cmt_span = 8 # align comments span this much in func # align_pp_define_span = 8; # align_pp_define_gap = 4; -# cmt_star_cont = FALSE +cmt_star_cont = true # indent_brace = 0 -- 1.7.8.2