Re: [PATCH 2/2] cli/count: apply uncrustify changes

diff --git a/0a/a771605ff959fa1c46b5c6e944bb49c7f651b4 b/0a/a771605ff959fa1c46b5c6e944bb49c7f651b4
new file mode 100644 (file)
index 0000000..8d1d8de
--- /dev/null
+++ b/0a/a771605ff959fa1c46b5c6e944bb49c7f651b4
@@ -0,0 +1,74 @@
+Return-Path: <david@tethera.net>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 04BC16DE1488\r
+ for <notmuch@notmuchmail.org>; Wed,  9 Sep 2015 16:18:42 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 3.129\r
+X-Spam-Level: ***\r
+X-Spam-Status: No, score=3.129 tagged_above=-999 required=5 tests=[AWL=-1.305,\r
+  RCVD_IN_BRBL_LASTEXT=1.644, RCVD_IN_SBL=2.596, RP_MATCHES_RCVD=-0.55,\r
+  URIBL_SBL=0.644, URIBL_SBL_A=0.1] autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id 4vhnviSwzlxz for <notmuch@notmuchmail.org>;\r
+ Wed,  9 Sep 2015 16:18:40 -0700 (PDT)\r
+Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])\r
+ by arlo.cworth.org (Postfix) with ESMTPS id DECDA6DE13D2\r
+ for <notmuch@notmuchmail.org>; Wed,  9 Sep 2015 16:18:39 -0700 (PDT)\r
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)\r
+ (envelope-from <david@tethera.net>)\r
+ id 1ZZodM-0002Fx-9f; Wed, 09 Sep 2015 20:18:32 -0300\r
+Received: (nullmailer pid 3411 invoked by uid 1000); Wed, 09 Sep 2015\r
+ 23:18:28 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: Tomi Ollila <tomi.ollila@iki.fi>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 2/2] cli/count: apply uncrustify changes\r
+In-Reply-To: <87613jpkam.fsf@zancas.localnet>\r
+References: <1441632818-22483-1-git-send-email-david@tethera.net>\r
+ <1441632818-22483-2-git-send-email-david@tethera.net>\r
+ <m2bndegwqf.fsf@guru.guru-group.fi> <87613jpkam.fsf@zancas.localnet>\r
+User-Agent: Notmuch/0.20.2+71~gf460ad4 (http://notmuchmail.org) Emacs/24.5.1\r
+ (x86_64-pc-linux-gnu)\r
+Date: Wed, 09 Sep 2015 20:18:28 -0300\r
+Message-ID: <87613j41x7.fsf@zancas.localnet>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.18\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: Wed, 09 Sep 2015 23:18:42 -0000\r
+\r
+David Bremner <david@tethera.net> writes:\r
+\r
+> Tomi Ollila <tomi.ollila@iki.fi> writes:\r
+>\r
+>>>  \r
+>>>      if (exclude == EXCLUDE_TRUE) {\r
+>>>    search_exclude_tags = notmuch_config_get_search_exclude_tags\r
+>>> -      (config, &search_exclude_tags_length);\r
+>>> +                            (config, &search_exclude_tags_length);\r
+>>\r
+>> With the first 2 uncrustify does a good job, but this last one it disagrees\r
+>> how emacs(1) indents (and how it is currently indented in other notmuch\r
+>> source files) -- I'd leave the last (3rd) change out.\r
+>\r
+> I actually think the uncrustify version is better, but I agree there is\r
+> not much point having a standard that isn't easily achievable with\r
+> emacs.  After a short struggle trying to understand CC-mode indentation,\r
+> I give up.\r
+\r
+Pushed these two, amended as Tomi suggested.\r
+\r
+d\r