From aa967682bcdbeaa11b3e79d66b1d68b129dd4161 Mon Sep 17 00:00:00 2001
From: Ben Burwell <ben@benburwell.com>
Date: Thu, 23 Jan 2020 12:18:40 -0500
Subject: [PATCH] Fix handling of multiple template-dirs
Before, while the docs stated that template-dirs was a colon-separated
list, a delimiter was not specified in the struct tag, so it was falling
back to the default for the ini library (a comma). Also added a note to
the docs to clarify that templates are configured in the [templates]
section.
---
config/config.go | 6 +++---
doc/aerc-config.5.scd | 4 +++-
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/config/config.go b/config/config.go
index e5f7395..fe548ff 100644
--- a/config/config.go
+++ b/config/config.go
@@ -106,9 +106,9 @@ type TriggersConfig struct {
}
type TemplateConfig struct {
- TemplateDirs []string
- QuotedReply string `ini:"quoted-reply"`
- Forwards string `ini:"forwards"`
+ TemplateDirs []string `ini:"template-dirs", delim:":"`
+ QuotedReply string `ini:"quoted-reply"`
+ Forwards string `ini:"forwards"`
}
type AercConfig struct {
diff --git a/doc/aerc-config.5.scd b/doc/aerc-config.5.scd
index 5dac4ac..791a39d 100644
--- a/doc/aerc-config.5.scd
+++ b/doc/aerc-config.5.scd
@@ -269,7 +269,7 @@ They are configured in the *[triggers]* section of aerc.conf.
Format specifiers from *index-format* are expanded with respect to the new
message.
-## Templates
+## TEMPLATES
Templates are used to populate the body of an email. The compose, reply
and forward commands can be called with the -T flag with the name of the
@@ -278,6 +278,8 @@ template name.
aerc ships with some default templates installed in the share directory (usually
_/usr/share/aerc/templates_).
+These options are configured in the *[templates]* section of aerc.conf.
+
*template-dirs*
The directory where the templates are stored. The config takes a
colon-separated list of dirs.