From 689f1e369be14b9f32b9ceda319642a90b1824e3 Mon Sep 17 00:00:00 2001 From: Tomi Ollila Date: Tue, 7 Feb 2012 18:34:17 +0200 Subject: [PATCH] [PATCH] uncrustify.cfg: comments and more types --- 27/c4822cdd6930a4d980a1b06c70a066827a22c4 | 114 ++++++++++++++++++++++ 1 file changed, 114 insertions(+) create mode 100644 27/c4822cdd6930a4d980a1b06c70a066827a22c4 diff --git a/27/c4822cdd6930a4d980a1b06c70a066827a22c4 b/27/c4822cdd6930a4d980a1b06c70a066827a22c4 new file mode 100644 index 000000000..085f344cd --- /dev/null +++ b/27/c4822cdd6930a4d980a1b06c70a066827a22c4 @@ -0,0 +1,114 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id BD6CB431FBC + for ; Tue, 7 Feb 2012 08:34:19 -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 NX6IetVx8st0 for ; + Tue, 7 Feb 2012 08:34:19 -0800 (PST) +Received: from guru.guru-group.fi (guru-group.fi [87.108.86.66]) + by olra.theworths.org (Postfix) with ESMTP id 1FF6C431FAE + for ; Tue, 7 Feb 2012 08:34:19 -0800 (PST) +Received: by guru.guru-group.fi (Postfix, from userid 501) + id 35EA168055; Tue, 7 Feb 2012 18:34:19 +0200 (EET) +From: Tomi Ollila +To: notmuch@notmuchmail.org +Subject: [PATCH] uncrustify.cfg: comments and more types +Date: Tue, 7 Feb 2012 18:34:17 +0200 +Message-Id: <1328632457-26230-1-git-send-email-tomi.ollila@iki.fi> +X-Mailer: git-send-email 1.7.6.1 +In-Reply-To: +References: +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: Tue, 07 Feb 2012 16:34:19 -0000 + +Changes to devel/uncrustify.cfg: + +* Updated header comment to state this is config file for *notmuch*. +* 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 | 21 +++++++++++++-------- + 1 files changed, 13 insertions(+), 8 deletions(-) + +diff --git a/devel/uncrustify.cfg b/devel/uncrustify.cfg +index d8075ba..bab9761 100644 +--- a/devel/uncrustify.cfg ++++ b/devel/uncrustify.cfg +@@ -1,13 +1,13 @@ + # +-# 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 + # +-# + + indent_with_tabs = 2 # 1=indent to level only, 2=indent with tabs + align_with_tabs = TRUE # use tabs to align +@@ -18,6 +18,8 @@ indent_columns = 4 + + indent_label = -2 # pos: absolute col, neg: relative column + ++indent_cmt_with_tabs = false # true would align to tabstop always... ++ + # + # inter-symbol newlines + # +@@ -54,11 +56,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,6 +112,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.6.5 + -- 2.26.2