summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Bremner <david@tethera.net>2022-01-01 08:01:35 -0400
committerDavid Bremner <david@tethera.net>2022-01-18 08:09:14 -0400
commit79936ac93e486d8ff82729840154bf8c2212ebb6 (patch)
tree964ddf5be999615d66bd96bf1efce829be6ecc65
parent417d202e642e0af0ef692e3ce250a6af985c7442 (diff)
lib/config: add known config key "show.extra_headers"
Used in a following commit to enable including extra headers beyond the default in structured output.
-rw-r--r--lib/config.cc3
-rw-r--r--lib/notmuch.h1
-rwxr-xr-xtest/T590-libconfig.sh4
3 files changed, 8 insertions, 0 deletions
diff --git a/lib/config.cc b/lib/config.cc
index f61eb636..003ce679 100644
--- a/lib/config.cc
+++ b/lib/config.cc
@@ -596,6 +596,8 @@ _notmuch_config_key_to_string (notmuch_config_key_t key)
return "user.name";
case NOTMUCH_CONFIG_AUTOCOMMIT:
return "database.autocommit";
+ case NOTMUCH_CONFIG_EXTRA_HEADERS:
+ return "show.extra_headers";
default:
return NULL;
}
@@ -643,6 +645,7 @@ _notmuch_config_default (notmuch_database_t *notmuch, notmuch_config_key_t key)
return "";
case NOTMUCH_CONFIG_AUTOCOMMIT:
return "8000";
+ case NOTMUCH_CONFIG_EXTRA_HEADERS:
case NOTMUCH_CONFIG_HOOK_DIR:
case NOTMUCH_CONFIG_BACKUP_DIR:
case NOTMUCH_CONFIG_OTHER_EMAIL:
diff --git a/lib/notmuch.h b/lib/notmuch.h
index fef98b4b..cd5c1246 100644
--- a/lib/notmuch.h
+++ b/lib/notmuch.h
@@ -2550,6 +2550,7 @@ typedef enum {
NOTMUCH_CONFIG_OTHER_EMAIL,
NOTMUCH_CONFIG_USER_NAME,
NOTMUCH_CONFIG_AUTOCOMMIT,
+ NOTMUCH_CONFIG_EXTRA_HEADERS,
NOTMUCH_CONFIG_LAST
} notmuch_config_key_t;
diff --git a/test/T590-libconfig.sh b/test/T590-libconfig.sh
index 0b5291ab..26a1f033 100755
--- a/test/T590-libconfig.sh
+++ b/test/T590-libconfig.sh
@@ -439,6 +439,7 @@ cat <<'EOF' >EXPECTED
09: 'NULL'
10: 'USER_FULL_NAME'
11: '8000'
+12: 'NULL'
== stderr ==
EOF
unset MAILDIR
@@ -749,6 +750,7 @@ cat <<'EOF' >EXPECTED
09: 'test_suite_other@notmuchmail.org;test_suite@otherdomain.org'
10: 'Notmuch Test Suite'
11: '8000'
+12: 'NULL'
== stderr ==
EOF
test_expect_equal_file EXPECTED OUTPUT
@@ -782,6 +784,7 @@ cat <<'EOF' >EXPECTED
09: 'NULL'
10: 'USER_FULL_NAME'
11: '8000'
+12: 'NULL'
== stderr ==
EOF
test_expect_equal_file EXPECTED OUTPUT.clean
@@ -858,6 +861,7 @@ maildir.synchronize_flags true
new.ignore sekrit_junk
new.tags unread;inbox
search.exclude_tags foo;bar;fub
+show.extra_headers (null)
test.key1 testvalue1
test.key2 testvalue2
user.name Notmuch Test Suite