X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=notmuch-config.c;h=58f83b0d299c8d4b6213758448bf1db69302b6b3;hb=8fe3ee6f270efae66e7e0287e32f93a9b48c7a32;hp=cadc6e61f9a1871fd0391c97419cc5161075e634;hpb=15e71cfda732c20d06f0a15b2ab16a940ecd5962;p=notmuch

diff --git a/notmuch-config.c b/notmuch-config.c
index cadc6e61..58f83b0d 100644
--- a/notmuch-config.c
+++ b/notmuch-config.c
@@ -37,11 +37,13 @@ static const char database_config_comment[] =
     " Notmuch will store its database within a sub-directory of the path\n"
     " configured here named \".notmuch\".\n";
 
-static const char messages_config_comment[] =
-    " Messages configuration\n"
+static const char new_config_comment[] =
+    " Configuration for \"notmuch new\"\n"
     "\n"
-    " The only value supported here is 'new_tags' which lists the tags that\n"
-    " should be applied to new messages.\n";
+    " The following options are supported here:\n"
+    "\n"
+    "\ttags	A list (separated by ';') of the tags that will be\n"
+    "\t	added to all messages incorporated by \"notmuch new\".\n";
 
 static const char user_config_comment[] =
     " User configuration\n"
@@ -180,7 +182,7 @@ notmuch_config_open (void *ctx,
     size_t tmp;
     char *notmuch_config_env = NULL;
     int file_had_database_group;
-    int file_had_messages_group;
+    int file_had_new_group;
     int file_had_user_group;
 
     if (is_new_ret)
@@ -250,8 +252,7 @@ notmuch_config_open (void *ctx,
      */
     file_had_database_group = g_key_file_has_group (config->key_file,
 						    "database");
-    file_had_messages_group = g_key_file_has_group (config->key_file,
-						    "messages");
+    file_had_new_group = g_key_file_has_group (config->key_file, "new");
     file_had_user_group = g_key_file_has_group (config->key_file, "user");
 
 
@@ -318,10 +319,10 @@ notmuch_config_open (void *ctx,
 				database_config_comment, NULL);
     }
 
-    if (! file_had_messages_group)
+    if (! file_had_new_group)
     {
-	g_key_file_set_comment (config->key_file, "messages", NULL,
-				messages_config_comment, NULL);
+	g_key_file_set_comment (config->key_file, "new", NULL,
+				new_config_comment, NULL);
     }
 
     if (! file_had_user_group)
@@ -518,7 +519,7 @@ notmuch_config_get_new_tags (notmuch_config_t *config,
 
     if (config->new_tags == NULL) {
 	tags = g_key_file_get_string_list (config->key_file,
-					   "messages", "new_tags",
+					   "new", "tags",
 					   &tags_length, NULL);
 	if (tags) {
 	    config->new_tags = talloc_size (config,
@@ -545,7 +546,7 @@ notmuch_config_set_new_tags (notmuch_config_t *config,
 			     size_t length)
 {
     g_key_file_set_string_list (config->key_file,
-				"messages", "new_tags",
+				"new", "tags",
 				new_tags, length);
 
     talloc_free (config->new_tags);