[RFC PATCH 1/3] cli: cosmetic style cleanup

diff --git a/2a/a306e33f8a5618661bbcae5407d887f7a8b191 b/2a/a306e33f8a5618661bbcae5407d887f7a8b191
new file mode 100644 (file)
index 0000000..07d6942
--- /dev/null
+++ b/2a/a306e33f8a5618661bbcae5407d887f7a8b191
@@ -0,0 +1,116 @@
+Return-Path: <jani@nikula.org>\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 666D8431FBD\r
+       for <notmuch@notmuchmail.org>; Sat,  2 Mar 2013 11:55:28 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 wk+jG0xqa5yP for <notmuch@notmuchmail.org>;\r
+       Sat,  2 Mar 2013 11:55:26 -0800 (PST)\r
+Received: from mail-la0-f41.google.com (mail-la0-f41.google.com\r
+       [209.85.215.41]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 2A877431FAE\r
+       for <notmuch@notmuchmail.org>; Sat,  2 Mar 2013 11:55:26 -0800 (PST)\r
+Received: by mail-la0-f41.google.com with SMTP id fo12so3947992lab.28\r
+       for <notmuch@notmuchmail.org>; Sat, 02 Mar 2013 11:55:23 -0800 (PST)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=google.com; s=20120113;\r
+       h=x-received:from:to:cc:subject:date:message-id:x-mailer\r
+       :x-gm-message-state;\r
+       bh=bZW1Cx1zdHuCuTY4ocqhCGBI5klXcq+BPPYgge7Axj8=;\r
+       b=AslaupO/uDc/LQihrGNX0gmq+5xgpz9XkiKqj87OrUQBC/Yr3OPQlX1eqLd2PRnC3c\r
+       MH5ifQHAIY3JuwMTJARPTH2aFqNqctZsc+lZMEMGYnQqrjqQeex9JtE/C5SRmlmZhXS7\r
+       tn1jhZTmDQrkowyFrbfwet+BhfRju1Xb+k472r8vORQeCuR331KSxrK2jkiAMpRQ8zV5\r
+       xibh71nIU29v1m6TJckwbVY8O9iMvdTkGDay8X5hBjX1+XKJn0hj6bHWOaqTGImjtavJ\r
+       keQVtUJRuTNFI6KWrubTbVUl883gs1XGEf5+LWDR3FoplcOSkM2dVCMYZ7d1xA+dV48Q\r
+       9M7w==\r
+X-Received: by 10.152.133.133 with SMTP id pc5mr12958795lab.32.1362254123158; \r
+       Sat, 02 Mar 2013 11:55:23 -0800 (PST)\r
+Received: from localhost (dsl-hkibrasgw4-50df51-27.dhcp.inet.fi.\r
+       [80.223.81.27])\r
+       by mx.google.com with ESMTPS id go12sm8939701lab.3.2013.03.02.11.55.21\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Sat, 02 Mar 2013 11:55:22 -0800 (PST)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [RFC PATCH 1/3] cli: cosmetic style cleanup\r
+Date: Sat,  2 Mar 2013 21:55:19 +0200\r
+Message-Id:\r
+ <5eaa3acc22ee5513bdce5ab931b7a79ade880e06.1362254104.git.jani@nikula.org>\r
+X-Mailer: git-send-email 1.7.10.4\r
+X-Gm-Message-State:\r
+ ALoCoQmYjSZNe03bTkAKXav0JnRHyMREZn+djZQPIVOfX3CRiLBww4Y6KC0LGtGZ0P85boYaBpq8\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: Sat, 02 Mar 2013 19:55:28 -0000\r
+\r
+---\r
+ notmuch-config.c |   13 +------------\r
+ 1 file changed, 1 insertion(+), 12 deletions(-)\r
+\r
+diff --git a/notmuch-config.c b/notmuch-config.c\r
+index b5c2066..45b4c0e 100644\r
+--- a/notmuch-config.c\r
++++ b/notmuch-config.c\r
+@@ -398,39 +398,28 @@ notmuch_config_open (void *ctx,\r
+      * the configuration file, we add some comments to help the user\r
+      * understand what can be done. */\r
+     if (is_new)\r
+-    {\r
+       g_key_file_set_comment (config->key_file, NULL, NULL,\r
+                               toplevel_config_comment, NULL);\r
+-    }\r
+ \r
+     if (! file_had_database_group)\r
+-    {\r
+       g_key_file_set_comment (config->key_file, "database", NULL,\r
+                               database_config_comment, NULL);\r
+-    }\r
+ \r
+     if (! file_had_new_group)\r
+-    {\r
+       g_key_file_set_comment (config->key_file, "new", NULL,\r
+                               new_config_comment, NULL);\r
+-    }\r
+ \r
+     if (! file_had_user_group)\r
+-    {\r
+       g_key_file_set_comment (config->key_file, "user", NULL,\r
+                               user_config_comment, NULL);\r
+-    }\r
+ \r
+     if (! file_had_maildir_group)\r
+-    {\r
+       g_key_file_set_comment (config->key_file, "maildir", NULL,\r
+                               maildir_config_comment, NULL);\r
+-    }\r
+ \r
+-    if (! file_had_search_group) {\r
++    if (! file_had_search_group)\r
+       g_key_file_set_comment (config->key_file, "search", NULL,\r
+                               search_config_comment, NULL);\r
+-    }\r
+ \r
+     if (is_new_ret)\r
+       *is_new_ret = is_new;\r
+-- \r
+1.7.10.4\r
+\r